Merge branch 'master' of ssh://gitea.ttstd.com:2222/tt/youlai-boot

Merge pull request !51 from Qiuyun/master

.gitignore

@@ -17,4 +17,3 @@ docker/*/data/
 docker/minio/config
 docker/xxljob/logs
 application-youlai.yml
-youlai_admin_template.sql

CHANGELOG.md

@@ -1,60 +0,0 @@
-# 2.7.1 (2024/4/18)
-### 🐛 fix
-- 修复用户名或者密码错误时，返回的错误信息不正确问题
-### 🛠️ refactor
-- JWT 解析和验证代码优化重构
-- 优化代码结构和完善注释，提高代码可读性
-
-# 2.7.0 (2024/4/13)
-### ✨ feat
-- 集成 Mybatis-Plus generator 代码生成器
-
-# 2.6.0 (2024/3/6)
-
-### ✨ feat
-- 黑名单方式实现 JWT 主动注销过期
-### 🛠️ refactor
-- 角色权限重构
-
-
-# 2.5.0 (2023/12/6)
-### ✨ feat
-- [集成 Spring Cache 和 Redis 缓存，路由缓存](https://blog.csdn.net/u013737132/article/details/134789862)
-### 🛠️ refactor
-- 权限判断逻辑调整，用户绑定权限调整为角色绑定权限
-### fix
-- [接口无请求权限，Spring Security 自定义异常无效问题修复](https://youlai.blog.csdn.net/article/details/134718249)
-
-
-# 2.4.1 (2023/11/7)
-### ✂️ refactor
-- 项目目录结构优化
-### ⬆️ chore
-- 升级 SpringBoot 版本 `3.1.4` → `3.1.5`
-
-
-# 2.2.1 (2023/5/25)
-
-### 🐛 fix
-
-- 修复多级路由的组件路径错误导致页面404问题
-
-# 2.2.0 (2023/5/21)
-
-### ✨ feat
-- 菜单、角色、字典、部门添加接口权限控制
-
-### 🐛 fix
-
-- 用户登录权限缓存键值不一致导致获取用户数据权限错误问题修复
-
-### ✂️ refactor
-
-- 递归获取菜单、部门属性列表代码重构优化
-
-### ⬆️ chore
-- 升级 SpringBoot 版本 `3.0.6` → `3.1.0`
-
-### 📝 docs
-- SQL 脚本更新，sys_menu 新增 `tree_path` 字段  (升级需更新SQL脚本)
-

Dockerfile

@@ -20,4 +20,4 @@ CMD java \
     -jar /app.jar
 
 # 暴露端口
-EXPOSE 8989
+EXPOSE 8000

README.md

@@ -1,201 +1,197 @@
 <div align="center">
 
-## 🎉 正在参加 Gitee 2025 最受欢迎开源软件评选
+<img alt="youlai-boot" width="80" src="./docs/images/logo/logo.png">
 
-<a href="https://gitee.com/activity/2025opensource?ident=I6VXEH" target="_blank">
-  <img src="https://img.shields.io/badge/VUE3--ELEMENT--ADMIN-点击投票支持-f97316?style=for-the-badge&logo=gitee&logoColor=white&labelColor=111827" alt="投票" height="50"/>
-</a>
+# youlai-boot
 
-<p>
-  <strong>📢 投票最后1天！恳请助力一票 🙏 无需重复投，您的支持是我们前行的最大动力！</strong>
-</p>
+**Spring Boot 4 企业级权限管理系统后端**
+
+[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-4.0.5-6DB33F?logo=spring-boot)](https://spring.io/projects/spring-boot)
+[![JDK](https://img.shields.io/badge/JDK-17%2B-007396?logo=openjdk)](https://openjdk.org/)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue?logo=apache)](LICENSE)
+[![Gitee Star](https://gitee.com/youlaiorg/youlai-boot/badge/star.svg)](https://gitee.com/youlaiorg/youlai-boot/stargazers)
+[![GitHub Star](https://img.shields.io/github/stars/youlaitech/youlai-boot?style=social)](https://github.com/youlaitech/youlai-boot)
+[![GitCode Star](https://gitcode.com/youlai/youlai-boot/star/badge.svg)](https://gitcode.com/youlai/youlai-boot/stargazers)
 
 </div>
 
 ![](https://foruda.gitee.com/images/1708618984641188532/a7cca095_716974.png "rainbow.png")
 
 <div align="center">
-   <img alt="logo" width="100" height="100" src="https://foruda.gitee.com/images/1733417239320800627/3c5290fe_716974.png">
-   <h2>youlai-boot</h2>
-   <img alt="有来技术" src="https://img.shields.io/badge/Java -17-brightgreen.svg"/>
-   <img alt="有来技术" src="https://img.shields.io/badge/SpringBoot-3.5.6-green.svg"/>
-   <a href="https://gitcode.com/youlai/youlai-boot" target="_blank">
-    <img alt="有来技术" src="https://gitcode.com/youlai/youlai-boot/star/badge.svg"/>
-   </a>
-   <a href="https://gitee.com/youlaiorg/youlai-boot" target="_blank">
-     <img alt="有来技术" src="https://gitee.com/youlaiorg/youlai-boot/badge/star.svg"/>
-   </a>     
-   <a href="https://github.com/haoxianrui/youlai-boot" target="_blank">
-     <img alt="有来技术" src="https://img.shields.io/github/stars/haoxianrui/youlai-boot.svg?style=social&label=Stars"/>
-   </a>
-   <br/>
-   <img alt="有来技术" src="https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg"/>
-   <a href="https://gitee.com/youlaiorg" target="_blank">
-     <img alt="有来技术" src="https://img.shields.io/badge/Author-有来开源组织-orange.svg"/>
-   </a>
+
+[🖥️ 在线预览](https://vue.youlai.tech) | [📲 移动端预览](https://app.youlai.tech) | [📖 文档](https://www.youlai.tech/docs/server/spring-boot/)
+
 </div>
 
-![](https://raw.gitmirror.com/youlaitech/image/main/docs/rainbow.png)
+## 简介
 
-<div align="center">
-  <a target="_blank" href="https://vue.youlai.tech/">🖥️ 在线预览</a> |  <a target="_blank" href="https://youlai.blog.csdn.net/article/details/145178880">📑 阅读文档</a> |  <a target="_blank" href="https://www.youlai.tech/youlai-boot">🌐 官网</a>
-</div>
+**youlai-boot** 是一套基于 Spring Boot 4 的企业级权限管理系统后端，配套前端 [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) 和移动端 [youlai-app](https://gitee.com/youlaiorg/youlai-app)，并提供 **6 种语言实现**（Java / Node.js / Go / Python / PHP / C#），共享同一套 API 规范与数据库结构。适用于企业中后台管理系统的学习参考与二次开发。
 
-## 📢 项目简介
+## 核心特性
 
-基于 JDK 17、Spring Boot 3、Spring Security 6、JWT、Redis、Mybatis-Plus、Vue
-3、Element-Plus 构建的前后端分离单体权限管理系统。
-[Mybatis-Flex 版本](https://gitee.com/youlaiorg/youlai-boot-flex)
+- 🔐 **安全体系** — Spring Security + JWT/Redis Token 双会话模式、令牌续期、多端互斥
+- 🛡️ **细粒度权限** — RBAC 五级：数据 → 菜单 → 按钮 → 接口 → 字段
+- ⚡ **代码生成器** — 一键生成前后端 CRUD 代码
+- 📦 **模块齐全** — 用户、角色、菜单、部门、字典、文件、定时任务、消息中心、操作日志
+- 🌐 **多租户 SaaS** — 数据隔离 + 租户配置，独立 [youlai-boot-tenant](https://gitee.com/youlaiorg/youlai-boot-tenant) 版本
+- 🔌 **实时通信** — SSE 推送：在线用户数、字典同步、通知广播
 
-- **🚀 开发框架**: 使用 Spring Boot 3 和 Vue 3，以及 Element-Plus 等主流技术栈，
-  实时更新。
+## 技术架构
 
-- **🔐 安全认证**: 基于 Spring Security 6 原生架构，集成 JWT 令牌自动续期（无状
-  态）和 Redis 会话多端互斥管理（实时强制离线）双重认证机制，构建企业级身份安全
-  中枢。
+<p align="center">
+  <img alt="youlai-boot 技术架构图" width="900" src="./docs/images/architecture/architecture.png">
+</p>
 
-- **🔑 权限管理**: 基于 RBAC 模型，实现细粒度的权限控制，涵盖接口方法和按钮级别
-  。
+## 系统预览
 
-- **🛠️ 功能模块**: 包括用户管理、角色管理、菜单管理、部门管理、字典管理等功能。
+**PC 端**
 
-## 🌈 项目源码
+<table align="center">
+  <tr>
+    <td><img alt="PC预览1" width="400" src="./docs/images/preview/pc-01.png"></td>
+    <td><img alt="PC预览2" width="400" src="./docs/images/preview/pc-02.png"></td>
+  </tr>
+  <tr>
+    <td><img alt="PC预览3" width="400" src="./docs/images/preview/pc-03.png"></td>
+    <td><img alt="PC预览4" width="400" src="./docs/images/preview/pc-04.png"></td>
+  </tr>
+    <tr>
+    <td><img alt="PC预览3" width="400" src="./docs/images/preview/pc-05.png"></td>
+    <td><img alt="PC预览4" width="400" src="./docs/images/preview/pc-06.png"></td>
+  </tr>
+</table>
 
-| 项目类型       | Gitee                                                                  | Github                                                                   | GitCode                                                               |
-| -------------- | ---------------------------------------------------------------------- | ------------------------------------------------------------------------ | --------------------------------------------------------------------- |
-| ✅ Java 后端   | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot)                 | [youlai-boot](https://github.com/haoxianrui/youlai-boot)                 | [youlai-boot](https://gitcode.com/youlai/youlai-boot)                 |
-| vue3 前端      | [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin)   | [vue3-element-admin](https://github.com/youlaitech/vue3-element-admin)   | [vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin)   |
-| uni-app 移动端 | [vue-uniapp-template](https://gitee.com/youlaiorg/vue-uniapp-template) | [vue-uniapp-template](https://github.com/youlaitech/vue-uniapp-template) | [vue-uniapp-template](https://gitcode.com/youlai/vue-uniapp-template) |
+**移动端**
 
-## 📚 项目文档
+<table align="center">
+  <tr>
+    <td><img alt="APP预览1" width="200" src="./docs/images/preview/app-01.png"></td>
+    <td><img alt="APP预览2" width="200" src="./docs/images/preview/app-02.png"></td>
+    <td><img alt="APP预览3" width="200" src="./docs/images/preview/app-03.png"></td>
+    <td><img alt="APP预览4" width="200" src="./docs/images/preview/app-04.png"></td>
+  </tr>
+</table>
 
-| 文档名称                  | 访问地址                                                                                                         |
-| ------------------------- | ---------------------------------------------------------------------------------------------------------------- |
-| 在线接口文档              | [https://www.apifox.cn/apidoc](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5)         |
-| 项目介绍与使用指南        | [https://www.youlai.tech/youlai-boot/](https://www.youlai.tech/youlai-boot/)                                     |
-| 功能详解与操作手册        | [https://youlai.blog.csdn.net/article/details/145178880](https://youlai.blog.csdn.net/article/details/145178880) |
-| 新手入门指南(项目 0 到 1) | [https://youlai.blog.csdn.net/article/details/145177011](https://youlai.blog.csdn.net/article/details/145177011) |
+## 快速开始
 
-## 📁 项目目录
+**环境要求**：JDK 17+ · MySQL 8.0+ · Redis 6.0+
 
-<details>
-<summary> 目录结构 </summary>
+1. 克隆项目：`git clone https://gitee.com/youlaiorg/youlai-boot.git`
+2. 导入数据库：`sql/youlai-admin.sql`
+3. 修改配置（可选，默认已配置线上只读数据源）：`src/main/resources/application-dev.yml`
+4. 启动服务，访问 http://localhost:8000/doc.html
 
-<br>
+默认账号：`admin` / `123456`
+
+**Docker 部署**：`cd deploy/docker`，然后 `docker-compose up -d`
+
+详细指南：[部署文档](https://www.youlai.tech/docs/server/spring-boot/deploy) · [开发规范](https://www.youlai.tech/docs/server/spring-boot/dev-standards)
+
+## 技术栈
+
+| 技术 | 版本 | 说明 |
+|:-----|:-----|:-----|
+| Spring Boot | 4.0.5 | 核心框架 |
+| Spring Security | 6.x | 认证授权 |
+| MyBatis-Plus | 3.5.15 | ORM 框架 |
+| Druid | 1.2.24 | 数据库连接池 |
+| Redis + Redisson | 6.0+ / 4.1.0 | 缓存 · 会话 · 分布式锁 |
+| Caffeine | 2.9.3 | 本地缓存 |
+| XXL-Job | 3.2.0 | 分布式定时任务 |
+| Knife4j | 4.5.0 | API 文档 |
+| MapStruct | 1.6.3 | 对象映射 |
+| MinIO | 8.5.10 | 对象存储 |
+
+## 目录结构
 
 ```
-youlai-boot
-├── docker                              # Docker 目录
-│   ├── docker-compose.yml              # docker-compose 脚本
-├── sql                                 # SQL脚本
-│   ├── mysql                           # MySQL 脚本
-├── src                                 # 源码目录
-│   ├── auth                            # 认证模块（登录入口）
-│   ├── common                          # 公共模块
-│   │   ├── annotation                  # 注解定义
-│   │   ├── base                        # 基础类
-│   │   ├── constant                    # 常量
-│   │   ├── enums                       # 枚举类型
-│   │   ├── model                       # 数据模型
-│   │   └── util                        # 工具类
-│   ├── config                          # 自动装配配置
-│   │   └── property                    # 配置属性目录
-│   ├── core                            # 核心框架
-│   │   ├── aspect                      # 切面(日志、防重提交)
-│   │   ├── exception                   # 异常处理
-│   │   ├── filter                      # 过滤器(请求日志、限流)
-│   │   ├── validator                   # 验证器
-│   │   └── web                         # Web响应封装(Result、PageResult等)
-│   ├── platform                        # 平台服务（通用服务）
-│   │   ├── codegen                     # 代码生成模块
-│   │   ├── file                        # 文件服务
-│   │   ├── mail                        # 邮件服务
-│   │   ├── sms                         # 短信服务
-│   │   └── websocket                   # WebSocket服务
-│   ├── plugin                          # 插件扩展
-│   │   ├── knife4j                     # Knife4j 扩展
-│   │   └── mybatis                     # Mybatis 扩展
-│   ├── security                        # 安全框架（Spring Security）
-│   │   ├── exception                   # 安全异常
-│   │   ├── filter                      # 安全过滤器
-│   │   ├── handler                     # 安全处理器
-│   │   ├── model                       # 安全模型
-│   │   ├── provider                    # 认证提供者
-│   │   ├── service                     # 安全服务
-│   │   ├── token                       # Token管理
-│   │   └── util                        # 安全工具类
-│   ├── system                          # 系统模块
-│   │   ├── controller                  # 控制层
-│   │   ├── converter                   # MapStruct 转换器
-│   │   ├── enums                       # 枚举
-│   │   ├── handler                     # 处理器
-│   │   ├── listener                    # 监听器
-│   │   ├── mapper                      # 数据库访问层
-│   │   ├── model                       # 模型层
-│   │   │   ├── bo                      # 业务对象
-│   │   │   ├── dto                     # 数据传输对象
-│   │   │   ├── entity                  # 实体对象
-│   │   │   ├── event                   # 事件对象
-│   │   │   ├── form                    # 表单对象
-│   │   │   ├── query                   # 查询参数对象
-│   │   │   └── vo                      # 视图对象
-│   │   └── service                     # 业务逻辑层
-│   └── YouLaiBootApplication           # 启动类
-└── end
+youlai-boot/
+├── deploy/
+│   └── docker/                      # Docker 部署编排
+├── docs/                            # 项目文档与图片资源
+├── sql/                             # 数据库初始化脚本
+├── src/main/java/com/youlai/boot/
+│   ├── YouLaiBootApplication.java   # 启动类
+│   ├── auth/                        # 认证授权（登录/登出/令牌）
+│   ├── codegen/                     # 代码生成器
+│   ├── common/                      # 公共模块（常量/枚举/统一响应）
+│   ├── file/                        # 文件服务（MinIO/本地/OSS）
+│   ├── framework/                   # 技术框架层
+│   │   ├── apidoc/                  # OpenAPI / Knife4j
+│   │   ├── cache/                   # Redis / Caffeine 缓存
+│   │   ├── captcha/                 # 图形验证码
+│   │   ├── integration/             # 短信 / 邮件 / 微信
+│   │   ├── job/                     # XXL-Job 定时任务
+│   │   ├── mybatis/                 # MyBatis-Plus 配置
+│   │   ├── security/                # Security / JWT / Token
+│   │   └── web/                     # 全局异常 / 跨域 / 限流
+│   ├── message/                     # SSE 消息推送
+│   └── system/                      # 系统业务（用户/角色/菜单/部门）
+└── pom.xml                          # Maven 依赖管理
 ```
 
-</details>
+## 生态矩阵
 
-## 🚀 项目启动
+**前端**
 
-📚 完整流程参考:
-[项目启动](https://www.youlai.tech/youlai-boot/1.%E9%A1%B9%E7%9B%AE%E5%90%AF%E5%8A%A8/)
+| 项目 | 技术栈 | 说明 |
+|:-----|:-------|:-----|
+| [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) | Vue 3 + Element Plus | PC 管理前端（主推） |
+| [youlai-app](https://gitee.com/youlaiorg/youlai-app) | Vue 3 + UniApp | 移动端 App |
 
-1. **克隆项目**
+**后端**
 
-   ```bash
-   git clone https://gitee.com/youlaiorg/youlai-boot.git
-   ```
+| 项目 | 技术栈 | 说明 |
+|:-----|:-------|:-----|
+| [youlai-nest](https://gitee.com/youlaiorg/youlai-nest) | NestJS + TypeORM | Node.js |
+| [youlai-gin](https://gitee.com/youlaiorg/youlai-gin) | Go + Gorm | Go |
+| [youlai-django](https://gitee.com/youlaiorg/youlai-django) | Django + DRF | Python |
+| [youlai-thinkphp](https://gitee.com/youlaiorg/youlai-thinkphp) | ThinkPHP 8 | PHP |
+| [youlai-aspnet](https://gitee.com/youlaiorg/youlai-aspnet) | ASP.NET Core | C# |
 
-2. **数据库初始化**
+> **youlai-boot** 还提供以下变种和分支版本：[多租户](https://gitee.com/youlaiorg/youlai-boot-tenant)（Spring Boot 4）· [MyBatis-Flex](https://gitee.com/youlaiorg/youlai-boot-flex)（Spring Boot 4）· [Spring Boot 3](https://gitee.com/youlaiorg/youlai-boot/tree/spring-boot-3) · [PostgreSQL](https://gitee.com/youlaiorg/youlai-boot/tree/db-pg) · [多模块](https://gitee.com/youlaiorg/youlai-boot/tree/multi-module)
+>
+> 六种后端共享同一套 **RESTful API 规范** 和 **数据库结构**，前端可无缝切换。
 
-   执行 [youlai_admin.sql](sql/mysql/youlai_admin.sql) 脚本完成数据库创建、表结
-   构和基础数据的初始化。
+## 文档资源
 
-3. **修改配置**
+| 资源 | 地址 |
+|:-----|:-----|
+| 📖 完整文档站 | [www.youlai.tech](https://www.youlai.tech/) |
+| 🖥️ PC 端在线预览 | [vue.youlai.tech](https://vue.youlai.tech) |
+| 📱 移动端在线预览 | [app.youlai.tech](https://app.youlai.tech) |
+| 🔗 Apifox 接口文档 | [apifox.com](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5) |
+| 🔗 本地接口文档 | [localhost:8000/doc.html](http://localhost:8000/doc.html) |
 
-   默认连接`有来`线上 MySQL/Redis（仅读权限），本地开发时请修改
-   [application-dev.yml](src/main/resources/application-dev.yml) 中的 MySQL 和
-   Redis 连接信息。
+## 参与贡献
 
-4. **启动项目**
+欢迎提交 Issue 和 Pull Request！详见 [贡献指南](https://www.youlai.tech/faq/help)。
 
-   执行
-   [YoulaiBootApplication.java](src/main/java/com/youlai/boot/YoulaiBootApplication.java)
-   的 main 方法完成后端项目启动；
+[![Contributors](https://contrib.rocks/image?repo=haoxianrui/youlai-boot)](https://github.com/haoxianrui/youlai-boot/graphs/contributors)
 
-   访问接口文档地址
-   [http://localhost:8989/doc.html](http://localhost:8989/doc.html) 验证项目启动
-   是否成功。
+## 开源协议
 
-## 🚀 项目部署
+本项目基于 [Apache License 2.0](LICENSE) 开源，可免费用于商业项目。
 
-参考官方文档:
-[项目部署指南](https://www.youlai.tech/youlai-boot/5.%E9%A1%B9%E7%9B%AE%E9%83%A8%E7%BD%B2/)
+---
 
-## ✅ 项目统计
+<table align="center">
+  <tr>
+    <td align="center">
+      <img src="./docs/images/qr/wechat-offical.png" height="180" alt="公众号「有来技术」"><br>
+      <sub>公众号「有来技术」</sub>
+    </td>
+    <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+    <td align="center">
+      <img src="./docs/images/qr/wechat-mp.jpg" height="180" alt="小程序「有来技术」"><br>
+      <sub>小程序「有来技术」</sub>
+    </td>
+    <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+    <td align="center">
+      <img src="./docs/images/qr/wechat-personal.png" height="180" alt="添加作者微信"><br>
+      <sub>添加作者微信</sub>
+    </td>
+  </tr>
+</table>
 
-![](https://repobeats.axiom.co/api/embed/544c5c0b5b3611a6c4d5ef0faa243a9066b89659.svg "Repobeats analytics image")
-
-Thanks to all the contributors!
-
-[![](https://contrib.rocks/image?repo=haoxianrui/youlai-boot)](https://github.com/haoxianrui/youlai-boot/graphs/contributors)
-
-## 💖 加交流群
-
-① 关注「有来技术」公众号，点击菜单 **交流群** 获取加群二维码（此举防止广告进群，
-感谢理解和支持）。
-
-② 直接添加微信 **`haoxianrui`** 备注「前端/后端/全栈」。
-
-![有来技术公众号](https://foruda.gitee.com/images/1737108820762592766/3390ed0d_716974.png)
+<p align="center"><em>技术交流 · 问题反馈 · 商务合作</em></p>

docker/docker-compose.yml

@@ -15,7 +15,7 @@ services:
     volumes:
       - ./mysql/conf/my.cnf:/etc/my.cnf # 挂载 my.cnf 文件到容器的指定路径
       - ./mysql/data:/var/lib/mysql # 持久化 MySQL 数据
-      - ../sql/mysql:/docker-entrypoint-initdb.d # 初始化 SQL 脚本目录
+      - ../sql:/docker-entrypoint-initdb.d # 初始化 SQL 脚本目录
     ports:
       - 3306:3306
     networks:

pom.xml

@@ -6,13 +6,13 @@
 
     <groupId>com.youlai</groupId>
     <artifactId>youlai-boot</artifactId>
-    <version>4.0.0</version>
-    <description>基于 Java 17 + SpringBoot 3 + Spring Security 构建的权限管理系统。</description>
+    <version>4.3.1</version>
+    <description>基于 Java 17 + SpringBoot 4 + Spring Security 构建的权限管理系统。</description>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.6</version> <!-- lookup parent from repository -->
+        <version>4.0.5</version> <!-- lookup parent from repository -->
         <relativePath/>
     </parent>
 
@@ -24,7 +24,8 @@
 
         <mysql-connector-j.version>9.1.0</mysql-connector-j.version>
         <druid.version>1.2.24</druid.version>
-        <mybatis-plus.version>3.5.5</mybatis-plus.version>
+        <!-- Spring Boot 4.x 必须使用更新的版本 -->
+        <mybatis-plus.version>3.5.15</mybatis-plus.version>
         <dynamic-datasource.version>4.3.1</dynamic-datasource.version>
 
         <knife4j.version>4.5.0</knife4j.version>
@@ -43,7 +44,7 @@
         <aliyun-sdk-oss.version>3.16.3</aliyun-sdk-oss.version>
 
         <!-- redisson 分布式锁 -->
-        <redisson.version>3.51.0</redisson.version>
+        <redisson.version>4.1.0</redisson.version>
 
         <!-- 自动代码生成 -->
         <mybatis-plus-generator.version>3.5.6</mybatis-plus-generator.version>
@@ -56,14 +57,14 @@
         <aliyun.java.sdk.core.version>4.7.6</aliyun.java.sdk.core.version>
         <aliyun.java.sdk.dysmsapi.version>2.2.1</aliyun.java.sdk.dysmsapi.version>
 
-        <!-- 微信 jdk -->
-        <weixin-java.version>4.7.7.B</weixin-java.version>
         <caffeine.version>2.9.3</caffeine.version>
 
         <!-- 阿里 TransmittableThreadLocal (支持异步场景的ThreadLocal传递) -->
         <transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
 
-        <spring-ai-openai.version>1.1.2</spring-ai-openai.version>
+        <weixin-java-miniapp.version>4.8.1.B</weixin-java-miniapp.version>
+
+
     </properties>
 
     <dependencies>
@@ -118,12 +119,18 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+
+        <!-- Spring Boot 4.x 已改名 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aspectj</artifactId>
         </dependency>
 
         <dependency>
@@ -131,11 +138,6 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
@@ -154,9 +156,15 @@
             <version>${druid.version}</version>
         </dependency>
 
+        <!-- Spring Boot 4.x 必须使用boot4版本 -->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
+            <version>${mybatis-plus.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-jsqlparser</artifactId>
             <version>${mybatis-plus.version}</version>
         </dependency>
 
@@ -259,12 +267,6 @@
             <version>${aliyun.java.sdk.dysmsapi.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-miniapp</artifactId>
-            <version>${weixin-java.version}</version>
-        </dependency>
-
         <!-- 本地缓存 -->
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
@@ -272,6 +274,13 @@
             <version>${caffeine.version}</version>
         </dependency>
 
+        <!-- 微信小程序登录 -->
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-miniapp</artifactId>
+            <version>${weixin-java-miniapp.version}</version>
+        </dependency>
+
         <!-- 动态多数据源 -->
         <!--<dependency>
             <groupId>com.baomidou</groupId>
@@ -279,11 +288,19 @@
             <version>${dynamic-datasource.version}</version>
         </dependency>-->
 
-        <!-- Spring AI OpenAI（兼容通义千问、DeepSeek等） -->
+        <!--以5.3.0版本为例-->
+        <!-- jiguang-sdk -->
         <dependency>
-            <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-starter-model-openai</artifactId>
-            <version>${spring-ai-openai.version}</version>
+            <groupId>io.github.jpush</groupId>
+            <artifactId>jiguang-sdk</artifactId>
+            <version>5.3.0</version>
+        </dependency>
+
+        <!-- 腾讯云短信 -->
+        <dependency>
+            <groupId>com.tencentcloudapi</groupId>
+            <artifactId>tencentcloud-sdk-java-sms</artifactId>
+            <version>3.1.1451</version>
         </dependency>
 
     </dependencies>

sql/youlai-admin.sql

@@ -10,7 +10,7 @@ CREATE DATABASE IF NOT EXISTS youlai_admin CHARACTER SET utf8mb4 DEFAULT COLLATE
 
 
 -- ----------------------------
--- 2. 创建表 && 数据初始化 
+-- 2. 创建表 && 数据初始化
 -- ----------------------------
 USE youlai_admin;
 
@@ -129,17 +129,16 @@ CREATE TABLE `sys_menu`  (
                              `redirect` varchar(128) COMMENT '跳转路径',
                              `create_time` datetime NULL COMMENT '创建时间',
                              `update_time` datetime NULL COMMENT '更新时间',
-                             `params` varchar(255) NULL COMMENT '路由参数',
+                             `params` json NULL COMMENT '路由参数',
                              PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '系统菜单表';
 
 -- ----------------------------
 -- Records of sys_menu
 -- ----------------------------
--- 顶级目录（1-9）：系统/代码生成/AI助手/文档/接口文档/组件/演示/多级/路由
+-- 顶级目录（1-9）：系统/代码生成/文档/接口文档/组件/演示/多级/路由
 INSERT INTO `sys_menu` VALUES (1, 0, '0', '系统管理', 'C', '', '/system', 'Layout', NULL, NULL, NULL, 1, 1, 'system', '/system/user', now(), now(), NULL);
 INSERT INTO `sys_menu` VALUES (2, 0, '0', '代码生成', 'C', '', '/codegen', 'Layout', NULL, NULL, NULL, 1, 2, 'code', '/codegen/index', now(), now(), NULL);
-INSERT INTO `sys_menu` VALUES (3, 0, '0', 'AI助手', 'C', '', '/ai', 'Layout', NULL, NULL, NULL, 1, 3, 'ai', '/ai/command-record', now(), now(), NULL);
 INSERT INTO `sys_menu` VALUES (4, 0, '0', '平台文档', 'C', '', '/doc', 'Layout', NULL, NULL, NULL, 1, 4, 'document', '', now(), now(), NULL);
 INSERT INTO `sys_menu` VALUES (5, 0, '0', '接口文档', 'C', '', '/api', 'Layout', NULL, NULL, NULL, 1, 5, 'api', '', now(), now(), NULL);
 INSERT INTO `sys_menu` VALUES (6, 0, '0', '组件封装', 'C', '', '/component', 'Layout', NULL, NULL, NULL, 1, 6, 'menu', '', now(), now(), NULL);
@@ -182,13 +181,14 @@ INSERT INTO `sys_menu` VALUES (2502, 250, '0,1,250', '字典新增', 'B', NULL,
 INSERT INTO `sys_menu` VALUES (2503, 250, '0,1,250', '字典编辑', 'B', NULL, '', NULL, 'sys:dict:update', NULL, NULL, 1, 3, '', NULL, now(), now(), NULL);
 INSERT INTO `sys_menu` VALUES (2504, 250, '0,1,250', '字典删除', 'B', NULL, '', NULL, 'sys:dict:delete', NULL, NULL, 1, 4, '', NULL, now(), now(), NULL);
 
-INSERT INTO `sys_menu` VALUES (251, 250, '0,1,250,251', '字典项', 'M', 'DictItem', 'dict-item', 'system/dict/dict-item', NULL, 0, 1, 0, 6, '', NULL, now(), now(), NULL);
-INSERT INTO `sys_menu` VALUES (2511, 251, '0,1,250,251', '字典项查询', 'B', NULL, '', NULL, 'sys:dict-item:list', NULL, NULL, 1, 1, '', NULL, now(), now(), NULL);
-INSERT INTO `sys_menu` VALUES (2512, 251, '0,1,250,251', '字典项新增', 'B', NULL, '', NULL, 'sys:dict-item:create', NULL, NULL, 1, 2, '', NULL, now(), now(), NULL);
-INSERT INTO `sys_menu` VALUES (2513, 251, '0,1,250,251', '字典项编辑', 'B', NULL, '', NULL, 'sys:dict-item:update', NULL, NULL, 1, 3, '', NULL, now(), now(), NULL);
-INSERT INTO `sys_menu` VALUES (2514, 251, '0,1,250,251', '字典项删除', 'B', NULL, '', NULL, 'sys:dict-item:delete', NULL, NULL, 1, 4, '', NULL, now(), now(), NULL);
+INSERT INTO `sys_menu` VALUES (251, 1, '0,1', '字典项', 'M', 'DictItem', 'dict-item', 'system/dict/dict-item', NULL, 0, 1, 0, 6, '', NULL, now(), now(), NULL);
+INSERT INTO `sys_menu` VALUES (2511, 251, '0,1,251', '字典项查询', 'B', NULL, '', NULL, 'sys:dict-item:list', NULL, NULL, 1, 1, '', NULL, now(), now(), NULL);
+INSERT INTO `sys_menu` VALUES (2512, 251, '0,1,251', '字典项新增', 'B', NULL, '', NULL, 'sys:dict-item:create', NULL, NULL, 1, 2, '', NULL, now(), now(), NULL);
+INSERT INTO `sys_menu` VALUES (2513, 251, '0,1,251', '字典项编辑', 'B', NULL, '', NULL, 'sys:dict-item:update', NULL, NULL, 1, 3, '', NULL, now(), now(), NULL);
+INSERT INTO `sys_menu` VALUES (2514, 251, '0,1,251', '字典项删除', 'B', NULL, '', NULL, 'sys:dict-item:delete', NULL, NULL, 1, 4, '', NULL, now(), now(), NULL);
 
 INSERT INTO `sys_menu` VALUES (260, 1, '0,1', '系统日志', 'M', 'Log', 'log', 'system/log/index', NULL, 0, 1, 1, 7, 'document', NULL, now(), now(), NULL);
+INSERT INTO `sys_menu` VALUES (2601, 260, '0,1,260', '日志查询', 'B', NULL, '', NULL, 'sys:log:list', NULL, NULL, 1, 1, '', NULL, now(), now(), NULL);
 
 INSERT INTO `sys_menu` VALUES (270, 1, '0,1', '系统配置', 'M', 'Config', 'config', 'system/config/index', NULL, 0, 1, 1, 8, 'setting', NULL, now(), now(), NULL);
 INSERT INTO `sys_menu` VALUES (2701, 270, '0,1,270', '系统配置查询', 'B', NULL, '', NULL, 'sys:config:list', 0, 1, 1, 1, '', NULL, now(), now(), NULL);
@@ -208,9 +208,6 @@ INSERT INTO `sys_menu` VALUES (2806, 280, '0,1,280', '通知撤回', 'B', NULL,
 -- 代码生成
 INSERT INTO `sys_menu` VALUES (310, 2, '0,2', '代码生成', 'M', 'Codegen', 'codegen', 'codegen/index', NULL, NULL, 1, 1, 1, 'code', NULL, now(), now(), NULL);
 
--- AI 助手
-INSERT INTO `sys_menu` VALUES (401, 3, '0,3', 'AI命令记录', 'M', 'ai', 'ai', 'ai/index', NULL, NULL, 1, 1, 1, 'document', NULL, now(), now(), NULL);
-
 -- 平台文档（外链通过 route_path 识别）
 INSERT INTO `sys_menu` VALUES (501, 4, '0,4', '平台文档(外链)', 'M', NULL, 'https://juejin.cn/post/7228990409909108793', '', NULL, NULL, NULL, 1, 1, 'document', '', now(), now(), NULL);
 INSERT INTO `sys_menu` VALUES (502, 4, '0,4', '后端文档', 'M', NULL, 'https://youlai.blog.csdn.net/article/details/145178880', '', NULL, NULL, NULL, 1, 2, 'document', '', now(), now(), NULL);
@@ -232,11 +229,10 @@ INSERT INTO `sys_menu` VALUES (708, 6, '0,6', '滚动文本', 'M', 'TextScroll',
 INSERT INTO `sys_menu` VALUES (709, 6, '0,6', '自适应表格操作列', 'M', 'AutoOperationColumn', 'operation-column', 'demo/auto-operation-column', NULL, NULL, 1, 1, 1, '', '', now(), now(), NULL);
 
 -- 功能演示
-INSERT INTO `sys_menu` VALUES (801, 7, '0,7', 'Websocket', 'M', 'WebSocket', '/function/websocket', 'demo/websocket', NULL, NULL, 1, 1, 1, '', '', now(), now(), NULL);
-INSERT INTO `sys_menu` VALUES (802, 7, '0,7', 'Icons', 'M', 'IconDemo', 'icon-demo', 'demo/icons', NULL, NULL, 1, 1, 2, 'el-icon-Notification', '', now(), now(), NULL);
-INSERT INTO `sys_menu` VALUES (803, 7, '0,7', '字典实时同步', 'M', 'DictSync', 'dict-sync', 'demo/dict-sync', NULL, NULL, NULL, 1, 3, '', '', now(), now(), NULL);
-INSERT INTO `sys_menu` VALUES (804, 7, '0,7', 'VxeTable', 'M', 'VxeTable', 'vxe-table', 'demo/vxe-table/index', NULL, NULL, 1, 1, 4, 'el-icon-MagicStick', '', now(), now(), NULL);
-INSERT INTO `sys_menu` VALUES (805, 7, '0,7', 'CURD单文件', 'M', 'CurdSingle', 'curd-single', 'demo/curd-single', NULL, NULL, 1, 1, 5, 'el-icon-Reading', '', now(), now(), NULL);
+INSERT INTO `sys_menu` VALUES (801, 7, '0,7', 'Icons', 'M', 'IconDemo', 'icon-demo', 'demo/icons', NULL, NULL, 1, 1, 2, 'el-icon-Notification', '', now(), now(), NULL);
+INSERT INTO `sys_menu` VALUES (802, 7, '0,7', '字典实时同步', 'M', 'DictSync', 'dict-sync', 'demo/dict-sync', NULL, NULL, NULL, 1, 3, '', '', now(), now(), NULL);
+INSERT INTO `sys_menu` VALUES (803, 7, '0,7', 'VxeTable', 'M', 'VxeTable', 'vxe-table', 'demo/vxe-table/index', NULL, NULL, 1, 1, 4, 'el-icon-MagicStick', '', now(), now(), NULL);
+INSERT INTO `sys_menu` VALUES (804, 7, '0,7', 'CURD单文件', 'M', 'CurdSingle', 'curd-single', 'demo/curd-single', NULL, NULL, 1, 1, 5, 'el-icon-Reading', '', now(), now(), NULL);
 
 -- 多级菜单示例
 INSERT INTO `sys_menu` VALUES (910, 8, '0,8', '菜单一级', 'C', NULL, 'multi-level1', 'Layout', NULL, 1, NULL, 1, 1, '', '', now(), now(), NULL);
@@ -258,7 +254,7 @@ CREATE TABLE `sys_role`  (
                              `code` varchar(32) NOT NULL COMMENT '角色编码',
                              `sort` int NULL COMMENT '显示顺序',
                              `status` tinyint(1) DEFAULT 1 COMMENT '角色状态(1-正常 0-停用)',
-                             `data_scope` tinyint NULL COMMENT '数据权限(1-所有数据 2-部门及子部门数据 3-本部门数据 4-本人数据)',
+                             `data_scope` tinyint NULL COMMENT '数据权限(1-所有数据 2-部门及子部门数据 3-本部门数据 4-本人数据 5-自定义部门数据)',
                              `create_by` bigint NULL COMMENT '创建人 ID',
                              `create_time` datetime NULL COMMENT '创建时间',
                              `update_by` bigint NULL COMMENT '更新人ID',
@@ -275,15 +271,10 @@ CREATE TABLE `sys_role`  (
 INSERT INTO `sys_role` VALUES (1, '超级管理员', 'ROOT', 1, 1, 1, NULL, now(), NULL, now(), 0);
 INSERT INTO `sys_role` VALUES (2, '系统管理员', 'ADMIN', 2, 1, 1, NULL, now(), NULL, NULL, 0);
 INSERT INTO `sys_role` VALUES (3, '访问游客', 'GUEST', 3, 1, 3, NULL, now(), NULL, now(), 0);
-INSERT INTO `sys_role` VALUES (4, '系统管理员1', 'ADMIN1', 4, 1, 1, NULL, now(), NULL, NULL, 0);
-INSERT INTO `sys_role` VALUES (5, '系统管理员2', 'ADMIN2', 5, 1, 1, NULL, now(), NULL, NULL, 0);
-INSERT INTO `sys_role` VALUES (6, '系统管理员3', 'ADMIN3', 6, 1, 1, NULL, now(), NULL, NULL, 0);
-INSERT INTO `sys_role` VALUES (7, '系统管理员4', 'ADMIN4', 7, 1, 1, NULL, now(), NULL, NULL, 0);
-INSERT INTO `sys_role` VALUES (8, '系统管理员5', 'ADMIN5', 8, 1, 1, NULL, now(), NULL, NULL, 0);
-INSERT INTO `sys_role` VALUES (9, '系统管理员6', 'ADMIN6', 9, 1, 1, NULL, now(), NULL, NULL, 0);
-INSERT INTO `sys_role` VALUES (10, '系统管理员7', 'ADMIN7', 10, 1, 1, NULL, now(), NULL, NULL, 0);
-INSERT INTO `sys_role` VALUES (11, '系统管理员8', 'ADMIN8', 11, 1, 1, NULL, now(), NULL, NULL, 0);
-INSERT INTO `sys_role` VALUES (12, '系统管理员9', 'ADMIN9', 12, 1, 1, NULL, now(), NULL, NULL, 0);
+INSERT INTO `sys_role` VALUES (4, '部门主管', 'DEPT_MANAGER', 4, 1, 2, NULL, now(), NULL, now(), 0);
+INSERT INTO `sys_role` VALUES (5, '部门成员', 'DEPT_MEMBER', 5, 1, 3, NULL, now(), NULL, now(), 0);
+INSERT INTO `sys_role` VALUES (6, '普通员工', 'EMPLOYEE', 6, 1, 4, NULL, now(), NULL, now(), 0);
+INSERT INTO `sys_role` VALUES (7, '自定义权限用户', 'CUSTOM_USER', 7, 1, 5, NULL, now(), NULL, now(), 0);
 
 -- ----------------------------
 -- Table structure for sys_role_menu
@@ -295,10 +286,26 @@ CREATE TABLE `sys_role_menu`  (
                                   UNIQUE INDEX `uk_roleid_menuid`(`role_id` ASC, `menu_id` ASC) USING BTREE COMMENT '角色菜单唯一索引'
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '角色菜单关联表';
 
+-- ----------------------------
+-- Table structure for sys_role_dept
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_role_dept`;
+CREATE TABLE `sys_role_dept`  (
+                                  `role_id` bigint NOT NULL COMMENT '角色ID',
+                                  `dept_id` bigint NOT NULL COMMENT '部门ID',
+                                  UNIQUE INDEX `uk_roleid_deptid`(`role_id` ASC, `dept_id` ASC) USING BTREE COMMENT '角色部门唯一索引'
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '角色部门关联表';
+
+-- ----------------------------
+-- Records of sys_role_dept
+-- ----------------------------
+INSERT IGNORE INTO `sys_role_dept` VALUES (7, 1);
+INSERT IGNORE INTO `sys_role_dept` VALUES (7, 2);
+
 -- ============================================
 -- 系统管理员角色菜单权限（role_id=2）
 -- 顶级目录
-INSERT INTO `sys_role_menu` VALUES (2, 1), (2, 2), (2, 3), (2, 4), (2, 5), (2, 6), (2, 7), (2, 8), (2, 9);
+INSERT INTO `sys_role_menu` VALUES (2, 1), (2, 2), (2, 4), (2, 5), (2, 6), (2, 7), (2, 8), (2, 9);
 -- 系统管理
 INSERT INTO `sys_role_menu` VALUES (2, 210), (2, 2101), (2, 2102), (2, 2103), (2, 2104), (2, 2105), (2, 2106), (2, 2107);
 INSERT INTO `sys_role_menu` VALUES (2, 220), (2, 2201), (2, 2202), (2, 2203), (2, 2204), (2, 2205);
@@ -306,13 +313,27 @@ INSERT INTO `sys_role_menu` VALUES (2, 230), (2, 2301), (2, 2302), (2, 2303), (2
 INSERT INTO `sys_role_menu` VALUES (2, 240), (2, 2401), (2, 2402), (2, 2403), (2, 2404);
 INSERT INTO `sys_role_menu` VALUES (2, 250), (2, 2501), (2, 2502), (2, 2503), (2, 2504);
 INSERT INTO `sys_role_menu` VALUES (2, 251), (2, 2511), (2, 2512), (2, 2513), (2, 2514);
-INSERT INTO `sys_role_menu` VALUES (2, 260);
+INSERT INTO `sys_role_menu` VALUES (2, 260), (2, 2601);
 INSERT INTO `sys_role_menu` VALUES (2, 270), (2, 2701), (2, 2702), (2, 2703), (2, 2704), (2, 2705);
 INSERT INTO `sys_role_menu` VALUES (2, 280), (2, 2801), (2, 2802), (2, 2803), (2, 2804), (2, 2805), (2, 2806);
+
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 210), (4, 2101), (4, 2102), (4, 2103), (4, 2104), (4, 2105), (4, 2106), (4, 2107);
+INSERT IGNORE INTO `sys_role_menu` VALUES (4, 220), (4, 2201), (4, 2202), (4, 2203), (4, 2204), (4, 2205);
+
+INSERT IGNORE INTO `sys_role_menu` VALUES (5, 1);
+INSERT IGNORE INTO `sys_role_menu` VALUES (5, 210), (5, 2101), (5, 2102), (5, 2103), (5, 2104), (5, 2105), (5, 2106), (5, 2107);
+INSERT IGNORE INTO `sys_role_menu` VALUES (5, 220), (5, 2201), (5, 2202), (5, 2203), (5, 2204), (5, 2205);
+
+INSERT IGNORE INTO `sys_role_menu` VALUES (6, 1);
+INSERT IGNORE INTO `sys_role_menu` VALUES (6, 210), (6, 2101), (6, 2102), (6, 2103), (6, 2104), (6, 2105), (6, 2106), (6, 2107);
+INSERT IGNORE INTO `sys_role_menu` VALUES (6, 220), (6, 2201), (6, 2202), (6, 2203), (6, 2204), (6, 2205);
+
+INSERT IGNORE INTO `sys_role_menu` VALUES (7, 1);
+INSERT IGNORE INTO `sys_role_menu` VALUES (7, 210), (7, 2101), (7, 2102), (7, 2103), (7, 2104), (7, 2105), (7, 2106), (7, 2107);
+INSERT IGNORE INTO `sys_role_menu` VALUES (7, 220), (7, 2201), (7, 2202), (7, 2203), (7, 2204), (7, 2205);
 -- 代码生成
 INSERT INTO `sys_role_menu` VALUES (2, 310);
--- AI 助手
-INSERT INTO `sys_role_menu` VALUES (2, 401);
 -- 平台文档
 INSERT INTO `sys_role_menu` VALUES (2, 501), (2, 502), (2, 503), (2, 504);
 -- 接口文档
@@ -320,7 +341,7 @@ INSERT INTO `sys_role_menu` VALUES (2, 601);
 -- 组件封装
 INSERT INTO `sys_role_menu` VALUES (2, 701), (2, 702), (2, 703), (2, 704), (2, 705), (2, 706), (2, 707), (2, 708), (2, 709);
 -- 功能演示 / 多级菜单
-INSERT INTO `sys_role_menu` VALUES (2, 801), (2, 802), (2, 803), (2, 804), (2, 805), (2, 910), (2, 911), (2, 912), (2, 913);
+INSERT INTO `sys_role_menu` VALUES (2, 801), (2, 802), (2, 803), (2, 804), (2, 910), (2, 911), (2, 912), (2, 913);
 -- 路由参数
 INSERT INTO `sys_role_menu` VALUES (2, 1001), (2, 1002);
 
@@ -344,17 +365,19 @@ CREATE TABLE `sys_user`  (
                              `update_time` datetime COMMENT '更新时间',
                              `update_by` bigint COMMENT '修改人ID',
                              `is_deleted` tinyint(1) DEFAULT 0 COMMENT '逻辑删除标识(0-未删除 1-已删除)',
-                             `openid` char(28) COMMENT '微信 openid',
-                             PRIMARY KEY (`id`) USING BTREE,
-                             UNIQUE KEY `uk_username` (`username`)
+                            PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '系统用户表';
 
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
-INSERT INTO `sys_user` VALUES (1, 'root', '有来技术', 0, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', NULL, 'https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif', '18812345677', 1, 'youlaitech@163.com', now(), NULL, now(), NULL, 0,NULL);
-INSERT INTO `sys_user` VALUES (2, 'admin', '系统管理员', 1, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', 1, 'https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif', '18812345678', 1, 'youlaitech@163.com', now(), NULL, now(), NULL, 0,NULL);
-INSERT INTO `sys_user` VALUES (3, 'test', '测试小用户', 1, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', 3, 'https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif', '18812345679', 1, 'youlaitech@163.com', now(), NULL, now(), NULL, 0,NULL);
+INSERT INTO `sys_user` VALUES (1, 'root', '有来技术', 0, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', NULL, 'https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif', '18812345677', 1, 'youlaitech@163.com', now(), NULL, now(), NULL, 0);
+INSERT INTO `sys_user` VALUES (2, 'admin', '系统管理员', 1, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', 1, 'https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif', '18888888888', 1, 'youlaitech@163.com', now(), NULL, now(), NULL, 0);
+INSERT INTO `sys_user` VALUES (3, 'test', '测试小用户', 1, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', 3, 'https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif', '18812345679', 1, 'youlaitech@163.com', now(), NULL, now(), NULL, 0);
+INSERT INTO `sys_user` VALUES (4, 'dept_manager', '部门主管', 1, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', 1, 'https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif', '18812345680', 1, 'manager@youlaitech.com', now(), NULL, now(), NULL, 0);
+INSERT INTO `sys_user` VALUES (5, 'dept_member', '部门成员', 1, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', 1, 'https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif', '18812345681', 1, 'member@youlaitech.com', now(), NULL, now(), NULL, 0);
+INSERT INTO `sys_user` VALUES (6, 'employee', '普通员工', 1, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', 2, 'https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif', '18812345682', 1, 'employee@youlaitech.com', now(), NULL, now(), NULL, 0);
+INSERT INTO `sys_user` VALUES (7, 'custom_user', '自定义权限用户', 1, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', 3, 'https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif', '18812345683', 1, 'custom@youlaitech.com', now(), NULL, now(), NULL, 0);
 
 -- ----------------------------
 -- Table structure for sys_user_role
@@ -369,9 +392,13 @@ CREATE TABLE `sys_user_role`  (
 -- ----------------------------
 -- Records of sys_user_role
 -- ----------------------------
-INSERT INTO `sys_user_role` VALUES (1, 1);
-INSERT INTO `sys_user_role` VALUES (2, 2);
-INSERT INTO `sys_user_role` VALUES (3, 3);
+INSERT IGNORE INTO `sys_user_role` VALUES (1, 1);
+INSERT IGNORE INTO `sys_user_role` VALUES (2, 2);
+INSERT IGNORE INTO `sys_user_role` VALUES (3, 3);
+INSERT IGNORE INTO `sys_user_role` VALUES (4, 4);
+INSERT IGNORE INTO `sys_user_role` VALUES (5, 5);
+INSERT IGNORE INTO `sys_user_role` VALUES (6, 6);
+INSERT IGNORE INTO `sys_user_role` VALUES (7, 7);
 
 
 -- ----------------------------
@@ -379,26 +406,30 @@ INSERT INTO `sys_user_role` VALUES (3, 3);
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_log`;
 CREATE TABLE `sys_log` (
-                           `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-                           `module` varchar(50) NOT NULL COMMENT '日志模块',
-                           `request_method` varchar(64) NOT NULL COMMENT '请求方式',
-                           `request_params` text COMMENT '请求参数(批量请求参数可能会超过text)',
-                           `response_content` mediumtext COMMENT '返回参数',
-                           `content` varchar(255) NOT NULL COMMENT '日志内容',
-                           `request_uri` varchar(255) COMMENT '请求路径',
-                           `method` varchar(255) COMMENT '方法名',
-                           `ip` varchar(45) COMMENT 'IP地址',
-                           `province` varchar(100) COMMENT '省份',
-                           `city` varchar(100) COMMENT '城市',
-                           `execution_time` bigint COMMENT '执行时间(ms)',
-                           `browser` varchar(100) COMMENT '浏览器',
-                           `browser_version` varchar(100) COMMENT '浏览器版本',
-                           `os` varchar(100) COMMENT '终端系统',
-                           `create_by` bigint COMMENT '创建人ID',
-                           `create_time` datetime COMMENT '创建时间',
-                           PRIMARY KEY (`id`) USING BTREE,
-                           KEY `idx_create_time` (`create_time`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COMMENT='系统操作日志表';
+    `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `module` TINYINT NOT NULL COMMENT '模块，数字枚举，参考 LogModule 枚举',
+    `action_type` TINYINT NOT NULL COMMENT '操作类型，数字枚举，参考 ActionType 枚举',
+    `title` VARCHAR(100) NOT NULL COMMENT '前端显示标题',
+    `content` TEXT COMMENT '自定义日志内容',
+    `operator_id` BIGINT COMMENT '操作人ID',
+    `operator_name` VARCHAR(50) COMMENT '操作人名称',
+    `request_uri` VARCHAR(255) COMMENT '请求路径',
+    `request_method` VARCHAR(10) COMMENT '请求方法',
+    `ip` VARCHAR(45) COMMENT 'IP地址',
+    `province` VARCHAR(100) COMMENT '省份',
+    `city` VARCHAR(100) COMMENT '城市',
+    `device` VARCHAR(100) COMMENT '设备',
+    `os` VARCHAR(100) COMMENT '操作系统',
+    `browser` VARCHAR(100) COMMENT '浏览器',
+    `status` TINYINT DEFAULT 1 COMMENT '0失败 1成功',
+    `error_msg` VARCHAR(255) COMMENT '错误信息',
+    `execution_time` INT COMMENT '执行时间(ms)',
+    `create_time` DATETIME COMMENT '操作时间',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `idx_module_action_time` (`module`, `action_type`, `create_time`),
+    KEY `idx_operator_time` (`operator_id`, `create_time`),
+    KEY `idx_time` (`create_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统操作日志表';
 
 -- ----------------------------
 -- Table structure for gen_table
@@ -513,7 +544,7 @@ CREATE TABLE `sys_user_notice` (
                                    `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
                                    `notice_id` bigint NOT NULL COMMENT '公共通知id',
                                    `user_id` bigint NOT NULL COMMENT '用户id',
-                                   `is_read` bigint DEFAULT '0' COMMENT '读取状态（0: 未读, 1: 已读）',
+                                   `is_read` tinyint DEFAULT '0' COMMENT '读取状态（0: 未读, 1: 已读）',
                                    `read_time` datetime COMMENT '阅读时间',
                                    `create_time` datetime NOT NULL COMMENT '创建时间',
                                    `update_time` datetime COMMENT '更新时间',
@@ -533,36 +564,23 @@ INSERT INTO `sys_user_notice` VALUES (9, 9, 2, 1, NULL, now(), now(), 0);
 INSERT INTO `sys_user_notice` VALUES (10, 10, 2, 1, NULL, now(), now(), 0);
 
 -- ----------------------------
--- AI 命令记录表
+-- Table structure for sys_user_social
 -- ----------------------------
-DROP TABLE IF EXISTS `ai_assistant_record`;
-CREATE TABLE `ai_assistant_record` (
-                                  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID',
-                                  `user_id` bigint DEFAULT NULL COMMENT '用户ID',
-                                  `username` varchar(64) DEFAULT NULL COMMENT '用户名',
-                                  `original_command` text COMMENT '原始命令',
-                                  `ai_provider` varchar(32) DEFAULT NULL COMMENT 'AI 供应商(qwen/openai/deepseek/gemini等)',
-                                  `ai_model` varchar(64) DEFAULT NULL COMMENT 'AI 模型名称(qwen-plus/qwen-max/gpt-4-turbo等)',
-                                  `parse_status` tinyint DEFAULT '0' COMMENT '解析是否成功(0-失败, 1-成功)',
-                                  `function_calls` text COMMENT '解析出的函数调用列表(JSON)',
-                                  `explanation` varchar(500) DEFAULT NULL COMMENT 'AI的理解说明',
-                                  `confidence` decimal(3,2) DEFAULT NULL COMMENT '置信度(0.00-1.00)',
-                                  `parse_error_message` text COMMENT '解析错误信息',
-                                  `input_tokens` int DEFAULT NULL COMMENT '输入Token数量',
-                                  `output_tokens` int DEFAULT NULL COMMENT '输出Token数量',
-                                  `parse_duration_ms` int DEFAULT NULL COMMENT '解析耗时(毫秒)',
-                                  `function_name` varchar(255) DEFAULT NULL COMMENT '执行的函数名称',
-                                  `function_arguments` text COMMENT '函数参数(JSON)',
-                                  `execute_status` tinyint(1) DEFAULT NULL COMMENT '执行状态(0-待执行, 1-成功, -1-失败)',
-                                  `execute_error_message` text COMMENT '执行错误信息',
-                                  `ip_address` varchar(128) DEFAULT NULL COMMENT 'IP地址',
-                                  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-                                  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-                                  PRIMARY KEY (`id`),
-                                  KEY `idx_user_id` (`user_id`),
-                                  KEY `idx_create_time` (`create_time`),
-                                  KEY `idx_provider` (`ai_provider`),
-                                  KEY `idx_model` (`ai_model`),
-                                  KEY `idx_parse_status` (`parse_status`),
-                                  KEY `idx_execute_status` (`execute_status`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='AI 助手行为记录表（解析、执行、审计）';
+DROP TABLE IF EXISTS `sys_user_social`;
+CREATE TABLE `sys_user_social` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+  `user_id` bigint NOT NULL COMMENT '用户ID',
+  `platform` varchar(20) NOT NULL COMMENT '平台类型(WECHAT_MINI/WECHAT_MP/ALIPAY/QQ/APPLE)',
+  `openid` varchar(64) NOT NULL COMMENT '平台openid',
+  `unionid` varchar(64) DEFAULT NULL COMMENT '微信unionid',
+  `nickname` varchar(64) DEFAULT NULL COMMENT '第三方昵称',
+  `avatar` varchar(255) DEFAULT NULL COMMENT '第三方头像URL',
+  `session_key` varchar(128) DEFAULT NULL COMMENT '微信session_key',
+  `verified` tinyint(1) DEFAULT 1 COMMENT '是否已验证(1-已验证 0-未验证)',
+  `create_time` datetime DEFAULT NULL COMMENT '绑定时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_platform_openid` (`platform`, `openid`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_unionid` (`unionid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户第三方账号绑定表';

src/main/java/com/youlai/boot/YouLaiBootApplication.java

@@ -2,6 +2,7 @@ package com.youlai.boot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * 应用启动类
@@ -9,6 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author Ray.Hao
  * @since 0.0.1
  */
+@EnableScheduling
 @SpringBootApplication
 public class YouLaiBootApplication {
 

src/main/java/com/youlai/boot/app/controller/AppAuthController.java

@@ -0,0 +1,63 @@
+package com.youlai.boot.app.controller;
+
+import com.youlai.boot.app.model.req.MobileLoginReq;
+import com.youlai.boot.app.model.req.MobileRegisterReq;
+import com.youlai.boot.app.service.AppAuthService;
+import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.common.enums.ActionTypeEnum;
+import com.youlai.boot.common.enums.LogModuleEnum;
+import com.youlai.boot.common.result.Result;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 认证控制层
+ *
+ */
+@Tag(name = "01.认证中心")
+@RestController
+@RequestMapping("/api/v1/app/auth/")
+@RequiredArgsConstructor
+@Slf4j
+public class AppAuthController {
+
+    private final AppAuthService appAuthService;
+
+
+    @Operation(summary = "手机号注册")
+    @PostMapping("/register/mobile")
+    @Log(module = LogModuleEnum.LOGIN, value = ActionTypeEnum.REGISTER)
+    public Result<AuthenticationToken> registerByMobile(@RequestBody @Valid MobileRegisterReq request) {
+        AuthenticationToken authenticationToken = appAuthService.registerByMobile(
+                request.getMobile(),
+                request.getCode(),
+                request.getPassword(),
+                request.getNickname()
+        );
+        return Result.success(authenticationToken);
+    }
+
+    @Operation(summary = "发送注册短信验证码")
+    @PostMapping("/register/sms/code")
+    public Result<Void> sendRegisterSmsCode(
+            @Parameter(description = "手机号", example = "18888888888") @RequestParam String mobile
+    ) {
+        return Result.judge(appAuthService.sendRegisterSmsCode(mobile));
+    }
+
+    @Operation(summary = "手机号验证码登录")
+    @PostMapping("/login/mobile")
+    @Log(module = LogModuleEnum.LOGIN, value = ActionTypeEnum.LOGIN)
+    public Result<AuthenticationToken> loginByMobile(@RequestBody @Valid MobileLoginReq request) {
+        AuthenticationToken authenticationToken = appAuthService.loginBySms(request.getMobile(), request.getCode());
+        return Result.success(authenticationToken);
+    }
+
+}
+

src/main/java/com/youlai/boot/app/controller/AppFileController.java

@@ -0,0 +1,57 @@
+package com.youlai.boot.app.controller;
+
+import com.youlai.boot.app.model.vo.AppFileInfo;
+import com.youlai.boot.app.service.AppFileService;
+import com.youlai.boot.common.result.Result;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 文件控制层
+ *
+ * @author Ray.Hao
+ * @since 2022/10/16
+ */
+@Tag(name = "10.文件接口")
+@RestController
+@RequestMapping("/api/v1/app/files")
+@RequiredArgsConstructor
+public class AppFileController {
+
+    private final AppFileService fileService;
+
+    @PostMapping
+    @Operation(summary = "文件上传")
+    public Result<AppFileInfo> uploadFile(
+            @Parameter(
+                    name = "file",
+                    description = "表单文件对象",
+                    required = true,
+                    in = ParameterIn.DEFAULT,
+                    schema = @Schema(name = "file", format = "binary")
+            )
+            @RequestPart(value = "file") MultipartFile file
+    ) {
+        Assert.isTrue(!file.isEmpty(), "上传文件不能为空文件");
+        AppFileInfo fileInfo = fileService.uploadFile(file);
+        return Result.success(fileInfo);
+    }
+
+    @DeleteMapping
+    @Operation(summary = "文件删除")
+    @SneakyThrows
+    public Result<?> deleteFile(
+            @Parameter(description = "文件路径") @RequestParam String filePath
+    ) {
+        boolean result = fileService.deleteFile(filePath);
+        return Result.judge(result);
+    }
+}

src/main/java/com/youlai/boot/app/converter/AppUserConverter.java

@@ -0,0 +1,47 @@
+package com.youlai.boot.app.converter;
+
+import com.youlai.boot.app.model.entity.AppUser;
+import com.youlai.boot.app.model.form.AppUserForm;
+import com.youlai.boot.common.model.Option;
+import com.youlai.boot.system.model.entity.SysUser;
+import com.youlai.boot.system.model.form.UserImportForm;
+import com.youlai.boot.system.model.form.UserProfileForm;
+import com.youlai.boot.system.model.vo.CurrentUserVO;
+import org.mapstruct.InheritInverseConfiguration;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
+
+import java.util.List;
+
+/**
+ * 用户对象转换器
+ *
+ * @author Ray.Hao
+ * @since 2022/6/8
+ */
+@Mapper(componentModel = "spring")
+public interface AppUserConverter {
+
+    AppUserForm toForm(AppUser entity);
+
+    @InheritInverseConfiguration(name = "toForm")
+    AppUser toEntity(AppUserForm entity);
+
+    @Mappings({
+            @Mapping(target = "userId", source = "id")
+    })
+    CurrentUserVO toCurrentUserVo(AppUser entity);
+
+    AppUser toEntity(UserImportForm vo);
+
+    AppUser toEntity(UserProfileForm formData);
+
+    @Mappings({
+            @Mapping(target = "label", source = "nickname"),
+            @Mapping(target = "value", source = "id")
+    })
+    Option<String> toOption(AppUser entity);
+
+    List<Option<String>> toOptions(List<AppUser> list);
+}

src/main/java/com/youlai/boot/app/mapper/AppUserMapper.java

@@ -0,0 +1,84 @@
+package com.youlai.boot.app.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.youlai.boot.app.model.entity.AppUser;
+import com.youlai.boot.app.model.form.AppUserForm;
+import com.youlai.boot.common.annotation.DataPermission;
+import com.youlai.boot.framework.security.model.UserAuthInfo;
+import com.youlai.boot.system.model.query.UserQuery;
+import com.youlai.boot.system.model.vo.UserExportVO;
+import com.youlai.boot.system.model.vo.UserPageVO;
+import com.youlai.boot.system.model.vo.UserProfileVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 用户持久层接口
+ *
+ */
+@Mapper
+public interface AppUserMapper extends BaseMapper<AppUser> {
+
+    /**
+     * 获取用户分页列表
+     *
+     * @param page        分页参数
+     * @param queryParams 查询参数
+     * @return 用户分页列表
+     */
+    @DataPermission(deptAlias = "u", userAlias = "u")
+    Page<UserPageVO> getUserPage(Page<UserPageVO> page, @Param("queryParams") UserQuery queryParams);
+
+    /**
+     * 获取用户表单详情
+     *
+     * @param userId 用户ID
+     * @return 用户表单详情
+     */
+    AppUserForm getUserFormData(Long userId);
+
+    /**
+     * 根据用户名获取认证信息
+     *
+     * @param username 用户名
+     * @return 认证信息
+     */
+    UserAuthInfo getAuthInfoByUsername(String username);
+
+    default UserAuthInfo getAuthCredentialsByUsername(String username) {
+        return getAuthInfoByUsername(username);
+    }
+
+    /**
+     * 根据手机号获取用户认证信息
+     *
+     * @param mobile 手机号
+     * @return 认证信息
+     */
+    UserAuthInfo getAuthInfoByMobile(String mobile);
+
+    default UserAuthInfo getAuthCredentialsByMobile(String mobile) {
+        return getAuthInfoByMobile(mobile);
+    }
+
+    /**
+     * 获取导出用户列表
+     *
+     * @param queryParams 查询参数
+     * @return 导出用户列表
+     */
+    @DataPermission(deptAlias = "u", userAlias = "u")
+    List<UserExportVO> listExportUsers(UserQuery queryParams);
+
+    /**
+     * 获取用户个人中心信息
+     *
+     * @param userId 用户ID
+     * @return 用户个人中心信息
+     */
+    UserProfileVO getUserProfile(Long userId);
+
+}

src/main/java/com/youlai/boot/app/model/entity/AppUser.java

@@ -0,0 +1,65 @@
+package com.youlai.boot.app.model.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.youlai.boot.common.base.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 移动端用户实体
+ */
+@TableName("app_user")
+@Getter
+@Setter
+public class AppUser extends BaseEntity {
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 性别((1-男 2-女 0-保密)
+     */
+    private Integer gender;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 绑定手机
+     */
+    private String mobile;
+
+    /**
+     * 绑定微信
+     */
+    private String wechatOpenid;
+
+    /**
+     * 状态((1-正常 0-禁用)
+     */
+    private Integer status;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 是否删除(0-否 1-是)
+     */
+    private Integer isDeleted;
+
+}

src/main/java/com/youlai/boot/app/model/form/AppUserForm.java

@@ -0,0 +1,58 @@
+package com.youlai.boot.app.model.form;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Pattern;
+import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
+import java.util.List;
+
+/**
+ * 用户表单对象
+ *
+ * @author haoxr
+ * @since 2022/4/12 11:04
+ */
+@Schema(description = "用户表单对象")
+@Data
+public class AppUserForm {
+
+    @Schema(description="用户ID")
+    private Long id;
+
+    @Schema(description="用户名")
+    @NotBlank(message = "用户名不能为空")
+    private String username;
+
+    @Schema(description="昵称")
+    @NotBlank(message = "昵称不能为空")
+    private String nickname;
+
+
+    @Schema(description="手机号码")
+    @Pattern(regexp = "^$|^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$", message = "手机号码格式不正确")
+    private String mobile;
+
+    @Schema(description="性别")
+    private Integer gender;
+
+    @Schema(description="用户头像")
+    private String avatar;
+
+    @Schema(description="邮箱")
+    private String email;
+
+    @Schema(description="用户状态(1:正常;0:禁用)")
+    @Range(min = 0, max = 1, message = "用户状态不正确")
+    private Integer status;
+
+    @Schema(description="部门ID")
+    private Long deptId;
+
+    @Schema(description="角色ID集合")
+    @NotEmpty(message = "用户角色不能为空")
+    private List<Long> roleIds;
+
+}

src/main/java/com/youlai/boot/app/model/req/MobileLoginReq.java

@@ -0,0 +1,24 @@
+package com.youlai.boot.app.model.req;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.Data;
+
+/**
+ * 手机号登录请求参数
+ *
+ */
+@Schema(description = "手机号登录请求参数")
+@Data
+public class MobileLoginReq {
+
+    @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "18888888888")
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String mobile;
+
+    @Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
+    @NotBlank(message = "验证码不能为空")
+    private String code;
+}

src/main/java/com/youlai/boot/app/model/req/MobileRegisterReq.java

@@ -0,0 +1,32 @@
+package com.youlai.boot.app.model.req;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+
+/**
+ * 手机号注册请求参数
+ *
+ */
+@Schema(description = "手机号注册请求参数")
+@Data
+public class MobileRegisterReq {
+
+    @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "18888888888")
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String mobile;
+
+    @Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
+    @NotBlank(message = "验证码不能为空")
+    private String code;
+
+    @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
+    @NotBlank(message = "密码不能为空")
+    private String password;
+
+    @Schema(description = "昵称", example = "用户昵称")
+    private String nickname;
+}

src/main/java/com/youlai/boot/app/model/vo/AppFileInfo.java

@@ -0,0 +1,23 @@
+package com.youlai.boot.app.model.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * 文件信息对象
+ *
+ * @author Ray.Hao
+ * @since 1.0.0
+ */
+@Schema(description = "文件对象")
+@Data
+public class AppFileInfo {
+
+    @Schema(description = "文件名称")
+    private String name;
+
+    @Schema(description = "文件URL")
+    private String url;
+
+}

src/main/java/com/youlai/boot/app/service/AppAuthService.java

@@ -0,0 +1,70 @@
+package com.youlai.boot.app.service;
+
+import com.youlai.boot.framework.captcha.model.CaptchaInfo;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
+
+public interface AppAuthService {
+
+    /**
+     * 获取验证码
+     */
+    CaptchaInfo getCaptcha();
+
+    /**
+     * 发送注册短信验证码
+     *
+     * @param mobile 手机号
+     */
+    boolean sendRegisterSmsCode(String mobile);
+
+    /**
+     * 手机号注册
+     *
+     * @param mobile 手机号
+     * @param code   验证码
+     * @param password 密码
+     * @param nickname 昵称
+     * @return 认证令牌
+     */
+    AuthenticationToken registerByMobile(String mobile, String code, String password, String nickname);
+
+    /**
+     * 发送登录短信验证码
+     *
+     * @param mobile 手机号
+     */
+    void sendLoginSmsCode(String mobile);
+
+    /**
+     * 短信验证码登录
+     *
+     * @param mobile 手机号
+     * @param code   验证码
+     * @return 认证令牌
+     */
+    AuthenticationToken loginBySms(String mobile, String code);
+
+    /**
+     * 账号密码登录
+     *
+     * @param username 用户名
+     * @param password 密码
+     * @return 认证令牌
+     */
+    AuthenticationToken login(String username, String password);
+
+
+    /**
+     * 退出登录
+     */
+    void logout();
+
+    /**
+     * 刷新令牌
+     *
+     * @param refreshToken 刷新令牌
+     * @return 认证令牌
+     */
+    AuthenticationToken refreshToken(String refreshToken);
+}
+

src/main/java/com/youlai/boot/app/service/AppFileService.java

@@ -0,0 +1,30 @@
+package com.youlai.boot.app.service;
+
+import com.youlai.boot.app.model.vo.AppFileInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 对象存储服务接口层
+ *
+ * @author haoxr
+ * @since 2022/11/19
+ */
+public interface AppFileService {
+
+    /**
+     * 上传文件
+     * @param file 表单文件对象
+     * @return 文件信息
+     */
+    AppFileInfo uploadFile(MultipartFile file);
+
+    /**
+     * 删除文件
+     *
+     * @param filePath 文件完整URL
+     * @return 删除结果
+     */
+    boolean deleteFile(String filePath);
+
+
+}

src/main/java/com/youlai/boot/app/service/AppUserService.java

@@ -0,0 +1,198 @@
+package com.youlai.boot.app.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.youlai.boot.app.model.entity.AppUser;
+import com.youlai.boot.app.model.form.AppUserForm;
+import com.youlai.boot.common.model.Option;
+import com.youlai.boot.framework.security.model.UserAuthInfo;
+import com.youlai.boot.system.model.entity.SysUser;
+import com.youlai.boot.system.model.form.*;
+import com.youlai.boot.system.model.query.UserQuery;
+import com.youlai.boot.system.model.vo.CurrentUserVO;
+import com.youlai.boot.system.model.vo.UserExportVO;
+import com.youlai.boot.system.model.vo.UserPageVO;
+import com.youlai.boot.system.model.vo.UserProfileVO;
+
+import java.util.List;
+
+/**
+ * 用户业务接口
+ *
+ * @author Ray.Hao
+ * @since 2022/1/14
+ */
+public interface AppUserService extends IService<AppUser> {
+
+    /**
+     * 用户分页列表
+     *
+     * @return {@link IPage<UserPageVO>} 用户分页列表
+     */
+    IPage<UserPageVO> getUserPage(UserQuery queryParams);
+
+    /**
+     * 获取用户表单数据
+     *
+     * @param userId 用户ID
+     * @return {@link AppUserForm} 用户表单数据
+     */
+    AppUserForm getUserFormData(Long userId);
+
+
+    /**
+     * 新增用户
+     *
+     * @param userForm 用户表单对象
+     * @return {@link Boolean} 是否新增成功
+     */
+    boolean saveUser(AppUserForm userForm);
+
+    /**
+     * 修改用户
+     *
+     * @param userId   用户ID
+     * @param userForm 用户表单对象
+     * @return {@link Boolean} 是否修改成功
+     */
+    boolean updateUser(Long userId, AppUserForm userForm);
+
+
+    /**
+     * 删除用户
+     *
+     * @param idsStr 用户ID，多个以英文逗号(,)分割
+     * @return {@link Boolean} 是否删除成功
+     */
+    boolean deleteUsers(String idsStr);
+
+
+    /**
+     * 根据用户名获取认证信息
+     *
+     * @param username 用户名
+     * @return {@link UserAuthInfo}
+     */
+    UserAuthInfo getAuthInfoByUsername(String username);
+
+    default UserAuthInfo getAuthCredentialsByUsername(String username) {
+        return getAuthInfoByUsername(username);
+    }
+
+
+    /**
+     * 获取导出用户列表
+     *
+     * @param queryParams 查询参数
+     * @return {@link List<UserExportVO>} 导出用户列表
+     */
+    List<UserExportVO> listExportUsers(UserQuery queryParams);
+
+
+    /**
+     * 获取登录用户信息
+     *
+     * @return {@link CurrentUserVO} 登录用户信息
+     */
+    CurrentUserVO getCurrentUserInfo();
+
+    /**
+     * 获取个人中心用户信息
+     *
+     * @return {@link UserProfileVO} 个人中心用户信息
+     */
+    UserProfileVO getUserProfile(Long userId);
+
+    /**
+     * 修改个人中心用户信息
+     *
+     * @param formData 表单数据
+     * @return {@link Boolean} 是否修改成功
+     */
+    boolean updateUserProfile(UserProfileForm formData);
+
+    /**
+     * 修改指定用户密码
+     *
+     * @param userId 用户ID
+     * @param data   修改密码表单数据
+     * @return {@link Boolean} 是否修改成功
+     */
+    boolean changeUserPassword(Long userId, PasswordUpdateForm data);
+
+    /**
+     * 重置指定用户密码
+     *
+     * @param userId   用户ID
+     * @param password 重置后的密码
+     * @return {@link Boolean} 是否重置成功
+     */
+    boolean resetUserPassword(Long userId, String password);
+
+    /**
+     * 发送短信验证码(绑定或更换手机号)
+     *
+     * @param mobile 手机号
+     * @return {@link Boolean} 是否发送成功
+     */
+    boolean sendMobileCode(String mobile);
+
+    /**
+     * 修改当前用户手机号
+     *
+     * @param data 表单数据
+     * @return {@link Boolean} 是否修改成功
+     */
+    boolean bindOrChangeMobile(MobileUpdateForm data);
+
+    /**
+     * 发送邮箱验证码(绑定或更换邮箱)
+     *
+     * @param email 邮箱
+     */
+    void sendEmailCode(String email);
+
+    /**
+     * 绑定或更换邮箱
+     *
+     * @param data 表单数据
+     * @return {@link Boolean} 是否绑定成功
+     */
+    boolean bindOrChangeEmail(EmailUpdateForm data);
+
+    /**
+     * 解绑手机号
+     *
+     * @param data 表单数据
+     * @return {@link Boolean} 是否解绑成功
+     */
+    boolean unbindMobile(PasswordVerifyForm data);
+
+    /**
+     * 解绑邮箱
+     *
+     * @param data 表单数据
+     * @return {@link Boolean} 是否解绑成功
+     */
+    boolean unbindEmail(PasswordVerifyForm data);
+
+    /**
+     * 获取用户选项列表
+     *
+     * @return {@link List<Option<String>>} 用户选项列表
+     */
+//    List<Option<String>> listUserOptions();
+
+    /**
+     * 根据手机号获取用户认证信息
+     *
+     * @param mobile 手机号
+     * @return {@link UserAuthInfo}
+     */
+    UserAuthInfo getAuthInfoByMobile(String mobile);
+
+    default UserAuthInfo getAuthCredentialsByMobile(String mobile) {
+        return getAuthInfoByMobile(mobile);
+    }
+
+}

src/main/java/com/youlai/boot/app/service/impl/AppAuthServiceImpl.java

@@ -0,0 +1,198 @@
+package com.youlai.boot.app.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.youlai.boot.app.model.entity.AppUser;
+import com.youlai.boot.app.service.AppAuthService;
+import com.youlai.boot.app.service.AppUserService;
+import com.youlai.boot.common.constant.RedisConstants;
+import com.youlai.boot.common.util.CodeGeneratorUtil;
+import com.youlai.boot.framework.captcha.model.CaptchaInfo;
+import com.youlai.boot.framework.captcha.service.CaptchaService;
+import com.youlai.boot.framework.integration.sms.enums.SmsTypeEnum;
+import com.youlai.boot.framework.integration.sms.service.SmsService;
+import com.youlai.boot.framework.integration.sms.service.impl.AliyunSmsService;
+import com.youlai.boot.framework.integration.sms.service.impl.TencentSmsService;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
+import com.youlai.boot.framework.security.token.TokenManager;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import com.youlai.boot.common.exception.BusinessException;
+import cn.hutool.core.lang.Assert;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 认证服务实现类
+ *
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class AppAuthServiceImpl implements AppAuthService {
+
+    private final AuthenticationManager authenticationManager;
+    private final TokenManager tokenManager;
+    private final AliyunSmsService smsService;
+    private final RedisTemplate<String, Object> redisTemplate;
+    private final CaptchaService captchaService;
+    private final AppUserService userService;
+    private final PasswordEncoder passwordEncoder;
+
+
+    @Override
+    public CaptchaInfo getCaptcha() {
+        return null;
+    }
+
+    /**
+     * 发送注册短信验证码
+     *
+     * @param mobile 手机号
+     */
+    @Override
+    public boolean sendRegisterSmsCode(String mobile) {
+        // 检查手机号是否已注册
+        long count = userService.count(new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getMobile, mobile));
+        if (count > 0) {
+            throw new BusinessException("该手机号已被注册");
+        }
+
+        String code = CodeGeneratorUtil.generateNumericCode(6);
+
+        // 发送短信验证码
+        Map<String, String> templateParams = new HashMap<>();
+        templateParams.put("code", code);
+
+        boolean success = smsService.sendSms(mobile, SmsTypeEnum.REGISTER, templateParams);
+        if (success) {
+            // 缓存验证码至Redis，用于注册校验
+            redisTemplate.opsForValue().set(StrUtil.format(RedisConstants.Captcha.SMS_REGISTER_CODE, mobile), code, 5, TimeUnit.MINUTES);
+        } else {
+            log.warn("短信发送失败，手机号: {}", mobile);
+        }
+
+        return success;
+    }
+
+    /**
+     * 手机号注册
+     *
+     * @param mobile 手机号
+     * @param code   验证码
+     * @param password 密码
+     * @param nickname 昵称
+     * @return 认证令牌
+     */
+    @Override
+    public AuthenticationToken registerByMobile(String mobile, String code, String password, String nickname) {
+        // 1. 校验验证码
+        String cacheKey = StrUtil.format(RedisConstants.Captcha.SMS_REGISTER_CODE, mobile);
+        String cachedCode = (String) redisTemplate.opsForValue().get(cacheKey);
+
+        if (StrUtil.isBlank(cachedCode)) {
+            throw new BusinessException("验证码已过期");
+        }
+
+        if (!Objects.equals(code, cachedCode)) {
+            throw new BusinessException("验证码错误");
+        }
+
+        // 2. 检查手机号是否已注册
+        long count = userService.count(new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getMobile, mobile));
+        Assert.isTrue(count == 0, "该手机号已被注册");
+
+        // 3. 创建新用户
+        AppUser user = new AppUser();
+        user.setUsername(mobile); // 使用手机号作为用户名
+        user.setMobile(mobile);
+        user.setPassword(passwordEncoder.encode(password));
+        user.setNickname(StrUtil.isNotBlank(nickname) ? nickname : mobile.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
+        user.setStatus(1); // 正常状态
+
+        boolean saveResult = userService.save(user);
+        if (!saveResult) {
+            throw new BusinessException("注册失败");
+        }
+
+        // 4. 删除验证码
+        redisTemplate.delete(cacheKey);
+
+        // 5. 自动登录并生成token
+        UsernamePasswordAuthenticationToken authenticationToken =
+                new UsernamePasswordAuthenticationToken(mobile, password);
+        Authentication authentication = authenticationManager.authenticate(authenticationToken);
+
+        AuthenticationToken authenticationTokenResponse =
+                tokenManager.generateToken(authentication);
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+
+        return authenticationTokenResponse;
+    }
+
+    @Override
+    public void sendLoginSmsCode(String mobile) {
+        String code = "1234";
+
+        Map<String, String> templateParams = new HashMap<>();
+        templateParams.put("code", code);
+
+        boolean success = false;
+
+        // 方式1: 使用阿里云短信（默认）
+//        try {
+//            success = aliyunSmsService.sendSms(mobile, SmsTypeEnum.LOGIN, templateParams);
+//            log.info("阿里云短信发送结果: {}", success ? "成功" : "失败");
+//        } catch (Exception e) {
+//            log.error("阿里云短信发送异常", e);
+//        }
+
+        // 方式2: 使用腾讯云短信（需要时取消下面注释，并注释掉上面的阿里云代码）
+        try {
+            success = smsService.sendSms(mobile, SmsTypeEnum.LOGIN, templateParams);
+            log.info("腾讯云短信发送结果: {}", success ? "成功" : "失败");
+        } catch (Exception e) {
+            log.error("腾讯云短信发送异常", e);
+        }
+
+        if (success) {
+            redisTemplate.opsForValue().set(StrUtil.format(RedisConstants.Captcha.SMS_LOGIN_CODE, mobile), code, 5, TimeUnit.MINUTES);
+        } else {
+            log.warn("短信发送失败，手机号: {}", mobile);
+        }
+    }
+
+    @Override
+    public AuthenticationToken loginBySms(String mobile, String code) {
+        return null;
+    }
+
+    @Override
+    public AuthenticationToken login(String username, String password) {
+        return null;
+    }
+
+    @Override
+    public void logout() {
+
+    }
+
+    @Override
+    public AuthenticationToken refreshToken(String refreshToken) {
+        return null;
+    }
+
+}

src/main/java/com/youlai/boot/app/service/impl/AppUserServiceImpl.java

@@ -0,0 +1,683 @@
+package com.youlai.boot.app.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.youlai.boot.app.converter.AppUserConverter;
+import com.youlai.boot.app.mapper.AppUserMapper;
+import com.youlai.boot.app.model.entity.AppUser;
+import com.youlai.boot.app.model.form.AppUserForm;
+import com.youlai.boot.app.service.AppUserService;
+import com.youlai.boot.common.constant.RedisConstants;
+import com.youlai.boot.common.constant.SystemConstants;
+import com.youlai.boot.common.exception.BusinessException;
+import com.youlai.boot.common.model.Option;
+import com.youlai.boot.framework.integration.mail.service.MailService;
+import com.youlai.boot.framework.integration.sms.enums.SmsTypeEnum;
+import com.youlai.boot.framework.integration.sms.service.SmsService;
+import com.youlai.boot.framework.security.model.RoleDataScope;
+import com.youlai.boot.framework.security.model.UserAuthInfo;
+import com.youlai.boot.framework.security.token.TokenManager;
+import com.youlai.boot.framework.security.util.SecurityUtils;
+import com.youlai.boot.system.converter.UserConverter;
+import com.youlai.boot.system.enums.DictCodeEnum;
+import com.youlai.boot.system.mapper.UserMapper;
+import com.youlai.boot.system.model.entity.Dept;
+import com.youlai.boot.system.model.entity.DictItem;
+import com.youlai.boot.system.model.entity.Role;
+import com.youlai.boot.system.model.form.*;
+import com.youlai.boot.system.model.query.UserQuery;
+import com.youlai.boot.system.model.vo.CurrentUserVO;
+import com.youlai.boot.system.model.vo.UserExportVO;
+import com.youlai.boot.system.model.vo.UserPageVO;
+import com.youlai.boot.system.model.vo.UserProfileVO;
+import com.youlai.boot.system.service.*;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * app用户业务实现类
+ *
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implements AppUserService {
+
+    private final PasswordEncoder passwordEncoder;
+
+    private final UserRoleService userRoleService;
+
+    private final DeptService deptService;
+
+    private final RoleService roleService;
+
+    private final RoleMenuService roleMenuService;
+
+    private final SmsService smsService;
+
+    private final MailService mailService;
+
+    private final StringRedisTemplate redisTemplate;
+
+    private final TokenManager tokenManager;
+
+    private final DictItemService dictItemService;
+
+    private final AppUserConverter userConverter;
+
+
+    /**
+     * 获取用户分页列表
+     *
+     * @param queryParams 查询参数
+     * @return {@link IPage<UserPageVO>} 用户分页列表
+     */
+    @Override
+    public IPage<UserPageVO> getUserPage(UserQuery queryParams) {
+
+        // 参数构建
+        int pageNum = queryParams.getPageNum();
+        int pageSize = queryParams.getPageSize();
+        Page<UserPageVO> page = new Page<>(pageNum, pageSize);
+
+        boolean isRoot = SecurityUtils.isRoot();
+        queryParams.setIsRoot(isRoot);
+
+        // 查询数据
+        return this.baseMapper.getUserPage(page, queryParams);
+    }
+
+    /**
+     * 获取用户表单数据
+     *
+     * @param userId 用户ID
+     * @return {@link AppUserForm} 用户表单数据
+     */
+    @Override
+    public AppUserForm getUserFormData(Long userId) {
+        return this.baseMapper.getUserFormData(userId);
+    }
+
+    /**
+     * 新增用户
+     *
+     * @param userForm 用户表单对象
+     * @return true|false
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean saveUser(AppUserForm userForm) {
+
+        String username = userForm.getUsername();
+
+        // 实体转换 form->entity
+        AppUser entity = userConverter.toEntity(userForm);
+
+        // 检查用户名是否已存在
+        long count = this.count(new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getUsername, username));
+        Assert.isTrue(count == 0, "用户名已存在");
+
+        // 设置默认加密密码
+        String defaultEncryptPwd = passwordEncoder.encode(SystemConstants.DEFAULT_PASSWORD);
+        entity.setPassword(defaultEncryptPwd);
+//        entity.setCreateBy(SecurityUtils.getUserId());
+
+        // 新增用户
+        boolean result = this.save(entity);
+
+        if (result) {
+            // 保存用户角色
+            userRoleService.saveUserRoles(entity.getId(), userForm.getRoleIds());
+        }
+        return result;
+    }
+
+    /**
+     * 更新用户
+     *
+     * @param userId   用户ID
+     * @param userForm 用户表单对象
+     * @return true|false
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updateUser(Long userId, AppUserForm userForm) {
+
+        String username = userForm.getUsername();
+
+        // 获取原用户信息
+        AppUser oldUser = this.getById(userId);
+        Assert.notNull(oldUser, "用户不存在");
+
+        // 检查用户名是否已存在（排除当前用户）
+        long count = this.count(new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getUsername, username)
+                .ne(AppUser::getId, userId)
+        );
+        Assert.isTrue(count == 0, "用户名已存在");
+
+        // form -> entity
+        AppUser entity = userConverter.toEntity(userForm);
+//        entity.setUpdateBy(SecurityUtils.getUserId());
+
+        // 修改用户
+        boolean result = this.updateById(entity);
+
+        if (result) {
+            // 保存用户角色
+            userRoleService.saveUserRoles(entity.getId(), userForm.getRoleIds());
+        }
+        return result;
+    }
+
+    /**
+     * 删除用户
+     *
+     * @param idsStr 用户ID，多个以英文逗号(,)分割
+     * @return true|false
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean deleteUsers(String idsStr) {
+        Assert.isTrue(StrUtil.isNotBlank(idsStr), "删除的用户数据为空");
+        // 逻辑删除
+        List<Long> ids = Arrays.stream(idsStr.split(","))
+                .map(Long::parseLong)
+                .collect(Collectors.toList());
+
+        boolean result = this.removeByIds(ids);
+        return result;
+    }
+
+    /**
+     * 根据用户名获取认证凭证信息
+     *
+     * @param username 用户名
+     * @return 用户认证凭证信息 {@link UserAuthInfo}
+     */
+    @Override
+    public UserAuthInfo getAuthInfoByUsername(String username) {
+        UserAuthInfo userAuthInfo = this.baseMapper.getAuthInfoByUsername(username);
+        if (userAuthInfo != null) {
+            Set<String> roles = userAuthInfo.getRoles();
+            // 获取数据权限列表（用于并集策略）
+            List<RoleDataScope> dataScopes = roleService.getRoleDataScopes(roles);
+            userAuthInfo.setDataScopes(dataScopes);
+        }
+        return userAuthInfo;
+    }
+
+    /**
+     * 根据手机号获取用户认证信息
+     *
+     * @param mobile 手机号
+     * @return 用户认证信息
+     */
+    @Override
+    public UserAuthInfo getAuthInfoByMobile(String mobile) {
+        if (StrUtil.isBlank(mobile)) {
+            return null;
+        }
+        UserAuthInfo userAuthInfo = this.baseMapper.getAuthInfoByMobile(mobile);
+        if (userAuthInfo != null) {
+            Set<String> roles = userAuthInfo.getRoles();
+            // 获取数据权限列表（用于并集策略）
+            List<RoleDataScope> dataScopes = roleService.getRoleDataScopes(roles);
+            userAuthInfo.setDataScopes(dataScopes);
+        }
+        return userAuthInfo;
+    }
+
+    /**
+     * 获取导出用户列表
+     *
+     * @param queryParams 查询参数
+     * @return {@link List<UserExportVO>} 导出用户列表
+     */
+    @Override
+    public List<UserExportVO> listExportUsers(UserQuery queryParams) {
+
+        boolean isRoot = SecurityUtils.isRoot();
+        queryParams.setIsRoot(isRoot);
+
+        List<UserExportVO> exportUsers = this.baseMapper.listExportUsers(queryParams);
+        if (CollectionUtil.isNotEmpty(exportUsers)) {
+            //获取性别的字典项
+            Map<String, String> genderMap = dictItemService.list(
+                            new LambdaQueryWrapper<DictItem>().eq(DictItem::getDictCode,
+                                    DictCodeEnum.GENDER.getValue())
+                    ).stream()
+                    .collect(Collectors.toMap(DictItem::getValue, DictItem::getLabel)
+                    );
+
+            exportUsers.forEach(item -> {
+                String gender = item.getGender();
+                if (StrUtil.isBlank(gender)) {
+                    return;
+                }
+
+                // 判断map是否为空
+                if (genderMap.isEmpty()) {
+                    return;
+                }
+
+                item.setGender(genderMap.get(gender));
+            });
+        }
+        return exportUsers;
+    }
+
+    /**
+     * 获取登录用户信息
+     *
+     * @return {@link CurrentUserVO}   用户信息
+     */
+    @Override
+    public CurrentUserVO getCurrentUserInfo() {
+
+        String username = SecurityUtils.getUsername();
+
+        // 获取登录用户基础信息
+        AppUser user = this.getOne(new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getUsername, username)
+                .select(
+                        AppUser::getId,
+                        AppUser::getUsername,
+                        AppUser::getNickname,
+                        AppUser::getAvatar,
+                        AppUser::getGender
+//                        AppUser::getDeptId
+                )
+        );
+        // entity->Vo
+        CurrentUserVO userInfoVo = userConverter.toCurrentUserVo(user);
+
+        // 性别
+        userInfoVo.setGender(user.getGender());
+
+        // 部门名称
+//        if (user.getDeptId() != null) {
+//            Dept dept = deptService.getById(user.getDeptId());
+//            if (dept != null) {
+//                userInfoVo.setDeptName(dept.getName());
+//            }
+//        }
+
+        // 用户角色集合
+        Set<String> roles = SecurityUtils.getRoles();
+        userInfoVo.setRoles(roles);
+
+        // 用户角色名称集合
+        if (CollectionUtil.isNotEmpty(roles)) {
+            Set<String> roleNames = roleService.list(new LambdaQueryWrapper<Role>()
+                            .in(Role::getCode, roles)
+                            .select(Role::getName)
+                    ).stream()
+                    .map(Role::getName)
+                    .filter(StrUtil::isNotBlank)
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+            userInfoVo.setRoleNames(roleNames);
+        }
+
+        // 用户权限集合
+        if (CollectionUtil.isNotEmpty(roles)) {
+            Set<String> perms = roleMenuService.getRolePermsByRoleCodes(roles);
+            userInfoVo.setPerms(perms);
+        }
+        return userInfoVo;
+    }
+
+    /**
+     * 获取个人中心用户信息
+     *
+     * @param userId 用户ID
+     * @return {@link UserProfileVO} 个人中心用户信息
+     */
+    @Override
+    public UserProfileVO getUserProfile(Long userId) {
+        return this.baseMapper.getUserProfile(userId);
+    }
+
+    /**
+     * 修改个人中心用户信息
+     *
+     * @param formData 表单数据
+     * @return true|false
+     */
+    @Override
+    public boolean updateUserProfile(UserProfileForm formData) {
+        Long userId = SecurityUtils.getUserId();
+
+        if (formData.getNickname() == null && formData.getAvatar() == null && formData.getGender() == null) {
+            throw new BusinessException("请修改至少一个字段");
+        }
+
+        return this.update(new LambdaUpdateWrapper<AppUser>()
+                .eq(AppUser::getId, userId)
+                .set(formData.getNickname() != null, AppUser::getNickname, formData.getNickname())
+                .set(formData.getAvatar() != null, AppUser::getAvatar, formData.getAvatar())
+                .set(formData.getGender() != null, AppUser::getGender, formData.getGender())
+        );
+    }
+
+    /**
+     * 修改指定用户密码
+     *
+     * @param userId 用户ID
+     * @param data   密码修改表单数据
+     * @return true|false
+     */
+    @Override
+    public boolean changeUserPassword(Long userId, PasswordUpdateForm data) {
+
+        AppUser user = this.getById(userId);
+        if (user == null) {
+            throw new BusinessException("用户不存在");
+        }
+
+        String oldPassword = data.getOldPassword();
+
+        // 校验原密码
+        if (!passwordEncoder.matches(oldPassword, user.getPassword())) {
+            throw new BusinessException("原密码错误");
+        }
+        // 新旧密码不能相同
+        if (passwordEncoder.matches(data.getNewPassword(), user.getPassword())) {
+            throw new BusinessException("新密码不能与原密码相同");
+        }
+
+        // 判断新密码和确认密码是否一致
+        if (!Objects.equals(data.getNewPassword(), data.getConfirmPassword())) {
+            throw new BusinessException("新密码和确认密码不一致");
+        }
+
+        String newPassword = data.getNewPassword();
+        boolean result = this.update(new LambdaUpdateWrapper<AppUser>()
+                .eq(AppUser::getId, userId)
+                .set(AppUser::getPassword, passwordEncoder.encode(newPassword))
+        );
+
+        if (result) {
+            // 密码变更后，使当前用户的所有会话失效，强制重新登录
+            tokenManager.invalidateUserSessions(userId);
+        }
+        return result;
+    }
+
+    /**
+     * 重置指定用户密码
+     *
+     * @param userId   用户ID
+     * @param password 密码重置表单数据
+     * @return true|false
+     */
+    @Override
+    public boolean resetUserPassword(Long userId, String password) {
+        boolean result = this.update(new LambdaUpdateWrapper<AppUser>()
+                .eq(AppUser::getId, userId)
+                .set(AppUser::getPassword, passwordEncoder.encode(password))
+        );
+        if (result) {
+            // 管理员重置用户密码后，使该用户的所有会话失效
+            tokenManager.invalidateUserSessions(userId);
+        }
+        return result;
+    }
+
+    /**
+     * 发送短信验证码(绑定或更换手机号)
+     *
+     * @param mobile 手机号
+     * @return true|false
+     */
+    @Override
+    public boolean sendMobileCode(String mobile) {
+
+        Long currentUserId = SecurityUtils.getUserId();
+        long mobileCount = this.count(new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getMobile, mobile)
+                .ne(AppUser::getId, currentUserId)
+        );
+        if (mobileCount > 0) {
+            throw new BusinessException("手机号已被其他账号绑定");
+        }
+
+        // String code = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
+        // TODO 为了方便测试，验证码固定为 123456，实际开发中在配置了厂商短信服务后，可以使用上面的随机验证码
+        String code = "123456";
+
+        Map<String, String> templateParams = new HashMap<>();
+        templateParams.put("code", code);
+        boolean result = smsService.sendSms(mobile, SmsTypeEnum.CHANGE_MOBILE, templateParams);
+        if (result) {
+            // 缓存验证码，5分钟有效，用于更换手机号校验
+            String redisCacheKey = StrUtil.format(RedisConstants.Captcha.MOBILE_CODE, mobile);
+            redisTemplate.opsForValue().set(redisCacheKey, code, 5, TimeUnit.MINUTES);
+        }
+        return result;
+    }
+
+    /**
+     * 绑定或更换手机号
+     *
+     * @param form 表单数据
+     * @return true|false
+     */
+    @Override
+    public boolean bindOrChangeMobile(MobileUpdateForm form) {
+
+        Long currentUserId = SecurityUtils.getUserId();
+        AppUser currentUser = this.getById(currentUserId);
+
+        if (currentUser == null) {
+            throw new BusinessException("用户不存在");
+        }
+
+        if (!passwordEncoder.matches(form.getPassword(), currentUser.getPassword())) {
+            throw new BusinessException("当前密码错误");
+        }
+
+        // 校验验证码
+        String inputVerifyCode = form.getCode();
+        String mobile = form.getMobile();
+
+        String cacheKey = StrUtil.format(RedisConstants.Captcha.MOBILE_CODE, mobile);
+
+        String cachedVerifyCode = redisTemplate.opsForValue().get(cacheKey);
+
+        if (StrUtil.isBlank(cachedVerifyCode)) {
+            throw new BusinessException("验证码已过期");
+        }
+        if (!inputVerifyCode.equals(cachedVerifyCode)) {
+            throw new BusinessException("验证码错误");
+        }
+
+        long mobileCount = this.count(new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getMobile, mobile)
+                .ne(AppUser::getId, currentUserId)
+        );
+        if (mobileCount > 0) {
+            throw new BusinessException("手机号已被其他账号绑定");
+        }
+
+        redisTemplate.delete(cacheKey);
+
+        // 更新手机号码
+        return this.update(
+                new LambdaUpdateWrapper<AppUser>()
+                        .eq(AppUser::getId, currentUserId)
+                        .set(AppUser::getMobile, mobile)
+        );
+    }
+
+    /**
+     * 发送邮箱验证码（绑定或更换邮箱）
+     *
+     * @param email 邮箱
+     */
+    @Override
+    public void sendEmailCode(String email) {
+
+        Long currentUserId = SecurityUtils.getUserId();
+        long emailCount = this.count(new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getEmail, email)
+                .ne(AppUser::getId, currentUserId)
+        );
+        if (emailCount > 0) {
+            throw new BusinessException("邮箱已被其他账号绑定");
+        }
+
+        // String code = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
+        // TODO 为了方便测试，验证码固定为 123456，实际开发中在配置了邮箱服务后，可以使用上面的随机验证码
+        String code = "123456";
+
+        mailService.sendMail(email, "邮箱验证码", "您的验证码为：" + code + "，请在5分钟内使用");
+        // 缓存验证码，5分钟有效，用于更换邮箱校验
+        String redisCacheKey = StrUtil.format(RedisConstants.Captcha.EMAIL_CODE, email);
+        redisTemplate.opsForValue().set(redisCacheKey, code, 5, TimeUnit.MINUTES);
+    }
+
+    /**
+     * 修改当前用户邮箱
+     *
+     * @param form 表单数据
+     * @return true|false
+     */
+    @Override
+    public boolean bindOrChangeEmail(EmailUpdateForm form) {
+
+        Long currentUserId = SecurityUtils.getUserId();
+
+        AppUser currentUser = this.getById(currentUserId);
+        if (currentUser == null) {
+            throw new BusinessException("用户不存在");
+        }
+
+        if (!passwordEncoder.matches(form.getPassword(), currentUser.getPassword())) {
+            throw new BusinessException("当前密码错误");
+        }
+
+        // 获取前端输入的验证码
+        String inputVerifyCode = form.getCode();
+
+        // 获取缓存的验证码
+        String email = form.getEmail();
+        String redisCacheKey = StrUtil.format(RedisConstants.Captcha.EMAIL_CODE, email);
+        String cachedVerifyCode = redisTemplate.opsForValue().get(redisCacheKey);
+
+        if (StrUtil.isBlank(cachedVerifyCode)) {
+            throw new BusinessException("验证码已过期");
+        }
+
+        if (!inputVerifyCode.equals(cachedVerifyCode)) {
+            throw new BusinessException("验证码错误");
+        }
+
+        long emailCount = this.count(new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getEmail, email)
+                .ne(AppUser::getId, currentUserId)
+        );
+        if (emailCount > 0) {
+            throw new BusinessException("邮箱已被其他账号绑定");
+        }
+
+        redisTemplate.delete(redisCacheKey);
+
+        // 更新邮箱地址
+        return this.update(
+                new LambdaUpdateWrapper<AppUser>()
+                        .eq(AppUser::getId, currentUserId)
+                        .set(AppUser::getEmail, email)
+        );
+    }
+
+    /**
+     * 解绑手机号
+     *
+     * @param form 表单数据
+     * @return true|false
+     */
+    @Override
+    public boolean unbindMobile(PasswordVerifyForm form) {
+
+        Long currentUserId = SecurityUtils.getUserId();
+        AppUser currentUser = this.getById(currentUserId);
+
+        if (currentUser == null) {
+            throw new BusinessException("用户不存在");
+        }
+
+        if (StrUtil.isBlank(currentUser.getMobile())) {
+            throw new BusinessException("当前账号未绑定手机号");
+        }
+
+        if (!passwordEncoder.matches(form.getPassword(), currentUser.getPassword())) {
+            throw new BusinessException("当前密码错误");
+        }
+
+        return this.update(new LambdaUpdateWrapper<AppUser>()
+                .eq(AppUser::getId, currentUserId)
+                .set(AppUser::getMobile, null)
+        );
+    }
+
+    /**
+     * 解绑邮箱
+     *
+     * @param form 表单数据
+     * @return true|false
+     */
+    @Override
+    public boolean unbindEmail(PasswordVerifyForm form) {
+
+        Long currentUserId = SecurityUtils.getUserId();
+        AppUser currentUser = this.getById(currentUserId);
+
+        if (currentUser == null) {
+            throw new BusinessException("用户不存在");
+        }
+
+        if (StrUtil.isBlank(currentUser.getEmail())) {
+            throw new BusinessException("当前账号未绑定邮箱");
+        }
+
+        if (!passwordEncoder.matches(form.getPassword(), currentUser.getPassword())) {
+            throw new BusinessException("当前密码错误");
+        }
+
+        return this.update(new LambdaUpdateWrapper<AppUser>()
+                .eq(AppUser::getId, currentUserId)
+                .set(AppUser::getEmail, null)
+        );
+    }
+
+    /**
+     * 获取用户选项列表
+     *
+     * @return {@link List<Option<String>>} 用户选项列表
+     */
+//    @Override
+//    public List<Option<String>> listUserOptions() {
+//        List<AppUser> list = this.list(new LambdaQueryWrapper<AppUser>()
+//                .eq(AppUser::getStatus, 1)
+//        );
+//        return userConverter.toOptions(list);
+//    }
+
+
+}

src/main/java/com/youlai/boot/app/service/impl/LocalAppFileService.java

@@ -0,0 +1,93 @@
+package com.youlai.boot.app.service.impl;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.IdUtil;
+import com.youlai.boot.app.model.vo.AppFileInfo;
+import com.youlai.boot.app.service.AppFileService;
+import com.youlai.boot.file.service.FileService;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.InputStream;
+import java.time.LocalDateTime;
+
+/**
+ * 本地存储服务类
+ *
+ * @author Theo
+ * @since 2024-12-09 17:11
+ */
+@Data
+@Slf4j
+@Component
+//@ConditionalOnProperty(value = "oss.type", havingValue = "local")
+//@ConfigurationProperties(prefix = "oss.local")
+@RequiredArgsConstructor
+public class LocalAppFileService implements AppFileService {
+
+    @Value("${oss.local.storage-path}")
+    private String storagePath;
+
+    /**
+     * 上传文件方法
+     *
+     * @param file 表单文件对象
+     * @return 文件信息
+     */
+    @Override
+    public AppFileInfo uploadFile(MultipartFile file) {
+        // 获取文件名
+        String originalFilename = file.getOriginalFilename();
+        // 获取文件后缀
+        String suffix = FileUtil.getSuffix(originalFilename);
+        // 生成uuid
+        String fileName = IdUtil.simpleUUID()+ "." + suffix;;
+        // 生成文件名(日期文件夹)
+        String folder = DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATE_PATTERN);
+        String filePrefix = storagePath.endsWith(File.separator) ? storagePath : storagePath + File.separator;
+        //  try-with-resource 语法糖自动释放流
+        try (InputStream inputStream = file.getInputStream()) {
+            // 上传文件
+            FileUtil.writeFromStream(inputStream, filePrefix + folder + File.separator + fileName);
+        } catch (Exception e) {
+            log.error("文件上传失败", e);
+            throw new RuntimeException("文件上传失败");
+        }
+        // 获取文件访问路径，因为这里是本地存储，所以直接返回文件的相对路径，需要前端自行处理访问前缀
+        String fileUrl = File.separator + folder + File.separator + fileName;
+        AppFileInfo fileInfo = new AppFileInfo();
+        fileInfo.setName(originalFilename);
+        fileInfo.setUrl(fileUrl);
+        return fileInfo;
+    }
+
+
+    /**
+     * 删除文件
+     * @param filePath 文件完整URL
+     * @return 是否删除成功
+     */
+    @Override
+    public boolean deleteFile(String filePath) {
+        //判断文件是否为空
+        if (filePath == null || filePath.isEmpty()) {
+            return false;
+        }
+        // 判断filepath是否为文件夹
+        if (FileUtil.isDirectory(storagePath + filePath)) {
+            // 禁止删除文件夹
+            return false;
+        }
+        // 删除文件
+        return FileUtil.del(storagePath + filePath);
+    }
+}

src/main/java/com/youlai/boot/auth/controller/AuthController.java

@@ -1,14 +1,13 @@
 package com.youlai.boot.auth.controller;
 
-import com.youlai.boot.auth.model.dto.WxMiniAppCodeLoginDTO;
-import com.youlai.boot.auth.model.dto.WxMiniAppPhoneLoginDTO;
-import com.youlai.boot.auth.model.vo.CaptchaVO;
-import com.youlai.boot.auth.model.dto.LoginRequest;
+import com.youlai.boot.auth.model.LoginReq;
+import com.youlai.boot.common.enums.ActionTypeEnum;
 import com.youlai.boot.common.enums.LogModuleEnum;
-import com.youlai.boot.core.web.Result;
+import com.youlai.boot.common.result.Result;
 import com.youlai.boot.auth.service.AuthService;
 import com.youlai.boot.common.annotation.Log;
-import com.youlai.boot.security.model.AuthenticationToken;
+import com.youlai.boot.framework.captcha.model.CaptchaInfo;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -34,27 +33,25 @@ public class AuthController {
 
     @Operation(summary = "获取验证码")
     @GetMapping("/captcha")
-    public Result<CaptchaVO> getCaptcha() {
-        CaptchaVO captcha = authService.getCaptcha();
+    public Result<CaptchaInfo> getCaptcha() {
+        CaptchaInfo captcha = authService.getCaptcha();
         return Result.success(captcha);
     }
 
     @Operation(summary = "账号密码登录")
     @PostMapping("/login")
-    @Log(value = "登录", module = LogModuleEnum.LOGIN)
-    public Result<?> login(@RequestBody @Valid LoginRequest request) {
-        String username = request.getUsername();
-        String password = request.getPassword();
-        AuthenticationToken authenticationToken = authService.login(username, password);
+    @Log(module = LogModuleEnum.LOGIN, value = ActionTypeEnum.LOGIN)
+    public Result<AuthenticationToken> login(@RequestBody @Valid LoginReq request) {
+        AuthenticationToken authenticationToken = authService.login(request.getUsername(), request.getPassword());
         return Result.success(authenticationToken);
     }
 
     @Operation(summary = "短信验证码登录")
     @PostMapping("/login/sms")
-    @Log(value = "短信验证码登录", module = LogModuleEnum.LOGIN)
+    @Log(module = LogModuleEnum.LOGIN, value = ActionTypeEnum.LOGIN)
     public Result<AuthenticationToken> loginBySms(
-            @Parameter(description = "手机号", example = "18812345678") @RequestParam String mobile,
-            @Parameter(description = "验证码", example = "1234") @RequestParam String code
+            @Parameter(description = "手机号", example = "18888888888") @RequestParam String mobile,
+            @Parameter(description = "验证码", example = "123456") @RequestParam String code
     ) {
         AuthenticationToken loginResult = authService.loginBySms(mobile, code);
         return Result.success(loginResult);
@@ -62,48 +59,24 @@ public class AuthController {
 
     @Operation(summary = "发送登录短信验证码")
     @PostMapping("/sms/code")
-    public Result<Void> sendLoginVerifyCode(
-            @Parameter(description = "手机号", example = "18812345678") @RequestParam String mobile
+    public Result<Void> sendSmsCode(
+            @Parameter(description = "手机号", example = "18888888888") @RequestParam String mobile
     ) {
-        authService.sendSmsLoginCode(mobile);
+        authService.sendSmsCode(mobile);
         return Result.success();
     }
 
-    @Operation(summary = "微信授权登录(Web)")
-    @PostMapping("/login/wechat")
-    @Log(value = "微信登录", module = LogModuleEnum.LOGIN)
-    public Result<AuthenticationToken> loginByWechat(
-            @Parameter(description = "微信授权码", example = "code") @RequestParam String code
-    ) {
-        AuthenticationToken loginResult = authService.loginByWechat(code);
-        return Result.success(loginResult);
-    }
-
-    @Operation(summary = "微信小程序登录(Code)")
-    @PostMapping("/wx/miniapp/code-login")
-    public Result<AuthenticationToken> loginByWxMiniAppCode(@RequestBody @Valid WxMiniAppCodeLoginDTO loginDto) {
-        AuthenticationToken token = authService.loginByWxMiniAppCode(loginDto);
-        return Result.success(token);
-    }
-
-    @Operation(summary = "微信小程序登录(手机号)")
-    @PostMapping("/wx/miniapp/phone-login")
-    public Result<AuthenticationToken> loginByWxMiniAppPhone(@RequestBody @Valid WxMiniAppPhoneLoginDTO loginDto) {
-        AuthenticationToken token = authService.loginByWxMiniAppPhone(loginDto);
-        return Result.success(token);
-    }
-
     @Operation(summary = "退出登录")
     @DeleteMapping("/logout")
-    @Log(value = "退出登录", module = LogModuleEnum.LOGIN)
-    public Result<?> logout() {
+    @Log(module = LogModuleEnum.LOGIN, value = ActionTypeEnum.LOGOUT)
+    public Result<Void> logout() {
         authService.logout();
         return Result.success();
     }
 
     @Operation(summary = "刷新令牌")
     @PostMapping("/refresh-token")
-    public Result<?> refreshToken(
+    public Result<AuthenticationToken> refreshToken(
             @Parameter(description = "刷新令牌", example = "xxx.xxx.xxx") @RequestParam String refreshToken
     ) {
         AuthenticationToken authenticationToken = authService.refreshToken(refreshToken);

src/main/java/com/youlai/boot/auth/controller/WxMaAuthController.java

@@ -0,0 +1,89 @@
+package com.youlai.boot.auth.controller;
+
+import com.youlai.boot.auth.model.WxMaBindMobileReq;
+import com.youlai.boot.auth.model.WxMaPhoneLoginReq;
+import com.youlai.boot.auth.model.WxMaLoginResp;
+import com.youlai.boot.auth.service.WxMaAuthService;
+import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.common.enums.ActionTypeEnum;
+import com.youlai.boot.common.enums.LogModuleEnum;
+import com.youlai.boot.common.result.Result;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
+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.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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import jakarta.validation.Valid;
+
+/**
+ * 微信小程序认证控制层
+ *
+ * @author Ray.Hao
+ * @since 2.4.0
+ */
+@Tag(name = "13.微信小程序认证")
+@RestController
+@RequestMapping("/api/v1/wxma/auth")
+@RequiredArgsConstructor
+@Slf4j
+public class WxMaAuthController {
+
+    private final WxMaAuthService wxMaAuthService;
+
+    /**
+     * 静默登录
+     * <p>
+     * 适用场景：个人小程序、无需手机号的登录场景
+     * <ul>
+     *   <li>已绑定手机号的用户：直接返回 token，登录成功</li>
+     *   <li>未绑定手机号的用户：返回 openid，需调用绑定手机号接口</li>
+     * </ul>
+     */
+    @Operation(summary = "静默登录", description = "通过微信 code 登录，已绑定用户直接返回 token，未绑定用户返回 openid 需绑定手机号")
+    @PostMapping("/silent-login")
+    @Log(module = LogModuleEnum.LOGIN, value = ActionTypeEnum.LOGIN)
+    public Result<WxMaLoginResp> silentLogin(
+            @Parameter(description = "微信登录凭证（wx.login 获取）", required = true, example = "0xxx")
+            @RequestParam String code
+    ) {
+        WxMaLoginResp result = wxMaAuthService.silentLogin(code);
+        return Result.success(result);
+    }
+
+    /**
+     * 手机号快捷登录
+     * <p>
+     * 适用场景：企业认证小程序（已开通手机号快捷登录权限）
+     * <p>
+     * 一步完成登录，无需绑定流程，自动创建新用户
+     */
+    @Operation(summary = "手机号快捷登录", description = "同时使用微信 code 和手机号授权 code 登录，适用于企业认证小程序")
+    @PostMapping("/phone-login")
+    @Log(module = LogModuleEnum.LOGIN, value = ActionTypeEnum.LOGIN)
+    public Result<AuthenticationToken> phoneLogin(@Valid @RequestBody WxMaPhoneLoginReq req) {
+        AuthenticationToken result = wxMaAuthService.phoneLogin(req.getLoginCode(), req.getPhoneCode());
+        return Result.success(result);
+    }
+
+    /**
+     * 绑定手机号
+     * <p>
+     * 适用场景：静默登录后未绑定手机号的用户
+     * <p>
+     * 绑定成功后自动完成登录
+     */
+    @Operation(summary = "绑定手机号", description = "为静默登录用户绑定手机号，绑定成功后自动登录")
+    @PostMapping("/bind-mobile")
+    @Log(module = LogModuleEnum.LOGIN, value = ActionTypeEnum.LOGIN)
+    public Result<AuthenticationToken> bindMobile(@Valid @RequestBody WxMaBindMobileReq req) {
+        AuthenticationToken result = wxMaAuthService.bindMobile(req.getOpenid(), req.getMobile(), req.getSmsCode());
+        return Result.success(result);
+    }
+}

src/main/java/com/youlai/boot/auth/model/LoginReq.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.auth.model.dto;
+package com.youlai.boot.auth.model;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -13,7 +13,7 @@ import jakarta.validation.constraints.NotBlank;
  */
 @Schema(description = "登录请求参数")
 @Data
-public class LoginRequest {
+public class LoginReq {
 
     @Schema(description = "用户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "admin")
     @NotBlank(message = "用户名不能为空")
@@ -26,7 +26,6 @@ public class LoginRequest {
     @Schema(description = "验证码缓存ID", example = "captcha_id_123")
     private String captchaId;
 
-    @Schema(description = "验证码", example = "1234")
+    @Schema(description = "验证码", example = "123456")
     private String captchaCode;
-}
-
+}

src/main/java/com/youlai/boot/auth/model/WxMaBindMobileReq.java

@@ -0,0 +1,28 @@
+package com.youlai.boot.auth.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * 微信小程序绑定手机号请求
+ *
+ * @author Ray.Hao
+ * @since 3.0.0
+ */
+@Schema(description = "微信小程序绑定手机号请求")
+@Data
+public class WxMaBindMobileReq {
+
+    @NotBlank(message = "openid 不能为空")
+    @Schema(description = "微信用户唯一标识（静默登录返回）", example = "oVBkZ0aYgDMDIywRdgPW8-joxXc4")
+    private String openid;
+
+    @NotBlank(message = "手机号不能为空")
+    @Schema(description = "手机号码", example = "18888888888")
+    private String mobile;
+
+    @NotBlank(message = "短信验证码不能为空")
+    @Schema(description = "短信验证码", example = "123456")
+    private String smsCode;
+}

src/main/java/com/youlai/boot/auth/model/WxMaLoginResp.java

@@ -0,0 +1,42 @@
+package com.youlai.boot.auth.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 微信小程序登录响应
+ *
+ * @author Ray.Hao
+ * @since 2.4.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "微信小程序登录响应")
+public class WxMaLoginResp {
+
+    @Schema(description = "是否新用户")
+    private Boolean isNewUser;
+
+    @Schema(description = "是否需要绑定手机号")
+    private Boolean needBindMobile;
+
+    @Schema(description = "微信openid（绑定手机号时需要）")
+    private String openid;
+
+    @Schema(description = "访问令牌")
+    private String accessToken;
+
+    @Schema(description = "刷新令牌")
+    private String refreshToken;
+
+    @Schema(description = "令牌类型")
+    private String tokenType;
+
+    @Schema(description = "过期时间（秒）")
+    private Integer expiresIn;
+}

src/main/java/com/youlai/boot/auth/model/WxMaPhoneLoginReq.java

@@ -0,0 +1,24 @@
+package com.youlai.boot.auth.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * 微信小程序手机号快捷登录请求
+ *
+ * @author Ray.Hao
+ * @since 3.0.0
+ */
+@Schema(description = "微信小程序手机号快捷登录请求")
+@Data
+public class WxMaPhoneLoginReq {
+
+    @NotBlank(message = "微信登录凭证不能为空")
+    @Schema(description = "微信登录凭证（wx.login 获取）", example = "0xxx")
+    private String loginCode;
+
+    @NotBlank(message = "手机号授权凭证不能为空")
+    @Schema(description = "手机号授权凭证（getPhoneNumber 事件获取）", example = "0xxx")
+    private String phoneCode;
+}

src/main/java/com/youlai/boot/auth/model/dto/WxMiniAppCodeLoginDTO.java

@@ -1,21 +0,0 @@
-package com.youlai.boot.auth.model.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotBlank;
-
-/**
- *微信小程序Code登录请求参数
- */
-@Schema(description = "微信小程序Code登录请求参数")
-@Data
-public class WxMiniAppCodeLoginDTO {
-
-    @Schema(description = "微信小程序登录时获取的code", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "code不能为空")
-    private String code;
-
-}
-
-

src/main/java/com/youlai/boot/auth/model/dto/WxMiniAppPhoneLoginDTO.java

@@ -1,27 +0,0 @@
-package com.youlai.boot.auth.model.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotBlank;
-
-/**
- * 微信小程序手机号登录请求参数
- */
-@Schema(description = "微信小程序手机号登录请求参数")
-@Data
-public class WxMiniAppPhoneLoginDTO {
-
-    @Schema(description = "微信小程序登录时获取的code", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "code不能为空")
-    private String code;
-
-    @Schema(description = "包括敏感数据在内的完整用户信息的加密数据")
-    private String encryptedData;
-
-    @Schema(description = "加密算法的初始向量")
-    private String iv;
-
-}
-
-

src/main/java/com/youlai/boot/auth/service/AuthService.java

@@ -1,9 +1,7 @@
 package com.youlai.boot.auth.service;
 
-import com.youlai.boot.auth.model.vo.CaptchaVO;
-import com.youlai.boot.auth.model.dto.WxMiniAppPhoneLoginDTO;
-import com.youlai.boot.security.model.AuthenticationToken;
-import com.youlai.boot.auth.model.dto.WxMiniAppCodeLoginDTO;
+import com.youlai.boot.framework.captcha.model.CaptchaInfo;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
 
 /**
  * 认证服务接口
@@ -14,71 +12,45 @@ import com.youlai.boot.auth.model.dto.WxMiniAppCodeLoginDTO;
 public interface AuthService {
 
     /**
-     * 登录
+     * 账号密码登录
      *
      * @param username 用户名
      * @param password 密码
-     * @return 登录结果
+     * @return 认证令牌
      */
     AuthenticationToken login(String username, String password);
 
-    /**
-     * 登出
-     */
-    void logout();
-
-    /**
-     * 获取验证码
-     *
-     * @return 验证码
-     */
-    CaptchaVO getCaptcha();
-
-    /**
-     * 刷新令牌
-     *
-     * @param refreshToken 刷新令牌
-     * @return 登录结果
-     */
-    AuthenticationToken refreshToken(String refreshToken);
-
-    /**
-     * 微信小程序登录
-     *
-     * @param code 微信登录code
-     * @return 登录结果
-     */
-    AuthenticationToken loginByWechat(String code);
-
-    /**
-     * 微信小程序Code登录
-     *
-     * @param loginDto 登录参数
-     * @return 访问令牌
-     */
-    AuthenticationToken loginByWxMiniAppCode(WxMiniAppCodeLoginDTO loginDto);
-
-    /**
-     * 微信小程序手机号登录
-     *
-     * @param loginDto 登录参数
-     * @return 访问令牌
-     */
-    AuthenticationToken loginByWxMiniAppPhone(WxMiniAppPhoneLoginDTO loginDto);
-
-    /**
-     * 发送短信验证码
-     *
-     * @param mobile 手机号
-     */
-    void sendSmsLoginCode(String mobile);
-
     /**
      * 短信验证码登录
      *
      * @param mobile 手机号
      * @param code   验证码
-     * @return 登录结果
+     * @return 认证令牌
      */
     AuthenticationToken loginBySms(String mobile, String code);
+
+    /**
+     * 发送短信验证码
+     *
+     * @param mobile 手机号
+     */
+    void sendSmsCode(String mobile);
+
+    /**
+     * 退出登录
+     */
+    void logout();
+
+    /**
+     * 获取验证码
+     */
+    CaptchaInfo getCaptcha();
+
+    /**
+     * 刷新令牌
+     *
+     * @param refreshToken 刷新令牌
+     * @return 认证令牌
+     */
+    AuthenticationToken refreshToken(String refreshToken);
 }

src/main/java/com/youlai/boot/auth/service/WxMaAuthService.java

@@ -0,0 +1,53 @@
+package com.youlai.boot.auth.service;
+
+import com.youlai.boot.auth.model.WxMaLoginResp;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
+
+/**
+ * 微信小程序认证服务接口
+ *
+ * @author Ray.Hao
+ * @since 2.4.0
+ */
+public interface WxMaAuthService {
+
+    /**
+     * 静默登录
+     * <p>
+     * 通过微信登录凭证（code）获取用户唯一标识（openid），
+     * 如果用户已绑定手机号则直接登录成功，否则返回需绑定手机号的提示。
+     * </p>
+     *
+     * @param code 微信登录凭证（wx.login 获取）
+     * @return 登录结果（成功返回 token，需绑定返回 openid）
+     */
+    WxMaLoginResp silentLogin(String code);
+
+    /**
+     * 手机号快捷登录
+     * <p>
+     * 同时使用微信登录凭证和手机号授权凭证，
+     * 一步完成用户注册/登录，无需额外绑定流程。
+     * 适用于企业认证的小程序（已开通手机号快捷登录权限）。
+     * </p>
+     *
+     * @param loginCode 微信登录凭证（wx.login 获取）
+     * @param phoneCode 手机号授权凭证（getPhoneNumber 事件获取）
+     * @return 认证令牌
+     */
+    AuthenticationToken phoneLogin(String loginCode, String phoneCode);
+
+    /**
+     * 绑定手机号
+     * <p>
+     * 为已静默登录但未绑定手机号的用户绑定手机号，
+     * 绑定成功后自动完成登录。
+     * </p>
+     *
+     * @param openid   微信用户唯一标识
+     * @param mobile   手机号码
+     * @param smsCode  短信验证码
+     * @return 认证令牌
+     */
+    AuthenticationToken bindMobile(String openid, String mobile, String smsCode);
+}

src/main/java/com/youlai/boot/auth/service/impl/AuthServiceImpl.java

@@ -1,26 +1,16 @@
 package com.youlai.boot.auth.service.impl;
 
-import cn.hutool.captcha.AbstractCaptcha;
-import cn.hutool.captcha.CaptchaUtil;
-import cn.hutool.captcha.generator.CodeGenerator;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import com.youlai.boot.auth.model.dto.WxMiniAppCodeLoginDTO;
-import com.youlai.boot.auth.model.dto.WxMiniAppPhoneLoginDTO;
-import com.youlai.boot.auth.model.vo.CaptchaVO;
 import com.youlai.boot.auth.service.AuthService;
 import com.youlai.boot.common.constant.RedisConstants;
-import com.youlai.boot.common.constant.SecurityConstants;
-import com.youlai.boot.common.enums.CaptchaTypeEnum;
-import com.youlai.boot.config.property.CaptchaProperties;
-import com.youlai.boot.platform.sms.enums.SmsTypeEnum;
-import com.youlai.boot.platform.sms.service.SmsService;
-import com.youlai.boot.security.model.AuthenticationToken;
-import com.youlai.boot.security.model.SmsAuthenticationToken;
-import com.youlai.boot.security.model.WxMiniAppCodeAuthenticationToken;
-import com.youlai.boot.security.model.WxMiniAppPhoneAuthenticationToken;
-import com.youlai.boot.security.token.TokenManager;
-import com.youlai.boot.security.util.SecurityUtils;
+import com.youlai.boot.framework.captcha.model.CaptchaInfo;
+import com.youlai.boot.framework.captcha.service.CaptchaService;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
+import com.youlai.boot.framework.security.model.SmsAuthenticationToken;
+import com.youlai.boot.framework.security.token.TokenManager;
+import com.youlai.boot.framework.security.util.SecurityUtils;
+import com.youlai.boot.framework.integration.sms.enums.SmsTypeEnum;
+import com.youlai.boot.framework.integration.sms.service.SmsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -30,7 +20,6 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
-import java.awt.*;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -49,12 +38,9 @@ public class AuthServiceImpl implements AuthService {
     private final AuthenticationManager authenticationManager;
     private final TokenManager tokenManager;
 
-    private final Font captchaFont;
-    private final CaptchaProperties captchaProperties;
-    private final CodeGenerator codeGenerator;
-
     private final SmsService smsService;
     private final RedisTemplate<String, Object> redisTemplate;
+    private final CaptchaService captchaService;
 
     /**
      * 用户名密码登录
@@ -84,34 +70,13 @@ public class AuthServiceImpl implements AuthService {
         return authenticationTokenResponse;
     }
 
-    /**
-     * 微信一键授权登录
-     *
-     * @param code 微信登录code
-     * @return 访问令牌
-     */
-    @Override
-    public AuthenticationToken loginByWechat(String code) {
-        // 1. 创建用户微信认证的令牌（未认证）
-        WxMiniAppCodeAuthenticationToken authenticationToken = new WxMiniAppCodeAuthenticationToken(code);
-
-        // 2. 执行认证（认证中）
-        Authentication authentication = authenticationManager.authenticate(authenticationToken);
-
-        // 3. 认证成功后生成 JWT 令牌，并存入 Security 上下文，供登录日志 AOP 使用（已认证）
-        AuthenticationToken token = tokenManager.generateToken(authentication);
-        SecurityContextHolder.getContext().setAuthentication(authentication);
-
-        return token;
-    }
-
     /**
      * 发送登录短信验证码
      *
      * @param mobile 手机号
      */
     @Override
-    public void sendSmsLoginCode(String mobile) {
+    public void sendSmsCode(String mobile) {
 
         // 随机生成4位验证码
         // String code = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
@@ -148,7 +113,6 @@ public class AuthServiceImpl implements AuthService {
         // 3. 认证成功后生成 JWT 令牌，并存入 Security 上下文，供登录日志 AOP 使用（已认证）
         AuthenticationToken authenticationToken = tokenManager.generateToken(authentication);
         SecurityContextHolder.getContext().setAuthentication(authentication);
-
         return authenticationToken;
     }
 
@@ -167,50 +131,10 @@ public class AuthServiceImpl implements AuthService {
 
     /**
      * 获取验证码
-     *
-     * @return 验证码
      */
     @Override
-    public CaptchaVO getCaptcha() {
-
-        String captchaType = captchaProperties.getType();
-        int width = captchaProperties.getWidth();
-        int height = captchaProperties.getHeight();
-        int interfereCount = captchaProperties.getInterfereCount();
-        int codeLength = captchaProperties.getCode().getLength();
-
-        AbstractCaptcha captcha;
-        if (CaptchaTypeEnum.CIRCLE.name().equalsIgnoreCase(captchaType)) {
-            captcha = CaptchaUtil.createCircleCaptcha(width, height, codeLength, interfereCount);
-        } else if (CaptchaTypeEnum.GIF.name().equalsIgnoreCase(captchaType)) {
-            captcha = CaptchaUtil.createGifCaptcha(width, height, codeLength);
-        } else if (CaptchaTypeEnum.LINE.name().equalsIgnoreCase(captchaType)) {
-            captcha = CaptchaUtil.createLineCaptcha(width, height, codeLength, interfereCount);
-        } else if (CaptchaTypeEnum.SHEAR.name().equalsIgnoreCase(captchaType)) {
-            captcha = CaptchaUtil.createShearCaptcha(width, height, codeLength, interfereCount);
-        } else {
-            throw new IllegalArgumentException("Invalid captcha type: " + captchaType);
-        }
-        captcha.setGenerator(codeGenerator);
-        captcha.setTextAlpha(captchaProperties.getTextAlpha());
-        captcha.setFont(captchaFont);
-
-        String captchaCode = captcha.getCode();
-        String imageBase64Data = captcha.getImageBase64Data();
-
-        // 验证码文本缓存至Redis，用于登录校验
-        String captchaId = IdUtil.fastSimpleUUID();
-        redisTemplate.opsForValue().set(
-                StrUtil.format(RedisConstants.Captcha.IMAGE_CODE, captchaId),
-                captchaCode,
-                captchaProperties.getExpireSeconds(),
-                TimeUnit.SECONDS
-        );
-
-        return CaptchaVO.builder()
-                .captchaId(captchaId)
-                .captchaBase64(imageBase64Data)
-                .build();
+    public CaptchaInfo getCaptcha() {
+        return captchaService.generate();
     }
 
     /**
@@ -224,50 +148,4 @@ public class AuthServiceImpl implements AuthService {
         return tokenManager.refreshToken(refreshToken);
     }
 
-    /**
-     * 微信小程序Code登录
-     *
-     * @param loginDto 登录参数
-     * @return 访问令牌
-     */
-    @Override
-    public AuthenticationToken loginByWxMiniAppCode(WxMiniAppCodeLoginDTO loginDto) {
-        // 1. 创建微信小程序认证令牌（未认证）
-        WxMiniAppCodeAuthenticationToken authenticationToken = new WxMiniAppCodeAuthenticationToken(loginDto.getCode());
-
-        // 2. 执行认证（认证中）
-        Authentication authentication = authenticationManager.authenticate(authenticationToken);
-
-        // 3. 认证成功后生成 JWT 令牌，并存入 Security 上下文，供登录日志 AOP 使用（已认证）
-        AuthenticationToken token = tokenManager.generateToken(authentication);
-        SecurityContextHolder.getContext().setAuthentication(authentication);
-
-        return token;
-    }
-
-    /**
-     * 微信小程序手机号登录
-     *
-     * @param loginDto 登录参数
-     * @return 访问令牌
-     */
-    @Override
-    public AuthenticationToken loginByWxMiniAppPhone(WxMiniAppPhoneLoginDTO loginDto) {
-        // 创建微信小程序手机号认证Token
-        WxMiniAppPhoneAuthenticationToken authenticationToken = new WxMiniAppPhoneAuthenticationToken(
-                loginDto.getCode(),
-                loginDto.getEncryptedData(),
-                loginDto.getIv()
-        );
-
-        // 执行认证
-        Authentication authentication = authenticationManager.authenticate(authenticationToken);
-
-        // 认证成功后生成JWT令牌，并存入Security上下文
-        AuthenticationToken token = tokenManager.generateToken(authentication);
-        SecurityContextHolder.getContext().setAuthentication(authentication);
-
-        return token;
-    }
-
 }

src/main/java/com/youlai/boot/auth/service/impl/WxMaAuthServiceImpl.java

@@ -0,0 +1,245 @@
+package com.youlai.boot.auth.service.impl;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.youlai.boot.auth.model.WxMaLoginResp;
+import com.youlai.boot.auth.service.WxMaAuthService;
+import com.youlai.boot.common.constant.RedisConstants;
+import com.youlai.boot.framework.security.exception.NeedBindMobileException;
+import com.youlai.boot.framework.security.model.AuthenticationToken;
+import com.youlai.boot.framework.security.model.SysUserDetails;
+import com.youlai.boot.framework.security.model.WxMaAuthenticationToken;
+import com.youlai.boot.framework.security.token.TokenManager;
+import com.youlai.boot.system.enums.SocialPlatformEnum;
+import com.youlai.boot.system.model.entity.SysUser;
+import com.youlai.boot.system.service.UserSocialService;
+import com.youlai.boot.system.service.UserService;
+import com.youlai.boot.system.service.UserRoleService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.Collections;
+
+/**
+ * 微信小程序认证服务实现
+ *
+ * @author Ray.Hao
+ * @since 4.0.0
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class WxMaAuthServiceImpl implements WxMaAuthService {
+
+    private final WxMaService wxMaService;
+    private final AuthenticationManager authenticationManager;
+    private final TokenManager tokenManager;
+    private final UserService userService;
+    private final UserSocialService userSocialService;
+    private final UserRoleService userRoleService;
+    private final RedisTemplate<String, Object> redisTemplate;
+
+    /**
+     * 静默登录
+     */
+    @Override
+    public WxMaLoginResp silentLogin(String code) {
+        WxMaAuthenticationToken token = new WxMaAuthenticationToken(code);
+
+        try {
+            Authentication authentication = authenticationManager.authenticate(token);
+            AuthenticationToken authToken = tokenManager.generateToken(authentication);
+            SecurityContextHolder.getContext().setAuthentication(authentication);
+            return WxMaLoginResp.builder()
+                    .isNewUser(false)
+                    .needBindMobile(false)
+                    .accessToken(authToken.getAccessToken())
+                    .refreshToken(authToken.getRefreshToken())
+                    .tokenType(authToken.getTokenType())
+                    .expiresIn(authToken.getExpiresIn())
+                    .build();
+        } catch (NeedBindMobileException e) {
+            return WxMaLoginResp.builder()
+                    .isNewUser(true)
+                    .needBindMobile(true)
+                    .openid(e.getOpenid())
+                    .build();
+        }
+    }
+
+    /**
+     * 手机号快捷登录
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AuthenticationToken phoneLogin(String loginCode, String phoneCode) {
+        // 1. 解析微信登录凭证，获取会话信息
+        WxMaJscode2SessionResult session = resolveSession(loginCode);
+        String openid = session.getOpenid();
+
+        // 2. 解析手机号授权凭证，获取手机号
+        String mobile = resolvePhoneNumber(phoneCode);
+
+        log.info("微信小程序手机号快捷登录：openid={}, mobile={}", openid, mobile);
+
+        // 3. 查询或创建用户
+        SysUser user = findOrCreateUser(mobile);
+
+        // 4. 绑定微信 openid
+        bindWechatOpenid(user, session);
+
+        // 5. 生成认证令牌
+        return generateAuthToken(mobile);
+    }
+
+    /**
+     * 绑定手机号
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AuthenticationToken bindMobile(String openid, String mobile, String smsCode) {
+        // 1. 验证短信验证码
+        validateSmsCode(mobile, smsCode);
+
+        // 2. 查询或创建用户
+        SysUser user = findOrCreateUser(mobile);
+
+        // 3. 绑定微信 openid
+        userSocialService.bindOrUpdate(
+                user.getId(),
+                SocialPlatformEnum.WECHAT_MINI,
+                openid,
+                null, null, null, null
+        );
+
+        log.info("微信小程序绑定手机号成功：mobile={}, openid={}", mobile, openid);
+
+        // 4. 生成认证令牌
+        return generateAuthToken(mobile);
+    }
+
+    // ==================== 私有方法 ====================
+
+    /**
+     * 解析微信登录凭证，获取会话信息
+     */
+    private WxMaJscode2SessionResult resolveSession(String loginCode) {
+        try {
+            return wxMaService.jsCode2SessionInfo(loginCode);
+        } catch (Exception e) {
+            log.error("获取微信会话信息失败，loginCode={}", loginCode, e);
+            throw new IllegalArgumentException("微信登录失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 解析手机号授权凭证，获取手机号
+     */
+    private String resolvePhoneNumber(String phoneCode) {
+        try {
+            WxMaPhoneNumberInfo phoneInfo = wxMaService.getUserService().getPhoneNoInfo(phoneCode);
+            return phoneInfo.getPhoneNumber();
+        } catch (Exception e) {
+            log.error("获取微信手机号失败，phoneCode={}", phoneCode, e);
+            throw new IllegalArgumentException("获取手机号失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 查询或创建用户
+     */
+    private SysUser findOrCreateUser(String mobile) {
+        SysUser user = userService.lambdaQuery()
+                .eq(SysUser::getMobile, mobile)
+                .one();
+
+        if (user == null) {
+            user = createNewUser(mobile);
+            log.info("微信小程序登录：创建新用户，mobile={}, userId={}", mobile, user.getId());
+        }
+
+        return user;
+    }
+
+    /**
+     * 创建新用户
+     * <p>
+     * 新用户默认分配 GUEST（访问游客）角色
+     * </p>
+     */
+    private SysUser createNewUser(String mobile) {
+        SysUser user = new SysUser();
+        user.setMobile(mobile);
+        user.setUsername("wx_" + IdUtil.fastSimpleUUID().substring(0, 8));
+        user.setNickname("微信用户");
+        user.setStatus(1);
+        user.setIsDeleted(0);
+        user.setCreateTime(LocalDateTime.now());
+        user.setUpdateTime(LocalDateTime.now());
+        userService.save(user);
+
+        // 分配 GUEST 角色（角色ID=3）
+        userRoleService.saveUserRoles(user.getId(), Collections.singletonList(3L));
+
+        return user;
+    }
+
+    /**
+     * 绑定微信 openid
+     */
+    private void bindWechatOpenid(SysUser user, WxMaJscode2SessionResult session) {
+        try {
+            userSocialService.bindOrUpdate(
+                    user.getId(),
+                    SocialPlatformEnum.WECHAT_MINI,
+                    session.getOpenid(),
+                    session.getUnionid(),
+                    user.getNickname(),
+                    user.getAvatar(),
+                    session.getSessionKey()
+            );
+        } catch (Exception e) {
+            // 绑定失败不影响登录
+            log.warn("绑定微信 openid 失败，userId={}, openid={}", user.getId(), session.getOpenid(), e);
+        }
+    }
+
+    /**
+     * 验证短信验证码
+     */
+    private void validateSmsCode(String mobile, String smsCode) {
+        String cacheKey = StrUtil.format(RedisConstants.Captcha.SMS_LOGIN_CODE, mobile);
+        String cachedCode = (String) redisTemplate.opsForValue().get(cacheKey);
+
+        if (!StrUtil.equals(smsCode, cachedCode)) {
+            throw new IllegalArgumentException("验证码错误");
+        }
+
+        // 验证成功后删除验证码
+        redisTemplate.delete(cacheKey);
+    }
+
+    /**
+     * 生成认证令牌
+     */
+    private AuthenticationToken generateAuthToken(String mobile) {
+        SysUserDetails userDetails = new SysUserDetails(userService.getAuthInfoByMobile(mobile));
+        Authentication authentication = new UsernamePasswordAuthenticationToken(
+                userDetails, null, userDetails.getAuthorities()
+        );
+        AuthenticationToken authToken = tokenManager.generateToken(authentication);
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+        return authToken;
+    }
+}

src/main/java/com/youlai/boot/codegen/config/CodegenProperties.java

@@ -1,9 +1,10 @@
-package com.youlai.boot.config.property;
+package com.youlai.boot.codegen.config;
 
 import cn.hutool.core.io.file.FileNameUtil;
 import cn.hutool.core.map.MapUtil;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -16,6 +17,7 @@ import java.util.Map;
  * @since 2.11.0
  */
 @Component
+@EnableConfigurationProperties(CodegenProperties.class)
 @ConfigurationProperties(prefix = "codegen")
 @Data
 public class CodegenProperties {

src/main/java/com/youlai/boot/codegen/controller/CodegenController.java

@@ -1,17 +1,18 @@
-package com.youlai.boot.platform.codegen.controller;
+package com.youlai.boot.codegen.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.core.web.PageResult;
-import com.youlai.boot.core.web.Result;
-import com.youlai.boot.config.property.CodegenProperties;
+import com.youlai.boot.common.result.PageResult;
+import com.youlai.boot.common.result.Result;
+import com.youlai.boot.codegen.config.CodegenProperties;
+import com.youlai.boot.common.enums.ActionTypeEnum;
 import com.youlai.boot.common.enums.LogModuleEnum;
-import com.youlai.boot.platform.codegen.service.CodegenService;
-import com.youlai.boot.platform.codegen.model.form.GenConfigForm;
-import com.youlai.boot.platform.codegen.model.query.TableQuery;
-import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO;
-import com.youlai.boot.platform.codegen.model.vo.TablePageVO;
+import com.youlai.boot.codegen.service.CodegenService;
+import com.youlai.boot.codegen.model.form.GenConfigForm;
+import com.youlai.boot.codegen.model.query.TableQuery;
+import com.youlai.boot.codegen.model.vo.CodegenPreviewVO;
+import com.youlai.boot.codegen.model.vo.TablePageVO;
 import com.youlai.boot.common.annotation.Log;
-import com.youlai.boot.platform.codegen.service.GenTableService;
+import com.youlai.boot.codegen.service.GenTableService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -45,7 +46,6 @@ public class CodegenController {
 
     @Operation(summary = "获取数据表分页列表")
     @GetMapping("/table")
-    @Log(value = "代码生成分页列表", module = LogModuleEnum.OTHER)
     public PageResult<TablePageVO> getTablePage(
             TableQuery queryParams
     ) {
@@ -64,7 +64,7 @@ public class CodegenController {
 
     @Operation(summary = "保存代码生成配置")
     @PostMapping("/{tableName}/config")
-    @Log(value = "生成代码", module = LogModuleEnum.OTHER)
+    @Log(module = LogModuleEnum.CODEGEN, value = ActionTypeEnum.UPDATE)
     public Result<?> saveGenConfig(@RequestBody GenConfigForm formData) {
         genTableService.saveGenConfig(formData);
         return Result.success();
@@ -81,20 +81,21 @@ public class CodegenController {
 
     @Operation(summary = "获取预览生成代码")
     @GetMapping("/{tableName}/preview")
-    @Log(value = "预览生成代码", module = LogModuleEnum.OTHER)
     public Result<List<CodegenPreviewVO>> getTablePreviewData(@PathVariable String tableName,
-                                                              @RequestParam(value = "pageType", required = false, defaultValue = "classic") String pageType) {
-        List<CodegenPreviewVO> list = codegenService.getCodegenPreviewData(tableName, pageType);
+                                                              @RequestParam(value = "pageType", required = false, defaultValue = "classic") String pageType,
+                                                              @RequestParam(value = "type", required = false, defaultValue = "ts") String type) {
+        List<CodegenPreviewVO> list = codegenService.getCodegenPreviewData(tableName, pageType, type);
         return Result.success(list);
     }
 
     @Operation(summary = "下载代码")
     @GetMapping("/{tableName}/download")
-    @Log(value = "下载代码", module = LogModuleEnum.OTHER)
+    @Log(module = LogModuleEnum.CODEGEN, value = ActionTypeEnum.DOWNLOAD)
     public void downloadZip(HttpServletResponse response, @PathVariable String tableName,
-                            @RequestParam(value = "pageType", required = false, defaultValue = "classic") String pageType) {
+                            @RequestParam(value = "pageType", required = false, defaultValue = "classic") String pageType,
+                            @RequestParam(value = "type", required = false, defaultValue = "ts") String type) {
         String[] tableNames = tableName.split(",");
-        byte[] data = codegenService.downloadCode(tableNames, pageType);
+        byte[] data = codegenService.downloadCode(tableNames, pageType, type);
 
         response.reset();
         response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(codegenProperties.getDownloadFileName(), StandardCharsets.UTF_8));
@@ -104,8 +105,8 @@ public class CodegenController {
             outputStream.write(data);
             outputStream.flush();
         } catch (IOException e) {
-            log.error("Error while writing the zip file to response", e);
-            throw new RuntimeException("Failed to write the zip file to response", e);
+            log.error("Error while writing the zip file1 to response", e);
+            throw new RuntimeException("Failed to write the zip file1 to response", e);
         }
     }
 }

src/main/java/com/youlai/boot/codegen/converter/CodegenConverter.java

@@ -1,8 +1,8 @@
-package com.youlai.boot.platform.codegen.converter;
+package com.youlai.boot.codegen.converter;
 
-import com.youlai.boot.platform.codegen.model.entity.GenTable;
-import com.youlai.boot.platform.codegen.model.entity.GenTableColumn;
-import com.youlai.boot.platform.codegen.model.form.GenConfigForm;
+import com.youlai.boot.codegen.model.entity.GenTable;
+import com.youlai.boot.codegen.model.entity.GenTableColumn;
+import com.youlai.boot.codegen.model.form.GenConfigForm;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
@@ -38,4 +38,4 @@ public interface CodegenConverter {
 
     GenTableColumn toGenTableColumn(GenConfigForm.FieldConfig fieldConfig);
 
-}
+}

src/main/java/com/youlai/boot/codegen/enums/FormTypeEnum.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.platform.codegen.enums;
+package com.youlai.boot.codegen.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonCreator;

src/main/java/com/youlai/boot/codegen/enums/JavaTypeEnum.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.platform.codegen.enums;
+package com.youlai.boot.codegen.enums;
 
 import lombok.Getter;
 

src/main/java/com/youlai/boot/codegen/enums/QueryTypeEnum.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.platform.codegen.enums;
+package com.youlai.boot.codegen.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonCreator;

src/main/java/com/youlai/boot/codegen/mapper/DatabaseMapper.java

@@ -1,11 +1,11 @@
-package com.youlai.boot.platform.codegen.mapper;
+package com.youlai.boot.codegen.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.platform.codegen.model.bo.ColumnMetaData;
-import com.youlai.boot.platform.codegen.model.bo.TableMetaData;
-import com.youlai.boot.platform.codegen.model.query.TableQuery;
-import com.youlai.boot.platform.codegen.model.vo.TablePageVO;
+import com.youlai.boot.codegen.model.vo.ColumnMetaVO;
+import com.youlai.boot.codegen.model.vo.TableMetaVO;
+import com.youlai.boot.codegen.model.query.TableQuery;
+import com.youlai.boot.codegen.model.vo.TablePageVO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -35,13 +35,7 @@ public interface DatabaseMapper extends BaseMapper {
      * @param tableName
      * @return
      */
-    List<ColumnMetaData> getTableColumns(String tableName);
+    List<ColumnMetaVO> getTableColumns(String tableName);
 
-    /**
-     * 获取表元数据
-     *
-     * @param tableName
-     * @return
-     */
-    TableMetaData getTableMetadata(String tableName);
+    TableMetaVO getTableMetadata(String tableName);
 }

src/main/java/com/youlai/boot/codegen/mapper/GenTableColumnMapper.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.platform.codegen.mapper;
+package com.youlai.boot.codegen.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.platform.codegen.model.entity.GenTableColumn;
+import com.youlai.boot.codegen.model.entity.GenTableColumn;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/youlai/boot/codegen/mapper/GenTableMapper.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.platform.codegen.mapper;
+package com.youlai.boot.codegen.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.platform.codegen.model.entity.GenTable;
+import com.youlai.boot.codegen.model.entity.GenTable;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/youlai/boot/codegen/model/entity/GenTable.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.platform.codegen.model.entity;
+package com.youlai.boot.codegen.model.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 

src/main/java/com/youlai/boot/codegen/model/entity/GenTableColumn.java

@@ -1,12 +1,12 @@
-package com.youlai.boot.platform.codegen.model.entity;
+package com.youlai.boot.codegen.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.youlai.boot.common.base.BaseEntity;
-import com.youlai.boot.platform.codegen.enums.FormTypeEnum;
-import com.youlai.boot.platform.codegen.enums.QueryTypeEnum;
+import com.youlai.boot.codegen.enums.FormTypeEnum;
+import com.youlai.boot.codegen.enums.QueryTypeEnum;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/youlai/boot/codegen/model/form/GenConfigForm.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.platform.codegen.model.form;
+package com.youlai.boot.codegen.model.form;
 
-import com.youlai.boot.platform.codegen.enums.FormTypeEnum;
-import com.youlai.boot.platform.codegen.enums.QueryTypeEnum;
+import com.youlai.boot.codegen.enums.FormTypeEnum;
+import com.youlai.boot.codegen.enums.QueryTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

src/main/java/com/youlai/boot/codegen/model/query/TablePageQuery.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.platform.codegen.model.query;
+package com.youlai.boot.codegen.model.query;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.youlai.boot.common.base.BaseQuery;

src/main/java/com/youlai/boot/codegen/model/query/TableQuery.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.platform.codegen.model.query;
+package com.youlai.boot.codegen.model.query;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.youlai.boot.common.base.BaseQuery;

src/main/java/com/youlai/boot/codegen/model/vo/CodegenPreviewVO.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.platform.codegen.model.vo;
+package com.youlai.boot.codegen.model.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -16,4 +16,10 @@ public class CodegenPreviewVO {
     @Schema(description = "生成文件内容")
     private String content;
 
+    @Schema(description = "文件范围(frontend/backend)")
+    private String scope;
+
+    @Schema(description = "文件语言(扩展名)")
+    private String language;
+
 }

src/main/java/com/youlai/boot/codegen/model/vo/ColumnMetaVO.java

@@ -0,0 +1,26 @@
+package com.youlai.boot.codegen.model.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "数据表字段元数据")
+@Data
+public class ColumnMetaVO {
+
+    private String columnName;
+
+    private String dataType;
+
+    private String columnComment;
+
+    private Long characterMaximumLength;
+
+    private Integer isPrimaryKey;
+
+    private String isNullable;
+
+    private String characterSetName;
+
+    private String collationName;
+
+}

src/main/java/com/youlai/boot/codegen/model/vo/TableMetaVO.java

@@ -0,0 +1,26 @@
+package com.youlai.boot.codegen.model.vo;
+
+import lombok.Data;
+
+/**
+ * 数据表元数据
+ *
+ * @author Ray
+ * @since 2.10.0
+ */
+@Data
+public class TableMetaVO {
+
+    private String tableName;
+
+    private String tableComment;
+
+    private String tableCollation;
+
+    private String engine;
+
+    private String charset;
+
+    private String createTime;
+
+}

src/main/java/com/youlai/boot/codegen/model/vo/TablePageVO.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.platform.codegen.model.vo;
+package com.youlai.boot.codegen.model.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

src/main/java/com/youlai/boot/codegen/service/CodegenService.java

@@ -1,9 +1,9 @@
-package com.youlai.boot.platform.codegen.service;
+package com.youlai.boot.codegen.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.platform.codegen.model.query.TableQuery;
-import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO;
-import com.youlai.boot.platform.codegen.model.vo.TablePageVO;
+import com.youlai.boot.codegen.model.query.TableQuery;
+import com.youlai.boot.codegen.model.vo.CodegenPreviewVO;
+import com.youlai.boot.codegen.model.vo.TablePageVO;
 
 import java.util.List;
 
@@ -29,12 +29,12 @@ public interface CodegenService {
      * @param tableName 表名
      * @return
      */
-    List<CodegenPreviewVO> getCodegenPreviewData(String tableName, String pageType);
+    List<CodegenPreviewVO> getCodegenPreviewData(String tableName, String pageType, String type);
 
     /**
      * 下载代码
      * @param tableNames 表名
      * @return
      */
-    byte[] downloadCode(String[] tableNames, String pageType);
+    byte[] downloadCode(String[] tableNames, String pageType, String type);
 }

src/main/java/com/youlai/boot/codegen/service/GenTableColumnService.java

@@ -1,7 +1,7 @@
-package com.youlai.boot.platform.codegen.service;
+package com.youlai.boot.codegen.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.boot.platform.codegen.model.entity.GenTableColumn;
+import com.youlai.boot.codegen.model.entity.GenTableColumn;
 
 /**
  * 代码生成配置接口

src/main/java/com/youlai/boot/codegen/service/GenTableService.java

@@ -1,8 +1,8 @@
-package com.youlai.boot.platform.codegen.service;
+package com.youlai.boot.codegen.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.boot.platform.codegen.model.entity.GenTable;
-import com.youlai.boot.platform.codegen.model.form.GenConfigForm;
+import com.youlai.boot.codegen.model.entity.GenTable;
+import com.youlai.boot.codegen.model.form.GenConfigForm;
 
 /**
  * 代码生成配置接口

src/main/java/com/youlai/boot/codegen/service/impl/CodegenServiceImpl.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.platform.codegen.service.impl;
+package com.youlai.boot.codegen.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
@@ -11,18 +11,18 @@ import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.platform.codegen.enums.JavaTypeEnum;
-import com.youlai.boot.config.property.CodegenProperties;
-import com.youlai.boot.platform.codegen.service.GenTableService;
-import com.youlai.boot.platform.codegen.service.GenTableColumnService;
-import com.youlai.boot.platform.codegen.service.CodegenService;
-import com.youlai.boot.core.exception.BusinessException;
-import com.youlai.boot.platform.codegen.mapper.DatabaseMapper;
-import com.youlai.boot.platform.codegen.model.entity.GenTable;
-import com.youlai.boot.platform.codegen.model.entity.GenTableColumn;
-import com.youlai.boot.platform.codegen.model.query.TableQuery;
-import com.youlai.boot.platform.codegen.model.vo.CodegenPreviewVO;
-import com.youlai.boot.platform.codegen.model.vo.TablePageVO;
+import com.youlai.boot.codegen.enums.JavaTypeEnum;
+import com.youlai.boot.codegen.config.CodegenProperties;
+import com.youlai.boot.codegen.service.GenTableService;
+import com.youlai.boot.codegen.service.GenTableColumnService;
+import com.youlai.boot.codegen.service.CodegenService;
+import com.youlai.boot.common.exception.BusinessException;
+import com.youlai.boot.codegen.mapper.DatabaseMapper;
+import com.youlai.boot.codegen.model.entity.GenTable;
+import com.youlai.boot.codegen.model.entity.GenTableColumn;
+import com.youlai.boot.codegen.model.query.TableQuery;
+import com.youlai.boot.codegen.model.vo.CodegenPreviewVO;
+import com.youlai.boot.codegen.model.vo.TablePageVO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -70,6 +70,49 @@ public class CodegenServiceImpl implements CodegenService {
         return databaseMapper.getTablePage(page, queryParams);
     }
 
+    /**
+     * 解析前端模板路径
+     *
+     * @param templateName 模板标识
+     * @param templateConfig 模板配置
+     * @param frontendType 前端类型
+     * @return 模板路径
+     */
+    private String resolveFrontendTemplatePath(String templateName,
+                                               CodegenProperties.TemplateConfig templateConfig,
+                                               String frontendType) {
+        if (!"js".equals(frontendType)) {
+            return templateConfig.getTemplatePath();
+        }
+        if ("API".equals(templateName)) {
+            return "codegen/frontend/js/api.js.vm";
+        }
+        if ("VIEW".equals(templateName)) {
+            return "codegen/frontend/js/index.js.vue.vm";
+        }
+        return templateConfig.getTemplatePath();
+    }
+
+    /**
+     * 解析前端文件后缀
+     *
+     * @param templateName 模板标识
+     * @param templateConfig 模板配置
+     * @param frontendType 前端类型
+     * @return 文件后缀
+     */
+    private String resolveFrontendExtension(String templateName,
+                                            CodegenProperties.TemplateConfig templateConfig,
+                                            String frontendType) {
+        if (!"js".equals(frontendType)) {
+            return templateConfig.getExtension();
+        }
+        if ("API".equals(templateName) || "API_TYPES".equals(templateName)) {
+            return ".js";
+        }
+        return templateConfig.getExtension();
+    }
+
     /**
      * 获取预览生成代码
      *
@@ -77,7 +120,7 @@ public class CodegenServiceImpl implements CodegenService {
      * @return 预览数据
      */
     @Override
-    public List<CodegenPreviewVO> getCodegenPreviewData(String tableName, String pageType) {
+    public List<CodegenPreviewVO> getCodegenPreviewData(String tableName, String pageType, String type) {
 
         List<CodegenPreviewVO> list = new ArrayList<>();
 
@@ -99,22 +142,31 @@ public class CodegenServiceImpl implements CodegenService {
 
         // 遍历模板配置
         Map<String, CodegenProperties.TemplateConfig> templateConfigs = codegenProperties.getTemplateConfigs();
+        String frontendType = StrUtil.blankToDefault(type, "ts").toLowerCase();
         for (Map.Entry<String, CodegenProperties.TemplateConfig> templateConfigEntry : templateConfigs.entrySet()) {
             CodegenPreviewVO previewVo = new CodegenPreviewVO();
 
             CodegenProperties.TemplateConfig templateConfig = templateConfigEntry.getValue();
 
+            String templateName = templateConfigEntry.getKey();
+            if ("js".equals(frontendType) && "API_TYPES".equals(templateName)) {
+                continue;
+            }
+
+            String effectiveTemplatePath = resolveFrontendTemplatePath(templateName, templateConfig, frontendType);
+            String extension = resolveFrontendExtension(templateName, templateConfig, frontendType);
+
             /* 1. 生成文件名 UserController */
             // User Role Menu Dept
             String entityName = genTable.getEntityName();
             // Controller Service Mapper Entity
-            String templateName = templateConfigEntry.getKey();
             // .java .ts .vue
-            String extension = templateConfig.getExtension();
 
             // 文件名 UserController.java
             String fileName = getFileName(entityName, templateName, extension);
             previewVo.setFileName(fileName);
+            previewVo.setScope(resolveScope(templateName));
+            previewVo.setLanguage(resolveLanguage(fileName));
 
             /* 2. 生成文件路径 */
             // 包名：com.youlai.boot
@@ -131,7 +183,13 @@ public class CodegenServiceImpl implements CodegenService {
             // 将模板文件中的变量替换为具体的值 生成代码内容
             // 优先使用保存的 ui，没有则使用请求参数
             String finalType = StrUtil.blankToDefault(genTable.getPageType(), pageType);
-            String content = getCodeContent(templateConfig, genTable, fieldConfigs, finalType);
+            String content = getCodeContent(
+                    effectiveTemplatePath,
+                    templateConfig.getSubpackageName(),
+                    genTable,
+                    fieldConfigs,
+                    finalType
+            );
             previewVo.setContent(content);
 
             list.add(previewVo);
@@ -139,6 +197,17 @@ public class CodegenServiceImpl implements CodegenService {
         return list;
     }
 
+    private String resolveScope(String templateName) {
+        return switch (templateName) {
+            case "API", "API_TYPES", "VIEW" -> "frontend";
+            default -> "backend";
+        };
+    }
+
+    private String resolveLanguage(String fileName) {
+        return FileNameUtil.extName(fileName).toLowerCase();
+    }
+
     /**
      * 生成文件名。
      *
@@ -155,11 +224,9 @@ public class CodegenServiceImpl implements CodegenService {
         } else if ("MapperXml".equals(templateName)) {
             return entityName + "Mapper" + extension;
         } else if ("API".equals(templateName)) {
-            // 生成 user.ts 命名
-            return StrUtil.toSymbolCase(entityName, '-') + extension;
+            return "index" + extension;
         } else if ("API_TYPES".equals(templateName)) {
-            // 生成 types/api/user.ts
-            return StrUtil.toSymbolCase(entityName, '-') + extension;
+            return "types" + extension;
         } else if ("VIEW".equals(templateName)) {
             return "index.vue";
         }
@@ -186,18 +253,18 @@ public class CodegenServiceImpl implements CodegenService {
                     + File.separator + moduleName
             );
         } else if ("API".equals(templateName)) {
-            // path = "src/api/system";
             path = (codegenProperties.getFrontendAppName()
                     + File.separator + "src"
-                    + File.separator + subPackageName
+                    + File.separator + "api"
                     + File.separator + moduleName
+                    + File.separator + StrUtil.toSymbolCase(entityName, '-')
             );
         } else if ("API_TYPES".equals(templateName)) {
-            // path = "src/types/api";
             path = (codegenProperties.getFrontendAppName()
                     + File.separator + "src"
-                    + File.separator + "types"
                     + File.separator + "api"
+                    + File.separator + moduleName
+                    + File.separator + StrUtil.toSymbolCase(entityName, '-')
             );
         } else if ("VIEW".equals(templateName)) {
             // path = "src/views/system/user";
@@ -232,7 +299,11 @@ public class CodegenServiceImpl implements CodegenService {
      * @param pageType       前端页面类型
      * @return 渲染后的代码内容
      */
-    private String getCodeContent(CodegenProperties.TemplateConfig templateConfig, GenTable genTable, List<GenTableColumn> fieldConfigs, String pageType) {
+    private String getCodeContent(String templatePath,
+                                  String subpackageName,
+                                  GenTable genTable,
+                                  List<GenTableColumn> fieldConfigs,
+                                  String pageType) {
 
         Map<String, Object> bindMap = new HashMap<>();
 
@@ -240,7 +311,7 @@ public class CodegenServiceImpl implements CodegenService {
 
         bindMap.put("packageName", genTable.getPackageName());
         bindMap.put("moduleName", genTable.getModuleName());
-        bindMap.put("subpackageName", templateConfig.getSubpackageName());
+        bindMap.put("subpackageName", subpackageName);
         bindMap.put("date", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm"));
         bindMap.put("entityName", entityName);
         bindMap.put("tableName", genTable.getTableName());
@@ -252,6 +323,7 @@ public class CodegenServiceImpl implements CodegenService {
         bindMap.put("entityKebab", entityKebab);
         bindMap.put("entityUpperSnake", entityUpperSnake);
         bindMap.put("businessName", genTable.getBusinessName());
+        bindMap.put("entityComment", genTable.getBusinessName());
         bindMap.put("fieldConfigs", fieldConfigs);
 
         boolean hasLocalDateTime = false;
@@ -282,9 +354,13 @@ public class CodegenServiceImpl implements CodegenService {
 
         TemplateEngine templateEngine = TemplateUtil.createEngine(new TemplateConfig("templates", TemplateConfig.ResourceMode.CLASSPATH));
         // 根据 ui 选择不同的前端页面模板：默认 index.vue.vm；封装版使用 index.curd.vue.vm
-        String path = templateConfig.getTemplatePath();
-        if ("curd".equalsIgnoreCase(pageType) && path.endsWith("index.vue.vm")) {
-            path = path.replace("index.vue.vm", "index.curd.vue.vm");
+        String path = templatePath;
+        if ("curd".equalsIgnoreCase(pageType)) {
+            if (path.endsWith("index.js.vue.vm")) {
+                path = path.replace("index.js.vue.vm", "index.curd.js.vue.vm");
+            } else if (path.endsWith("index.vue.vm")) {
+                path = path.replace("index.vue.vm", "index.curd.vue.vm");
+            }
         }
         Template template = templateEngine.getTemplate(path);
 
@@ -299,13 +375,13 @@ public class CodegenServiceImpl implements CodegenService {
      * @return zip 压缩文件字节数组
      */
     @Override
-    public byte[] downloadCode(String[] tableNames, String ui) {
+    public byte[] downloadCode(String[] tableNames, String ui, String type) {
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
              ZipOutputStream zip = new ZipOutputStream(outputStream)) {
 
             // 遍历每个表名，生成对应的代码并压缩到 zip 文件中
             for (String tableName : tableNames) {
-                generateAndZipCode(tableName, zip, ui);
+                generateAndZipCode(tableName, zip, ui, type);
             }
             // 确保所有压缩数据写入输出流，避免数据残留在内存缓冲区引发的数据不完整
             zip.finish();
@@ -313,7 +389,7 @@ public class CodegenServiceImpl implements CodegenService {
 
         } catch (IOException e) {
             log.error("Error while generating zip for code download", e);
-            throw new RuntimeException("Failed to generate code zip file", e);
+            throw new RuntimeException("Failed to generate code zip file1", e);
         }
     }
 
@@ -324,8 +400,8 @@ public class CodegenServiceImpl implements CodegenService {
      * @param zip       压缩文件输出流
      * @param ui        页面类型
      */
-    private void generateAndZipCode(String tableName, ZipOutputStream zip, String ui) {
-        List<CodegenPreviewVO> codePreviewList = getCodegenPreviewData(tableName, ui);
+    private void generateAndZipCode(String tableName, ZipOutputStream zip, String ui, String type) {
+        List<CodegenPreviewVO> codePreviewList = getCodegenPreviewData(tableName, ui, type);
 
         for (CodegenPreviewVO codePreview : codePreviewList) {
             String fileName = codePreview.getFileName();
@@ -344,7 +420,7 @@ public class CodegenServiceImpl implements CodegenService {
                 zip.closeEntry();
 
             } catch (IOException e) {
-                log.error("Error while adding file {} to zip", fileName, e);
+                log.error("Error while adding file1 {} to zip", fileName, e);
             }
         }
     }

src/main/java/com/youlai/boot/codegen/service/impl/GenTableColumnServiceImpl.java

@@ -1,9 +1,9 @@
-package com.youlai.boot.platform.codegen.service.impl;
+package com.youlai.boot.codegen.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.boot.platform.codegen.mapper.GenTableColumnMapper;
-import com.youlai.boot.platform.codegen.model.entity.GenTableColumn;
-import com.youlai.boot.platform.codegen.service.GenTableColumnService;
+import com.youlai.boot.codegen.mapper.GenTableColumnMapper;
+import com.youlai.boot.codegen.model.entity.GenTableColumn;
+import com.youlai.boot.codegen.service.GenTableColumnService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

src/main/java/com/youlai/boot/codegen/service/impl/GenTableServiceImpl.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.platform.codegen.service.impl;
+package com.youlai.boot.codegen.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
@@ -7,21 +7,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.boot.YouLaiBootApplication;
 import com.youlai.boot.common.enums.EnvEnum;
-import com.youlai.boot.platform.codegen.enums.FormTypeEnum;
-import com.youlai.boot.platform.codegen.enums.JavaTypeEnum;
-import com.youlai.boot.platform.codegen.enums.QueryTypeEnum;
-import com.youlai.boot.core.exception.BusinessException;
-import com.youlai.boot.config.property.CodegenProperties;
-import com.youlai.boot.platform.codegen.converter.CodegenConverter;
-import com.youlai.boot.platform.codegen.mapper.DatabaseMapper;
-import com.youlai.boot.platform.codegen.mapper.GenTableMapper;
-import com.youlai.boot.platform.codegen.model.bo.ColumnMetaData;
-import com.youlai.boot.platform.codegen.model.bo.TableMetaData;
-import com.youlai.boot.platform.codegen.model.entity.GenTable;
-import com.youlai.boot.platform.codegen.model.entity.GenTableColumn;
-import com.youlai.boot.platform.codegen.model.form.GenConfigForm;
-import com.youlai.boot.platform.codegen.service.GenTableService;
-import com.youlai.boot.platform.codegen.service.GenTableColumnService;
+import com.youlai.boot.codegen.enums.FormTypeEnum;
+import com.youlai.boot.codegen.enums.JavaTypeEnum;
+import com.youlai.boot.codegen.enums.QueryTypeEnum;
+import com.youlai.boot.common.exception.BusinessException;
+import com.youlai.boot.codegen.config.CodegenProperties;
+import com.youlai.boot.codegen.converter.CodegenConverter;
+import com.youlai.boot.codegen.mapper.DatabaseMapper;
+import com.youlai.boot.codegen.mapper.GenTableMapper;
+import com.youlai.boot.codegen.model.vo.ColumnMetaVO;
+import com.youlai.boot.codegen.model.vo.TableMetaVO;
+import com.youlai.boot.codegen.model.entity.GenTable;
+import com.youlai.boot.codegen.model.entity.GenTableColumn;
+import com.youlai.boot.codegen.model.form.GenConfigForm;
+import com.youlai.boot.codegen.service.GenTableService;
+import com.youlai.boot.codegen.service.GenTableColumnService;
 import com.youlai.boot.system.service.MenuService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -72,7 +72,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
 
         // 如果没有代码生成配置，则根据表的元数据生成默认配置
         if (genTable == null) {
-            TableMetaData tableMetadata = databaseMapper.getTableMetadata(tableName);
+            TableMetaVO tableMetadata = databaseMapper.getTableMetadata(tableName);
             Assert.isTrue(tableMetadata != null, "未找到表元数据");
 
             genTable = new GenTable();
@@ -100,7 +100,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
         List<GenTableColumn> genTableColumns = new ArrayList<>();
 
         // 获取表的列
-        List<ColumnMetaData> tableColumns = databaseMapper.getTableColumns(tableName);
+        List<ColumnMetaVO> tableColumns = databaseMapper.getTableColumns(tableName);
         if (CollectionUtil.isNotEmpty(tableColumns)) {
             // 查询字段生成配置
             List<GenTableColumn> fieldConfigList = genTableColumnService.list(
@@ -113,7 +113,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
                     .filter(Objects::nonNull) // 过滤掉空值
                     .max(Integer::compareTo)
                     .orElse(0);
-            for (ColumnMetaData tableColumn : tableColumns) {
+            for (ColumnMetaVO tableColumn : tableColumns) {
                 // 根据列名获取字段生成配置
                 String columnName = tableColumn.getColumnName();
                 GenTableColumn fieldConfig = fieldConfigList.stream()
@@ -150,16 +150,16 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
     /**
      * 创建默认字段配置
      *
-     * @param columnMetaData 表字段元数据
+     * @param columnMetaVO 表字段元数据
      * @return
      */
-    private GenTableColumn createDefaultFieldConfig(ColumnMetaData columnMetaData) {
+    private GenTableColumn createDefaultFieldConfig(ColumnMetaVO columnMetaVO) {
         GenTableColumn fieldConfig = new GenTableColumn();
-        fieldConfig.setColumnName(columnMetaData.getColumnName());
-        fieldConfig.setColumnType(columnMetaData.getDataType());
-        fieldConfig.setFieldComment(columnMetaData.getColumnComment());
-        fieldConfig.setFieldName(StrUtil.toCamelCase(columnMetaData.getColumnName()));
-        fieldConfig.setIsRequired("YES".equals(columnMetaData.getIsNullable()) ? 0 : 1);
+        fieldConfig.setColumnName(columnMetaVO.getColumnName());
+        fieldConfig.setColumnType(columnMetaVO.getDataType());
+        fieldConfig.setFieldComment(columnMetaVO.getColumnComment());
+        fieldConfig.setFieldName(StrUtil.toCamelCase(columnMetaVO.getColumnName()));
+        fieldConfig.setIsRequired("YES".equals(columnMetaVO.getIsNullable()) ? 0 : 1);
 
         String columnType = StrUtil.blankToDefault(fieldConfig.getColumnType(), "").toLowerCase();
         if ("date".equals(columnType)) {
@@ -171,7 +171,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
         }
 
         fieldConfig.setQueryType(QueryTypeEnum.EQ);
-        fieldConfig.setMaxLength(columnMetaData.getCharacterMaximumLength());
+        fieldConfig.setMaxLength(columnMetaVO.getCharacterMaximumLength());
         return fieldConfig;
     }
 

src/main/java/com/youlai/boot/common/annotation/Log.java

@@ -1,5 +1,6 @@
 package com.youlai.boot.common.annotation;
 
+import com.youlai.boot.common.enums.ActionTypeEnum;
 import com.youlai.boot.common.enums.LogModuleEnum;
 
 import java.lang.annotation.*;
@@ -16,34 +17,31 @@ import java.lang.annotation.*;
 public @interface Log {
 
     /**
-     * 日志描述
+     * 模块
      *
-     * @return 日志描述
+     * @return 模块
      */
-    String value() default "";
-
-    /**
-     * 日志模块
-     *
-     * @return 日志模块
-     */
-
     LogModuleEnum module();
 
     /**
-     * 是否记录请求参数
+     * 操作类型
      *
-     * @return 是否记录请求参数
+     * @return 操作类型
      */
-    boolean params() default true;
+    ActionTypeEnum value();
 
     /**
-     * 是否记录响应结果
-     * <br/>
-     * 响应结果默认不记录，避免日志过大
-     * @return 是否记录响应结果
+     * 操作标题（可选，默认使用枚举描述）
+     *
+     * @return 标题
      */
-    boolean result() default false;
+    String title() default "";
 
+    /**
+     * 自定义日志内容（可选，用于记录操作细节）
+     *
+     * @return 日志内容
+     */
+    String content() default "";
 
-}
+}

src/main/java/com/youlai/boot/common/annotation/ValidField.java

@@ -1,6 +1,6 @@
 package com.youlai.boot.common.annotation;
 
-import com.youlai.boot.core.validator.FieldValidator;
+import com.youlai.boot.common.validator.FieldValidator;
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 

src/main/java/com/youlai/boot/common/aspect/LogAspect.java

@@ -0,0 +1,145 @@
+package com.youlai.boot.common.aspect;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
+import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.common.enums.ActionTypeEnum;
+import com.youlai.boot.common.enums.LogModuleEnum;
+import com.youlai.boot.common.util.IPUtils;
+import com.youlai.boot.framework.security.util.SecurityUtils;
+import com.youlai.boot.system.model.entity.SysLog;
+import com.youlai.boot.system.service.LogService;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import java.time.LocalDateTime;
+
+/**
+ * 日志切面
+ *
+ * @author Ray.Hao
+ * @since 2.10.0
+ */
+@Aspect
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LogAspect {
+
+    private final LogService logService;
+
+    /**
+     * 日志注解切点
+     */
+    @Pointcut("@annotation(logAnnotation)")
+    public void logPointCut(Log logAnnotation) {
+    }
+
+    /**
+     * 环绕通知：记录操作日志
+     */
+    @Around(value = "logPointCut(logAnnotation)", argNames = "pjp,logAnnotation")
+    public Object around(ProceedingJoinPoint pjp, Log logAnnotation) throws Throwable {
+
+        long startTime = System.currentTimeMillis();
+        // 在方法执行前获取用户信息，避免 logout 等操作清除 SecurityContext 后无法获取
+        Long userId = SecurityUtils.getUserId();
+        String username = SecurityUtils.getUsername();
+        Object result = null;
+        Exception exception = null;
+
+        try {
+            result = pjp.proceed();
+            return result;
+        } catch (Exception e) {
+            exception = e;
+            throw e;
+        } finally {
+            long executionTime = System.currentTimeMillis() - startTime;
+            // fallback：登录等场景在 proceed() 前未认证，需在 proceed() 后获取
+            if (userId == null) {
+                userId = SecurityUtils.getUserId();
+                username = SecurityUtils.getUsername();
+            }
+            try {
+                saveLogAsync(logAnnotation, executionTime, exception, userId, username);
+            } catch (Exception ex) {
+                log.error("保存操作日志失败", ex);
+            }
+        }
+    }
+
+    /**
+     * 异步保存日志
+     */
+    @Async
+    public void saveLogAsync(Log logAnnotation, long executionTime, Exception exception, Long userId, String username) {
+        try {
+            ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            if (attributes == null) {
+                return;
+            }
+
+            HttpServletRequest request = attributes.getRequest();
+
+            // 解析 User-Agent
+            String userAgentStr = request.getHeader("User-Agent");
+            UserAgent userAgent = UserAgentUtil.parse(userAgentStr);
+            String sn = request.getHeader("X-Device-SN");
+
+            // 解析 IP 地区
+            String ip = IPUtils.getIpAddr(request);
+            String region = IPUtils.getRegion(ip);
+            String province = null;
+            String city = null;
+            if (StrUtil.isNotBlank(region)) {
+                String[] parts = region.split("\\|");
+                if (parts.length >= 3) {
+                    province = StrUtil.blankToDefault(parts[2], null);
+                    city = StrUtil.blankToDefault(parts[3], null);
+                }
+            }
+
+            // 构建日志实体
+            LogModuleEnum module = logAnnotation.module();
+            ActionTypeEnum actionType = logAnnotation.value();
+            String title = StrUtil.blankToDefault(logAnnotation.title(),
+                    module.getLabel() + "-" + actionType.getLabel());
+            String content = logAnnotation.content();
+
+            SysLog logEntity = new SysLog();
+            logEntity.setModule(module);
+            logEntity.setActionType(actionType);
+            logEntity.setTitle(title);
+            logEntity.setContent(content);
+            logEntity.setOperatorId(userId != null ? userId : 99);
+            logEntity.setOperatorName(username != null ? username : sn);
+            logEntity.setRequestUri(request.getRequestURI());
+            logEntity.setRequestMethod(request.getMethod());
+            logEntity.setIp(ip);
+            logEntity.setProvince(province);
+            logEntity.setCity(city);
+            logEntity.setDevice(userAgent.getOs().getName());
+            logEntity.setOs(userAgent.getOs().getName());
+            logEntity.setBrowser(userAgent.getBrowser().getName());
+            logEntity.setStatus(exception == null ? 1 : 0);
+            logEntity.setErrorMsg(exception != null ? exception.getMessage() : null);
+            logEntity.setExecutionTime((int) executionTime);
+            logEntity.setCreateTime(LocalDateTime.now());
+
+            logService.save(logEntity);
+        } catch (Exception e) {
+            log.error("保存操作日志异常: {}", e.getMessage());
+        }
+    }
+}

src/main/java/com/youlai/boot/common/aspect/RepeatSubmitAspect.java

@@ -1,11 +1,11 @@
-package com.youlai.boot.core.aspect;
+package com.youlai.boot.common.aspect;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import com.youlai.boot.common.constant.RedisConstants;
 import com.youlai.boot.common.constant.SecurityConstants;
-import com.youlai.boot.core.web.ResultCode;
-import com.youlai.boot.core.exception.BusinessException;
+import com.youlai.boot.common.result.ResultCode;
+import com.youlai.boot.common.exception.BusinessException;
 import com.youlai.boot.common.annotation.RepeatSubmit;
 import com.youlai.boot.common.util.IPUtils;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/youlai/boot/common/config/FilePath.java

@@ -0,0 +1,46 @@
+package com.youlai.boot.common.config;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+
+public class FilePath {
+//    @Value("${file.upload-dir-unix}")
+    private static final String unixUploadDir = "/data/uploads" ;
+
+//    @Value("${file.upload-dir-windows}")
+    private static final String windowsUploadDir = "uploadFile";
+
+    private static Logger logger = LoggerFactory.getLogger(FilePath.class);
+
+
+    public static final String TABLET_PATH = "tablet";
+    public static final String AVATAR_PATH = "avatar";
+    public static final String APK_ICON_PATH = "apkIcon";
+    public static final String SCREENSHOT_PATH = "screenshot";
+
+    public static String getRootPath() {
+        String osName = System.getProperty("os.name");
+        logger.info("osName: {}", osName);
+        if (osName.contains("Windows")) {
+            String projectPath = System.getProperty("user.dir");
+            logger.info("projectPath: {}", projectPath);
+            return projectPath + File.separator + windowsUploadDir;
+        } else {
+            return unixUploadDir;
+        }
+    }
+
+    public static String getAvatarPath() {
+        return getRootPath() + File.separator + TABLET_PATH + File.separator + AVATAR_PATH + File.separator;
+    }
+
+    public static String getApkIconPath() {
+        return getRootPath() + File.separator + TABLET_PATH + File.separator + APK_ICON_PATH + File.separator;
+    }
+
+    public static String getScreenshotPath() {
+        return getRootPath() + File.separator + TABLET_PATH + File.separator + SCREENSHOT_PATH + File.separator;
+    }
+}

src/main/java/com/youlai/boot/common/constant/JwtClaimConstants.java

@@ -26,9 +26,11 @@ public interface JwtClaimConstants {
     String DEPT_ID = "deptId";
 
     /**
-     * 数据权限
+     * 数据权限列表
+     * <p>
+     * 存储用户所有角色的数据权限范围，用于实现多角色权限合并（并集策略）
      */
-    String DATA_SCOPE = "dataScope";
+    String DATA_SCOPES = "dataScopes";
 
     /**
      * 权限(角色Code)集合
@@ -36,8 +38,11 @@ public interface JwtClaimConstants {
     String AUTHORITIES = "authorities";
 
     /**
-     * 安全版本号，用于按用户失效历史令牌
+     * Token 版本号
+     * <p>
+     * 用于用户级会话失效，当用户修改密码、被禁用、强制下线时递增版本号，
+     * 使该用户之前签发的所有 Token 失效。
      */
-    String SECURITY_VERSION = "securityVersion";
+    String TOKEN_VERSION = "tokenVersion";
 
 }

src/main/java/com/youlai/boot/common/constant/RedisConstants.java

@@ -26,18 +26,19 @@ public interface RedisConstants {
      * 认证模块
      */
     interface Auth {
-        // 存储访问令牌对应的用户信息（accessToken -> OnlineUser）
+        // 存储访问令牌对应的用户会话信息（accessToken -> UserSession）
         String ACCESS_TOKEN_USER = "auth:token:access:{}";
-        // 存储刷新令牌对应的用户信息（refreshToken -> OnlineUser）
+        // 存储刷新令牌对应的用户会话信息（refreshToken -> UserSession）
         String REFRESH_TOKEN_USER = "auth:token:refresh:{}";
         // 用户与访问令牌的映射（userId -> accessToken）
         String USER_ACCESS_TOKEN = "auth:user:access:{}";
         // 用户与刷新令牌的映射（userId -> refreshToken
         String USER_REFRESH_TOKEN = "auth:user:refresh:{}";
-        // 黑名单 Token（用于退出登录或注销）
+        // 已撤销 Token 的 JTI（单端退出/会话注销）：如果 jti 在撤销列表中，则 Token 立即无效
         String BLACKLIST_TOKEN = "auth:token:blacklist:{}";
-        // 用户安全版本号（用于按用户失效历史 JWT）
-        String USER_SECURITY_VERSION = "auth:user:security_version:{}";
+        String REVOKED_JTI = BLACKLIST_TOKEN;
+        // 用户 Token 版本号（用于按用户失效历史 JWT）：token.tokenVersion != redis.tokenVersion => token 无效
+        String USER_TOKEN_VERSION = "auth:user:token_version:{}";
     }
 
     /**

src/main/java/com/youlai/boot/common/enums/ActionTypeEnum.java

@@ -0,0 +1,65 @@
+package com.youlai.boot.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.youlai.boot.common.base.IBaseEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+
+/**
+ * 操作类型枚举
+ *
+ * @author Ray
+ * @since 2.10.0
+ */
+@Schema(enumAsRef = true)
+@Getter
+public enum ActionTypeEnum implements IBaseEnum<Integer> {
+
+    LOGIN(1, "登录"),
+    LOGOUT(2, "登出"),
+    INSERT(3, "新增"),
+    UPDATE(4, "修改"),
+    DELETE(5, "删除"),
+    GRANT(6, "授权"),
+    EXPORT(7, "导出"),
+    IMPORT(8, "导入"),
+    UPLOAD(9, "上传"),
+    DOWNLOAD(10, "下载"),
+    CHANGE_PASSWORD(11, "修改密码"),
+    RESET_PASSWORD(12, "重置密码"),
+    ENABLE(13, "启用"),
+    DISABLE(14, "禁用"),
+    LIST(15, "查询列表"),
+    REGISTER(16, "注册"),
+    VIEW(17, "查看"),
+    REFRESH(18, "刷新"),
+    SCREENSHOT(19, "截图"),
+    REBOOT(20, "重启"),
+    SHUTDOWN(21, "关机"),
+    LOCATE(22, "定位"),
+    RESTORE(23, "重置"),
+    DEVELOPER(24, "开发者选项"),
+    OTHER(99, "其他");
+
+    @EnumValue
+    private final Integer value;
+
+    @JsonValue
+    private final String label;
+
+    ActionTypeEnum(Integer value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public Integer getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+}

src/main/java/com/youlai/boot/common/enums/DataScopeEnum.java

@@ -5,6 +5,9 @@ import lombok.Getter;
 
 /**
  * 数据权限枚举
+ * <p>
+ * 多角色数据权限合并策略：取并集（OR），即用户能看到所有角色权限范围内的数据。
+ * 如果任一角色是 ALL，则直接跳过数据权限过滤。
  *
  * @author Ray.Hao
  * @since 2.3.0
@@ -13,12 +16,31 @@ import lombok.Getter;
 public enum DataScopeEnum implements IBaseEnum<Integer> {
 
     /**
-     * value 越小，数据权限范围越大
+     * 所有数据权限 - 最高权限，可查看所有数据
      */
     ALL(1, "所有数据"),
+
+    /**
+     * 部门及子部门数据 - 可查看本部门及其下属所有部门的数据
+     */
     DEPT_AND_SUB(2, "部门及子部门数据"),
+
+    /**
+     * 本部门数据 - 仅可查看本部门的数据
+     */
     DEPT(3, "本部门数据"),
-    SELF(4, "本人数据");
+
+    /**
+     * 本人数据 - 仅可查看自己的数据
+     */
+    SELF(4, "本人数据"),
+
+    /**
+     * 自定义部门数据 - 可查看指定部门的数据
+     * <p>
+     * 需要配合 sys_role_dept 表使用，存储角色可访问的部门ID列表
+     */
+    CUSTOM(5, "自定义部门数据");
 
     private final Integer value;
 
@@ -28,4 +50,32 @@ public enum DataScopeEnum implements IBaseEnum<Integer> {
         this.value = value;
         this.label = label;
     }
+
+    /**
+     * 判断是否为全部数据权限
+     *
+     * @param value 数据权限值
+     * @return 是否为全部数据权限
+     */
+    public static boolean isAll(Integer value) {
+        return ALL.getValue().equals(value);
+    }
+
+    /**
+     * 根据值获取枚举
+     *
+     * @param value 数据权限值
+     * @return 枚举对象，未找到则返回 null
+     */
+    public static DataScopeEnum getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (DataScopeEnum dataScope : values()) {
+            if (dataScope.getValue().equals(value)) {
+                return dataScope;
+            }
+        }
+        return null;
+    }
 }

src/main/java/com/youlai/boot/common/enums/LogModuleEnum.java

@@ -1,6 +1,8 @@
 package com.youlai.boot.common.enums;
 
+import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonValue;
+import com.youlai.boot.common.base.IBaseEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 
@@ -12,22 +14,41 @@ import lombok.Getter;
  */
 @Schema(enumAsRef = true)
 @Getter
-public enum LogModuleEnum {
+public enum LogModuleEnum implements IBaseEnum<Integer> {
 
-    EXCEPTION("异常"),
-    LOGIN("登录"),
-    USER("用户"),
-    DEPT("部门"),
-    ROLE("角色"),
-    MENU("菜单"),
-    DICT("字典"),
-    SETTING("系统配置"),
-    OTHER("其他");
+    LOGIN(1, "登录"),
+    USER(2, "用户管理"),
+    ROLE(3, "角色管理"),
+    DEPT(4, "部门管理"),
+    MENU(5, "菜单管理"),
+    DICT(6, "字典管理"),
+    CONFIG(7, "系统配置"),
+    FILE(8, "文件管理"),
+    NOTICE(9, "通知公告"),
+    LOG(10, "日志管理"),
+    CODEGEN(11, "代码生成"),
+    DEVICE(15, "设备SN管理"),
+    MOBILE(16, "移动设备管理"),
+    OTHER(99, "其他");
+
+    @EnumValue
+    private final Integer value;
 
     @JsonValue
-    private final String moduleName;
+    private final String label;
 
-    LogModuleEnum(String moduleName) {
-        this.moduleName = moduleName;
+    LogModuleEnum(Integer value, String label) {
+        this.value = value;
+        this.label = label;
     }
-}
+
+    @Override
+    public Integer getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+}

src/main/java/com/youlai/boot/common/enums/RequestMethodEnum.java

@@ -1,52 +0,0 @@
-package com.youlai.boot.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum RequestMethodEnum {
-    /**
-     * 搜寻 @AnonymousGetMapping
-     */
-    GET("GET"),
-
-    /**
-     * 搜寻 @AnonymousPostMapping
-     */
-    POST("POST"),
-
-    /**
-     * 搜寻 @AnonymousPutMapping
-     */
-    PUT("PUT"),
-
-    /**
-     * 搜寻 @AnonymousPatchMapping
-     */
-    PATCH("PATCH"),
-
-    /**
-     * 搜寻 @AnonymousDeleteMapping
-     */
-    DELETE("DELETE"),
-
-    /**
-     * 否则就是所有 Request 接口都放行
-     */
-    ALL("All");
-
-    /**
-     * Request 类型
-     */
-    private final String type;
-
-    public static RequestMethodEnum find(String type) {
-        for (RequestMethodEnum value : RequestMethodEnum.values()) {
-            if (value.getType().equals(type)) {
-                return value;
-            }
-        }
-        return ALL;
-    }
-}

src/main/java/com/youlai/boot/common/exception/BusinessException.java

@@ -1,6 +1,6 @@
-package com.youlai.boot.core.exception;
+package com.youlai.boot.common.exception;
 
-import com.youlai.boot.core.web.IResultCode;
+import com.youlai.boot.common.result.IResultCode;
 import lombok.Getter;
 import org.slf4j.helpers.MessageFormatter;
 

src/main/java/com/youlai/boot/common/exception/DataPermissionException.java

@@ -0,0 +1,28 @@
+package com.youlai.boot.common.exception;
+
+import lombok.Getter;
+
+/**
+ * 数据权限异常
+ * <p>
+ * 当数据权限拦截器拼接SQL条件失败时抛出，属于系统级异常，非业务异常。
+ *
+ * @author zc
+ * @since 2.0.0
+ */
+@Getter
+public class DataPermissionException extends RuntimeException {
+
+    private final String mappedStatementId;
+
+    public DataPermissionException(String mappedStatementId, String message) {
+        super(message);
+        this.mappedStatementId = mappedStatementId;
+    }
+
+    public DataPermissionException(String mappedStatementId, String message, Throwable cause) {
+        super(message, cause);
+        this.mappedStatementId = mappedStatementId;
+    }
+
+}

src/main/java/com/youlai/boot/common/model/KeyValue.java

@@ -27,4 +27,4 @@ public class KeyValue {
     @Schema(description = "选项的标签")
     private String value;
 
-}
+}

src/main/java/com/youlai/boot/common/model/Option.java

@@ -50,4 +50,4 @@ public class Option<T> {
     @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
     private List<Option<T>> children;
 
-}
+}

src/main/java/com/youlai/boot/common/result/ExcelResult.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.core.web;
+package com.youlai.boot.common.result;
 
 import lombok.Data;
 

src/main/java/com/youlai/boot/common/result/IResultCode.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.core.web;
+package com.youlai.boot.common.result;
 
 /**
  * 响应码接口

src/main/java/com/youlai/boot/common/result/PageResult.java

@@ -1,7 +1,6 @@
-package com.youlai.boot.core.web;
+package com.youlai.boot.common.result;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -21,13 +20,7 @@ public class PageResult<T> implements Serializable {
 
     private String msg;
 
-    private List<T> data;
-
-    /**
-     * 分页元信息；非分页接口不显示此字段
-     */
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    private Page page;
+    private PageData<T> data;
 
     /**
      * 构建分页结果（MyBatis-Plus {@link IPage}）。
@@ -43,13 +36,10 @@ public class PageResult<T> implements Serializable {
                 (page == null || page.getRecords() == null)
                         ? Collections.emptyList()
                         : page.getRecords();
-        result.setData(records);
-
-        Page pageMeta = new Page();
-        pageMeta.setPageNum(page != null ? page.getCurrent() : 1L);
-        pageMeta.setPageSize(page != null ? page.getSize() : 0L);
-        pageMeta.setTotal(page != null ? page.getTotal() : 0L);
-        result.setPage(pageMeta);
+        PageData<T> pageData = new PageData<>();
+        pageData.setList(records);
+        pageData.setTotal(page != null ? page.getTotal() : 0L);
+        result.setData(pageData);
 
         return result;
     }
@@ -63,17 +53,17 @@ public class PageResult<T> implements Serializable {
         PageResult<T> result = new PageResult<>();
         result.setCode(ResultCode.SUCCESS.getCode());
         result.setMsg(ResultCode.SUCCESS.getMsg());
-        result.setData(list != null ? list : Collections.emptyList());
-        result.setPage(null);
+        PageData<T> pageData = new PageData<>();
+        pageData.setList(list != null ? list : Collections.emptyList());
+        pageData.setTotal(0L);
+        result.setData(pageData);
         return result;
     }
 
     @Data
-    public static class Page {
+    public static class PageData<T> {
 
-        private long pageNum;
-
-        private long pageSize;
+        private List<T> list;
 
         private long total;
     }

src/main/java/com/youlai/boot/common/result/ResponseWriter.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.core.web;
+package com.youlai.boot.common.result;
 
 import cn.hutool.extra.servlet.JakartaServletUtil;
 import cn.hutool.json.JSONUtil;
@@ -10,7 +10,7 @@ import org.springframework.http.MediaType;
 import java.nio.charset.StandardCharsets;
 
 /**
- * Web响应写入器
+ * 响应写入器
  * <p>
  * 用于在过滤器、Security处理器等无法使用 @RestControllerAdvice 的场景中统一写入HTTP响应。
  * 支持写入成功响应和错误响应。
@@ -20,12 +20,12 @@ import java.nio.charset.StandardCharsets;
  * @since 2.0.0
  */
 @Slf4j
-public final class WebResponseWriter {
+public final class ResponseWriter {
 
     /**
      * 私有构造函数，防止实例化
      */
-    private WebResponseWriter() {
+    private ResponseWriter() {
         throw new UnsupportedOperationException("工具类不允许实例化");
     }
 
@@ -69,7 +69,7 @@ public final class WebResponseWriter {
         Result<?> result = message == null
                 ? Result.failed(resultCode)
                 : Result.failed(resultCode, message);
-        
+
         int httpStatus = mapHttpStatus(resultCode);
         writeResult(response, result, httpStatus);
     }
@@ -85,11 +85,11 @@ public final class WebResponseWriter {
         try {
             // 设置HTTP状态码
             response.setStatus(httpStatus);
-            
+
             // 设置响应编码和内容类型
             response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
             response.setContentType(MediaType.APPLICATION_JSON_VALUE);
-            
+
             // 写入响应
             JakartaServletUtil.write(response,
                     JSONUtil.toJsonStr(result),
@@ -103,6 +103,9 @@ public final class WebResponseWriter {
 
     /**
      * 根据业务结果码映射HTTP状态码
+     * 401: 未认证（token无效/过期）
+     * 403: 权限不足
+     * 400: 其他业务错误
      *
      * @param resultCode 业务结果码
      * @return HTTP状态码
@@ -110,13 +113,10 @@ public final class WebResponseWriter {
     private static int mapHttpStatus(ResultCode resultCode) {
         return switch (resultCode) {
             case ACCESS_UNAUTHORIZED,
-                    ACCESS_TOKEN_INVALID,
-                    REFRESH_TOKEN_INVALID -> HttpStatus.UNAUTHORIZED.value();
+                 ACCESS_TOKEN_INVALID,
+                 REFRESH_TOKEN_INVALID -> HttpStatus.UNAUTHORIZED.value();
+            case ACCESS_PERMISSION_EXCEPTION -> HttpStatus.FORBIDDEN.value();
             default -> HttpStatus.BAD_REQUEST.value();
         };
     }
 }
-
-
-
-

src/main/java/com/youlai/boot/common/result/Result.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.core.web;
+package com.youlai.boot.common.result;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;

src/main/java/com/youlai/boot/common/result/ResultCode.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.core.web;
+package com.youlai.boot.common.result;
 
 import java.io.Serializable;
 
@@ -53,10 +53,10 @@ import java.io.Serializable;
 public enum ResultCode implements IResultCode, Serializable {
 
     SUCCESS("00000", "成功"),
-    
+
     /** 一级宏观错误码：用户端错误（由客户端输入/认证/权限/请求方式等引起，需客户端配合修正） */
     USER_ERROR("A0001", "用户端错误"),
-    
+
 
     /** 二级宏观错误码：用户端具体错误（按号段细分，便于定位是注册/登录/令牌/参数/防重等问题） */
 
@@ -98,7 +98,17 @@ public enum ResultCode implements IResultCode, Serializable {
     /** A07xx：文件处理异常 */
     UPLOAD_FILE_EXCEPTION("A0700", "上传文件异常"),
     DELETE_FILE_EXCEPTION("A0710", "删除文件异常"),
-    
+
+    /** A08xx：移动设备认证异常 */
+    MOBILE_DEVICE_ID_REQUIRED("A0801", "设备标识不能为空"),
+    MOBILE_NONCE_REQUIRED("A0802", "随机数不能为空"),
+    MOBILE_TIMESTAMP_REQUIRED("A0803", "时间戳不能为空"),
+    MOBILE_TIMESTAMP_INVALID("A0804", "时间戳格式无效"),
+    MOBILE_TIMESTAMP_EXPIRED("A0805", "请求已过期，请重试"),
+    MOBILE_SIGN_REQUIRED("A0806", "签名不能为空"),
+    MOBILE_SIGN_INVALID("A0807", "签名验证失败"),
+    MOBILE_DEVICE_NOT_REGISTERED("A0808", "设备未注册"),
+
     /** 一级宏观错误码：系统端错误（服务端内部异常/超时/不可用等，需后端排查修复） */
     SYSTEM_ERROR("B0001", "系统执行出错"),
 
@@ -111,6 +121,7 @@ public enum ResultCode implements IResultCode, Serializable {
     /** 二级宏观错误码：第三方服务具体错误（按号段细分，便于定位是接口不存在/数据库异常等） */
     INTERFACE_NOT_EXIST("C0113", "接口不存在"),
     DATABASE_SERVICE_ERROR("C0300", "数据库服务出错"),
+    DATABASE_EXECUTION_ERROR("C0310", "数据库执行异常"),
     DATABASE_EXECUTION_SYNTAX_ERROR("C0313", "数据库执行语法错误"),
     INTEGRITY_CONSTRAINT_VIOLATION("C0342", "违反了完整性约束"),
     DATABASE_ACCESS_DENIED("C0351", "演示环境已禁用数据库写入功能，请本地部署修改数据库链接或开启Mock模式进行体验");

src/main/java/com/youlai/boot/common/util/CodeGeneratorUtil.java

@@ -0,0 +1,70 @@
+package com.youlai.boot.common.util;
+
+import java.security.SecureRandom;
+
+/**
+ * 验证码工具类
+ */
+public class CodeGeneratorUtil {
+
+    private static final SecureRandom secureRandom = new SecureRandom();
+
+    // 数字字符集
+    private static final String DIGITS = "0123456789";
+
+    // 字母字符集
+    private static final String LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+    // 数字和字母组合字符集
+    private static final String ALPHANUMERIC = DIGITS + LETTERS;
+
+    /**
+     * 生成指定长度的纯数字验证码
+     *
+     * @param length 验证码长度
+     * @return 验证码字符串
+     */
+    public static String generateNumericCode(int length) {
+        return generateCode(DIGITS, length);
+    }
+
+    /**
+     * 生成指定长度的字母验证码
+     *
+     * @param length 验证码长度
+     * @return 验证码字符串
+     */
+    public static String generateLetterCode(int length) {
+        return generateCode(LETTERS, length);
+    }
+
+    /**
+     * 生成指定长度的字母数字混合验证码
+     *
+     * @param length 验证码长度
+     * @return 验证码字符串
+     */
+    public static String generateAlphanumericCode(int length) {
+        return generateCode(ALPHANUMERIC, length);
+    }
+
+    /**
+     * 根据指定字符集生成验证码
+     *
+     * @param charSet 字符集
+     * @param length 验证码长度
+     * @return 验证码字符串
+     */
+    private static String generateCode(String charSet, int length) {
+        if (length <= 0) {
+            throw new IllegalArgumentException("验证码长度必须大于0");
+        }
+
+        StringBuilder code = new StringBuilder(length);
+        for (int i = 0; i < length; i++) {
+            int index = secureRandom.nextInt(charSet.length());
+            code.append(charSet.charAt(index));
+        }
+        return code.toString();
+    }
+}

src/main/java/com/youlai/boot/common/util/DateUtils.java

@@ -1,61 +0,0 @@
-
-package com.youlai.boot.common.util;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.lang.reflect.Field;
-
-/**
- * 日期工具类
- *
- * @author haoxr
- * @since 2.4.2
- */
-public class DateUtils {
-
-    /**
-     * 区间日期格式化为数据库日期格式
-     * <p>
-     * eg：2021-01-01 → 2021-01-01 00:00:00
-     *
-     * @param obj                要处理的对象
-     * @param startTimeFieldName 起始时间字段名
-     * @param endTimeFieldName   结束时间字段名
-     */
-    public static void toDatabaseFormat(Object obj, String startTimeFieldName, String endTimeFieldName) {
-        Field startTimeField = ReflectUtil.getField(obj.getClass(), startTimeFieldName);
-        Field endTimeField = ReflectUtil.getField(obj.getClass(), endTimeFieldName);
-
-        if (startTimeField != null) {
-            processDateTimeField(obj, startTimeField, startTimeFieldName, "yyyy-MM-dd 00:00:00");
-        }
-
-        if (endTimeField != null) {
-            processDateTimeField(obj, endTimeField, endTimeFieldName, "yyyy-MM-dd 23:59:59");
-        }
-    }
-
-    /**
-     * 处理日期字段
-     *
-     * @param obj           要处理的对象
-     * @param field         字段
-     * @param fieldName     字段名
-     * @param targetPattern 目标数据库日期格式
-     */
-    private static void processDateTimeField(Object obj, Field field, String fieldName, String targetPattern) {
-        Object fieldValue = ReflectUtil.getFieldValue(obj, fieldName);
-        if (fieldValue != null) {
-            // 得到原始的日期格式
-            String pattern = field.isAnnotationPresent(DateTimeFormat.class) ? field.getAnnotation(DateTimeFormat.class).pattern() : "yyyy-MM-dd";
-            // 转换为日期对象
-            DateTime dateTime = DateUtil.parse(StrUtil.toString(fieldValue), pattern);
-            // 转换为目标数据库日期格式
-            ReflectUtil.setFieldValue(obj, fieldName, dateTime.toString(targetPattern));
-        }
-    }
-}

src/main/java/com/youlai/boot/common/util/HashUtils.java

@@ -0,0 +1,138 @@
+package com.youlai.boot.common.util;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class HashUtils {
+
+    public static String calculateMultipartFileMd5(MultipartFile file) throws NoSuchAlgorithmException, IOException {
+        MessageDigest digest = MessageDigest.getInstance("MD5");
+        // 使用try-with-resources自动管理输入流
+        try (InputStream inputStream = file.getInputStream()) {
+            byte[] buffer = new byte[4096]; // 统一缓冲区大小为4KB
+            int bytesRead;
+            while ((bytesRead = inputStream.read(buffer)) != -1) {
+                digest.update(buffer, 0, bytesRead);
+            }
+        }
+        byte[] hashBytes = digest.digest();
+        return bytesToHex(hashBytes); // 复用现有工具方法
+    }
+
+    /**
+     * 计算 MultipartFile 的 SHA1 哈希值
+     *
+     * @param file 上传的文件
+     * @return SHA1 哈希值（小写十六进制字符串）
+     * @throws NoSuchAlgorithmException 算法不存在异常
+     * @throws IOException IO异常
+     */
+    public static String calculateMultipartFileSha1(MultipartFile file) throws NoSuchAlgorithmException, IOException {
+        MessageDigest digest = MessageDigest.getInstance("SHA-1");
+        try (InputStream inputStream = file.getInputStream()) {
+            byte[] buffer = new byte[4096];
+            int bytesRead;
+            while ((bytesRead = inputStream.read(buffer)) != -1) {
+                digest.update(buffer, 0, bytesRead);
+            }
+        }
+        byte[] hashBytes = digest.digest();
+        return bytesToHex(hashBytes);
+    }
+
+    /**
+     * 计算 MultipartFile 的 SHA256 哈希值
+     *
+     * @param file 上传的文件
+     * @return SHA256 哈希值（小写十六进制字符串）
+     * @throws NoSuchAlgorithmException 算法不存在异常
+     * @throws IOException IO异常
+     */
+    public static String calculateMultipartFileSha256(MultipartFile file) throws NoSuchAlgorithmException, IOException {
+        MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        try (InputStream inputStream = file.getInputStream()) {
+            byte[] buffer = new byte[4096];
+            int bytesRead;
+            while ((bytesRead = inputStream.read(buffer)) != -1) {
+                digest.update(buffer, 0, bytesRead);
+            }
+        }
+        byte[] hashBytes = digest.digest();
+        return bytesToHex(hashBytes);
+    }
+
+    public static String getFileMD5(File file) throws NoSuchAlgorithmException, IOException {
+        MessageDigest md = MessageDigest.getInstance("MD5");
+        FileInputStream fis = new FileInputStream(file);
+        byte[] dataBytes = new byte[1024];
+
+        int bytesRead;
+        while ((bytesRead = fis.read(dataBytes)) != -1) {
+            md.update(dataBytes, 0, bytesRead);
+        }
+
+        byte[] mdBytes = md.digest();
+
+        StringBuilder sb = new StringBuilder();
+        for (byte mdByte : mdBytes) {
+            sb.append(Integer.toString((mdByte & 0xff) + 0x100, 16).substring(1));
+        }
+        return sb.toString();
+    }
+
+    public static String calculateSHA1(File file) throws NoSuchAlgorithmException, IOException {
+        InputStream inputStream = new FileInputStream(file);
+        return calculateSHA1(inputStream);
+    }
+
+    public static String calculateSHA1(InputStream inputStream) throws NoSuchAlgorithmException, IOException {
+        MessageDigest digest = MessageDigest.getInstance("SHA-1");
+        byte[] buffer = new byte[4096];
+        int bytesRead;
+        while ((bytesRead = inputStream.read(buffer)) != -1) {
+            digest.update(buffer, 0, bytesRead);
+        }
+        byte[] hashBytes = digest.digest();
+        return bytesToHex(hashBytes, true);
+    }
+
+    public static String calculateSHA256(File file) throws NoSuchAlgorithmException, IOException {
+        MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        try (InputStream inputStream = new FileInputStream(file)) {
+            byte[] buffer = new byte[4096];
+            int bytesRead;
+            while ((bytesRead = inputStream.read(buffer)) != -1) {
+                digest.update(buffer, 0, bytesRead);
+            }
+        }
+        byte[] hashBytes = digest.digest();
+        return bytesToHex(hashBytes);
+    }
+
+    private static String bytesToHex(byte[] bytes) {
+        StringBuilder hexString = new StringBuilder();
+        for (byte b : bytes) {
+            String hex = String.format("%02x", b & 0xFF);
+            /*大写*/
+//            String hex = String.format("%02X", b & 0xFF);
+            hexString.append(hex);
+        }
+        return hexString.toString();
+    }
+
+    private static String bytesToHex(byte[] bytes, boolean upcase) {
+        String format = upcase ? "%02X" : "%02x";
+        StringBuilder hexString = new StringBuilder();
+        for (byte b : bytes) {
+            String hex = String.format(format, b & 0xFF);
+            hexString.append(hex);
+        }
+        return hexString.toString();
+    }
+}

src/main/java/com/youlai/boot/common/validator/FieldValidator.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.core.validator;
+package com.youlai.boot.common.validator;
 
 import com.youlai.boot.common.annotation.ValidField;
 import jakarta.validation.ConstraintValidator;
@@ -18,16 +18,14 @@ public class FieldValidator implements ConstraintValidator<ValidField, String> {
 
     @Override
     public void initialize(ValidField constraintAnnotation) {
-        // 初始化允许的值列表
         this.allowedValues = constraintAnnotation.allowedValues();
     }
 
     @Override
     public boolean isValid(String value, ConstraintValidatorContext context) {
         if (value == null) {
-            return true; // 如果字段允许为空，可以返回 true
+            return true;
         }
-        // 检查值是否在允许列表中
         return Arrays.asList(allowedValues).contains(value);
     }
 }