Merge remote-tracking branch 'origin/dev' into 4.X

发布 4.0.1 大升级 4.X 之后第一个修复版本
update springboot 2.6.3 => 2.6.4
2025-10-12 13:03:44 +08:00 · 2022-03-01 10:12:32 +08:00 · 2022-03-01 10:08:09 +08:00 · 2022-02-28 13:27:16 +08:00 · 2022-02-28 13:03:55 +08:00 · 2022-02-28 12:17:40 +08:00
404 changed files with 14336 additions and 12545 deletions
--- a/.gitee/ISSUE_TEMPLATE.zh-CN.md
+++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md
@@ -0,0 +1,13 @@
+### 使用版本
+
+
+### 问题描述
+
+
+### 希望结果
+
+
+### 重现步骤
+
+
+### 报错信息(截图为主 请勿发混乱格式)
--- a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
+++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
@@ -0,0 +1,7 @@
+### 更改目的 解决了什么问题
+
+
+### 描述 做了哪些改动
+
+
+### 测试 都做了哪些测试(未经过测试不采纳)
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,9 @@ target/
 *.iml
 *.ipr

+### JRebel ###
+rebel.xml
+
 ### NetBeans ###
 nbproject/private/
 build/*
--- a/README.md
+++ b/README.md
@@ -4,48 +4,49 @@
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE)
 [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
 <br>
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.4.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-4.0.1-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
 [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.5-blue.svg)]()
 [![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]()
 [![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()
-[![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]()

-> RuoYi-Vue-Plus 是基于 RuoYi-Vue 针对 `分布式集群` 场景升级(不兼容原框架)
+> RuoYi-Vue-Plus 是重写 RuoYi-Vue 针对 `分布式集群` 场景全方位升级(不兼容原框架)

 > 系统演示: [传送门](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/系统演示?sort_id=4836388)

-| 功能介绍 | 使用技术 | 文档地址 | 特性注意事项 |
-|---|---|---|---|
-| 当前框架 | RuoYi-Vue-Plus | [RuoYi-Vue-Plus文档](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages) | 重写RuoYi-Vue全方位升级(不兼容原框架) |
-| satoken分支 | RuoYi-Vue-Plus-satoken | [satoken分支地址](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/satoken/) | 使用satoken重构权限鉴权(公测 可尝试上生产) |
-| 单体分支 | RuoYi-Vue-Plus-fast | [fast分支地址](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/fast/) | 单体应用结构 |
-| 原框架 | RuoYi-Vue | [RuoYi-Vue官网](http://ruoyi.vip/) | 定期同步需要的功能 |
-| 前端开发框架 | Vue、Element UI | [Element UI官网](https://element.eleme.cn/#/zh-CN) | |
-| 后端开发框架 | SpringBoot | [SpringBoot官网](https://spring.io/projects/spring-boot/#learn) | |
-| 容器框架 | Undertow | [Undertow官网](https://undertow.io/) | 基于 Netty 的高性能容器 |
-| 权限认证框架 | Spring Security、Jwt | [SpringSecurity官网](https://spring.io/projects/spring-security#learn) | 支持多终端认证系统 |
-| 关系数据库 | MySQL | [MySQL官网](https://dev.mysql.com/) | 适配 8.X 最低 5.7 |
-| 缓存数据库 | Redis | [Redis官网](https://redis.io/) | 适配 6.X 最低 4.X |
-| 数据库框架 | Mybatis-Plus | [Mybatis-Plus文档](https://baomidou.com/guide/) | 快速 CRUD 增加开发效率 |
-| 数据库框架 | p6spy | [p6spy官网](https://p6spy.readthedocs.io/) | 更强劲的 SQL 分析 |
-| 多数据源框架 | dynamic-datasource | [dynamic-ds文档](https://www.kancloud.cn/tracy5546/dynamic-datasource/content) | 支持主从与多种类数据库异构 |
-| 序列化框架 | Jackson | [Jackson官网](https://github.com/FasterXML/jackson) | 统一使用 jackson 高效可靠 |
-| Redis客户端 | Redisson | [Redisson文档](https://github.com/redisson/redisson/wiki/%E7%9B%AE%E5%BD%95) | 支持单机、集群配置 |
-| 分布式限流 | Redisson | [Redisson文档](https://github.com/redisson/redisson/wiki/%E7%9B%AE%E5%BD%95) | 全局、请求IP、集群ID 多种限流 |
-| 分布式锁 | Lock4j | [Lock4j官网](https://gitee.com/baomidou/lock4j) | 注解锁、工具锁 多种多样 |
-| 分布式幂等 | Redisson | [Lock4j文档](https://gitee.com/baomidou/lock4j) | 拦截重复提交 |
-| 分布式日志 | TLog | [TLog文档](https://yomahub.com/tlog/docs) | 支持跟踪链路日志记录、性能分析、链路排查 |
-| 分布式任务调度 | Xxl-Job | [Xxl-Job官网](https://www.xuxueli.com/xxl-job/) | 高性能 高可靠 易扩展 |
-| 文件存储 | Minio | [Minio文档](https://docs.min.io/) | 本地存储 |
-| 文件存储 | 七牛、阿里、腾讯 | [OSS使用文档](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4359146&doc_id=1469725) | 云存储 |
-| 监控框架 | SpringBoot-Admin | [SpringBoot-Admin文档](https://codecentric.github.io/spring-boot-admin/current/) | 全方位服务监控 |
-| 校验框架 | Validation | [Validation文档](https://docs.jboss.org/hibernate/stable/validator/reference/en-US/html_single/) | 增强接口安全性、严谨性 支持国际化 |
-| Excel框架 | Alibaba EasyExcel | [EasyExcel文档](https://www.yuque.com/easyexcel/doc/easyexcel) | 性能优异 扩展性强 |
-| 文档框架 | Knife4j | [Knife4j文档](https://doc.xiaominfo.com/knife4j/documentation/) | 美化接口文档 |
-| 工具类框架 | Hutool、Lombok | [Hutool文档](https://www.hutool.cn/docs/) | 减少代码冗余 增加安全性 |
-| 代码生成器 | 适配MP、Knife4j规范化代码 | [Hutool文档](https://www.hutool.cn/docs/) | 一键生成前后端代码 |
-| 部署方式 | Docker | [Docker文档](https://docs.docker.com/) | 容器编排 一键部署业务集群 |
-| 国际化 | SpringMessage | [SpringMVC文档](https://docs.spring.io/spring-framework/docs/current/reference/html/web.html#mvc) | Spring标准国际化方案 |
+| 功能介绍     | 使用技术                | 文档地址                                                                                              | 特性注意事项                     |
+|----------|---------------------|---------------------------------------------------------------------------------------------------|----------------------------|
+| 当前框架     | RuoYi-Vue-Plus      | [RuoYi-Vue-Plus文档](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages)                       | 重写RuoYi-Vue全方位升级(不兼容原框架)   |
+| 微服务分支    | RuoYi-Cloud-Plus    | [微服务分支地址](https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus)                                          | 重写RuoYi-Cloud全方位升级(不兼容原框架) |
+| 单体分支     | RuoYi-Vue-Plus-fast | [fast分支地址](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/fast/)                                | 单体应用结构                     |
+| Vue3分支   | RuoYi-Vue-Plus-UI   | [UI地址](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus-UI)                                            | 由于组件还未完善 仅供学习              |
+| 原框架      | RuoYi-Vue           | [RuoYi-Vue官网](http://ruoyi.vip/)                                                                  | 定期同步需要的功能                  |
+| 前端开发框架   | Vue、Element UI      | [Element UI官网](https://element.eleme.cn/#/zh-CN)                                                  |                            |
+| 后端开发框架   | SpringBoot          | [SpringBoot官网](https://spring.io/projects/spring-boot/#learn)                                     |                            |
+| 容器框架     | Undertow            | [Undertow官网](https://undertow.io/)                                                                | 基于 XNIO 的高性能容器             |
+| 权限认证框架   | Sa-Token、Jwt        | [Sa-Token官网](https://sa-token.dev33.cn/)                                                          | 强解耦、强扩展                    |
+| 关系数据库    | MySQL               | [MySQL官网](https://dev.mysql.com/)                                                                 | 适配 8.X 最低 5.7              |
+| 缓存数据库    | Redis               | [Redis官网](https://redis.io/)                                                                      | 适配 6.X 最低 4.X              |
+| 数据库框架    | Mybatis-Plus        | [Mybatis-Plus文档](https://baomidou.com/guide/)                                                     | 快速 CRUD 增加开发效率             |
+| 数据库框架    | p6spy               | [p6spy官网](https://p6spy.readthedocs.io/)                                                          | 更强劲的 SQL 分析                |
+| 多数据源框架   | dynamic-datasource  | [dynamic-ds文档](https://www.kancloud.cn/tracy5546/dynamic-datasource/content)                      | 支持主从与多种类数据库异构              |
+| 序列化框架    | Jackson             | [Jackson官网](https://github.com/FasterXML/jackson)                                                 | 统一使用 jackson 高效可靠          |
+| Redis客户端 | Redisson            | [Redisson文档](https://github.com/redisson/redisson/wiki/%E7%9B%AE%E5%BD%95)                        | 支持单机、集群配置                  |
+| 分布式限流    | Redisson            | [Redisson文档](https://github.com/redisson/redisson/wiki/%E7%9B%AE%E5%BD%95)                        | 全局、请求IP、集群ID 多种限流          |
+| 分布式队列    | Redisson            | [Redisson文档](https://github.com/redisson/redisson/wiki/%E7%9B%AE%E5%BD%95)                        | 普通队列、延迟队列、优先队列 等           |
+| 分布式锁     | Lock4j              | [Lock4j官网](https://gitee.com/baomidou/lock4j)                                                     | 注解锁、工具锁 多种多样               |
+| 分布式幂等    | Redisson            | [Lock4j文档](https://gitee.com/baomidou/lock4j)                                                     | 拦截重复提交                     |
+| 分布式日志    | TLog                | [TLog文档](https://yomahub.com/tlog/docs)                                                           | 支持跟踪链路日志记录、性能分析、链路排查       |
+| 分布式任务调度  | Xxl-Job             | [Xxl-Job官网](https://www.xuxueli.com/xxl-job/)                                                     | 高性能 高可靠 易扩展                |
+| 文件存储     | Minio               | [Minio文档](https://docs.min.io/)                                                                   | 本地存储                       |
+| 文件存储     | 七牛、阿里、腾讯            | [OSS使用文档](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4359146&doc_id=1469725) | 云存储                        |
+| 监控框架     | SpringBoot-Admin    | [SpringBoot-Admin文档](https://codecentric.github.io/spring-boot-admin/current/)                    | 全方位服务监控                    |
+| 校验框架     | Validation          | [Validation文档](https://docs.jboss.org/hibernate/stable/validator/reference/en-US/html_single/)    | 增强接口安全性、严谨性 支持国际化          |
+| Excel框架  | Alibaba EasyExcel   | [EasyExcel文档](https://www.yuque.com/easyexcel/doc/easyexcel)                                      | 性能优异 扩展性强                  |
+| 文档框架     | Knife4j             | [Knife4j文档](https://doc.xiaominfo.com/knife4j/documentation/)                                     | 美化接口文档                     |
+| 工具类框架    | Hutool、Lombok       | [Hutool文档](https://www.hutool.cn/docs/)                                                           | 减少代码冗余 增加安全性               |
+| 代码生成器    | 适配MP、Knife4j规范化代码   | [Hutool文档](https://www.hutool.cn/docs/)                                                           | 一键生成前后端代码                  |
+| 部署方式     | Docker              | [Docker文档](https://docs.docker.com/)                                                              | 容器编排 一键部署业务集群              |
+| 国际化      | SpringMessage       | [SpringMVC文档](https://docs.spring.io/spring-framework/docs/current/reference/html/web.html#mvc)   | Spring标准国际化方案              |

 ## 参考文档

@@ -73,8 +74,8 @@

 * 同步升级 RuoYi-Vue
 * GitHub 地址 [RuoYi-Vue-Plus-github](https://github.com/JavaLionLi/RuoYi-Vue-Plus)
-* 单模块 fast 分支 [RuoYi-Vue-Plus-fast](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/fast/)
-* satoken 分支 [RuoYi-Vue-Plus-satoken](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/satoken/)
+* 单模块 分支 [RuoYi-Vue-Plus-fast](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/fast/)
+* 微服务 分支 [RuoYi-Cloud-Plus](https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus)
 * 用户扩展项目 [扩展项目列表](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4478302&doc_id=1469725)

 ## 加群与捐献
@@ -83,7 +84,7 @@

 ## 捐献作者
 作者为兼职做开源,平时还需要工作,如果帮到了您可以请作者吃个盒饭  
-<img src="https://images.gitee.com/uploads/images/2021/0525/101654_451e4523_1766278.jpeg" width="300px" height="450px" />
+<img src="https://images.gitee.com/uploads/images/2022/0218/213734_b1b8197f_1766278.jpeg" width="300px" height="450px" />
 <img src="https://images.gitee.com/uploads/images/2021/0525/101713_3d18b119_1766278.jpeg" width="300px" height="450px" />

 ## 业务功能
@@ -113,40 +114,40 @@
 ## 演示图例

 <table border="1" cellpadding="1" cellspacing="1" style="width:500px">
-	<tbody>
-		<tr>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-972235bcbe3518dedd351ff0e2ee7d1031c.png" width="1920" /></td>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-5e0097702fa91e2e36391de8127676a7fa1.png" width="1920" /></td>
-		</tr>
-		<tr>
-			<td>
-			<p><img src="https://oscimg.oschina.net/oscnet/up-e56e3828f48cd9886d88731766f06d5f3c1.png" width="1920" /></p>
-			</td>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-0715990ea1a9f254ec2138fcd063c1f556a.png" width="1920" /></td>
-		</tr>
-		<tr>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-eaf5417ccf921bb64abb959e3d8e290467f.png" width="1920" /></td>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-fc285cf33095ebf8318de6999af0f473861.png" width="1920" /></td>
-		</tr>
-		<tr>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-60c83fd8bd61c29df6dbf47c88355e9c272.png" width="1920" /></td>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-7f731948c8b73c7d90f67f9e1c7a534d5c3.png" width="1920" /></td>
-		</tr>
-		<tr>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-e4de89b5e2d20c52d3c3a47f9eb88eb8526.png" width="1920" /></td>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-8791d823a508eb90e67c604f36f57491a67.png" width="1920" /></td>
-		</tr>
-		<tr>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-4589afd99982ead331785299b894174feb6.png" width="1920" /></td>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-8ea177cdacaea20995daf2f596b15232561.png" width="1920" /></td>
-		</tr>
-		<tr>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-32d1d04c55c11f74c9129fbbc58399728c4.png" width="1920" /></td>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-04fa118f7631b7ae6fd72299ca0a1430a63.png" width="1920" /></td>
-		</tr>
-		<tr>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-fe7e85b65827802bfaadf3acd42568b58c7.png" width="1920" /></td>
-			<td><img src="https://oscimg.oschina.net/oscnet/up-eff2b02a54f8188022d8498cfe6af6fcc06.png" width="1920" /></td>
-		</tr>
-	</tbody>
+    <tbody>
+        <tr>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-972235bcbe3518dedd351ff0e2ee7d1031c.png" width="1920" /></td>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-5e0097702fa91e2e36391de8127676a7fa1.png" width="1920" /></td>
+        </tr>
+        <tr>
+            <td>
+            <p><img src="https://oscimg.oschina.net/oscnet/up-e56e3828f48cd9886d88731766f06d5f3c1.png" width="1920" /></p>
+            </td>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-0715990ea1a9f254ec2138fcd063c1f556a.png" width="1920" /></td>
+        </tr>
+        <tr>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-eaf5417ccf921bb64abb959e3d8e290467f.png" width="1920" /></td>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-fc285cf33095ebf8318de6999af0f473861.png" width="1920" /></td>
+        </tr>
+        <tr>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-60c83fd8bd61c29df6dbf47c88355e9c272.png" width="1920" /></td>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-7f731948c8b73c7d90f67f9e1c7a534d5c3.png" width="1920" /></td>
+        </tr>
+        <tr>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-e4de89b5e2d20c52d3c3a47f9eb88eb8526.png" width="1920" /></td>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-8791d823a508eb90e67c604f36f57491a67.png" width="1920" /></td>
+        </tr>
+        <tr>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-4589afd99982ead331785299b894174feb6.png" width="1920" /></td>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-8ea177cdacaea20995daf2f596b15232561.png" width="1920" /></td>
+        </tr>
+        <tr>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-32d1d04c55c11f74c9129fbbc58399728c4.png" width="1920" /></td>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-04fa118f7631b7ae6fd72299ca0a1430a63.png" width="1920" /></td>
+        </tr>
+        <tr>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-fe7e85b65827802bfaadf3acd42568b58c7.png" width="1920" /></td>
+            <td><img src="https://oscimg.oschina.net/oscnet/up-eff2b02a54f8188022d8498cfe6af6fcc06.png" width="1920" /></td>
+        </tr>
+    </tbody>
 </table>
--- a/pom.xml
+++ b/pom.xml
@@ -2,49 +2,50 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>

    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi-vue-plus</artifactId>
-    <version>3.4.0</version>
+    <version>4.0.1</version>

    <name>RuoYi-Vue-Plus</name>
    <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
    <description>RuoYi-Vue-Plus后台管理系统</description>

    <properties>
-        <ruoyi-vue-plus.version>3.4.0</ruoyi-vue-plus.version>
-        <spring-boot.version>2.5.7</spring-boot.version>
+        <ruoyi-vue-plus.version>4.0.1</ruoyi-vue-plus.version>
+        <spring-boot.version>2.6.4</spring-boot.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
-        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+        <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
        <druid.version>1.2.8</druid.version>
        <knife4j.version>3.0.3</knife4j.version>
        <swagger-annotations.version>1.5.22</swagger-annotations.version>
        <poi.version>4.1.2</poi.version>
-        <easyexcel.version>2.2.11</easyexcel.version>
+        <easyexcel.version>3.0.5</easyexcel.version>
+        <cglib.version>3.3.0</cglib.version>
        <velocity.version>2.3</velocity.version>
-        <jwt.version>0.9.1</jwt.version>
-        <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
+        <satoken.version>1.29.0</satoken.version>
+        <mybatis-plus.version>3.5.1</mybatis-plus.version>
        <p6spy.version>3.9.1</p6spy.version>
-        <hutool.version>5.7.16</hutool.version>
+        <hutool.version>5.7.21</hutool.version>
        <okhttp.version>4.9.2</okhttp.version>
-        <spring-boot-admin.version>2.5.4</spring-boot-admin.version>
-        <redisson.version>3.16.4</redisson.version>
+        <spring-boot-admin.version>2.6.2</spring-boot-admin.version>
+        <redisson.version>3.16.8</redisson.version>
        <lock4j.version>2.2.1</lock4j.version>
-        <dynamic-ds.version>3.4.1</dynamic-ds.version>
-        <tlog.version>1.3.4</tlog.version>
+        <dynamic-ds.version>3.5.0</dynamic-ds.version>
+        <tlog.version>1.3.6</tlog.version>
        <xxl-job.version>2.3.0</xxl-job.version>

        <!-- jdk11 缺失依赖 jaxb-->
        <jaxb.version>3.0.1</jaxb.version>

        <!-- OSS 配置 -->
-        <qiniu.version>7.8.0</qiniu.version>
-        <aliyun.oss.version>3.13.1</aliyun.oss.version>
-        <qcloud.cos.version>5.6.58</qcloud.cos.version>
-        <minio.version>8.3.3</minio.version>
+        <qiniu.version>7.9.3</qiniu.version>
+        <aliyun.oss.version>3.14.0</aliyun.oss.version>
+        <qcloud.cos.version>5.6.68</qcloud.cos.version>
+        <minio.version>8.3.7</minio.version>

        <!-- docker 配置 -->
        <docker.registry.url>localhost</docker.registry.url>
@@ -67,6 +68,15 @@
                <scope>import</scope>
            </dependency>

+            <!-- hutool 的依赖配置-->
+            <dependency>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-bom</artifactId>
+                <version>${hutool.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
            <!-- 阿里数据库连接池 -->
            <dependency>
                <groupId>com.alibaba</groupId>
@@ -115,6 +125,12 @@
                </exclusions>
            </dependency>

+            <dependency>
+                <groupId>cglib</groupId>
+                <artifactId>cglib</artifactId>
+                <version>${cglib.version}</version>
+            </dependency>
+
            <!-- velocity代码生成使用模板 -->
            <dependency>
                <groupId>org.apache.velocity</groupId>
@@ -122,11 +138,17 @@
                <version>${velocity.version}</version>
            </dependency>

-            <!-- Token生成与解析-->
+            <!-- Sa-Token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
            <dependency>
-                <groupId>io.jsonwebtoken</groupId>
-                <artifactId>jjwt</artifactId>
-                <version>${jwt.version}</version>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-spring-boot-starter</artifactId>
+                <version>${satoken.version}</version>
+            </dependency>
+            <!-- Sa-Token 整合 jwt -->
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-jwt</artifactId>
+                <version>${satoken.version}</version>
            </dependency>

            <!-- jdk11 缺失依赖 jaxb-->
@@ -160,12 +182,6 @@
                <version>${p6spy.version}</version>
            </dependency>

-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-all</artifactId>
-                <version>${hutool.version}</version>
-            </dependency>
-
            <dependency>
                <groupId>com.squareup.okhttp3</groupId>
                <artifactId>okhttp</artifactId>
@@ -204,29 +220,13 @@

            <dependency>
                <groupId>com.yomahub</groupId>
-                <artifactId>tlog-spring-boot-configuration</artifactId>
+                <artifactId>tlog-web-spring-boot-starter</artifactId>
                <version>${tlog.version}</version>
            </dependency>

            <dependency>
                <groupId>com.yomahub</groupId>
-                <artifactId>tlog-webroot</artifactId>
-                <version>${tlog.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>javassist</artifactId>
-                        <groupId>org.javassist</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>guava</artifactId>
-                        <groupId>com.google.guava</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>com.yomahub</groupId>
-                <artifactId>tlog-xxl-job</artifactId>
+                <artifactId>tlog-xxljob-spring-boot-starter</artifactId>
                <version>${tlog.version}</version>
            </dependency>

@@ -300,7 +300,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.9.0</version>
                <configuration>
                    <source>${java.version}</source>
                    <target>${java.version}</target>
@@ -310,8 +310,18 @@
        </plugins>
        <resources>
            <resource>
-                <!--打包该目录下的 application.yml -->
                <directory>src/main/resources</directory>
+                <!-- 关闭过滤 -->
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <!-- 引入所有 匹配文件进行过滤 -->
+                <includes>
+                    <include>application*</include>
+                    <include>bootstrap*</include>
+                    <include>banner*</include>
+                </includes>
                <!-- 启用过滤 即该资源中的变量将会被过滤器中的值替换 -->
                <filtering>true</filtering>
            </resource>
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.4.0</version>
+        <version>4.0.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>jar</packaging>
@@ -86,7 +86,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.2</version>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <warName>${project.artifactId}</warName>
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
@@ -5,10 +5,10 @@ import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.IdUtil;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.enums.CaptchaType;
-import com.ruoyi.common.utils.RedisUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.common.utils.reflect.ReflectUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.config.properties.CaptchaProperties;
@@ -16,7 +16,6 @@ import com.ruoyi.system.service.ISysConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

@@ -30,7 +29,7 @@ import java.util.concurrent.TimeUnit;
 * @author Lion Li
 */
@Api(value = "验证码操作处理", tags = {"验证码管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
 public class CaptchaController {

@@ -42,12 +41,12 @@ public class CaptchaController {
     */
    @ApiOperation("生成验证码")
    @GetMapping("/captchaImage")
-    public AjaxResult<Map<String, Object>> getCode() {
+    public R<Map<String, Object>> getCode() {
        Map<String, Object> ajax = new HashMap<>();
        boolean captchaOnOff = configService.selectCaptchaOnOff();
        ajax.put("captchaOnOff", captchaOnOff);
        if (!captchaOnOff) {
-            return AjaxResult.success(ajax);
+            return R.ok(ajax);
        }
        // 保存验证码信息
        String uuid = IdUtil.simpleUUID();
@@ -64,7 +63,7 @@ public class CaptchaController {
        RedisUtils.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
        ajax.put("uuid", uuid);
        ajax.put("img", captcha.getImageBase64());
-        return AjaxResult.success(ajax);
+        return R.ok(ajax);
    }

    private String getCodeResult(String capStr) {
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
@@ -1,15 +1,14 @@
 package com.ruoyi.web.controller.monitor;

-import com.ruoyi.common.core.domain.AjaxResult;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.RedisServerCommands;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -22,7 +21,7 @@ import java.util.*;
 * @author Lion Li
 */
@Api(value = "缓存监控", tags = {"缓存监控管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/monitor/cache")
 public class CacheController {
@@ -30,9 +29,9 @@ public class CacheController {
    private final RedisTemplate<String, String> redisTemplate;

    @ApiOperation("获取缓存监控详细信息")
-    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @SaCheckPermission("monitor:cache:list")
    @GetMapping()
-    public AjaxResult<Map<String, Object>> getInfo() throws Exception {
+    public R<Map<String, Object>> getInfo() throws Exception {
        Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::info);
        Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
        Object dbSize = redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::dbSize);
@@ -52,6 +51,6 @@ public class CacheController {
            });
        }
        result.put("commandStats", pieList);
-        return AjaxResult.success(result);
+        return R.ok(result);
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
@@ -1,8 +1,10 @@
 package com.ruoyi.web.controller.monitor;

+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -11,8 +13,6 @@ import com.ruoyi.system.service.ISysLogininforService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -26,7 +26,7 @@ import java.util.List;
 */
@Validated
@Api(value = "系统访问记录", tags = {"系统访问记录管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/monitor/logininfor")
 public class SysLogininforController extends BaseController {
@@ -34,15 +34,15 @@ public class SysLogininforController extends BaseController {
    private final ISysLogininforService logininforService;

    @ApiOperation("查询系统访问记录列表")
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+    @SaCheckPermission("monitor:logininfor:list")
    @GetMapping("/list")
-    public TableDataInfo<SysLogininfor> list(SysLogininfor logininfor) {
-        return logininforService.selectPageLogininforList(logininfor);
+    public TableDataInfo<SysLogininfor> list(SysLogininfor logininfor, PageQuery pageQuery) {
+        return logininforService.selectPageLogininforList(logininfor, pageQuery);
    }

    @ApiOperation("导出系统访问记录列表")
    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+    @SaCheckPermission("monitor:logininfor:export")
    @PostMapping("/export")
    public void export(SysLogininfor logininfor, HttpServletResponse response) {
        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
@@ -50,19 +50,19 @@ public class SysLogininforController extends BaseController {
    }

    @ApiOperation("删除系统访问记录")
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @SaCheckPermission("monitor:logininfor:remove")
    @Log(title = "登录日志", businessType = BusinessType.DELETE)
    @DeleteMapping("/{infoIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] infoIds) {
+    public R<Void> remove(@PathVariable Long[] infoIds) {
        return toAjax(logininforService.deleteLogininforByIds(infoIds));
    }

    @ApiOperation("清空系统访问记录")
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @SaCheckPermission("monitor:logininfor:remove")
    @Log(title = "登录日志", businessType = BusinessType.CLEAN)
    @DeleteMapping("/clean")
-    public AjaxResult<Void> clean() {
+    public R<Void> clean() {
        logininforService.cleanLogininfor();
-        return AjaxResult.success();
+        return R.ok();
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
@@ -1,8 +1,10 @@
 package com.ruoyi.web.controller.monitor;

+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -11,8 +13,6 @@ import com.ruoyi.system.service.ISysOperLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -26,7 +26,7 @@ import java.util.List;
 */
@Validated
@Api(value = "操作日志记录", tags = {"操作日志记录管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/monitor/operlog")
 public class SysOperlogController extends BaseController {
@@ -34,15 +34,15 @@ public class SysOperlogController extends BaseController {
    private final ISysOperLogService operLogService;

    @ApiOperation("查询操作日志记录列表")
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+    @SaCheckPermission("monitor:operlog:list")
    @GetMapping("/list")
-    public TableDataInfo<SysOperLog> list(SysOperLog operLog) {
-        return operLogService.selectPageOperLogList(operLog);
+    public TableDataInfo<SysOperLog> list(SysOperLog operLog, PageQuery pageQuery) {
+        return operLogService.selectPageOperLogList(operLog, pageQuery);
    }

    @ApiOperation("导出操作日志记录列表")
    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+    @SaCheckPermission("monitor:operlog:export")
    @PostMapping("/export")
    public void export(SysOperLog operLog, HttpServletResponse response) {
        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
@@ -51,18 +51,18 @@ public class SysOperlogController extends BaseController {

    @ApiOperation("删除操作日志记录")
    @Log(title = "操作日志", businessType = BusinessType.DELETE)
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @SaCheckPermission("monitor:operlog:remove")
    @DeleteMapping("/{operIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] operIds) {
+    public R<Void> remove(@PathVariable Long[] operIds) {
        return toAjax(operLogService.deleteOperLogByIds(operIds));
    }

    @ApiOperation("清空操作日志记录")
    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @SaCheckPermission("monitor:operlog:remove")
    @DeleteMapping("/clean")
-    public AjaxResult<Void> clean() {
+    public R<Void> clean() {
        operLogService.cleanOperLog();
-        return AjaxResult.success();
+        return R.ok();
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
@@ -1,28 +1,28 @@
 package com.ruoyi.web.controller.monitor;

+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.dto.UserOnlineDTO;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.utils.RedisUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.system.domain.SysUserOnline;
-import com.ruoyi.system.service.ISysUserOnlineService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;

 /**
 * 在线用户监控
@@ -30,51 +30,58 @@ import java.util.List;
 * @author Lion Li
 */
@Api(value = "在线用户监控", tags = {"在线用户监控管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/monitor/online")
 public class SysUserOnlineController extends BaseController {

-    private final ISysUserOnlineService userOnlineService;
-
    @ApiOperation("在线用户列表")
-    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+    @SaCheckPermission("monitor:online:list")
    @GetMapping("/list")
    public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
-        Collection<String> keys = RedisUtils.keys(Constants.LOGIN_TOKEN_KEY + "*");
-        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
+        // 获取所有未过期的 token
+        List<String> keys = StpUtil.searchTokenValue("", -1, 0);
+        List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>();
        for (String key : keys) {
-            LoginUser user = RedisUtils.getCacheObject(key);
-            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) {
-                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
-                }
-            } else if (StringUtils.isNotEmpty(ipaddr)) {
-                if (StringUtils.equals(ipaddr, user.getIpaddr())) {
-                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
-                }
-            } else if (StringUtils.isNotEmpty(userName)) {
-                if (StringUtils.equals(userName, user.getUsername())) {
-                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
-                }
-            } else {
-                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+            String token = key.replace(Constants.LOGIN_TOKEN_KEY, "");
+            // 如果已经过期则踢下线
+            if (StpUtil.stpLogic.getTokenActivityTimeoutByToken(token) < 0) {
+                continue;
            }
+            userOnlineDTOList.add(RedisUtils.getCacheObject(Constants.ONLINE_TOKEN_KEY + token));
        }
-        Collections.reverse(userOnlineList);
-        userOnlineList.removeAll(Collections.singleton(null));
-        return PageUtils.buildDataInfo(userOnlineList);
+        if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
+            userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
+                StringUtils.equals(ipaddr, userOnline.getIpaddr()) &&
+                    StringUtils.equals(userName, userOnline.getUserName())
+            ).collect(Collectors.toList());
+        } else if (StringUtils.isNotEmpty(ipaddr)) {
+            userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
+                    StringUtils.equals(ipaddr, userOnline.getIpaddr()))
+                .collect(Collectors.toList());
+        } else if (StringUtils.isNotEmpty(userName)) {
+            userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
+                StringUtils.equals(userName, userOnline.getUserName())
+            ).collect(Collectors.toList());
+        }
+        Collections.reverse(userOnlineDTOList);
+        userOnlineDTOList.removeAll(Collections.singleton(null));
+        List<SysUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class);
+        return TableDataInfo.build(userOnlineList);
    }

    /**
     * 强退用户
     */
    @ApiOperation("强退用户")
-    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
+    @SaCheckPermission("monitor:online:forceLogout")
    @Log(title = "在线用户", businessType = BusinessType.FORCE)
    @DeleteMapping("/{tokenId}")
-    public AjaxResult<Void> forceLogout(@PathVariable String tokenId) {
-        RedisUtils.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
-        return AjaxResult.success();
+    public R<Void> forceLogout(@PathVariable String tokenId) {
+        try {
+            StpUtil.kickoutByTokenValue(tokenId);
+        } catch (NotLoginException e) {
+        }
+        return R.ok();
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@@ -1,9 +1,11 @@
 package com.ruoyi.web.controller.system;

+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -13,8 +15,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -28,7 +28,7 @@ import java.util.List;
 */
@Validated
@Api(value = "参数配置控制器", tags = {"参数配置管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/config")
 public class SysConfigController extends BaseController {
@@ -39,15 +39,15 @@ public class SysConfigController extends BaseController {
     * 获取参数配置列表
     */
    @ApiOperation("获取参数配置列表")
-    @PreAuthorize("@ss.hasPermi('system:config:list')")
+    @SaCheckPermission("system:config:list")
    @GetMapping("/list")
-    public TableDataInfo<SysConfig> list(SysConfig config) {
-        return configService.selectPageConfigList(config);
+    public TableDataInfo<SysConfig> list(SysConfig config, PageQuery pageQuery) {
+        return configService.selectPageConfigList(config, pageQuery);
    }

    @ApiOperation("导出参数配置列表")
    @Log(title = "参数管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:config:export')")
+    @SaCheckPermission("system:config:export")
    @PostMapping("/export")
    public void export(SysConfig config, HttpServletResponse response) {
        List<SysConfig> list = configService.selectConfigList(config);
@@ -58,10 +58,10 @@ public class SysConfigController extends BaseController {
     * 根据参数编号获取详细信息
     */
    @ApiOperation("根据参数编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:config:query')")
+    @SaCheckPermission("system:config:query")
    @GetMapping(value = "/{configId}")
-    public AjaxResult<SysConfig> getInfo(@ApiParam("参数ID") @PathVariable Long configId) {
-        return AjaxResult.success(configService.selectConfigById(configId));
+    public R<SysConfig> getInfo(@ApiParam("参数ID") @PathVariable Long configId) {
+        return R.ok(configService.selectConfigById(configId));
    }

    /**
@@ -69,20 +69,20 @@ public class SysConfigController extends BaseController {
     */
    @ApiOperation("根据参数键名查询参数值")
    @GetMapping(value = "/configKey/{configKey}")
-    public AjaxResult<Void> getConfigKey(@ApiParam("参数Key") @PathVariable String configKey) {
-        return AjaxResult.success(configService.selectConfigByKey(configKey));
+    public R<Void> getConfigKey(@ApiParam("参数Key") @PathVariable String configKey) {
+        return R.ok(configService.selectConfigByKey(configKey));
    }

    /**
     * 新增参数配置
     */
    @ApiOperation("新增参数配置")
-    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    @SaCheckPermission("system:config:add")
    @Log(title = "参数管理", businessType = BusinessType.INSERT)
    @PostMapping
-    public AjaxResult<Void> add(@Validated @RequestBody SysConfig config) {
+    public R<Void> add(@Validated @RequestBody SysConfig config) {
        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
-            return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+            return R.fail("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
        }
        return toAjax(configService.insertConfig(config));
    }
@@ -91,37 +91,48 @@ public class SysConfigController extends BaseController {
     * 修改参数配置
     */
    @ApiOperation("修改参数配置")
-    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+    @SaCheckPermission("system:config:edit")
    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
    @PutMapping
-    public AjaxResult<Void> edit(@Validated @RequestBody SysConfig config) {
+    public R<Void> edit(@Validated @RequestBody SysConfig config) {
        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
-            return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+            return R.fail("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
        }
        return toAjax(configService.updateConfig(config));
    }

+    /**
+     * 根据参数键名修改参数配置
+     */
+    @ApiOperation("根据参数键名修改参数配置")
+    @SaCheckPermission("system:config:edit")
+    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateByKey")
+    public R<Void> updateByKey(@RequestBody SysConfig config) {
+        return toAjax(configService.updateConfig(config));
+    }
+
    /**
     * 删除参数配置
     */
    @ApiOperation("删除参数配置")
-    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @SaCheckPermission("system:config:remove")
    @Log(title = "参数管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{configIds}")
-    public AjaxResult<Void> remove(@ApiParam("参数ID串") @PathVariable Long[] configIds) {
+    public R<Void> remove(@ApiParam("参数ID串") @PathVariable Long[] configIds) {
        configService.deleteConfigByIds(configIds);
-        return success();
+        return R.ok();
    }

    /**
     * 刷新参数缓存
     */
    @ApiOperation("刷新参数缓存")
-    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @SaCheckPermission("system:config:remove")
    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
    @DeleteMapping("/refreshCache")
-    public AjaxResult<Void> refreshCache() {
+    public R<Void> refreshCache() {
        configService.resetConfigCache();
-        return AjaxResult.success();
+        return R.ok();
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -1,11 +1,12 @@
 package com.ruoyi.web.controller.system;

+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.ArrayUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
@@ -14,8 +15,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -30,7 +29,7 @@ import java.util.Map;
 */
@Validated
@Api(value = "部门控制器", tags = {"部门管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/dept")
 public class SysDeptController extends BaseController {
@@ -41,35 +40,35 @@ public class SysDeptController extends BaseController {
     * 获取部门列表
     */
    @ApiOperation("获取部门列表")
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @SaCheckPermission("system:dept:list")
    @GetMapping("/list")
-    public AjaxResult<List<SysDept>> list(SysDept dept) {
+    public R<List<SysDept>> list(SysDept dept) {
        List<SysDept> depts = deptService.selectDeptList(dept);
-        return AjaxResult.success(depts);
+        return R.ok(depts);
    }

    /**
     * 查询部门列表（排除节点）
     */
    @ApiOperation("查询部门列表（排除节点）")
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @SaCheckPermission("system:dept:list")
    @GetMapping("/list/exclude/{deptId}")
-    public AjaxResult<List<SysDept>> excludeChild(@ApiParam("部门ID") @PathVariable(value = "deptId", required = false) Long deptId) {
+    public R<List<SysDept>> excludeChild(@ApiParam("部门ID") @PathVariable(value = "deptId", required = false) Long deptId) {
        List<SysDept> depts = deptService.selectDeptList(new SysDept());
        depts.removeIf(d -> d.getDeptId().equals(deptId)
-                || ArrayUtil.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
-        return AjaxResult.success(depts);
+            || ArrayUtil.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
+        return R.ok(depts);
    }

    /**
     * 根据部门编号获取详细信息
     */
    @ApiOperation("根据部门编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+    @SaCheckPermission("system:dept:query")
    @GetMapping(value = "/{deptId}")
-    public AjaxResult<SysDept> getInfo(@ApiParam("部门ID") @PathVariable Long deptId) {
+    public R<SysDept> getInfo(@ApiParam("部门ID") @PathVariable Long deptId) {
        deptService.checkDeptDataScope(deptId);
-        return AjaxResult.success(deptService.selectDeptById(deptId));
+        return R.ok(deptService.selectDeptById(deptId));
    }

    /**
@@ -77,9 +76,9 @@ public class SysDeptController extends BaseController {
     */
    @ApiOperation("获取部门下拉树列表")
    @GetMapping("/treeselect")
-    public AjaxResult<List<Tree<Long>>> treeselect(SysDept dept) {
+    public R<List<Tree<Long>>> treeselect(SysDept dept) {
        List<SysDept> depts = deptService.selectDeptList(dept);
-        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+        return R.ok(deptService.buildDeptTreeSelect(depts));
    }

    /**
@@ -87,24 +86,24 @@ public class SysDeptController extends BaseController {
     */
    @ApiOperation("加载对应角色部门列表树")
    @GetMapping(value = "/roleDeptTreeselect/{roleId}")
-    public AjaxResult<Map<String, Object>> roleDeptTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) {
+    public R<Map<String, Object>> roleDeptTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) {
        List<SysDept> depts = deptService.selectDeptList(new SysDept());
        Map<String, Object> ajax = new HashMap<>();
        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
        ajax.put("depts", deptService.buildDeptTreeSelect(depts));
-        return AjaxResult.success(ajax);
+        return R.ok(ajax);
    }

    /**
     * 新增部门
     */
    @ApiOperation("新增部门")
-    @PreAuthorize("@ss.hasPermi('system:dept:add')")
+    @SaCheckPermission("system:dept:add")
    @Log(title = "部门管理", businessType = BusinessType.INSERT)
    @PostMapping
-    public AjaxResult<Void> add(@Validated @RequestBody SysDept dept) {
+    public R<Void> add(@Validated @RequestBody SysDept dept) {
        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
-            return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+            return R.fail("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
        }
        return toAjax(deptService.insertDept(dept));
    }
@@ -113,17 +112,19 @@ public class SysDeptController extends BaseController {
     * 修改部门
     */
    @ApiOperation("修改部门")
-    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+    @SaCheckPermission("system:dept:edit")
    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
    @PutMapping
-    public AjaxResult<Void> edit(@Validated @RequestBody SysDept dept) {
+    public R<Void> edit(@Validated @RequestBody SysDept dept) {
+        Long deptId = dept.getDeptId();
+        deptService.checkDeptDataScope(deptId);
        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
-            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        } else if (dept.getParentId().equals(dept.getDeptId())) {
-            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+            return R.fail("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        } else if (dept.getParentId().equals(deptId)) {
+            return R.fail("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
        } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) {
-            return AjaxResult.error("该部门包含未停用的子部门！");
+            && deptService.selectNormalChildrenDeptById(deptId) > 0) {
+            return R.fail("该部门包含未停用的子部门！");
        }
        return toAjax(deptService.updateDept(dept));
    }
@@ -132,16 +133,17 @@ public class SysDeptController extends BaseController {
     * 删除部门
     */
    @ApiOperation("删除部门")
-    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+    @SaCheckPermission("system:dept:remove")
    @Log(title = "部门管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{deptId}")
-    public AjaxResult<Void> remove(@ApiParam("部门ID串") @PathVariable Long deptId) {
+    public R<Void> remove(@ApiParam("部门ID串") @PathVariable Long deptId) {
        if (deptService.hasChildByDeptId(deptId)) {
-            return AjaxResult.error("存在下级部门,不允许删除");
+            return R.fail("存在下级部门,不允许删除");
        }
        if (deptService.checkDeptExistUser(deptId)) {
-            return AjaxResult.error("部门存在用户,不允许删除");
+            return R.fail("部门存在用户,不允许删除");
        }
+        deptService.checkDeptDataScope(deptId);
        return toAjax(deptService.deleteDeptById(deptId));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -1,12 +1,14 @@
 package com.ruoyi.web.controller.system;

+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysDictTypeService;
@@ -14,8 +16,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -30,7 +30,7 @@ import java.util.List;
 */
@Validated
@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/dict/data")
 public class SysDictDataController extends BaseController {
@@ -39,15 +39,15 @@ public class SysDictDataController extends BaseController {
    private final ISysDictTypeService dictTypeService;

    @ApiOperation("查询字典数据列表")
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @SaCheckPermission("system:dict:list")
    @GetMapping("/list")
-    public TableDataInfo<SysDictData> list(SysDictData dictData) {
-        return dictDataService.selectPageDictDataList(dictData);
+    public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) {
+        return dictDataService.selectPageDictDataList(dictData, pageQuery);
    }

    @ApiOperation("导出字典数据列表")
    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @SaCheckPermission("system:dict:export")
    @PostMapping("/export")
    public void export(SysDictData dictData, HttpServletResponse response) {
        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
@@ -58,10 +58,10 @@ public class SysDictDataController extends BaseController {
     * 查询字典数据详细
     */
    @ApiOperation("查询字典数据详细")
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @SaCheckPermission("system:dict:query")
    @GetMapping(value = "/{dictCode}")
-    public AjaxResult<SysDictData> getInfo(@ApiParam("字典code") @PathVariable Long dictCode) {
-        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
+    public R<SysDictData> getInfo(@ApiParam("字典code") @PathVariable Long dictCode) {
+        return R.ok(dictDataService.selectDictDataById(dictCode));
    }

    /**
@@ -69,22 +69,22 @@ public class SysDictDataController extends BaseController {
     */
    @ApiOperation("根据字典类型查询字典数据信息")
    @GetMapping(value = "/type/{dictType}")
-    public AjaxResult<List<SysDictData>> dictType(@ApiParam("字典类型") @PathVariable String dictType) {
+    public R<List<SysDictData>> dictType(@ApiParam("字典类型") @PathVariable String dictType) {
        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
-        if (StringUtils.isNull(data)) {
+        if (ObjectUtil.isNull(data)) {
            data = new ArrayList<>();
        }
-        return AjaxResult.success(data);
+        return R.ok(data);
    }

    /**
     * 新增字典类型
     */
    @ApiOperation("新增字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @SaCheckPermission("system:dict:add")
    @Log(title = "字典数据", businessType = BusinessType.INSERT)
    @PostMapping
-    public AjaxResult<Void> add(@Validated @RequestBody SysDictData dict) {
+    public R<Void> add(@Validated @RequestBody SysDictData dict) {
        return toAjax(dictDataService.insertDictData(dict));
    }

@@ -92,10 +92,10 @@ public class SysDictDataController extends BaseController {
     * 修改保存字典类型
     */
    @ApiOperation("修改保存字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @SaCheckPermission("system:dict:edit")
    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
    @PutMapping
-    public AjaxResult<Void> edit(@Validated @RequestBody SysDictData dict) {
+    public R<Void> edit(@Validated @RequestBody SysDictData dict) {
        return toAjax(dictDataService.updateDictData(dict));
    }

@@ -103,11 +103,11 @@ public class SysDictDataController extends BaseController {
     * 删除字典类型
     */
    @ApiOperation("删除字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @SaCheckPermission("system:dict:remove")
    @Log(title = "字典类型", businessType = BusinessType.DELETE)
    @DeleteMapping("/{dictCodes}")
-    public AjaxResult<Void> remove(@ApiParam("字典code串") @PathVariable Long[] dictCodes) {
+    public R<Void> remove(@ApiParam("字典code串") @PathVariable Long[] dictCodes) {
        dictDataService.deleteDictDataByIds(dictCodes);
-        return success();
+        return R.ok();
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
@@ -1,9 +1,11 @@
 package com.ruoyi.web.controller.system;

+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysDictType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
@@ -13,8 +15,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -28,7 +28,7 @@ import java.util.List;
 */
@Validated
@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/dict/type")
 public class SysDictTypeController extends BaseController {
@@ -36,15 +36,15 @@ public class SysDictTypeController extends BaseController {
    private final ISysDictTypeService dictTypeService;

    @ApiOperation("查询字典类型列表")
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @SaCheckPermission("system:dict:list")
    @GetMapping("/list")
-    public TableDataInfo<SysDictType> list(SysDictType dictType) {
-        return dictTypeService.selectPageDictTypeList(dictType);
+    public TableDataInfo<SysDictType> list(SysDictType dictType, PageQuery pageQuery) {
+        return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
    }

    @ApiOperation("导出字典类型列表")
    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @SaCheckPermission("system:dict:export")
    @PostMapping("/export")
    public void export(SysDictType dictType, HttpServletResponse response) {
        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
@@ -55,22 +55,22 @@ public class SysDictTypeController extends BaseController {
     * 查询字典类型详细
     */
    @ApiOperation("查询字典类型详细")
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @SaCheckPermission("system:dict:query")
    @GetMapping(value = "/{dictId}")
-    public AjaxResult<SysDictType> getInfo(@ApiParam("字典ID") @PathVariable Long dictId) {
-        return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
+    public R<SysDictType> getInfo(@ApiParam("字典ID") @PathVariable Long dictId) {
+        return R.ok(dictTypeService.selectDictTypeById(dictId));
    }

    /**
     * 新增字典类型
     */
    @ApiOperation("新增字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @SaCheckPermission("system:dict:add")
    @Log(title = "字典类型", businessType = BusinessType.INSERT)
    @PostMapping
-    public AjaxResult<Void> add(@Validated @RequestBody SysDictType dict) {
+    public R<Void> add(@Validated @RequestBody SysDictType dict) {
        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-            return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+            return R.fail("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
        }
        return toAjax(dictTypeService.insertDictType(dict));
    }
@@ -79,12 +79,12 @@ public class SysDictTypeController extends BaseController {
     * 修改字典类型
     */
    @ApiOperation("修改字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @SaCheckPermission("system:dict:edit")
    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
    @PutMapping
-    public AjaxResult<Void> edit(@Validated @RequestBody SysDictType dict) {
+    public R<Void> edit(@Validated @RequestBody SysDictType dict) {
        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-            return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+            return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
        }
        return toAjax(dictTypeService.updateDictType(dict));
    }
@@ -93,24 +93,24 @@ public class SysDictTypeController extends BaseController {
     * 删除字典类型
     */
    @ApiOperation("删除字典类型")
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @SaCheckPermission("system:dict:remove")
    @Log(title = "字典类型", businessType = BusinessType.DELETE)
    @DeleteMapping("/{dictIds}")
-    public AjaxResult<Void> remove(@ApiParam("字典ID串") @PathVariable Long[] dictIds) {
+    public R<Void> remove(@ApiParam("字典ID串") @PathVariable Long[] dictIds) {
        dictTypeService.deleteDictTypeByIds(dictIds);
-        return success();
+        return R.ok();
    }

    /**
     * 刷新字典缓存
     */
    @ApiOperation("刷新字典缓存")
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @SaCheckPermission("system:dict:remove")
    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
    @DeleteMapping("/refreshCache")
-    public AjaxResult<Void> refreshCache() {
+    public R<Void> refreshCache() {
        dictTypeService.resetDictCache();
-        return AjaxResult.success();
+        return R.ok();
    }

    /**
@@ -118,8 +118,8 @@ public class SysDictTypeController extends BaseController {
     */
    @ApiOperation("获取字典选择框列表")
    @GetMapping("/optionselect")
-    public AjaxResult<List<SysDictType>> optionselect() {
+    public R<List<SysDictType>> optionselect() {
        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
-        return AjaxResult.success(dictTypes);
+        return R.ok(dictTypes);
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
@@ -5,7 +5,6 @@ import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

@@ -15,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 * @author Lion Li
 */
@Api(value = "首页控制器", tags = {"首页管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
 public class SysIndexController {

--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,11 +1,13 @@
 package com.ruoyi.web.controller.system;

+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.system.domain.vo.RouterVo;
 import com.ruoyi.system.service.ISysMenuService;
 import com.ruoyi.system.service.ISysUserService;
@@ -14,7 +16,6 @@ import com.ruoyi.system.service.SysPermissionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,7 +34,7 @@ import java.util.Set;
 */
@Validated
@Api(value = "登录验证控制器", tags = {"登录验证管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
 public class SysLoginController {

@@ -50,13 +51,24 @@ public class SysLoginController {
     */
    @ApiOperation("登录方法")
    @PostMapping("/login")
-    public AjaxResult<Map<String, Object>> login(@RequestBody LoginBody loginBody) {
+    public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) {
        Map<String, Object> ajax = new HashMap<>();
        // 生成令牌
        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-                loginBody.getUuid());
+            loginBody.getUuid());
        ajax.put(Constants.TOKEN, token);
-        return AjaxResult.success(ajax);
+        return R.ok(ajax);
+    }
+
+    @ApiOperation("登出方法")
+    @PostMapping("/logout")
+    public R<Void> logout() {
+        try {
+            StpUtil.logout();
+            loginService.logout(LoginHelper.getUsername());
+        } catch (NotLoginException e) {
+        }
+        return R.ok("退出成功");
    }

    /**
@@ -66,8 +78,8 @@ public class SysLoginController {
     */
    @ApiOperation("获取用户信息")
    @GetMapping("getInfo")
-    public AjaxResult<Map<String, Object>> getInfo() {
-        SysUser user = userService.selectUserById(SecurityUtils.getUserId());
+    public R<Map<String, Object>> getInfo() {
+        SysUser user = userService.selectUserById(LoginHelper.getUserId());
        // 角色集合
        Set<String> roles = permissionService.getRolePermission(user);
        // 权限集合
@@ -76,7 +88,7 @@ public class SysLoginController {
        ajax.put("user", user);
        ajax.put("roles", roles);
        ajax.put("permissions", permissions);
-        return AjaxResult.success(ajax);
+        return R.ok(ajax);
    }

    /**
@@ -86,9 +98,9 @@ public class SysLoginController {
     */
    @ApiOperation("获取路由信息")
    @GetMapping("getRouters")
-    public AjaxResult<List<RouterVo>> getRouters() {
-        Long userId = SecurityUtils.getUserId();
+    public R<List<RouterVo>> getRouters() {
+        Long userId = LoginHelper.getUserId();
        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
-        return AjaxResult.success(menuService.buildMenus(menus));
+        return R.ok(menuService.buildMenus(menus));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -1,10 +1,11 @@
 package com.ruoyi.web.controller.system;

+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.tree.Tree;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
@@ -13,8 +14,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -29,7 +28,7 @@ import java.util.Map;
 */
@Validated
@Api(value = "菜单信息控制器", tags = {"菜单信息管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/menu")
 public class SysMenuController extends BaseController {
@@ -40,21 +39,21 @@ public class SysMenuController extends BaseController {
     * 获取菜单列表
     */
    @ApiOperation("获取菜单列表")
-    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    @SaCheckPermission("system:menu:list")
    @GetMapping("/list")
-    public AjaxResult<List<SysMenu>> list(SysMenu menu) {
+    public R<List<SysMenu>> list(SysMenu menu) {
        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
-        return AjaxResult.success(menus);
+        return R.ok(menus);
    }

    /**
     * 根据菜单编号获取详细信息
     */
    @ApiOperation("根据菜单编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:menu:query')")
+    @SaCheckPermission("system:menu:query")
    @GetMapping(value = "/{menuId}")
-    public AjaxResult<SysMenu> getInfo(@ApiParam("菜单ID") @PathVariable Long menuId) {
-        return AjaxResult.success(menuService.selectMenuById(menuId));
+    public R<SysMenu> getInfo(@ApiParam("菜单ID") @PathVariable Long menuId) {
+        return R.ok(menuService.selectMenuById(menuId));
    }

    /**
@@ -62,9 +61,9 @@ public class SysMenuController extends BaseController {
     */
    @ApiOperation("获取菜单下拉树列表")
    @GetMapping("/treeselect")
-    public AjaxResult<List<Tree<Long>>> treeselect(SysMenu menu) {
+    public R<List<Tree<Long>>> treeselect(SysMenu menu) {
        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
-        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
+        return R.ok(menuService.buildMenuTreeSelect(menus));
    }

    /**
@@ -72,26 +71,26 @@ public class SysMenuController extends BaseController {
     */
    @ApiOperation("加载对应角色菜单列表树")
    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
-    public AjaxResult<Map<String, Object>> roleMenuTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) {
+    public R<Map<String, Object>> roleMenuTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) {
        List<SysMenu> menus = menuService.selectMenuList(getUserId());
        Map<String, Object> ajax = new HashMap<>();
        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
-        return AjaxResult.success(ajax);
+        return R.ok(ajax);
    }

    /**
     * 新增菜单
     */
    @ApiOperation("新增菜单")
-    @PreAuthorize("@ss.hasPermi('system:menu:add')")
+    @SaCheckPermission("system:menu:add")
    @Log(title = "菜单管理", businessType = BusinessType.INSERT)
    @PostMapping
-    public AjaxResult<Void> add(@Validated @RequestBody SysMenu menu) {
+    public R<Void> add(@Validated @RequestBody SysMenu menu) {
        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+            return R.fail("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+            return R.fail("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
        }
        return toAjax(menuService.insertMenu(menu));
    }
@@ -100,16 +99,16 @@ public class SysMenuController extends BaseController {
     * 修改菜单
     */
    @ApiOperation("修改菜单")
-    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+    @SaCheckPermission("system:menu:edit")
    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
    @PutMapping
-    public AjaxResult<Void> edit(@Validated @RequestBody SysMenu menu) {
+    public R<Void> edit(@Validated @RequestBody SysMenu menu) {
        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+            return R.fail("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+            return R.fail("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
        } else if (menu.getMenuId().equals(menu.getParentId())) {
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+            return R.fail("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
        }
        return toAjax(menuService.updateMenu(menu));
    }
@@ -118,15 +117,15 @@ public class SysMenuController extends BaseController {
     * 删除菜单
     */
    @ApiOperation("删除菜单")
-    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+    @SaCheckPermission("system:menu:remove")
    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{menuId}")
-    public AjaxResult<Void> remove(@ApiParam("菜单ID") @PathVariable("menuId") Long menuId) {
+    public R<Void> remove(@ApiParam("菜单ID") @PathVariable("menuId") Long menuId) {
        if (menuService.hasChildByMenuId(menuId)) {
-            return AjaxResult.error("存在子菜单,不允许删除");
+            return R.fail("存在子菜单,不允许删除");
        }
        if (menuService.checkMenuExistRole(menuId)) {
-            return AjaxResult.error("菜单已分配,不允许删除");
+            return R.fail("菜单已分配,不允许删除");
        }
        return toAjax(menuService.deleteMenuById(menuId));
    }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
@@ -1,8 +1,10 @@
 package com.ruoyi.web.controller.system;

+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.SysNotice;
@@ -11,8 +13,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
 */
@Validated
@Api(value = "公告信息控制器", tags = {"公告信息管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/notice")
 public class SysNoticeController extends BaseController {
@@ -34,30 +34,30 @@ public class SysNoticeController extends BaseController {
     * 获取通知公告列表
     */
    @ApiOperation("获取通知公告列表")
-    @PreAuthorize("@ss.hasPermi('system:notice:list')")
+    @SaCheckPermission("system:notice:list")
    @GetMapping("/list")
-    public TableDataInfo<SysNotice> list(SysNotice notice) {
-        return noticeService.selectPageNoticeList(notice);
+    public TableDataInfo<SysNotice> list(SysNotice notice, PageQuery pageQuery) {
+        return noticeService.selectPageNoticeList(notice, pageQuery);
    }

    /**
     * 根据通知公告编号获取详细信息
     */
    @ApiOperation("根据通知公告编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:notice:query')")
+    @SaCheckPermission("system:notice:query")
    @GetMapping(value = "/{noticeId}")
-    public AjaxResult<SysNotice> getInfo(@ApiParam("公告ID") @PathVariable Long noticeId) {
-        return AjaxResult.success(noticeService.selectNoticeById(noticeId));
+    public R<SysNotice> getInfo(@ApiParam("公告ID") @PathVariable Long noticeId) {
+        return R.ok(noticeService.selectNoticeById(noticeId));
    }

    /**
     * 新增通知公告
     */
    @ApiOperation("新增通知公告")
-    @PreAuthorize("@ss.hasPermi('system:notice:add')")
+    @SaCheckPermission("system:notice:add")
    @Log(title = "通知公告", businessType = BusinessType.INSERT)
    @PostMapping
-    public AjaxResult<Void> add(@Validated @RequestBody SysNotice notice) {
+    public R<Void> add(@Validated @RequestBody SysNotice notice) {
        return toAjax(noticeService.insertNotice(notice));
    }

@@ -65,10 +65,10 @@ public class SysNoticeController extends BaseController {
     * 修改通知公告
     */
    @ApiOperation("修改通知公告")
-    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+    @SaCheckPermission("system:notice:edit")
    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
    @PutMapping
-    public AjaxResult<Void> edit(@Validated @RequestBody SysNotice notice) {
+    public R<Void> edit(@Validated @RequestBody SysNotice notice) {
        return toAjax(noticeService.updateNotice(notice));
    }

@@ -76,10 +76,10 @@ public class SysNoticeController extends BaseController {
     * 删除通知公告
     */
    @ApiOperation("删除通知公告")
-    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+    @SaCheckPermission("system:notice:remove")
    @Log(title = "通知公告", businessType = BusinessType.DELETE)
    @DeleteMapping("/{noticeIds}")
-    public AjaxResult<Void> remove(@ApiParam("公告ID串") @PathVariable Long[] noticeIds) {
+    public R<Void> remove(@ApiParam("公告ID串") @PathVariable Long[] noticeIds) {
        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
@@ -1,9 +1,11 @@
 package com.ruoyi.web.controller.system;

+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
@@ -16,8 +18,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -34,7 +34,7 @@ import java.util.Arrays;
 */
@Validated
@Api(value = "对象存储配置控制器", tags = {"对象存储配置管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/oss/config")
 public class SysOssConfigController extends BaseController {
@@ -45,33 +45,33 @@ public class SysOssConfigController extends BaseController {
     * 查询对象存储配置列表
     */
    @ApiOperation("查询对象存储配置列表")
-    @PreAuthorize("@ss.hasPermi('system:oss:list')")
+    @SaCheckPermission("system:oss:list")
    @GetMapping("/list")
-    public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo) {
-        return iSysOssConfigService.queryPageList(bo);
+    public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
+        return iSysOssConfigService.queryPageList(bo, pageQuery);
    }

    /**
     * 获取对象存储配置详细信息
     */
    @ApiOperation("获取对象存储配置详细信息")
-    @PreAuthorize("@ss.hasPermi('system:oss:query')")
+    @SaCheckPermission("system:oss:query")
    @GetMapping("/{ossConfigId}")
-    public AjaxResult<SysOssConfigVo> getInfo(@ApiParam("OSS配置ID")
+    public R<SysOssConfigVo> getInfo(@ApiParam("OSS配置ID")
                                              @NotNull(message = "主键不能为空")
                                              @PathVariable("ossConfigId") Integer ossConfigId) {
-        return AjaxResult.success(iSysOssConfigService.queryById(ossConfigId));
+        return R.ok(iSysOssConfigService.queryById(ossConfigId));
    }

    /**
     * 新增对象存储配置
     */
    @ApiOperation("新增对象存储配置")
-    @PreAuthorize("@ss.hasPermi('system:oss:add')")
+    @SaCheckPermission("system:oss:add")
    @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
-    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
        return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
    }

@@ -79,11 +79,11 @@ public class SysOssConfigController extends BaseController {
     * 修改对象存储配置
     */
    @ApiOperation("修改对象存储配置")
-    @PreAuthorize("@ss.hasPermi('system:oss:edit')")
+    @SaCheckPermission("system:oss:edit")
    @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
-    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
        return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
    }

@@ -91,10 +91,10 @@ public class SysOssConfigController extends BaseController {
     * 删除对象存储配置
     */
    @ApiOperation("删除对象存储配置")
-    @PreAuthorize("@ss.hasPermi('system:oss:remove')")
+    @SaCheckPermission("system:oss:remove")
    @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ossConfigIds}")
-    public AjaxResult<Void> remove(@ApiParam("OSS配置ID串")
+    public R<Void> remove(@ApiParam("OSS配置ID串")
                                   @NotEmpty(message = "主键不能为空")
                                   @PathVariable Long[] ossConfigIds) {
        return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
@@ -104,10 +104,10 @@ public class SysOssConfigController extends BaseController {
     * 状态修改
     */
    @ApiOperation("状态修改")
-    @PreAuthorize("@ss.hasPermi('system:oss:edit')")
+    @SaCheckPermission("system:oss:edit")
    @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
    @PutMapping("/changeStatus")
-    public AjaxResult<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
+    public R<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
        return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
@@ -1,23 +1,20 @@
 package com.ruoyi.web.controller.system;


+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpException;
 import cn.hutool.http.HttpUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.oss.constant.OssConstant;
-import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.domain.bo.SysOssBo;
 import com.ruoyi.system.domain.vo.SysOssVo;
@@ -25,9 +22,7 @@ import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysOssService;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -46,8 +41,8 @@ import java.util.Map;
 * @author Lion Li
 */
@Validated
-@Api(value = "OSS对象存储控制器", tags = {"OSS对象存储管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@Api(value = "对象存储控制器", tags = {"对象存储管理"})
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/oss")
 public class SysOssController extends BaseController {
@@ -59,10 +54,10 @@ public class SysOssController extends BaseController {
     * 查询OSS对象存储列表
     */
    @ApiOperation("查询OSS对象存储列表")
-    @PreAuthorize("@ss.hasPermi('system:oss:list')")
+    @SaCheckPermission("system:oss:list")
    @GetMapping("/list")
-    public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo) {
-        return iSysOssService.queryPageList(bo);
+    public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
+        return iSysOssService.queryPageList(bo, pageQuery);
    }

    /**
@@ -70,13 +65,12 @@ public class SysOssController extends BaseController {
     */
    @ApiOperation("上传OSS对象存储")
    @ApiImplicitParams({
-        @ApiImplicitParam(name = "file", value = "文件", dataTypeClass = File.class, required = true),
+        @ApiImplicitParam(name = "file", value = "文件", paramType = "query", dataTypeClass = File.class, required = true)
    })
-    @PreAuthorize("@ss.hasPermi('system:oss:upload')")
+    @SaCheckPermission("system:oss:upload")
    @Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
-    @RepeatSubmit
    @PostMapping("/upload")
-    public AjaxResult<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
+    public R<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
        if (ObjectUtil.isNull(file)) {
            throw new ServiceException("上传文件不能为空");
        }
@@ -84,11 +78,11 @@ public class SysOssController extends BaseController {
        Map<String, String> map = new HashMap<>(2);
        map.put("url", oss.getUrl());
        map.put("fileName", oss.getFileName());
-        return AjaxResult.success(map);
+        return R.ok(map);
    }

    @ApiOperation("下载OSS对象存储")
-    @PreAuthorize("@ss.hasPermi('system:oss:download')")
+    @SaCheckPermission("system:oss:download")
    @GetMapping("/download/{ossId}")
    public void download(@ApiParam("OSS对象ID") @PathVariable Long ossId, HttpServletResponse response) throws IOException {
        SysOss sysOss = iSysOssService.getById(ossId);
@@ -115,28 +109,13 @@ public class SysOssController extends BaseController {
     * 删除OSS对象存储
     */
    @ApiOperation("删除OSS对象存储")
-    @PreAuthorize("@ss.hasPermi('system:oss:remove')")
+    @SaCheckPermission("system:oss:remove")
    @Log(title = "OSS对象存储", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ossIds}")
-    public AjaxResult<Void> remove(@ApiParam("OSS对象ID串")
+    public R<Void> remove(@ApiParam("OSS对象ID串")
                                   @NotEmpty(message = "主键不能为空")
                                   @PathVariable Long[] ossIds) {
        return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
    }

-    /**
-     * 变更图片列表预览状态
-     */
-    @ApiOperation("变更图片列表预览状态")
-    @PreAuthorize("@ss.hasPermi('system:oss:edit')")
-    @Log(title = "OSS对象存储", businessType = BusinessType.UPDATE)
-    @PutMapping("/changePreviewListResource")
-    public AjaxResult<Void> changePreviewListResource(@RequestBody String body) {
-        Map<String, Boolean> map = JsonUtils.parseMap(body);
-        SysConfig config = iSysConfigService.getOne(new LambdaQueryWrapper<SysConfig>()
-            .eq(SysConfig::getConfigKey, OssConstant.PEREVIEW_LIST_RESOURCE_KEY));
-        config.setConfigValue(map.get("previewListResource").toString());
-        return toAjax(iSysConfigService.updateConfig(config));
-    }
-
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
@@ -1,9 +1,11 @@
 package com.ruoyi.web.controller.system;

+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -13,8 +15,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -28,7 +28,7 @@ import java.util.List;
 */
@Validated
@Api(value = "岗位信息控制器", tags = {"岗位信息管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/post")
 public class SysPostController extends BaseController {
@@ -39,15 +39,15 @@ public class SysPostController extends BaseController {
     * 获取岗位列表
     */
    @ApiOperation("获取岗位列表")
-    @PreAuthorize("@ss.hasPermi('system:post:list')")
+    @SaCheckPermission("system:post:list")
    @GetMapping("/list")
-    public TableDataInfo<SysPost> list(SysPost post) {
-        return postService.selectPagePostList(post);
+    public TableDataInfo<SysPost> list(SysPost post, PageQuery pageQuery) {
+        return postService.selectPagePostList(post, pageQuery);
    }

    @ApiOperation("导出岗位列表")
    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:post:export')")
+    @SaCheckPermission("system:post:export")
    @PostMapping("/export")
    public void export(SysPost post, HttpServletResponse response) {
        List<SysPost> list = postService.selectPostList(post);
@@ -58,24 +58,24 @@ public class SysPostController extends BaseController {
     * 根据岗位编号获取详细信息
     */
    @ApiOperation("根据岗位编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:post:query')")
+    @SaCheckPermission("system:post:query")
    @GetMapping(value = "/{postId}")
-    public AjaxResult<SysPost> getInfo(@ApiParam("岗位ID") @PathVariable Long postId) {
-        return AjaxResult.success(postService.selectPostById(postId));
+    public R<SysPost> getInfo(@ApiParam("岗位ID") @PathVariable Long postId) {
+        return R.ok(postService.selectPostById(postId));
    }

    /**
     * 新增岗位
     */
    @ApiOperation("新增岗位")
-    @PreAuthorize("@ss.hasPermi('system:post:add')")
+    @SaCheckPermission("system:post:add")
    @Log(title = "岗位管理", businessType = BusinessType.INSERT)
    @PostMapping
-    public AjaxResult<Void> add(@Validated @RequestBody SysPost post) {
+    public R<Void> add(@Validated @RequestBody SysPost post) {
        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
-            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+            return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
        } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
-            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+            return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
        }
        return toAjax(postService.insertPost(post));
    }
@@ -84,14 +84,14 @@ public class SysPostController extends BaseController {
     * 修改岗位
     */
    @ApiOperation("修改岗位")
-    @PreAuthorize("@ss.hasPermi('system:post:edit')")
+    @SaCheckPermission("system:post:edit")
    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
    @PutMapping
-    public AjaxResult<Void> edit(@Validated @RequestBody SysPost post) {
+    public R<Void> edit(@Validated @RequestBody SysPost post) {
        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
-            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+            return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
        } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
-            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+            return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
        }
        return toAjax(postService.updatePost(post));
    }
@@ -100,10 +100,10 @@ public class SysPostController extends BaseController {
     * 删除岗位
     */
    @ApiOperation("删除岗位")
-    @PreAuthorize("@ss.hasPermi('system:post:remove')")
+    @SaCheckPermission("system:post:remove")
    @Log(title = "岗位管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{postIds}")
-    public AjaxResult<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] postIds) {
+    public R<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] postIds) {
        return toAjax(postService.deletePostByIds(postIds));
    }

@@ -112,8 +112,8 @@ public class SysPostController extends BaseController {
     */
    @ApiOperation("获取岗位选择框列表")
    @GetMapping("/optionselect")
-    public AjaxResult<List<SysPost>> optionselect() {
+    public R<List<SysPost>> optionselect() {
        List<SysPost> posts = postService.selectPostAll();
-        return AjaxResult.success(posts);
+        return R.ok(posts);
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -1,21 +1,22 @@
 package com.ruoyi.web.controller.system;

+import cn.dev33.satoken.secure.BCrypt;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.service.TokenService;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.service.ISysOssService;
 import com.ruoyi.system.service.ISysUserService;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -31,13 +32,12 @@ import java.util.Map;
 */
@Validated
@Api(value = "个人信息控制器", tags = {"个人信息管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/user/profile")
 public class SysProfileController extends BaseController {

    private final ISysUserService userService;
-    private final TokenService tokenService;
    private final ISysOssService iSysOssService;

    /**
@@ -45,14 +45,13 @@ public class SysProfileController extends BaseController {
     */
    @ApiOperation("个人信息")
    @GetMapping
-    public AjaxResult<Map<String, Object>> profile() {
-        LoginUser loginUser = getLoginUser();
-        SysUser user = userService.selectUserById(loginUser.getUserId());
+    public R<Map<String, Object>> profile() {
+        SysUser user = userService.selectUserById(getUserId());
        Map<String, Object> ajax = new HashMap<>();
        ajax.put("user", user);
-        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
-        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
-        return AjaxResult.success(ajax);
+        ajax.put("roleGroup", userService.selectUserRoleGroup(user.getUserName()));
+        ajax.put("postGroup", userService.selectUserPostGroup(user.getUserName()));
+        return R.ok(ajax);
    }

    /**
@@ -61,24 +60,22 @@ public class SysProfileController extends BaseController {
    @ApiOperation("修改用户")
    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
    @PutMapping
-    public AjaxResult<Void> updateProfile(@RequestBody SysUser user) {
+    public R<Void> updateProfile(@RequestBody SysUser user) {
        if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+            && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+            return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
        }
        if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+            return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
        }
-        LoginUser loginUser = getLoginUser();
-        SysUser sysUser = userService.selectUserById(loginUser.getUserId());
-        user.setUserId(sysUser.getUserId());
+        user.setUserId(getUserId());
        user.setUserName(null);
        user.setPassword(null);
        if (userService.updateUserProfile(user) > 0) {
-            return AjaxResult.success();
+            return R.ok();
        }
-        return AjaxResult.error("修改个人信息异常，请联系管理员");
+        return R.fail("修改个人信息异常，请联系管理员");
    }

    /**
@@ -91,23 +88,21 @@ public class SysProfileController extends BaseController {
    })
    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
    @PutMapping("/updatePwd")
-    public AjaxResult<Void> updatePwd(String oldPassword, String newPassword) {
-        LoginUser loginUser = getLoginUser();
-        String userName = loginUser.getUsername();
-        String password = loginUser.getPassword();
-        if (!SecurityUtils.matchesPassword(oldPassword, password)) {
-            return AjaxResult.error("修改密码失败，旧密码错误");
+    public R<Void> updatePwd(String oldPassword, String newPassword) {
+        SysUser user = userService.selectUserById(LoginHelper.getUserId());
+        String userName = user.getUserName();
+        String password = user.getPassword();
+        if (!BCrypt.checkpw(oldPassword, password)) {
+            return R.fail("修改密码失败，旧密码错误");
        }
-        if (SecurityUtils.matchesPassword(newPassword, password)) {
-            return AjaxResult.error("新密码不能与旧密码相同");
+        if (BCrypt.checkpw(newPassword, password)) {
+            return R.fail("新密码不能与旧密码相同");
        }
-        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {
-            // 更新缓存用户密码
-            loginUser.setPassword(SecurityUtils.encryptPassword(newPassword));
-            tokenService.setLoginUser(loginUser);
-            return AjaxResult.success();
+
+        if (userService.resetUserPwd(userName, BCrypt.hashpw(newPassword)) > 0) {
+            return R.ok();
        }
-        return AjaxResult.error("修改密码异常，请联系管理员");
+        return R.fail("修改密码异常，请联系管理员");
    }

    /**
@@ -115,21 +110,20 @@ public class SysProfileController extends BaseController {
     */
    @ApiOperation("头像上传")
    @ApiImplicitParams({
-        @ApiImplicitParam(name = "avatarfile", value = "用户头像", dataTypeClass = File.class, required = true),
+        @ApiImplicitParam(name = "avatarfile", value = "用户头像", paramType = "query", dataTypeClass = File.class, required = true)
    })
    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
    @PostMapping("/avatar")
-    public AjaxResult<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) {
+    public R<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) {
        Map<String, Object> ajax = new HashMap<>();
        if (!file.isEmpty()) {
-            LoginUser loginUser = getLoginUser();
            SysOss oss = iSysOssService.upload(file);
            String avatar = oss.getUrl();
-            if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) {
+            if (userService.updateUserAvatar(getUsername(), avatar)) {
                ajax.put("imgUrl", avatar);
-                return AjaxResult.success(ajax);
+                return R.ok(ajax);
            }
        }
-        return AjaxResult.error("上传图片异常，请联系管理员", ajax);
+        return R.fail("上传图片异常，请联系管理员");
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
@@ -1,15 +1,13 @@
 package com.ruoyi.web.controller.system;

 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.model.RegisterBody;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.SysRegisterService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@Validated
@Api(value = "注册验证控制器", tags = {"注册验证管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
 public class SysRegisterController extends BaseController {

@@ -31,11 +29,11 @@ public class SysRegisterController extends BaseController {

    @ApiOperation("用户注册")
    @PostMapping("/register")
-    public AjaxResult<Void> register(@RequestBody RegisterBody user) {
+    public R<Void> register(@Validated @RequestBody RegisterBody user) {
        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
-            return error("当前系统没有开启注册功能！");
+            return R.fail("当前系统没有开启注册功能！");
        }
-        String msg = registerService.register(user);
-        return StringUtils.isEmpty(msg) ? success() : error(msg);
+        registerService.register(user);
+        return R.ok();
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -1,16 +1,18 @@
 package com.ruoyi.web.controller.system;

+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.service.TokenService;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.service.ISysRoleService;
@@ -18,8 +20,6 @@ import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.SysPermissionService;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -33,26 +33,25 @@ import java.util.List;
 */
@Validated
@Api(value = "角色信息控制器", tags = {"角色信息管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/role")
 public class SysRoleController extends BaseController {

    private final ISysRoleService roleService;
-    private final TokenService tokenService;
    private final ISysUserService userService;
    private final SysPermissionService permissionService;

    @ApiOperation("查询角色信息列表")
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @SaCheckPermission("system:role:list")
    @GetMapping("/list")
-    public TableDataInfo<SysRole> list(SysRole role) {
-        return roleService.selectPageRoleList(role);
+    public TableDataInfo<SysRole> list(SysRole role, PageQuery pageQuery) {
+        return roleService.selectPageRoleList(role, pageQuery);
    }

    @ApiOperation("导出角色信息列表")
    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:role:export')")
+    @SaCheckPermission("system:role:export")
    @PostMapping("/export")
    public void export(SysRole role, HttpServletResponse response) {
        List<SysRole> list = roleService.selectRoleList(role);
@@ -63,25 +62,25 @@ public class SysRoleController extends BaseController {
     * 根据角色编号获取详细信息
     */
    @ApiOperation("根据角色编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @SaCheckPermission("system:role:query")
    @GetMapping(value = "/{roleId}")
-    public AjaxResult<SysRole> getInfo(@ApiParam("角色ID") @PathVariable Long roleId) {
+    public R<SysRole> getInfo(@ApiParam("角色ID") @PathVariable Long roleId) {
        roleService.checkRoleDataScope(roleId);
-        return AjaxResult.success(roleService.selectRoleById(roleId));
+        return R.ok(roleService.selectRoleById(roleId));
    }

    /**
     * 新增角色
     */
    @ApiOperation("新增角色")
-    @PreAuthorize("@ss.hasPermi('system:role:add')")
+    @SaCheckPermission("system:role:add")
    @Log(title = "角色管理", businessType = BusinessType.INSERT)
    @PostMapping
-    public AjaxResult<Void> add(@Validated @RequestBody SysRole role) {
+    public R<Void> add(@Validated @RequestBody SysRole role) {
        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
-            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+            return R.fail("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
        } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
-            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+            return R.fail("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
        }
        return toAjax(roleService.insertRole(role));

@@ -91,39 +90,41 @@ public class SysRoleController extends BaseController {
     * 修改保存角色
     */
    @ApiOperation("修改保存角色")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @SaCheckPermission("system:role:edit")
    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
    @PutMapping
-    public AjaxResult<Void> edit(@Validated @RequestBody SysRole role) {
+    public R<Void> edit(@Validated @RequestBody SysRole role) {
        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
-            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+            return R.fail("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
        } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
-            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+            return R.fail("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
        }

        if (roleService.updateRole(role) > 0) {
            // 更新缓存用户权限
            LoginUser loginUser = getLoginUser();
            SysUser sysUser = userService.selectUserById(loginUser.getUserId());
-            if (StringUtils.isNotNull(sysUser) && !sysUser.isAdmin()) {
-                loginUser.setPermissions(permissionService.getMenuPermission(sysUser));
-                tokenService.setLoginUser(loginUser);
+            if (ObjectUtil.isNotNull(sysUser) && !sysUser.isAdmin()) {
+                loginUser.setMenuPermission(permissionService.getMenuPermission(sysUser));
+                LoginHelper.setLoginUser(loginUser);
            }
-            return AjaxResult.success();
+            return R.ok();
        }
-        return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+        return R.fail("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
    }

    /**
     * 修改保存数据权限
     */
    @ApiOperation("修改保存数据权限")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @SaCheckPermission("system:role:edit")
    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
    @PutMapping("/dataScope")
-    public AjaxResult<Void> dataScope(@RequestBody SysRole role) {
+    public R<Void> dataScope(@RequestBody SysRole role) {
        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
        return toAjax(roleService.authDataScope(role));
    }

@@ -131,11 +132,12 @@ public class SysRoleController extends BaseController {
     * 状态修改
     */
    @ApiOperation("状态修改")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @SaCheckPermission("system:role:edit")
    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
    @PutMapping("/changeStatus")
-    public AjaxResult<Void> changeStatus(@RequestBody SysRole role) {
+    public R<Void> changeStatus(@RequestBody SysRole role) {
        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
        return toAjax(roleService.updateRoleStatus(role));
    }

@@ -143,10 +145,10 @@ public class SysRoleController extends BaseController {
     * 删除角色
     */
    @ApiOperation("删除角色")
-    @PreAuthorize("@ss.hasPermi('system:role:remove')")
+    @SaCheckPermission("system:role:remove")
    @Log(title = "角色管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{roleIds}")
-    public AjaxResult<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] roleIds) {
+    public R<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] roleIds) {
        return toAjax(roleService.deleteRoleByIds(roleIds));
    }

@@ -154,40 +156,40 @@ public class SysRoleController extends BaseController {
     * 获取角色选择框列表
     */
    @ApiOperation("获取角色选择框列表")
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @SaCheckPermission("system:role:query")
    @GetMapping("/optionselect")
-    public AjaxResult<List<SysRole>> optionselect() {
-        return AjaxResult.success(roleService.selectRoleAll());
+    public R<List<SysRole>> optionselect() {
+        return R.ok(roleService.selectRoleAll());
    }

    /**
     * 查询已分配用户角色列表
     */
    @ApiOperation("查询已分配用户角色列表")
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @SaCheckPermission("system:role:list")
    @GetMapping("/authUser/allocatedList")
-    public TableDataInfo<SysUser> allocatedList(SysUser user) {
-        return userService.selectAllocatedList(user);
+    public TableDataInfo<SysUser> allocatedList(SysUser user, PageQuery pageQuery) {
+        return userService.selectAllocatedList(user, pageQuery);
    }

    /**
     * 查询未分配用户角色列表
     */
    @ApiOperation("查询未分配用户角色列表")
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @SaCheckPermission("system:role:list")
    @GetMapping("/authUser/unallocatedList")
-    public TableDataInfo<SysUser> unallocatedList(SysUser user) {
-        return userService.selectUnallocatedList(user);
+    public TableDataInfo<SysUser> unallocatedList(SysUser user, PageQuery pageQuery) {
+        return userService.selectUnallocatedList(user, pageQuery);
    }

    /**
     * 取消授权用户
     */
    @ApiOperation("取消授权用户")
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @SaCheckPermission("system:role:edit")
    @Log(title = "角色管理", businessType = BusinessType.GRANT)
    @PutMapping("/authUser/cancel")
-    public AjaxResult<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
+    public R<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
        return toAjax(roleService.deleteAuthUser(userRole));
    }

@@ -199,10 +201,10 @@ public class SysRoleController extends BaseController {
        @ApiImplicitParam(name = "roleId", value = "角色ID", paramType = "query", dataTypeClass = String.class),
        @ApiImplicitParam(name = "userIds", value = "用户ID串", paramType = "query", dataTypeClass = String.class)
    })
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @SaCheckPermission("system:role:edit")
    @Log(title = "角色管理", businessType = BusinessType.GRANT)
    @PutMapping("/authUser/cancelAll")
-    public AjaxResult<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
+    public R<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
        return toAjax(roleService.deleteAuthUsers(roleId, userIds));
    }

@@ -214,10 +216,11 @@ public class SysRoleController extends BaseController {
        @ApiImplicitParam(name = "roleId", value = "角色ID", paramType = "query", dataTypeClass = String.class),
        @ApiImplicitParam(name = "userIds", value = "用户ID串", paramType = "query", dataTypeClass = String.class)
    })
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @SaCheckPermission("system:role:edit")
    @Log(title = "角色管理", businessType = BusinessType.GRANT)
    @PutMapping("/authUser/selectAll")
-    public AjaxResult<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
+    public R<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
+        roleService.checkRoleDataScope(roleId);
        return toAjax(roleService.insertAuthUsers(roleId, userIds));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -1,19 +1,22 @@
 package com.ruoyi.web.controller.system;

+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.secure.BCrypt;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.excel.ExcelResult;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.vo.SysUserExportVo;
@@ -24,8 +27,6 @@ import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -44,7 +45,7 @@ import java.util.stream.Collectors;
 */
@Validated
@Api(value = "用户信息控制器", tags = {"用户信息管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/user")
 public class SysUserController extends BaseController {
@@ -57,15 +58,15 @@ public class SysUserController extends BaseController {
     * 获取用户列表
     */
    @ApiOperation("获取用户列表")
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @SaCheckPermission("system:user:list")
    @GetMapping("/list")
-    public TableDataInfo<SysUser> list(SysUser user) {
-        return userService.selectPageUserList(user);
+    public TableDataInfo<SysUser> list(SysUser user, PageQuery pageQuery) {
+        return userService.selectPageUserList(user, pageQuery);
    }

    @ApiOperation("导出用户列表")
    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    @SaCheckPermission("system:user:export")
    @PostMapping("/export")
    public void export(SysUser user, HttpServletResponse response) {
        List<SysUser> list = userService.selectUserList(user);
@@ -83,14 +84,14 @@ public class SysUserController extends BaseController {

    @ApiOperation("导入用户列表")
    @ApiImplicitParams({
-            @ApiImplicitParam(name = "file", value = "导入文件", dataType = "java.io.File", required = true),
+        @ApiImplicitParam(name = "file", value = "导入文件", dataType = "java.io.File", required = true),
    })
    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:import')")
+    @SaCheckPermission("system:user:import")
    @PostMapping("/importData")
-    public AjaxResult<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
+    public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
        ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
-        return AjaxResult.success(result.getAnalysis());
+        return R.ok(result.getAnalysis());
    }

    @ApiOperation("下载导入模板")
@@ -103,40 +104,41 @@ public class SysUserController extends BaseController {
     * 根据用户编号获取详细信息
     */
    @ApiOperation("根据用户编号获取详细信息")
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @SaCheckPermission("system:user:query")
    @GetMapping(value = {"/", "/{userId}"})
-    public AjaxResult<Map<String, Object>> getInfo(@ApiParam("用户ID") @PathVariable(value = "userId", required = false) Long userId) {
+    public R<Map<String, Object>> getInfo(@ApiParam("用户ID") @PathVariable(value = "userId", required = false) Long userId) {
        userService.checkUserDataScope(userId);
        Map<String, Object> ajax = new HashMap<>();
        List<SysRole> roles = roleService.selectRoleAll();
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("roles", LoginHelper.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
        ajax.put("posts", postService.selectPostAll());
-        if (StringUtils.isNotNull(userId)) {
-            ajax.put("user", userService.selectUserById(userId));
+        if (ObjectUtil.isNotNull(userId)) {
+            SysUser sysUser = userService.selectUserById(userId);
+            ajax.put("user", sysUser);
            ajax.put("postIds", postService.selectPostListByUserId(userId));
-            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
+            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
        }
-        return AjaxResult.success(ajax);
+        return R.ok(ajax);
    }

    /**
     * 新增用户
     */
    @ApiOperation("新增用户")
-    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @SaCheckPermission("system:user:add")
    @Log(title = "用户管理", businessType = BusinessType.INSERT)
    @PostMapping
-    public AjaxResult<Void> add(@Validated @RequestBody SysUser user) {
+    public R<Void> add(@Validated @RequestBody SysUser user) {
        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+            return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
        } else if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+            && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+            return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
        } else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+            return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
        }
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setPassword(BCrypt.hashpw(user.getPassword()));
        return toAjax(userService.insertUser(user));
    }

@@ -144,17 +146,18 @@ public class SysUserController extends BaseController {
     * 修改用户
     */
    @ApiOperation("修改用户")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @SaCheckPermission("system:user:edit")
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @PutMapping
-    public AjaxResult<Void> edit(@Validated @RequestBody SysUser user) {
+    public R<Void> edit(@Validated @RequestBody SysUser user) {
        userService.checkUserAllowed(user);
+        userService.checkUserDataScope(user.getUserId());
        if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+            && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+            return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
        } else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+            return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
        }
        return toAjax(userService.updateUser(user));
    }
@@ -163,12 +166,12 @@ public class SysUserController extends BaseController {
     * 删除用户
     */
    @ApiOperation("删除用户")
-    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    @SaCheckPermission("system:user:remove")
    @Log(title = "用户管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{userIds}")
-    public AjaxResult<Void> remove(@ApiParam("角色ID串") @PathVariable Long[] userIds) {
+    public R<Void> remove(@ApiParam("角色ID串") @PathVariable Long[] userIds) {
        if (ArrayUtil.contains(userIds, getUserId())) {
-            return error("当前用户不能删除");
+            return R.fail("当前用户不能删除");
        }
        return toAjax(userService.deleteUserByIds(userIds));
    }
@@ -177,12 +180,13 @@ public class SysUserController extends BaseController {
     * 重置密码
     */
    @ApiOperation("重置密码")
-    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+    @SaCheckPermission("system:user:resetPwd")
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @PutMapping("/resetPwd")
-    public AjaxResult<Void> resetPwd(@RequestBody SysUser user) {
+    public R<Void> resetPwd(@RequestBody SysUser user) {
        userService.checkUserAllowed(user);
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        userService.checkUserDataScope(user.getUserId());
+        user.setPassword(BCrypt.hashpw(user.getPassword()));
        return toAjax(userService.resetPwd(user));
    }

@@ -190,11 +194,12 @@ public class SysUserController extends BaseController {
     * 状态修改
     */
    @ApiOperation("状态修改")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @SaCheckPermission("system:user:edit")
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @PutMapping("/changeStatus")
-    public AjaxResult<Void> changeStatus(@RequestBody SysUser user) {
+    public R<Void> changeStatus(@RequestBody SysUser user) {
        userService.checkUserAllowed(user);
+        userService.checkUserDataScope(user.getUserId());
        return toAjax(userService.updateUserStatus(user));
    }

@@ -202,15 +207,15 @@ public class SysUserController extends BaseController {
     * 根据用户编号获取授权角色
     */
    @ApiOperation("根据用户编号获取授权角色")
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @SaCheckPermission("system:user:query")
    @GetMapping("/authRole/{userId}")
-    public AjaxResult<Map<String, Object>> authRole(@ApiParam("用户ID") @PathVariable("userId") Long userId) {
+    public R<Map<String, Object>> authRole(@ApiParam("用户ID") @PathVariable("userId") Long userId) {
        SysUser user = userService.selectUserById(userId);
        List<SysRole> roles = roleService.selectRolesByUserId(userId);
        Map<String, Object> ajax = new HashMap<>();
        ajax.put("user", user);
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        return AjaxResult.success(ajax);
+        ajax.put("roles", LoginHelper.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        return R.ok(ajax);
    }

    /**
@@ -221,11 +226,12 @@ public class SysUserController extends BaseController {
        @ApiImplicitParam(name = "userId", value = "用户Id", paramType = "query", dataTypeClass = String.class),
        @ApiImplicitParam(name = "roleIds", value = "角色ID串", paramType = "query", dataTypeClass = String.class)
    })
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @SaCheckPermission("system:user:edit")
    @Log(title = "用户管理", businessType = BusinessType.GRANT)
    @PutMapping("/authRole")
-    public AjaxResult<Void> insertAuthRole(Long userId, Long[] roleIds) {
+    public R<Void> insertAuthRole(Long userId, Long[] roleIds) {
+        userService.checkUserDataScope(userId);
        userService.insertUserAuth(userId, roleIds);
-        return success();
+        return R.ok();
    }
 }
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -9,7 +9,7 @@ spring:
        # 设置 Spring Boot Admin Server 地址
        url: http://localhost:9090/admin
        instance:
-          prefer-ip: true # 注册实例时，优先使用 IP
+          service-host-type: IP
        username: ruoyi
        password: 123456

@@ -51,7 +51,9 @@ spring:
        # 主库数据源
        master:
          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
+          # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
+          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
          username: root
          password: root
        # 从库数据源
@@ -127,9 +129,9 @@ spring:

 redisson:
  # 线程池数量
-  threads: 16
+  threads: 4
  # Netty线程池数量
-  nettyThreads: 32
+  nettyThreads: 8
  # 传输模式
  transportMode: "NIO"
  # 单节点配置
@@ -137,9 +139,9 @@ redisson:
    # 客户端名称
    clientName: ${ruoyi.name}
    # 最小空闲连接数
-    connectionMinimumIdleSize: 32
+    connectionMinimumIdleSize: 8
    # 连接池大小
-    connectionPoolSize: 64
+    connectionPoolSize: 32
    # 连接空闲超时，单位：毫秒
    idleConnectionTimeout: 10000
    # 命令等待超时，单位：毫秒
@@ -148,11 +150,5 @@ redisson:
    retryAttempts: 3
    # 命令重试发送时间间隔，单位：毫秒
    retryInterval: 1500
-    # 发布和订阅连接的最小空闲连接数
-    subscriptionConnectionMinimumIdleSize: 1
    # 发布和订阅连接池大小
    subscriptionConnectionPoolSize: 50
-    # 单个连接最大订阅数量
-    subscriptionsPerConnection: 5
-    # DNS监测时间间隔，单位：毫秒
-    dnsMonitoringInterval: 5000
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -16,7 +16,7 @@ spring:
        # 设置 Spring Boot Admin Server 地址
        url: http://172.30.0.90:9090/admin
        instance:
-          prefer-ip: true # 注册实例时，优先使用 IP
+          service-host-type: IP
        username: ruoyi
        password: 123456

@@ -58,7 +58,9 @@ spring:
        # 主库数据源
        master:
          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
+          # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
+          url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
          username: root
          password: root
        # 从库数据源
@@ -155,11 +157,5 @@ redisson:
    retryAttempts: 3
    # 命令重试发送时间间隔，单位：毫秒
    retryInterval: 1500
-    # 发布和订阅连接的最小空闲连接数
-    subscriptionConnectionMinimumIdleSize: 1
    # 发布和订阅连接池大小
    subscriptionConnectionPoolSize: 50
-    # 单个连接最大订阅数量
-    subscriptionsPerConnection: 5
-    # DNS监测时间间隔，单位：毫秒
-    dnsMonitoringInterval: 5000
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -5,13 +5,13 @@ ruoyi:
  # 版本
  version: ${ruoyi-vue-plus.version}
  # 版权年份
-  copyrightYear: 2021
+  copyrightYear: 2022
  # 实例演示开关
  demoEnabled: true
  # 获取ip地址开关
  addressEnabled: true
  # 缓存懒加载
-  cacheLazy: true
+  cacheLazy: false

 captcha:
  # 页面 <参数设置> 可开启关闭 验证码校验
@@ -53,10 +53,6 @@ logging:
    org.springframework: warn
  config: classpath:logback.xml

-# tlog 全局访问性能拦截
-tlog:
-  enable-invoke-time-print: true
-
 # Spring配置
 spring:
  application:
@@ -83,6 +79,10 @@ spring:
  thymeleaf:
    # 将系统模板放置到最前面 否则会与 springboot-admin 页面冲突
    template-resolver-order: 1
+  mvc:
+    pathmatch:
+      # 适配 boot 2.6 路由与 springfox 兼容
+      matching-strategy: ANT_PATH_MATCHER
  jackson:
    # 日期格式化
    date-format: yyyy-MM-dd HH:mm:ss
@@ -95,24 +95,46 @@ spring:
      # 允许对象忽略json中不存在的属性
      fail_on_unknown_properties: false

-# token配置
-token:
-  # 令牌自定义标识
-  header: Authorization
-  # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
-  # 令牌有效期（默认30分钟）
-  expireTime: 30
+# Sa-Token配置
+sa-token:
+  # token名称 (同时也是cookie名称)
+  token-name: Authorization
+  # token有效期 设为一天 (必定过期) 单位: 秒
+  timeout: 86400
+  # token临时有效期 (指定时间无操作就过期) 单位: 秒
+  activity-timeout: 1800
+  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
+  is-concurrent: true
+  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
+  is-share: false
+  # 是否尝试从请求体里读取token
+  is-read-body: false
+  # 是否尝试从header里读取token
+  is-read-head: true
+  # 是否尝试从cookie里读取token
+  is-read-cookie: false
+  # token前缀
+  token-prefix: "Bearer"
+  # token风格
+  token-style: uuid
+  # jwt秘钥
+  jwt-secret-key: abcdefghijklmnopqrstuvwxyz
+  # 是否输出操作日志
+  is-log: true

 # security配置
 security:
-  # 登出路径
-  logout-url: /logout
-  # 匿名路径
-  anonymous:
+  # 排除路径
+  excludes:
    - /login
+    - /logout
    - /register
    - /captchaImage
+    # 静态资源
+    - /*.html
+    - /**/*.html
+    - /**/*.css
+    - /**/*.js
    # swagger 文档配置
    - /doc.html
    - /swagger-resources/**
@@ -120,11 +142,11 @@ security:
    - /*/api-docs
    # druid 监控配置
    - /druid/**
+  # 用户放行
+  permit-all:
    # actuator 监控配置
    - /actuator
    - /actuator/**
-  # 用户放行
-  permit-all:

 # 重复提交
 repeat-submit:
@@ -221,6 +243,10 @@ knife4j:
  enable: true
  # 是否开启生产环境保护策略
  production: @knife4j.production@
+  basic:
+    enable: true
+    username: ruoyi
+    password: 123456
  # 前端Ui的个性化配置属性
  setting:
    # 默认语言
--- a/ruoyi-admin/src/main/resources/i18n/messages.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages.properties
@@ -2,21 +2,27 @@
 not.null=* 必须填写
 user.jcaptcha.error=验证码错误
 user.jcaptcha.expire=验证码已失效
-user.not.exists=用户不存在/密码错误
+user.not.exists=对不起, 您的账号：{0} 不存在.
 user.password.not.match=用户不存在/密码错误
 user.password.retry.limit.count=密码输入错误{0}次
-user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
-user.password.delete=对不起，您的账号已被删除
-user.blocked=用户已封禁，请联系管理员
+user.password.retry.limit.exceed=密码错误次数过多，帐户锁定{0}分钟
+user.password.delete=对不起，您的账号：{0} 已被删除
+user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员
 role.blocked=角色已封禁，请联系管理员
 user.logout.success=退出成功
 length.not.valid=长度必须在{min}到{max}个字符之间
+user.username.not.blank=用户名不能为空
 user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
+user.username.length.valid=账户长度必须在{min}到{max}个字符之间
+user.password.not.blank=用户密码不能为空
+user.password.length.valid=用户密码长度必须在{min}到{max}个字符之间
 user.password.not.valid=* 5-50个字符
 user.email.not.valid=邮箱格式错误
 user.mobile.phone.number.not.valid=手机号格式错误
 user.login.success=登录成功
 user.register.success=注册成功
+user.register.save.error=保存用户 {0} 失败，注册账号已存在
+user.register.error=注册失败，请联系系统管理人员
 user.notfound=请重新登录
 user.forcelogout=管理员强制退出，请重新登录
 user.unknown.error=未知错误，请重新登录
--- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
@@ -2,21 +2,27 @@
 not.null=* Required fill in
 user.jcaptcha.error=Captcha error
 user.jcaptcha.expire=Captcha invalid
-user.not.exists=User does not exist/Password error
+user.not.exists=Sorry, your account: {0} does not exist
 user.password.not.match=User does not exist/Password error
 user.password.retry.limit.count=Password input error {0} times
-user.password.retry.limit.exceed=Password input error {0} times, account locked for 10 minutes
-user.password.delete=Sorry, your account has been deleted
-user.blocked=User disabled，please contact administrators
+user.password.retry.limit.exceed=Too many password errors, account locked for {0} minutes
+user.password.delete=Sorry, your account：{0} has been deleted
+user.blocked=Sorry, your account: {0} has been disabled. Please contact the administrator
 role.blocked=Role disabled，please contact administrators
 user.logout.success=Exit successful
 length.not.valid=The length must be between {min} and {max} characters
+user.username.not.blank=Username cannot be blank
 user.username.not.valid=* 2 to 20 chinese characters, letters, numbers or underscores, and must start with a non number
+user.username.length.valid=Account length must be between {min} and {max} characters
+user.password.not.blank=Password cannot be empty
+user.password.length.valid=Password length must be between {min} and {max} characters
 user.password.not.valid=* 5-50 characters
 user.email.not.valid=Mailbox format error
 user.mobile.phone.number.not.valid=Phone number format error
 user.login.success=Login successful
 user.register.success=Register successful
+user.register.save.error=Failed to save user {0}, The registered account already exists
+user.register.error=Register failed, please contact system administrator
 user.notfound=Please login again
 user.forcelogout=The administrator is forced to exit，please login again
 user.unknown.error=Unknown error, please login again
--- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
@@ -2,21 +2,27 @@
 not.null=* 必须填写
 user.jcaptcha.error=验证码错误
 user.jcaptcha.expire=验证码已失效
-user.not.exists=用户不存在/密码错误
+user.not.exists=对不起, 您的账号：{0} 不存在.
 user.password.not.match=用户不存在/密码错误
 user.password.retry.limit.count=密码输入错误{0}次
-user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
-user.password.delete=对不起，您的账号已被删除
-user.blocked=用户已封禁，请联系管理员
+user.password.retry.limit.exceed=密码错误次数过多，帐户锁定{0}分钟
+user.password.delete=对不起，您的账号：{0} 已被删除
+user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员
 role.blocked=角色已封禁，请联系管理员
 user.logout.success=退出成功
 length.not.valid=长度必须在{min}到{max}个字符之间
+user.username.not.blank=用户名不能为空
 user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
+user.username.length.valid=账户长度必须在{min}到{max}个字符之间
+user.password.not.blank=用户密码不能为空
+user.password.length.valid=用户密码长度必须在{min}到{max}个字符之间
 user.password.not.valid=* 5-50个字符
 user.email.not.valid=邮箱格式错误
 user.mobile.phone.number.not.valid=手机号格式错误
 user.login.success=登录成功
 user.register.success=注册成功
+user.register.save.error=保存用户 {0} 失败，注册账号已存在
+user.register.error=注册失败，请联系系统管理人员
 user.notfound=请重新登录
 user.forcelogout=管理员强制退出，请重新登录
 user.unknown.error=未知错误，请重新登录
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -5,13 +5,13 @@
              value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>

-	<!-- 控制台输出 -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
-			<pattern>${console.log.pattern}</pattern>
+            <pattern>${console.log.pattern}</pattern>
            <charset>utf-8</charset>
-		</encoder>
-	</appender>
+        </encoder>
+    </appender>

    <!-- 控制台输出 -->
    <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -32,20 +32,20 @@
        </filter>
    </appender>

-	<!-- 系统日志输出 -->
-	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-info.log</file>
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-info.log</file>
        <!-- 循环政策：基于时间创建日志文件 -->
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 日志文件名格式 -->
-			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
-		</rollingPolicy>
+            <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
-			<pattern>${log.pattern}</pattern>
-		</encoder>
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <!-- 过滤的级别 -->
            <level>INFO</level>
            <!-- 匹配时的操作：接收（记录） -->
@@ -53,16 +53,16 @@
            <!-- 不匹配时的操作：拒绝（不记录） -->
            <onMismatch>DENY</onMismatch>
        </filter>
-	</appender>
+    </appender>

-	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-error.log</file>
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-error.log</file>
        <!-- 循环政策：基于时间创建日志文件 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 日志文件名格式 -->
            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
        </rollingPolicy>
        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
            <pattern>${log.pattern}</pattern>
@@ -70,23 +70,23 @@
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <!-- 过滤的级别 -->
            <level>ERROR</level>
-			<!-- 匹配时的操作：接收（记录） -->
+            <!-- 匹配时的操作：接收（记录） -->
            <onMatch>ACCEPT</onMatch>
-			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <!-- 不匹配时的操作：拒绝（不记录） -->
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>

-	<!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
-	<!-- Spring日志级别控制  -->
-	<logger name="org.springframework" level="warn" />
+    <!-- 系统模块日志级别控制  -->
+    <logger name="com.ruoyi" level="info" />
+    <!-- Spring日志级别控制  -->
+    <logger name="org.springframework" level="warn" />

-	<root level="info">
-		<appender-ref ref="console" />
-	</root>
+    <root level="info">
+        <appender-ref ref="console" />
+    </root>

-	<!--系统操作日志-->
+    <!--系统操作日志-->
    <root level="info">
        <appender-ref ref="file_info" />
        <appender-ref ref="file_error" />
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.4.0</version>
+        <version>4.0.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -29,10 +29,15 @@
            <artifactId>spring-web</artifactId>
        </dependency>

-        <!-- spring security 安全认证 -->
+        <!-- Sa-Token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-spring-boot-starter</artifactId>
+        </dependency>
+        <!-- Sa-Token 整合 jwt -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-jwt</artifactId>
        </dependency>

        <!-- 自定义验证注解 -->
@@ -64,18 +69,17 @@
            <artifactId>easyexcel</artifactId>
        </dependency>

+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib</artifactId>
+        </dependency>
+
        <!-- yml解析器 -->
        <dependency>
            <groupId>org.yaml</groupId>
            <artifactId>snakeyaml</artifactId>
        </dependency>

-        <!-- Token生成与解析-->
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-        </dependency>
-
        <!-- jdk11 缺失依赖 jaxb-->
        <dependency>
            <groupId>com.sun.xml.bind</groupId>
@@ -96,18 +100,41 @@
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-extension</artifactId>
        </dependency>
+
+        <!-- dynamic-datasource 多数据源-->
        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
        </dependency>

        <dependency>
-            <groupId>de.codecentric</groupId>
-            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-http</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-captcha</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-jwt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-extra</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
        </dependency>

        <dependency>
@@ -120,10 +147,6 @@
            <artifactId>swagger-annotations</artifactId>
        </dependency>

-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
        <!--  自动生成YML配置关联JSON文件  -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -141,16 +164,6 @@
            <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
        </dependency>

-        <dependency>
-            <groupId>com.yomahub</groupId>
-            <artifactId>tlog-spring-boot-configuration</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.yomahub</groupId>
-            <artifactId>tlog-webroot</artifactId>
-        </dependency>
-
    </dependencies>

 </project>
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java
@@ -0,0 +1,26 @@
+package com.ruoyi.common.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 数据权限
+ *
+ * @author Lion Li
+ * @version 3.5.0
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DataColumn {
+
+    /**
+     * 占位符关键字
+     */
+    String key() default "deptName";
+
+    /**
+     * 占位符替换值
+     */
+    String value() default "dept_id";
+
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataPermission.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataPermission.java
@@ -0,0 +1,18 @@
+package com.ruoyi.common.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 数据权限组
+ *
+ * @author Lion Li
+ * @version 3.5.0
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DataPermission {
+
+    DataColumn[] value();
+
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
@@ -1,28 +0,0 @@
-package com.ruoyi.common.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * 数据权限过滤注解
- *
- * @author ruoyi
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface DataScope {
-    /**
-     * 部门表的别名
-     */
-    String deptAlias() default "";
-
-    /**
-     * 用户表的别名
-     */
-    String userAlias() default "";
-
-    /**
-     * 是否过滤用户权限
-     */
-    boolean isUser() default false;
-}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
@@ -1,23 +0,0 @@
-package com.ruoyi.common.annotation;
-
-import com.ruoyi.common.enums.DataSourceType;
-
-import java.lang.annotation.*;
-
-/**
- * 自定义多数据源切换注解
- * <p>
- * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
- *
- * @author ruoyi
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-public @interface DataSource {
-    /**
-     * 切换数据源名称
-     */
-    DataSourceType value() default DataSourceType.MASTER;
-}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java
@@ -0,0 +1,24 @@
+package com.ruoyi.common.annotation;
+
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ruoyi.common.enums.SensitiveStrategy;
+import com.ruoyi.common.jackson.SensitiveJsonSerializer;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 数据脱敏注解
+ *
+ * @author zhujie
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@JacksonAnnotationsInside
+@JsonSerialize(using = SensitiveJsonSerializer.class)
+public @interface Sensitive {
+    SensitiveStrategy strategy();
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java
@@ -13,73 +13,73 @@ import com.ruoyi.common.utils.StringUtils;
 */
 public class UnsignedMathGenerator implements CodeGenerator {

-	private static final long serialVersionUID = -5514819971774091076L;
+    private static final long serialVersionUID = -5514819971774091076L;

-	private static final String operators = "+-*";
+    private static final String OPERATORS = "+-*";

-	/**
-	 * 参与计算数字最大长度
-	 */
-	private final int numberLength;
+    /**
+     * 参与计算数字最大长度
+     */
+    private final int numberLength;

-	/**
-	 * 构造
-	 */
-	public UnsignedMathGenerator() {
-		this(2);
-	}
+    /**
+     * 构造
+     */
+    public UnsignedMathGenerator() {
+        this(2);
+    }

-	/**
-	 * 构造
-	 *
-	 * @param numberLength 参与计算最大数字位数
-	 */
-	public UnsignedMathGenerator(int numberLength) {
-		this.numberLength = numberLength;
-	}
+    /**
+     * 构造
+     *
+     * @param numberLength 参与计算最大数字位数
+     */
+    public UnsignedMathGenerator(int numberLength) {
+        this.numberLength = numberLength;
+    }

-	@Override
-	public String generate() {
-		final int limit = getLimit();
-		int min = RandomUtil.randomInt(limit);
-		int max = RandomUtil.randomInt(min, limit);
-		String number1 = Integer.toString(max);
-		String number2 = Integer.toString(min);
-		number1 = StringUtils.rightPad(number1, this.numberLength, CharUtil.SPACE);
-		number2 = StringUtils.rightPad(number2, this.numberLength, CharUtil.SPACE);
+    @Override
+    public String generate() {
+        final int limit = getLimit();
+        int a = RandomUtil.randomInt(limit);
+        int b = RandomUtil.randomInt(limit);
+        String max = Integer.toString(Math.max(a,b));
+        String min = Integer.toString(Math.min(a,b));
+        max = StringUtils.rightPad(max, this.numberLength, CharUtil.SPACE);
+        min = StringUtils.rightPad(min, this.numberLength, CharUtil.SPACE);

-		return number1 + RandomUtil.randomChar(operators) + number2 + '=';
-	}
+        return max + RandomUtil.randomChar(OPERATORS) + min + '=';
+    }

-	@Override
-	public boolean verify(String code, String userInputCode) {
-		int result;
-		try {
-			result = Integer.parseInt(userInputCode);
-		} catch (NumberFormatException e) {
-			// 用户输入非数字
-			return false;
-		}
+    @Override
+    public boolean verify(String code, String userInputCode) {
+        int result;
+        try {
+            result = Integer.parseInt(userInputCode);
+        } catch (NumberFormatException e) {
+            // 用户输入非数字
+            return false;
+        }

-		final int calculateResult = (int) Calculator.conversion(code);
-		return result == calculateResult;
-	}
+        final int calculateResult = (int) Calculator.conversion(code);
+        return result == calculateResult;
+    }

-	/**
-	 * 获取验证码长度
-	 *
-	 * @return 验证码长度
-	 */
-	public int getLength() {
-		return this.numberLength * 2 + 2;
-	}
+    /**
+     * 获取验证码长度
+     *
+     * @return 验证码长度
+     */
+    public int getLength() {
+        return this.numberLength * 2 + 2;
+    }

-	/**
-	 * 根据长度获取参与计算数字最大值
-	 *
-	 * @return 最大值
-	 */
-	private int getLimit() {
-		return Integer.parseInt("1" + StringUtils.repeat('0', this.numberLength));
-	}
+    /**
+     * 根据长度获取参与计算数字最大值
+     *
+     * @return 最大值
+     */
+    private int getLimit() {
+        return Integer.parseInt("1" + StringUtils.repeat('0', this.numberLength));
+    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
@@ -2,7 +2,6 @@ package com.ruoyi.common.config;

 import lombok.Data;
 import lombok.Getter;
-import lombok.experimental.Accessors;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

@@ -13,7 +12,6 @@ import org.springframework.stereotype.Component;
 */

@Data
-@Accessors(chain = true)
@Component
@ConfigurationProperties(prefix = "ruoyi")
 public class RuoYiConfig {
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -1,136 +1,126 @@
 package com.ruoyi.common.constant;

-import io.jsonwebtoken.Claims;
-
 /**
 * 通用常量信息
 *
 * @author ruoyi
 */
-public class Constants {
+public interface Constants {
+
    /**
     * UTF-8 字符集
     */
-    public static final String UTF8 = "UTF-8";
+    String UTF8 = "UTF-8";

    /**
     * GBK 字符集
     */
-    public static final String GBK = "GBK";
+    String GBK = "GBK";

    /**
     * http请求
     */
-    public static final String HTTP = "http://";
+    String HTTP = "http://";

    /**
     * https请求
     */
-    public static final String HTTPS = "https://";
+    String HTTPS = "https://";

    /**
     * 通用成功标识
     */
-    public static final String SUCCESS = "0";
+    String SUCCESS = "0";

    /**
     * 通用失败标识
     */
-    public static final String FAIL = "1";
+    String FAIL = "1";

    /**
     * 登录成功
     */
-    public static final String LOGIN_SUCCESS = "Success";
+    String LOGIN_SUCCESS = "Success";

    /**
     * 注销
     */
-    public static final String LOGOUT = "Logout";
+    String LOGOUT = "Logout";

    /**
     * 注册
     */
-    public static final String REGISTER = "Register";
+    String REGISTER = "Register";

    /**
     * 登录失败
     */
-    public static final String LOGIN_FAIL = "Error";
+    String LOGIN_FAIL = "Error";

    /**
     * 验证码 redis key
     */
-    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
+    String CAPTCHA_CODE_KEY = "captcha_codes:";

    /**
     * 登录用户 redis key
     */
-    public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+    public static final String LOGIN_TOKEN_KEY = "Authorization:login:token:";
+
+    /**
+     * 在线用户 redis key
+     */
+    public static final String ONLINE_TOKEN_KEY = "online_tokens:";

    /**
     * 防重提交 redis key
     */
-    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
+    String REPEAT_SUBMIT_KEY = "repeat_submit:";

    /**
     * 限流 redis key
     */
-    public static final String RATE_LIMIT_KEY = "rate_limit:";
+    String RATE_LIMIT_KEY = "rate_limit:";

    /**
     * 验证码有效期（分钟）
     */
-    public static final Integer CAPTCHA_EXPIRATION = 2;
+    Integer CAPTCHA_EXPIRATION = 2;
+
+    /**
+     * 登陆错误 redis key
+     */
+    String LOGIN_ERROR = "login_error:";
+
+    /**
+     * 登录错误次数
+     */
+    Integer LOGIN_ERROR_NUMBER = 5;
+
+    /**
+     * 登录错误限制时间(分钟)
+     */
+    Integer LOGIN_ERROR_LIMIT_TIME = 10;

    /**
     * 令牌
     */
-    public static final String TOKEN = "token";
+    String TOKEN = "token";

    /**
     * 令牌前缀
     */
-    public static final String TOKEN_PREFIX = "Bearer ";
-
-    /**
-     * 令牌前缀
-     */
-    public static final String LOGIN_USER_KEY = "login_user_key";
-
-    /**
-     * 用户ID
-     */
-    public static final String JWT_USERID = "userid";
-
-    /**
-     * 用户名称
-     */
-    public static final String JWT_USERNAME = Claims.SUBJECT;
-
-    /**
-     * 用户头像
-     */
-    public static final String JWT_AVATAR = "avatar";
-
-    /**
-     * 创建时间
-     */
-    public static final String JWT_CREATED = "created";
-
-    /**
-     * 用户权限
-     */
-    public static final String JWT_AUTHORITIES = "authorities";
+    String LOGIN_USER_KEY = "login_user_key";

    /**
     * 参数管理 cache key
     */
-    public static final String SYS_CONFIG_KEY = "sys_config:";
+    String SYS_CONFIG_KEY = "sys_config:";

    /**
     * 字典管理 cache key
     */
-    public static final String SYS_DICT_KEY = "sys_dict:";
+    String SYS_DICT_KEY = "sys_dict:";

 }
+
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -5,184 +5,189 @@ package com.ruoyi.common.constant;
 *
 * @author ruoyi
 */
-public class GenConstants {
+public interface GenConstants {
    /**
     * 单表（增删改查）
     */
-    public static final String TPL_CRUD = "crud";
+    String TPL_CRUD = "crud";

    /**
     * 树表（增删改查）
     */
-    public static final String TPL_TREE = "tree";
+    String TPL_TREE = "tree";

    /**
     * 主子表（增删改查）
     */
-    public static final String TPL_SUB = "sub";
+    String TPL_SUB = "sub";

    /**
     * 树编码字段
     */
-    public static final String TREE_CODE = "treeCode";
+    String TREE_CODE = "treeCode";

    /**
     * 树父编码字段
     */
-    public static final String TREE_PARENT_CODE = "treeParentCode";
+    String TREE_PARENT_CODE = "treeParentCode";

    /**
     * 树名称字段
     */
-    public static final String TREE_NAME = "treeName";
+    String TREE_NAME = "treeName";

    /**
     * 上级菜单ID字段
     */
-    public static final String PARENT_MENU_ID = "parentMenuId";
+    String PARENT_MENU_ID = "parentMenuId";

    /**
     * 上级菜单名称字段
     */
-    public static final String PARENT_MENU_NAME = "parentMenuName";
+    String PARENT_MENU_NAME = "parentMenuName";

    /**
     * 数据库字符串类型
     */
-    public static final String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
+    String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};

    /**
     * 数据库文本类型
     */
-    public static final String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
+    String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};

    /**
     * 数据库时间类型
     */
-    public static final String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
+    String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};

    /**
     * 数据库数字类型
     */
-    public static final String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
-            "bit", "bigint", "float", "double", "decimal"};
+    String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
+        "bit", "bigint", "float", "double", "decimal"};

    /**
     * BO对象 不需要添加字段
     */
-    public static final String[] COLUMNNAME_NOT_ADD = {"create_by", "create_time", "del_flag", "update_by",
-            "update_time", "version"};
+    String[] COLUMNNAME_NOT_ADD = {"create_by", "create_time", "del_flag", "update_by",
+        "update_time", "version"};

    /**
     * BO对象 不需要编辑字段
     */
-    public static final String[] COLUMNNAME_NOT_EDIT = {"create_by", "create_time", "del_flag", "update_by",
-            "update_time", "version"};
+    String[] COLUMNNAME_NOT_EDIT = {"create_by", "create_time", "del_flag", "update_by",
+        "update_time", "version"};

    /**
     * VO对象 不需要返回字段
     */
-    public static final String[] COLUMNNAME_NOT_LIST = {"create_by", "create_time", "del_flag", "update_by",
-            "update_time", "version"};
+    String[] COLUMNNAME_NOT_LIST = {"create_by", "create_time", "del_flag", "update_by",
+        "update_time", "version"};

    /**
     * BO对象 不需要查询字段
     */
-    public static final String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by",
-            "update_time", "remark", "version"};
+    String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by",
+        "update_time", "remark", "version"};

    /**
     * Entity基类字段
     */
-    public static final String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime"};
+    String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime"};

    /**
     * Tree基类字段
     */
-    public static final String[] TREE_ENTITY = {"parentName", "parentId", "children"};
+    String[] TREE_ENTITY = {"parentName", "parentId", "children"};

    /**
     * 文本框
     */
-    public static final String HTML_INPUT = "input";
+    String HTML_INPUT = "input";

    /**
     * 文本域
     */
-    public static final String HTML_TEXTAREA = "textarea";
+    String HTML_TEXTAREA = "textarea";

    /**
     * 下拉框
     */
-    public static final String HTML_SELECT = "select";
+    String HTML_SELECT = "select";

    /**
     * 单选框
     */
-    public static final String HTML_RADIO = "radio";
+    String HTML_RADIO = "radio";

    /**
     * 复选框
     */
-    public static final String HTML_CHECKBOX = "checkbox";
+    String HTML_CHECKBOX = "checkbox";

    /**
     * 日期控件
     */
-    public static final String HTML_DATETIME = "datetime";
+    String HTML_DATETIME = "datetime";

    /**
     * 图片上传控件
     */
-    public static final String HTML_IMAGE_UPLOAD = "imageUpload";
+    String HTML_IMAGE_UPLOAD = "imageUpload";

    /**
     * 文件上传控件
     */
-    public static final String HTML_FILE_UPLOAD = "fileUpload";
+    String HTML_FILE_UPLOAD = "fileUpload";

    /**
     * 富文本控件
     */
-    public static final String HTML_EDITOR = "editor";
+    String HTML_EDITOR = "editor";

    /**
     * 字符串类型
     */
-    public static final String TYPE_STRING = "String";
+    String TYPE_STRING = "String";

    /**
     * 整型
     */
-    public static final String TYPE_INTEGER = "Integer";
+    String TYPE_INTEGER = "Integer";

    /**
     * 长整型
     */
-    public static final String TYPE_LONG = "Long";
+    String TYPE_LONG = "Long";

    /**
     * 浮点型
     */
-    public static final String TYPE_DOUBLE = "Double";
+    String TYPE_DOUBLE = "Double";

    /**
     * 高精度计算类型
     */
-    public static final String TYPE_BIGDECIMAL = "BigDecimal";
+    String TYPE_BIGDECIMAL = "BigDecimal";

    /**
     * 时间类型
     */
-    public static final String TYPE_DATE = "Date";
+    String TYPE_DATE = "Date";

    /**
     * 模糊查询
     */
-    public static final String QUERY_LIKE = "LIKE";
+    String QUERY_LIKE = "LIKE";
+
+    /**
+     * 相等查询
+     */
+    String QUERY_EQ = "EQ";

    /**
     * 需要
     */
-    public static final String REQUIRE = "1";
+    String REQUIRE = "1";
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -5,108 +5,114 @@ package com.ruoyi.common.constant;
 *
 * @author ruoyi
 */
-public class UserConstants {
+public interface UserConstants {

    /**
     * 平台内系统用户的唯一标志
     */
-    public static final String SYS_USER = "SYS_USER";
+    String SYS_USER = "SYS_USER";

    /**
     * 正常状态
     */
-    public static final String NORMAL = "0";
+    String NORMAL = "0";

    /**
     * 异常状态
     */
-    public static final String EXCEPTION = "1";
+    String EXCEPTION = "1";

    /**
     * 用户封禁状态
     */
-    public static final String USER_DISABLE = "1";
+    String USER_DISABLE = "1";

    /**
     * 角色封禁状态
     */
-    public static final String ROLE_DISABLE = "1";
+    String ROLE_DISABLE = "1";

    /**
     * 部门正常状态
     */
-    public static final String DEPT_NORMAL = "0";
+    String DEPT_NORMAL = "0";

    /**
     * 部门停用状态
     */
-    public static final String DEPT_DISABLE = "1";
+    String DEPT_DISABLE = "1";

    /**
     * 字典正常状态
     */
-    public static final String DICT_NORMAL = "0";
+    String DICT_NORMAL = "0";

    /**
     * 是否为系统默认（是）
     */
-    public static final String YES = "Y";
+    String YES = "Y";

    /**
     * 是否菜单外链（是）
     */
-    public static final String YES_FRAME = "0";
+    String YES_FRAME = "0";

    /**
     * 是否菜单外链（否）
     */
-    public static final String NO_FRAME = "1";
+    String NO_FRAME = "1";

    /**
     * 菜单类型（目录）
     */
-    public static final String TYPE_DIR = "M";
+    String TYPE_DIR = "M";

    /**
     * 菜单类型（菜单）
     */
-    public static final String TYPE_MENU = "C";
+    String TYPE_MENU = "C";

    /**
     * 菜单类型（按钮）
     */
-    public static final String TYPE_BUTTON = "F";
+    String TYPE_BUTTON = "F";

    /**
     * Layout组件标识
     */
-    public final static String LAYOUT = "Layout";
+    String LAYOUT = "Layout";

    /**
     * ParentView组件标识
     */
-    public final static String PARENT_VIEW = "ParentView";
+    String PARENT_VIEW = "ParentView";

    /**
     * InnerLink组件标识
     */
-    public final static String INNER_LINK = "InnerLink";
+    String INNER_LINK = "InnerLink";

    /**
     * 校验返回结果码
     */
-    public final static String UNIQUE = "0";
-    public final static String NOT_UNIQUE = "1";
+    String UNIQUE = "0";
+    String NOT_UNIQUE = "1";

    /**
     * 用户名长度限制
     */
-    public static final int USERNAME_MIN_LENGTH = 2;
-    public static final int USERNAME_MAX_LENGTH = 20;
+    int USERNAME_MIN_LENGTH = 2;
+    int USERNAME_MAX_LENGTH = 20;

    /**
     * 密码长度限制
     */
-    public static final int PASSWORD_MIN_LENGTH = 5;
-    public static final int PASSWORD_MAX_LENGTH = 20;
+    int PASSWORD_MIN_LENGTH = 5;
+    int PASSWORD_MAX_LENGTH = 20;
+
+    /**
+     * 管理员ID
+     */
+    Long ADMIN_ID = 1L;
+
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java
@@ -4,8 +4,9 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;
-import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
 import lombok.extern.slf4j.Slf4j;

@@ -20,32 +21,32 @@ import java.math.BigDecimal;
@Slf4j
 public class ExcelBigNumberConvert implements Converter<Long> {

-	@Override
-	public Class<Long> supportJavaTypeKey() {
-		return Long.class;
-	}
+    @Override
+    public Class<Long> supportJavaTypeKey() {
+        return Long.class;
+    }

-	@Override
-	public CellDataTypeEnum supportExcelTypeKey() {
-		return CellDataTypeEnum.STRING;
-	}
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }

-	@Override
-	public Long convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
-		return Convert.toLong(cellData.getData());
-	}
+    @Override
+    public Long convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        return Convert.toLong(cellData.getData());
+    }

-	@Override
-	public CellData<Object> convertToExcelData(Long object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
-		if (ObjectUtil.isNotNull(object)) {
-			String str = Convert.toStr(object);
-			if (str.length() > 15) {
-				return new CellData<>(str);
-			}
-		}
-		CellData<Object> cellData = new CellData<>(new BigDecimal(object));
-		cellData.setType(CellDataTypeEnum.NUMBER);
-		return cellData;
-	}
+    @Override
+    public WriteCellData<Object> convertToExcelData(Long object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        if (ObjectUtil.isNotNull(object)) {
+            String str = Convert.toStr(object);
+            if (str.length() > 15) {
+                return new WriteCellData<>(str);
+            }
+        }
+        WriteCellData<Object> cellData = new WriteCellData<>(new BigDecimal(object));
+        cellData.setType(CellDataTypeEnum.NUMBER);
+        return cellData;
+    }

 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
@@ -2,10 +2,12 @@ package com.ruoyi.common.convert;

 import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;
-import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.core.service.DictService;
@@ -24,48 +26,48 @@ import java.lang.reflect.Field;
@Slf4j
 public class ExcelDictConvert implements Converter<Object> {

-	@Override
-	public Class<Object> supportJavaTypeKey() {
-		return Object.class;
-	}
+    @Override
+    public Class<Object> supportJavaTypeKey() {
+        return Object.class;
+    }

-	@Override
-	public CellDataTypeEnum supportExcelTypeKey() {
-		return null;
-	}
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return null;
+    }

-	@Override
-	public Object convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
-		ExcelDictFormat anno = getAnnotation(contentProperty.getField());
-		String type = anno.dictType();
-		String label = cellData.getStringValue();
-		String value;
-		if (StringUtils.isBlank(type)) {
-			value = ExcelUtil.reverseByExp(label, anno.readConverterExp(), anno.separator());
-		} else {
-			value = SpringUtils.getBean(DictService.class).getDictValue(type, label, anno.separator());
-		}
-		return Convert.convert(contentProperty.getField().getType(), value);
-	}
+    @Override
+    public Object convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        ExcelDictFormat anno = getAnnotation(contentProperty.getField());
+        String type = anno.dictType();
+        String label = cellData.getStringValue();
+        String value;
+        if (StringUtils.isBlank(type)) {
+            value = ExcelUtil.reverseByExp(label, anno.readConverterExp(), anno.separator());
+        } else {
+            value = SpringUtils.getBean(DictService.class).getDictValue(type, label, anno.separator());
+        }
+        return Convert.convert(contentProperty.getField().getType(), value);
+    }

-	@Override
-	public CellData<String> convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
-		if (StringUtils.isNull(object)) {
-			return new CellData<>("");
-		}
-		ExcelDictFormat anno = getAnnotation(contentProperty.getField());
-		String type = anno.dictType();
-		String value = Convert.toStr(object);
-		String label;
-		if (StringUtils.isBlank(type)) {
-			label = ExcelUtil.convertByExp(value, anno.readConverterExp(), anno.separator());
-		} else {
-			label = SpringUtils.getBean(DictService.class).getDictLabel(type, value, anno.separator());
-		}
-		return new CellData<>(label);
-	}
+    @Override
+    public WriteCellData<String> convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        if (ObjectUtil.isNull(object)) {
+            return new WriteCellData<>("");
+        }
+        ExcelDictFormat anno = getAnnotation(contentProperty.getField());
+        String type = anno.dictType();
+        String value = Convert.toStr(object);
+        String label;
+        if (StringUtils.isBlank(type)) {
+            label = ExcelUtil.convertByExp(value, anno.readConverterExp(), anno.separator());
+        } else {
+            label = SpringUtils.getBean(DictService.class).getDictLabel(type, value, anno.separator());
+        }
+        return new WriteCellData<>(label);
+    }

-	private ExcelDictFormat getAnnotation(Field field) {
-		return AnnotationUtil.getAnnotation(field, ExcelDictFormat.class);
-	}
+    private ExcelDictFormat getAnnotation(Field field) {
+        return AnnotationUtil.getAnnotation(field, ExcelDictFormat.class);
+    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -1,53 +1,25 @@
 package com.ruoyi.common.core.controller;

-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;

 /**
 * web层通用数据处理
 *
- * @author ruoyi
+ * @author Lion Li
 */
 public class BaseController {

-    /**
-     * 返回成功
-     */
-    public AjaxResult<Void> success() {
-        return AjaxResult.success();
-    }
-
-    /**
-     * 返回失败消息
-     */
-    public AjaxResult<Void> error() {
-        return AjaxResult.error();
-    }
-
-    /**
-     * 返回成功消息
-     */
-    public AjaxResult<Void> success(String message) {
-        return AjaxResult.success(message);
-    }
-
-    /**
-     * 返回失败消息
-     */
-    public AjaxResult<Void> error(String message) {
-        return AjaxResult.error(message);
-    }
-
    /**
     * 响应返回结果
     *
     * @param rows 影响行数
     * @return 操作结果
     */
-    protected AjaxResult<Void> toAjax(int rows) {
-        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    protected R<Void> toAjax(int rows) {
+        return rows > 0 ? R.ok() : R.fail();
    }

    /**
@@ -56,8 +28,8 @@ public class BaseController {
     * @param result 结果
     * @return 操作结果
     */
-    protected AjaxResult<Void> toAjax(boolean result) {
-        return result ? success() : error();
+    protected R<Void> toAjax(boolean result) {
+        return result ? R.ok() : R.fail();
    }

    /**
@@ -71,27 +43,27 @@ public class BaseController {
     * 获取用户缓存信息
     */
    public LoginUser getLoginUser() {
-        return SecurityUtils.getLoginUser();
+        return LoginHelper.getLoginUser();
    }

    /**
     * 获取登录用户id
     */
    public Long getUserId() {
-        return getLoginUser().getUserId();
+        return LoginHelper.getUserId();
    }

    /**
     * 获取登录部门id
     */
    public Long getDeptId() {
-        return getLoginUser().getDeptId();
+        return LoginHelper.getDeptId();
    }

    /**
     * 获取登录用户名
     */
    public String getUsername() {
-        return getLoginUser().getUsername();
+        return LoginHelper.getUsername();
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
@@ -1,134 +0,0 @@
-package com.ruoyi.common.core.domain;
-
-import cn.hutool.http.HttpStatus;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-/**
- * 操作消息提醒
- *
- * @author Lion Li
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(chain = true)
-@ApiModel("请求响应对象")
-public class AjaxResult<T> {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 状态码
-	 */
-	@ApiModelProperty("消息状态码")
-	private int code;
-
-	/**
-	 * 返回内容
-	 */
-	@ApiModelProperty("消息内容")
-	private String msg;
-
-	/**
-	 * 数据对象
-	 */
-	@ApiModelProperty("数据对象")
-	private T data;
-
-	/**
-	 * 初始化一个新创建的 AjaxResult 对象
-	 *
-	 * @param code 状态码
-	 * @param msg  返回内容
-	 */
-	public AjaxResult(int code, String msg) {
-		this.code = code;
-		this.msg = msg;
-	}
-
-	/**
-	 * 返回成功消息
-	 *
-	 * @return 成功消息
-	 */
-	public static AjaxResult<Void> success() {
-		return AjaxResult.success("操作成功");
-	}
-
-	/**
-	 * 返回成功数据
-	 *
-	 * @return 成功消息
-	 */
-	public static <T> AjaxResult<T> success(T data) {
-		return AjaxResult.success("操作成功", data);
-	}
-
-	/**
-	 * 返回成功消息
-	 *
-	 * @param msg 返回内容
-	 * @return 成功消息
-	 */
-	public static AjaxResult<Void> success(String msg) {
-		return AjaxResult.success(msg, null);
-	}
-
-	/**
-	 * 返回成功消息
-	 *
-	 * @param msg  返回内容
-	 * @param data 数据对象
-	 * @return 成功消息
-	 */
-	public static <T> AjaxResult<T> success(String msg, T data) {
-		return new AjaxResult<>(HttpStatus.HTTP_OK, msg, data);
-	}
-
-	/**
-	 * 返回错误消息
-	 *
-	 * @return
-	 */
-	public static AjaxResult<Void> error() {
-		return AjaxResult.error("操作失败");
-	}
-
-	/**
-	 * 返回错误消息
-	 *
-	 * @param msg 返回内容
-	 * @return 警告消息
-	 */
-	public static AjaxResult<Void> error(String msg) {
-		return AjaxResult.error(msg, null);
-	}
-
-	/**
-	 * 返回错误消息
-	 *
-	 * @param msg  返回内容
-	 * @param data 数据对象
-	 * @return 警告消息
-	 */
-	public static <T> AjaxResult<T> error(String msg, T data) {
-		return new AjaxResult<>(HttpStatus.HTTP_INTERNAL_ERROR, msg, data);
-	}
-
-	/**
-	 * 返回错误消息
-	 *
-	 * @param code 状态码
-	 * @param msg  返回内容
-	 * @return 警告消息
-	 */
-	public static AjaxResult<Void> error(int code, String msg) {
-		return new AjaxResult<>(code, msg, null);
-	}
-
-}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;

 import java.io.Serializable;
 import java.util.Date;
@@ -18,51 +17,50 @@ import java.util.Map;
 */

@Data
-@Accessors(chain = true)
 public class BaseEntity implements Serializable {

-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;

-	/**
-	 * 搜索值
-	 */
-	@ApiModelProperty(value = "搜索值")
-	@TableField(exist = false)
-	private String searchValue;
+    /**
+     * 搜索值
+     */
+    @ApiModelProperty(value = "搜索值")
+    @TableField(exist = false)
+    private String searchValue;

-	/**
-	 * 创建者
-	 */
-	@ApiModelProperty(value = "创建者")
-	@TableField(fill = FieldFill.INSERT)
-	private String createBy;
+    /**
+     * 创建者
+     */
+    @ApiModelProperty(value = "创建者")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;

-	/**
-	 * 创建时间
-	 */
-	@ApiModelProperty(value = "创建时间")
-	@TableField(fill = FieldFill.INSERT)
-	private Date createTime;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;

-	/**
-	 * 更新者
-	 */
-	@ApiModelProperty(value = "更新者")
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private String updateBy;
+    /**
+     * 更新者
+     */
+    @ApiModelProperty(value = "更新者")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;

-	/**
-	 * 更新时间
-	 */
-	@ApiModelProperty(value = "更新时间")
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Date updateTime;
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;

-	/**
-	 * 请求参数
-	 */
-	@ApiModelProperty(value = "请求参数")
-	@TableField(exist = false)
-	private Map<String, Object> params = new HashMap<>();
+    /**
+     * 请求参数
+     */
+    @ApiModelProperty(value = "请求参数")
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();

 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
@@ -0,0 +1,91 @@
+package com.ruoyi.common.core.domain;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.sql.SqlUtil;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 分页查询实体类
+ *
+ * @author Lion Li
+ */
+
+@Data
+public class PageQuery implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+    /**
+     * 当前记录起始索引 默认值
+     */
+    public static final int DEFAULT_PAGE_NUM = 1;
+
+    /**
+     * 每页显示记录数 默认值 默认查全部
+     */
+    public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
+
+    public <T> Page<T> build() {
+        Integer pageNum = ObjectUtil.defaultIfNull(getPageNum(), DEFAULT_PAGE_NUM);
+        Integer pageSize = ObjectUtil.defaultIfNull(getPageSize(), DEFAULT_PAGE_SIZE);
+        if (pageNum <= 0) {
+            pageNum = DEFAULT_PAGE_NUM;
+        }
+        Page<T> page = new Page<>(pageNum, pageSize);
+        OrderItem orderItem = buildOrderItem();
+        if (ObjectUtil.isNotNull(orderItem)) {
+            page.addOrder(orderItem);
+        }
+        return page;
+    }
+
+    private OrderItem buildOrderItem() {
+        // 兼容前端排序类型
+        if ("ascending".equals(isAsc)) {
+            isAsc = "asc";
+        } else if ("descending".equals(isAsc)) {
+            isAsc = "desc";
+        }
+        if (StringUtils.isNotBlank(orderByColumn)) {
+            String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
+            orderBy = StringUtils.toUnderScoreCase(orderBy);
+            if ("asc".equals(isAsc)) {
+                return OrderItem.asc(orderBy);
+            } else if ("desc".equals(isAsc)) {
+                return OrderItem.desc(orderBy);
+            }
+        }
+        return null;
+    }
+
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
@@ -0,0 +1,84 @@
+package com.ruoyi.common.core.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 响应信息主体
+ *
+ * @author Lion Li
+ */
+@Data
+@NoArgsConstructor
+@ApiModel("请求响应对象")
+public class R<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 成功
+     */
+    public static final int SUCCESS = 200;
+
+    /**
+     * 失败
+     */
+    public static final int FAIL = 500;
+
+    @ApiModelProperty("消息状态码")
+    private int code;
+
+    @ApiModelProperty("消息内容")
+    private String msg;
+
+    @ApiModelProperty("数据对象")
+    private T data;
+
+    public static <T> R<T> ok() {
+        return restResult(null, SUCCESS, "操作成功");
+    }
+
+    public static <T> R<T> ok(T data) {
+        return restResult(data, SUCCESS, "操作成功");
+    }
+
+    public static <T> R<T> ok(String msg) {
+        return restResult(null, SUCCESS, msg);
+    }
+
+    public static <T> R<T> ok(String msg, T data) {
+        return restResult(data, SUCCESS, msg);
+    }
+
+    public static <T> R<T> fail() {
+        return restResult(null, FAIL, "操作失败");
+    }
+
+    public static <T> R<T> fail(String msg) {
+        return restResult(null, FAIL, msg);
+    }
+
+    public static <T> R<T> fail(T data) {
+        return restResult(data, FAIL, "操作失败");
+    }
+
+    public static <T> R<T> fail(String msg, T data) {
+        return restResult(data, FAIL, msg);
+    }
+
+    public static <T> R<T> fail(int code, String msg) {
+        return restResult(null, code, msg);
+    }
+
+    private static <T> R<T> restResult(T data, int code, String msg) {
+        R<T> r = new R<>();
+        r.setCode(code);
+        r.setData(data);
+        r.setMsg(msg);
+        return r;
+    }
+
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;

 import java.util.ArrayList;
 import java.util.List;
@@ -17,29 +16,28 @@ import java.util.List;

@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 public class TreeEntity extends BaseEntity {

-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;

-	/**
-	 * 父菜单名称
-	 */
-	@TableField(exist = false)
-	@ApiModelProperty(value = "父菜单名称")
-	private String parentName;
+    /**
+     * 父菜单名称
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "父菜单名称")
+    private String parentName;

-	/**
-	 * 父菜单ID
-	 */
-	@ApiModelProperty(value = "父菜单ID")
-	private Long parentId;
+    /**
+     * 父菜单ID
+     */
+    @ApiModelProperty(value = "父菜单ID")
+    private Long parentId;

-	/**
-	 * 子部门
-	 */
-	@TableField(exist = false)
-	@ApiModelProperty(value = "子部门")
-	private List<?> children = new ArrayList<>();
+    /**
+     * 子部门
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "子部门")
+    private List<?> children = new ArrayList<>();

 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java
@@ -1,8 +1,6 @@
 package com.ruoyi.common.core.domain.dto;

 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;

 import java.io.Serializable;
 import java.util.Date;
@@ -14,8 +12,6 @@ import java.util.Date;
 */

@Data
-@NoArgsConstructor
-@Accessors(chain = true)
 public class OperLogDTO implements Serializable {

    private static final long serialVersionUID = 1L;
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/RoleDTO.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/RoleDTO.java
@@ -0,0 +1,38 @@
+package com.ruoyi.common.core.domain.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 角色
+ *
+ * @author Lion Li
+ */
+
+@Data
+@NoArgsConstructor
+public class RoleDTO implements Serializable {
+
+    /**
+     * 角色ID
+     */
+    private Long roleId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 角色权限
+     */
+    private String roleKey;
+
+    /**
+     * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
+     */
+    private String dataScope;
+
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java
@@ -0,0 +1,61 @@
+package com.ruoyi.common.core.domain.dto;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 当前在线会话
+ *
+ * @author ruoyi
+ */
+
+@Data
+@NoArgsConstructor
+public class UserOnlineDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 会话编号
+     */
+    private String tokenId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 登录地址
+     */
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 登录时间
+     */
+    private Long loginTime;
+
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -8,10 +8,10 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;

 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;

 /**
@@ -22,72 +22,71 @@ import javax.validation.constraints.Size;

@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_dept")
@ApiModel("部门业务对象")
 public class SysDept extends TreeEntity {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;

-	/**
-	 * 部门ID
-	 */
-	@ApiModelProperty(value = "部门id")
-	@TableId(value = "dept_id")
-	private Long deptId;
+    /**
+     * 部门ID
+     */
+    @ApiModelProperty(value = "部门id")
+    @TableId(value = "dept_id")
+    private Long deptId;

-	/**
-	 * 部门名称
-	 */
-	@ApiModelProperty(value = "部门名称")
-	@NotBlank(message = "部门名称不能为空")
-	@Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
-	private String deptName;
+    /**
+     * 部门名称
+     */
+    @ApiModelProperty(value = "部门名称")
+    @NotBlank(message = "部门名称不能为空")
+    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
+    private String deptName;

-	/**
-	 * 显示顺序
-	 */
-	@ApiModelProperty(value = "显示顺序")
-	@NotBlank(message = "显示顺序不能为空")
-	private String orderNum;
+    /**
+     * 显示顺序
+     */
+    @ApiModelProperty(value = "显示顺序")
+    @NotNull(message = "显示顺序不能为空")
+    private Long orderNum;

-	/**
-	 * 负责人
-	 */
-	@ApiModelProperty(value = "负责人")
-	private String leader;
+    /**
+     * 负责人
+     */
+    @ApiModelProperty(value = "负责人")
+    private String leader;

-	/**
-	 * 联系电话
-	 */
-	@ApiModelProperty(value = "联系电话")
-	@Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
-	private String phone;
+    /**
+     * 联系电话
+     */
+    @ApiModelProperty(value = "联系电话")
+    @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
+    private String phone;

-	/**
-	 * 邮箱
-	 */
-	@ApiModelProperty(value = "邮箱")
-	@Email(message = "邮箱格式不正确")
-	@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-	private String email;
+    /**
+     * 邮箱
+     */
+    @ApiModelProperty(value = "邮箱")
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+    private String email;

-	/**
-	 * 部门状态:0正常,1停用
-	 */
-	@ApiModelProperty(value = "部门状态:0正常,1停用")
-	private String status;
+    /**
+     * 部门状态:0正常,1停用
+     */
+    @ApiModelProperty(value = "部门状态:0正常,1停用")
+    private String status;

-	/**
-	 * 删除标志（0代表存在 2代表删除）
-	 */
-	@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
-	@TableLogic
-	private String delFlag;
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    @TableLogic
+    private String delFlag;

-	/**
-	 * 祖级列表
-	 */
-	@ApiModelProperty(value = "祖级列表")
-	private String ancestors;
+    /**
+     * 祖级列表
+     */
+    @ApiModelProperty(value = "祖级列表")
+    private String ancestors;

 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;

 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -25,91 +24,90 @@ import javax.validation.constraints.Size;

@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_dict_data")
@ExcelIgnoreUnannotated
@ApiModel("字典数据业务对象")
 public class SysDictData extends BaseEntity {

-	/**
-	 * 字典编码
-	 */
-	@ApiModelProperty(value = "字典编码")
-	@ExcelProperty(value = "字典编码")
-	@TableId(value = "dict_code")
-	private Long dictCode;
+    /**
+     * 字典编码
+     */
+    @ApiModelProperty(value = "字典编码")
+    @ExcelProperty(value = "字典编码")
+    @TableId(value = "dict_code")
+    private Long dictCode;

-	/**
-	 * 字典排序
-	 */
-	@ApiModelProperty(value = "字典排序")
-	@ExcelProperty(value = "字典排序")
-	private Long dictSort;
+    /**
+     * 字典排序
+     */
+    @ApiModelProperty(value = "字典排序")
+    @ExcelProperty(value = "字典排序")
+    private Long dictSort;

-	/**
-	 * 字典标签
-	 */
-	@ApiModelProperty(value = "字典标签")
-	@ExcelProperty(value = "字典标签")
-	@NotBlank(message = "字典标签不能为空")
-	@Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
-	private String dictLabel;
+    /**
+     * 字典标签
+     */
+    @ApiModelProperty(value = "字典标签")
+    @ExcelProperty(value = "字典标签")
+    @NotBlank(message = "字典标签不能为空")
+    @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
+    private String dictLabel;

-	/**
-	 * 字典键值
-	 */
-	@ApiModelProperty(value = "字典键值")
-	@ExcelProperty(value = "字典键值")
-	@NotBlank(message = "字典键值不能为空")
-	@Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
-	private String dictValue;
+    /**
+     * 字典键值
+     */
+    @ApiModelProperty(value = "字典键值")
+    @ExcelProperty(value = "字典键值")
+    @NotBlank(message = "字典键值不能为空")
+    @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
+    private String dictValue;

-	/**
-	 * 字典类型
-	 */
-	@ApiModelProperty(value = "字典类型")
-	@ExcelProperty(value = "字典类型")
-	@NotBlank(message = "字典类型不能为空")
-	@Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
-	private String dictType;
+    /**
+     * 字典类型
+     */
+    @ApiModelProperty(value = "字典类型")
+    @ExcelProperty(value = "字典类型")
+    @NotBlank(message = "字典类型不能为空")
+    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
+    private String dictType;

-	/**
-	 * 样式属性（其他样式扩展）
-	 */
-	@ApiModelProperty(value = "样式属性（其他样式扩展）")
-	@Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
-	private String cssClass;
+    /**
+     * 样式属性（其他样式扩展）
+     */
+    @ApiModelProperty(value = "样式属性（其他样式扩展）")
+    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
+    private String cssClass;

-	/**
-	 * 表格字典样式
-	 */
-	@ApiModelProperty(value = "表格字典样式")
-	private String listClass;
+    /**
+     * 表格字典样式
+     */
+    @ApiModelProperty(value = "表格字典样式")
+    private String listClass;

-	/**
-	 * 是否默认（Y是 N否）
-	 */
-	@ApiModelProperty(value = "是否默认（Y是 N否）")
-	@ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class)
-	@ExcelDictFormat(dictType = "sys_yes_no")
-	private String isDefault;
+    /**
+     * 是否默认（Y是 N否）
+     */
+    @ApiModelProperty(value = "是否默认（Y是 N否）")
+    @ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_yes_no")
+    private String isDefault;

-	/**
-	 * 状态（0正常 1停用）
-	 */
-	@ApiModelProperty(value = "状态（0正常 1停用）")
-	@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-	@ExcelDictFormat(dictType = "sys_normal_disable")
-	private String status;
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ApiModelProperty(value = "状态（0正常 1停用）")
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private String status;

-	/**
-	 * 备注
-	 */
-	@ApiModelProperty(value = "备注")
-	private String remark;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;

-	public boolean getDefault() {
-		return UserConstants.YES.equals(this.isDefault);
-	}
+    public boolean getDefault() {
+        return UserConstants.YES.equals(this.isDefault);
+    }

 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
@@ -24,50 +24,49 @@ import javax.validation.constraints.Size;

@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_dict_type")
@ExcelIgnoreUnannotated
@ApiModel("字典类型业务对象")
 public class SysDictType extends BaseEntity {

-	/**
-	 * 字典主键
-	 */
-	@ApiModelProperty(value = "字典主键")
-	@ExcelProperty(value = "字典主键")
-	@TableId(value = "dict_id")
-	private Long dictId;
+    /**
+     * 字典主键
+     */
+    @ApiModelProperty(value = "字典主键")
+    @ExcelProperty(value = "字典主键")
+    @TableId(value = "dict_id")
+    private Long dictId;

-	/**
-	 * 字典名称
-	 */
-	@ApiModelProperty(value = "字典名称")
-	@ExcelProperty(value = "字典名称")
-	@NotBlank(message = "字典名称不能为空")
-	@Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
-	private String dictName;
+    /**
+     * 字典名称
+     */
+    @ApiModelProperty(value = "字典名称")
+    @ExcelProperty(value = "字典名称")
+    @NotBlank(message = "字典名称不能为空")
+    @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
+    private String dictName;

-	/**
-	 * 字典类型
-	 */
-	@ApiModelProperty(value = "字典类型")
-	@ExcelProperty(value = "字典类型")
-	@NotBlank(message = "字典类型不能为空")
-	@Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
-	private String dictType;
+    /**
+     * 字典类型
+     */
+    @ApiModelProperty(value = "字典类型")
+    @ExcelProperty(value = "字典类型")
+    @NotBlank(message = "字典类型不能为空")
+    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
+    private String dictType;

-	/**
-	 * 状态（0正常 1停用）
-	 */
-	@ApiModelProperty(value = "状态（0正常 1停用）")
-	@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-	@ExcelDictFormat(dictType = "sys_normal_disable")
-	private String status;
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ApiModelProperty(value = "状态（0正常 1停用）")
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private String status;

-	/**
-	 * 备注
-	 */
-	@ApiModelProperty(value = "备注")
-	private String remark;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;

 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -1,5 +1,6 @@
 package com.ruoyi.common.core.domain.entity;

+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.TreeEntity;
@@ -7,9 +8,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;

 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;

 /**
@@ -20,101 +21,101 @@ import javax.validation.constraints.Size;

@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_menu")
@ApiModel("菜单权限业务对象")
 public class SysMenu extends TreeEntity {

-	/**
-	 * 菜单ID
-	 */
-	@ApiModelProperty(value = "菜单ID")
-	@TableId(value = "menu_id")
-	private Long menuId;
+    /**
+     * 菜单ID
+     */
+    @ApiModelProperty(value = "菜单ID")
+    @TableId(value = "menu_id")
+    private Long menuId;

-	/**
-	 * 菜单名称
-	 */
-	@ApiModelProperty(value = "菜单名称")
-	@NotBlank(message = "菜单名称不能为空")
-	@Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
-	private String menuName;
+    /**
+     * 菜单名称
+     */
+    @ApiModelProperty(value = "菜单名称")
+    @NotBlank(message = "菜单名称不能为空")
+    @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
+    private String menuName;

-	/**
-	 * 显示顺序
-	 */
-	@ApiModelProperty(value = "显示顺序")
-	@NotBlank(message = "显示顺序不能为空")
-	private String orderNum;
+    /**
+     * 显示顺序
+     */
+    @ApiModelProperty(value = "显示顺序")
+    @NotNull(message = "显示顺序不能为空")
+    private Long orderNum;

-	/**
-	 * 路由地址
-	 */
-	@ApiModelProperty(value = "路由地址")
-	@Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
-	private String path;
+    /**
+     * 路由地址
+     */
+    @ApiModelProperty(value = "路由地址")
+    @Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
+    private String path;

-	/**
-	 * 组件路径
-	 */
-	@ApiModelProperty(value = "组件路径")
-	@Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
-	private String component;
+    /**
+     * 组件路径
+     */
+    @ApiModelProperty(value = "组件路径")
+    @Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
+    private String component;

    /**
     * 路由参数
     */
-	@ApiModelProperty(value = "路由参数")
+    @ApiModelProperty(value = "路由参数")
+    @TableField("`query`")
    private String query;

-	/**
-	 * 是否为外链（0是 1否）
-	 */
-	@ApiModelProperty(value = "是否为外链（0是 1否）")
-	private String isFrame;
+    /**
+     * 是否为外链（0是 1否）
+     */
+    @ApiModelProperty(value = "是否为外链（0是 1否）")
+    private String isFrame;

-	/**
-	 * 是否缓存（0缓存 1不缓存）
-	 */
-	@ApiModelProperty(value = "是否缓存（0缓存 1不缓存）")
-	private String isCache;
+    /**
+     * 是否缓存（0缓存 1不缓存）
+     */
+    @ApiModelProperty(value = "是否缓存（0缓存 1不缓存）")
+    private String isCache;

-	/**
-	 * 类型（M目录 C菜单 F按钮）
-	 */
-	@ApiModelProperty(value = "类型（M目录 C菜单 F按钮）")
-	@NotBlank(message = "菜单类型不能为空")
-	private String menuType;
+    /**
+     * 类型（M目录 C菜单 F按钮）
+     */
+    @ApiModelProperty(value = "类型（M目录 C菜单 F按钮）")
+    @NotBlank(message = "菜单类型不能为空")
+    private String menuType;

-	/**
-	 * 显示状态（0显示 1隐藏）
-	 */
-	@ApiModelProperty(value = "显示状态（0显示 1隐藏）")
-	private String visible;
+    /**
+     * 显示状态（0显示 1隐藏）
+     */
+    @ApiModelProperty(value = "显示状态（0显示 1隐藏）")
+    private String visible;

-	/**
-	 * 菜单状态（0显示 1隐藏）
-	 */
-	@ApiModelProperty(value = "菜单状态（0显示 1隐藏）")
-	private String status;
+    /**
+     * 菜单状态（0显示 1隐藏）
+     */
+    @ApiModelProperty(value = "菜单状态（0显示 1隐藏）")
+    private String status;

-	/**
-	 * 权限字符串
-	 */
-	@ApiModelProperty(value = "权限字符串")
-	@Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
-	private String perms;
+    /**
+     * 权限字符串
+     */
+    @ApiModelProperty(value = "权限字符串")
+    @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
+    private String perms;

-	/**
-	 * 菜单图标
-	 */
-	@ApiModelProperty(value = "菜单图标")
-	private String icon;
+    /**
+     * 菜单图标
+     */
+    @ApiModelProperty(value = "菜单图标")
+    private String icon;

-	/**
-	 * 备注
-	 */
-	@ApiModelProperty(value = "备注")
-	private String remark;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;

 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;

 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -27,118 +27,113 @@ import javax.validation.constraints.Size;
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_role")
@ExcelIgnoreUnannotated
 public class SysRole extends BaseEntity {

-	/**
-	 * 角色ID
-	 */
-	@ApiModelProperty(value = "角色ID")
-	@ExcelProperty(value = "角色序号")
-	@TableId(value = "role_id")
-	private Long roleId;
+    /**
+     * 角色ID
+     */
+    @ApiModelProperty(value = "角色ID")
+    @ExcelProperty(value = "角色序号")
+    @TableId(value = "role_id")
+    private Long roleId;

-	/**
-	 * 角色名称
-	 */
-	@ApiModelProperty(value = "角色名称")
-	@ExcelProperty(value = "角色名称")
-	@NotBlank(message = "角色名称不能为空")
-	@Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
-	private String roleName;
+    /**
+     * 角色名称
+     */
+    @ApiModelProperty(value = "角色名称")
+    @ExcelProperty(value = "角色名称")
+    @NotBlank(message = "角色名称不能为空")
+    @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
+    private String roleName;

-	/**
-	 * 角色权限
-	 */
-	@ApiModelProperty(value = "角色权限")
-	@ExcelProperty(value = "角色权限")
-	@NotBlank(message = "权限字符不能为空")
-	@Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
-	private String roleKey;
+    /**
+     * 角色权限
+     */
+    @ApiModelProperty(value = "角色权限")
+    @ExcelProperty(value = "角色权限")
+    @NotBlank(message = "权限字符不能为空")
+    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
+    private String roleKey;

-	/**
-	 * 角色排序
-	 */
-	@ApiModelProperty(value = "角色排序")
-	@ExcelProperty(value = "角色排序")
-	@NotBlank(message = "显示顺序不能为空")
-	private String roleSort;
+    /**
+     * 角色排序
+     */
+    @ApiModelProperty(value = "角色排序")
+    @ExcelProperty(value = "角色排序")
+    @NotBlank(message = "显示顺序不能为空")
+    private String roleSort;

-	/**
-	 * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
-	 */
-	@ApiModelProperty(value = "数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）")
-	@ExcelProperty(value = "数据范围", converter = ExcelDictConvert.class)
-	@ExcelDictFormat(readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
-	private String dataScope;
+    /**
+     * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
+     */
+    @ApiModelProperty(value = "数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）")
+    @ExcelProperty(value = "数据范围", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
+    private String dataScope;

-	/**
-	 * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
-	 */
-	@ApiModelProperty(value = "菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）")
-	private boolean menuCheckStrictly;
+    /**
+     * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
+     */
+    @ApiModelProperty(value = "菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）")
+    private boolean menuCheckStrictly;

-	/**
-	 * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
-	 */
-	@ApiModelProperty(value = "部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）")
-	private boolean deptCheckStrictly;
+    /**
+     * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
+     */
+    @ApiModelProperty(value = "部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）")
+    private boolean deptCheckStrictly;

-	/**
-	 * 角色状态（0正常 1停用）
-	 */
-	@ApiModelProperty(value = "角色状态（0正常 1停用）")
-	@ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class)
-	@ExcelDictFormat(dictType = "sys_common_status")
-	private String status;
+    /**
+     * 角色状态（0正常 1停用）
+     */
+    @ApiModelProperty(value = "角色状态（0正常 1停用）")
+    @ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_common_status")
+    private String status;

-	/**
-	 * 删除标志（0代表存在 2代表删除）
-	 */
-	@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
-	@TableLogic
-	private String delFlag;
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    @TableLogic
+    private String delFlag;

-	/**
-	 * 备注
-	 */
-	@ApiModelProperty(value = "备注")
-	private String remark;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;

-	/**
-	 * 用户是否存在此角色标识 默认不存在
-	 */
-	@ApiModelProperty(value = "用户是否存在此角色标识 默认不存在")
-	@TableField(exist = false)
-	private boolean flag = false;
+    /**
+     * 用户是否存在此角色标识 默认不存在
+     */
+    @ApiModelProperty(value = "用户是否存在此角色标识 默认不存在")
+    @TableField(exist = false)
+    private boolean flag = false;

-	/**
-	 * 菜单组
-	 */
-	@ApiModelProperty(value = "菜单组")
-	@TableField(exist = false)
-	private Long[] menuIds;
+    /**
+     * 菜单组
+     */
+    @ApiModelProperty(value = "菜单组")
+    @TableField(exist = false)
+    private Long[] menuIds;

-	/**
-	 * 部门组（数据权限）
-	 */
-	@ApiModelProperty(value = "部门组（数据权限）")
-	@TableField(exist = false)
-	private Long[] deptIds;
+    /**
+     * 部门组（数据权限）
+     */
+    @ApiModelProperty(value = "部门组（数据权限）")
+    @TableField(exist = false)
+    private Long[] deptIds;

-	public SysRole(Long roleId) {
-		this.roleId = roleId;
-	}
+    public SysRole(Long roleId) {
+        this.roleId = roleId;
+    }

-	@ApiModelProperty(value = "是否管理员")
-	public boolean isAdmin() {
-		return isAdmin(this.roleId);
-	}
-
-	public static boolean isAdmin(Long roleId) {
-		return roleId != null && 1L == roleId;
-	}
+    @ApiModelProperty(value = "是否管理员")
+    public boolean isAdmin() {
+        return UserConstants.ADMIN_ID.equals(this.roleId);
+    }

 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -3,13 +3,16 @@ package com.ruoyi.common.core.domain.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.common.annotation.Sensitive;
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.enums.SensitiveStrategy;
+import com.ruoyi.common.xss.Xss;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;

 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
@@ -26,159 +29,164 @@ import java.util.List;
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_user")
@ApiModel("用户信息业务对象")
 public class SysUser extends BaseEntity {

-	/**
-	 * 用户ID
-	 */
-	@ApiModelProperty(value = "用户ID")
-	@TableId(value = "user_id")
-	private Long userId;
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty(value = "用户ID")
+    @TableId(value = "user_id")
+    private Long userId;

-	/**
-	 * 部门ID
-	 */
-	@ApiModelProperty(value = "部门ID")
-	private Long deptId;
+    /**
+     * 部门ID
+     */
+    @ApiModelProperty(value = "部门ID")
+    private Long deptId;

-	/**
-	 * 用户账号
-	 */
-	@ApiModelProperty(value = "用户账号")
-	@NotBlank(message = "用户账号不能为空")
-	@Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
-	private String userName;
+    /**
+     * 用户账号
+     */
+    @ApiModelProperty(value = "用户账号")
+    @Xss(message = "用户账号不能包含脚本字符")
+    @NotBlank(message = "用户账号不能为空")
+    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
+    private String userName;

-	/**
-	 * 用户昵称
-	 */
-	@ApiModelProperty(value = "用户昵称")
-	@Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-	private String nickName;
+    /**
+     * 用户昵称
+     */
+    @ApiModelProperty(value = "用户昵称")
+    @Xss(message = "用户昵称不能包含脚本字符")
+    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+    private String nickName;

-	/**
-	 * 用户邮箱
-	 */
-	@ApiModelProperty(value = "用户邮箱")
-	@Email(message = "邮箱格式不正确")
-	@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-	private String email;
+    /**
+     * 用户类型（sys_user系统用户）
+     */
+    @ApiModelProperty(value = "用户类型")
+    private String userType;

-	/**
-	 * 手机号码
-	 */
-	@ApiModelProperty(value = "手机号码")
-	private String phonenumber;
+    /**
+     * 用户邮箱
+     */
+    @Sensitive(strategy = SensitiveStrategy.EMAIL)
+    @ApiModelProperty(value = "用户邮箱")
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+    private String email;

-	/**
-	 * 用户性别
-	 */
-	@ApiModelProperty(value = "用户性别")
-	private String sex;
+    /**
+     * 手机号码
+     */
+    @Sensitive(strategy = SensitiveStrategy.PHONE)
+    @ApiModelProperty(value = "手机号码")
+    private String phonenumber;

-	/**
-	 * 用户头像
-	 */
-	@ApiModelProperty(value = "用户头像")
-	private String avatar;
+    /**
+     * 用户性别
+     */
+    @ApiModelProperty(value = "用户性别")
+    private String sex;

-	/**
-	 * 密码
-	 */
-	@ApiModelProperty(value = "密码")
-	@TableField(
-			insertStrategy = FieldStrategy.NOT_EMPTY,
-			updateStrategy = FieldStrategy.NOT_EMPTY,
-			whereStrategy = FieldStrategy.NOT_EMPTY
-	)
-	private String password;
+    /**
+     * 用户头像
+     */
+    @ApiModelProperty(value = "用户头像")
+    private String avatar;

-	@JsonIgnore
-	@JsonProperty
-	public String getPassword() {
-		return password;
-	}
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value = "密码")
+    @TableField(
+        insertStrategy = FieldStrategy.NOT_EMPTY,
+        updateStrategy = FieldStrategy.NOT_EMPTY,
+        whereStrategy = FieldStrategy.NOT_EMPTY
+    )
+    private String password;

-	/**
-	 * 帐号状态（0正常 1停用）
-	 */
-	@ApiModelProperty(value = "帐号状态（0正常 1停用）")
-	private String status;
+    @JsonIgnore
+    @JsonProperty
+    public String getPassword() {
+        return password;
+    }

-	/**
-	 * 删除标志（0代表存在 2代表删除）
-	 */
-	@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
-	@TableLogic
-	private String delFlag;
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @ApiModelProperty(value = "帐号状态（0正常 1停用）")
+    private String status;

-	/**
-	 * 最后登录IP
-	 */
-	@ApiModelProperty(value = "最后登录IP")
-	private String loginIp;
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    @TableLogic
+    private String delFlag;

-	/**
-	 * 最后登录时间
-	 */
-	@ApiModelProperty(value = "最后登录时间")
-	private Date loginDate;
+    /**
+     * 最后登录IP
+     */
+    @ApiModelProperty(value = "最后登录IP")
+    private String loginIp;

-	/**
-	 * 备注
-	 */
-	@ApiModelProperty(value = "备注")
-	private String remark;
+    /**
+     * 最后登录时间
+     */
+    @ApiModelProperty(value = "最后登录时间")
+    private Date loginDate;

-	/**
-	 * 部门对象
-	 */
-	@ApiModelProperty(value = "部门对象")
-	@TableField(exist = false)
-	private SysDept dept;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;

-	/**
-	 * 角色对象
-	 */
-	@ApiModelProperty(value = "角色对象")
-	@TableField(exist = false)
-	private List<SysRole> roles;
+    /**
+     * 部门对象
+     */
+    @ApiModelProperty(value = "部门对象")
+    @TableField(exist = false)
+    private SysDept dept;

-	/**
-	 * 角色组
-	 */
-	@ApiModelProperty(value = "角色组")
-	@TableField(exist = false)
-	private Long[] roleIds;
+    /**
+     * 角色对象
+     */
+    @ApiModelProperty(value = "角色对象")
+    @TableField(exist = false)
+    private List<SysRole> roles;

-	/**
-	 * 岗位组
-	 */
-	@ApiModelProperty(value = "岗位组")
-	@TableField(exist = false)
-	private Long[] postIds;
+    /**
+     * 角色组
+     */
+    @ApiModelProperty(value = "角色组")
+    @TableField(exist = false)
+    private Long[] roleIds;

-	/**
-	 * 角色ID
-	 */
-	@ApiModelProperty(value = "角色ID")
-	@TableField(exist = false)
-	private Long roleId;
+    /**
+     * 岗位组
+     */
+    @ApiModelProperty(value = "岗位组")
+    @TableField(exist = false)
+    private Long[] postIds;

-	public SysUser(Long userId) {
-		this.userId = userId;
-	}
+    /**
+     * 数据权限 当前角色ID
+     */
+    @ApiModelProperty(value = "角色ID")
+    @TableField(exist = false)
+    private Long roleId;

-	@ApiModelProperty(value = "是否管理员")
-	public boolean isAdmin() {
-		return isAdmin(this.userId);
-	}
+    public SysUser(Long userId) {
+        this.userId = userId;
+    }

-	public static boolean isAdmin(Long userId) {
-		return userId != null && 1L == userId;
-	}
+    @ApiModelProperty(value = "是否管理员")
+    public boolean isAdmin() {
+        return UserConstants.ADMIN_ID.equals(this.userId);
+    }

 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
@@ -1,43 +1,49 @@
-package com.ruoyi.common.core.domain.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 用户登录对象
- *
- * @author Lion Li
- */
-
-@Data
-@Accessors(chain = true)
-@ApiModel("用户登录对象")
-public class LoginBody {
-
-    /**
-     * 用户名
-     */
-    @ApiModelProperty(value = "用户名")
-    private String username;
-
-    /**
-     * 用户密码
-     */
-    @ApiModelProperty(value = "用户密码")
-    private String password;
-
-    /**
-     * 验证码
-     */
-    @ApiModelProperty(value = "验证码")
-    private String code;
-
-    /**
-     * 唯一标识
-     */
-    @ApiModelProperty(value = "唯一标识")
-    private String uuid = "";
-
-}
+package com.ruoyi.common.core.domain.model;
+
+import com.ruoyi.common.constant.UserConstants;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 用户登录对象
+ *
+ * @author Lion Li
+ */
+
+@Data
+@ApiModel("用户登录对象")
+public class LoginBody {
+
+    /**
+     * 用户名
+     */
+    @NotBlank(message = "{user.username.not.blank}")
+    @Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}")
+    @ApiModelProperty(value = "用户名")
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    @NotBlank(message = "{user.password.not.blank}")
+    @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
+    @ApiModelProperty(value = "用户密码")
+    private String password;
+
+    /**
+     * 验证码
+     */
+    @ApiModelProperty(value = "验证码")
+    private String code;
+
+    /**
+     * 唯一标识
+     */
+    @ApiModelProperty(value = "唯一标识")
+    private String uuid;
+
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
@@ -1,13 +1,12 @@
 package com.ruoyi.common.core.domain.model;

-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ruoyi.common.core.domain.dto.RoleDTO;
+import com.ruoyi.common.helper.LoginHelper;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;

-import java.util.Collection;
+import java.io.Serializable;
+import java.util.List;
 import java.util.Set;

 /**
@@ -18,8 +17,7 @@ import java.util.Set;

@Data
@NoArgsConstructor
-@Accessors(chain = true)
-public class LoginUser implements UserDetails {
+public class LoginUser implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -33,11 +31,21 @@ public class LoginUser implements UserDetails {
     */
    private Long deptId;

+    /**
+     * 部门名
+     */
+    private String deptName;
+
    /**
     * 用户唯一标识
     */
    private String token;

+    /**
+     * 用户类型
+     */
+    private String userType;
+
    /**
     * 登录时间
     */
@@ -69,9 +77,14 @@ public class LoginUser implements UserDetails {
    private String os;

    /**
-     * 权限列表
+     * 菜单权限
     */
-    private Set<String> permissions;
+    private Set<String> menuPermission;
+
+    /**
+     * 角色权限
+     */
+    private Set<String> rolePermission;

    /**
     * 用户名
@@ -79,73 +92,20 @@ public class LoginUser implements UserDetails {
    private String username;

    /**
-     * 密码
+     * 角色对象
     */
-    private String password;
-
-    public LoginUser(String username, String password, Set<String> permissions) {
-        this.username = username;
-        this.password = password;
-        this.permissions = permissions;
-    }
-
-    public LoginUser(Long userId, Long deptId, String username, String password, Set<String> permissions) {
-        this.userId = userId;
-        this.deptId = deptId;
-        this.username = username;
-        this.password = password;
-        this.permissions = permissions;
-    }
-
-    @JsonIgnore
-    @Override
-    public String getPassword() {
-        return password;
-    }
-
-    @Override
-    public String getUsername() {
-        return username;
-    }
+    private List<RoleDTO> roles;

    /**
-     * 账户是否未过期,过期无法验证
+     * 数据权限 当前角色ID
     */
-    @JsonIgnore
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
+    private Long roleId;

    /**
-     * 指定用户是否解锁,锁定的用户无法进行身份验证
+     * 获取登录id
     */
-    @JsonIgnore
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
+    public String getLoginId() {
+        return userType + LoginHelper.JOIN_CODE + userId;
    }

-    /**
-     * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
-     */
-    @JsonIgnore
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    /**
-     * 是否可用 ,禁用的用户不能身份验证
-     */
-    @JsonIgnore
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return null;
-    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
@@ -1,13 +1,21 @@
-package com.ruoyi.common.core.domain.model;
-
-import io.swagger.annotations.ApiModel;
-
-/**
- * 用户注册对象
- *
- * @author Lion Li
- */
-@ApiModel("用户注册对象")
-public class RegisterBody extends LoginBody {
-
-}
+package com.ruoyi.common.core.domain.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 用户注册对象
+ *
+ * @author Lion Li
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("用户注册对象")
+public class RegisterBody extends LoginBody {
+
+    @ApiModelProperty(value = "用户类型")
+    private String userType;
+
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java
@@ -0,0 +1,229 @@
+package com.ruoyi.common.core.mapper;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.enums.SqlMethod;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import com.baomidou.mybatisplus.core.toolkit.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.ruoyi.common.utils.BeanCopyUtils;
+import org.apache.ibatis.binding.MapperMethod;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 自定义 Mapper 接口, 实现 自定义扩展
+ *
+ * @param <M> mapper 泛型
+ * @param <T> table 泛型
+ * @param <V> vo 泛型
+ * @author Lion Li
+ * @since 2021-05-13
+ */
+@SuppressWarnings("unchecked")
+public interface BaseMapperPlus<M, T, V> extends BaseMapper<T> {
+
+    Log log = LogFactory.getLog(BaseMapperPlus.class);
+
+    int DEFAULT_BATCH_SIZE = 1000;
+
+    default Class<V> currentVoClass() {
+        return (Class<V>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseMapperPlus.class, 2);
+    }
+
+    default Class<T> currentModelClass() {
+        return (Class<T>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseMapperPlus.class, 1);
+    }
+
+    default Class<M> currentMapperClass() {
+        return (Class<M>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseMapperPlus.class, 0);
+    }
+
+    default List<T> selectList() {
+        return this.selectList(new QueryWrapper<>());
+    }
+
+    /**
+     * 批量插入
+     */
+    default boolean insertBatch(Collection<T> entityList) {
+        return insertBatch(entityList, DEFAULT_BATCH_SIZE);
+    }
+
+    /**
+     * 批量更新
+     */
+    default boolean updateBatchById(Collection<T> entityList) {
+        return updateBatchById(entityList, DEFAULT_BATCH_SIZE);
+    }
+
+    /**
+     * 批量插入或更新
+     */
+    default boolean insertOrUpdateBatch(Collection<T> entityList) {
+        return insertOrUpdateBatch(entityList, DEFAULT_BATCH_SIZE);
+    }
+
+    /**
+     * 批量插入(包含限制条数)
+     */
+    default boolean insertBatch(Collection<T> entityList, int batchSize) {
+        String sqlStatement = SqlHelper.getSqlStatement(this.currentMapperClass(), SqlMethod.INSERT_ONE);
+        return SqlHelper.executeBatch(this.currentModelClass(), log, entityList, batchSize,
+            (sqlSession, entity) -> sqlSession.insert(sqlStatement, entity));
+    }
+
+    /**
+     * 批量更新(包含限制条数)
+     */
+    default boolean updateBatchById(Collection<T> entityList, int batchSize) {
+        String sqlStatement = SqlHelper.getSqlStatement(this.currentMapperClass(), SqlMethod.UPDATE_BY_ID);
+        return SqlHelper.executeBatch(this.currentModelClass(), log, entityList, batchSize,
+            (sqlSession, entity) -> {
+                MapperMethod.ParamMap<T> param = new MapperMethod.ParamMap<>();
+                param.put(Constants.ENTITY, entity);
+                sqlSession.update(sqlStatement, param);
+            });
+    }
+
+    /**
+     * 批量插入或更新(包含限制条数)
+     */
+    default boolean insertOrUpdateBatch(Collection<T> entityList, int batchSize) {
+        TableInfo tableInfo = TableInfoHelper.getTableInfo(this.currentModelClass());
+        Assert.notNull(tableInfo, "error: can not execute. because can not find cache of TableInfo for entity!");
+        String keyProperty = tableInfo.getKeyProperty();
+        Assert.notEmpty(keyProperty, "error: can not execute. because can not find column for id from entity!");
+        return SqlHelper.saveOrUpdateBatch(this.currentModelClass(), this.currentMapperClass(), log, entityList, batchSize, (sqlSession, entity) -> {
+            Object idVal = tableInfo.getPropertyValue(entity, keyProperty);
+            String sqlStatement = SqlHelper.getSqlStatement(this.currentMapperClass(), SqlMethod.SELECT_BY_ID);
+            return StringUtils.checkValNull(idVal)
+                || CollectionUtils.isEmpty(sqlSession.selectList(sqlStatement, entity));
+        }, (sqlSession, entity) -> {
+            MapperMethod.ParamMap<T> param = new MapperMethod.ParamMap<>();
+            param.put(Constants.ENTITY, entity);
+            String sqlStatement = SqlHelper.getSqlStatement(this.currentMapperClass(), SqlMethod.UPDATE_BY_ID);
+            sqlSession.update(sqlStatement, param);
+        });
+    }
+
+    /**
+     * 插入或更新(包含限制条数)
+     */
+    default boolean insertOrUpdate(T entity) {
+        if (null != entity) {
+            TableInfo tableInfo = TableInfoHelper.getTableInfo(this.currentModelClass());
+            Assert.notNull(tableInfo, "error: can not execute. because can not find cache of TableInfo for entity!");
+            String keyProperty = tableInfo.getKeyProperty();
+            Assert.notEmpty(keyProperty, "error: can not execute. because can not find column for id from entity!");
+            Object idVal = tableInfo.getPropertyValue(entity, tableInfo.getKeyProperty());
+            return StringUtils.checkValNull(idVal) || Objects.isNull(selectById((Serializable) idVal)) ? insert(entity) > 0 : updateById(entity) > 0;
+        }
+        return false;
+    }
+
+    default V selectVoById(Serializable id) {
+        return selectVoById(id, this.currentVoClass());
+    }
+
+    /**
+     * 根据 ID 查询
+     */
+    default <C> C selectVoById(Serializable id, Class<C> voClass) {
+        T obj = this.selectById(id);
+        if (ObjectUtil.isNull(obj)) {
+            return null;
+        }
+        return BeanCopyUtils.copy(obj, voClass);
+    }
+
+    default List<V> selectVoById(Collection<? extends Serializable> idList) {
+        return selectVoBatchIds(idList, this.currentVoClass());
+    }
+
+    /**
+     * 查询（根据ID 批量查询）
+     */
+    default <C> List<C> selectVoBatchIds(Collection<? extends Serializable> idList, Class<C> voClass) {
+        List<T> list = this.selectBatchIds(idList);
+        if (CollUtil.isEmpty(list)) {
+            return CollUtil.newArrayList();
+        }
+        return BeanCopyUtils.copyList(list, voClass);
+    }
+
+    default List<V> selectVoByMap(Map<String, Object> map) {
+        return selectVoByMap(map, this.currentVoClass());
+    }
+
+    /**
+     * 查询（根据 columnMap 条件）
+     */
+    default <C> List<C> selectVoByMap(Map<String, Object> map, Class<C> voClass) {
+        List<T> list = this.selectByMap(map);
+        if (CollUtil.isEmpty(list)) {
+            return CollUtil.newArrayList();
+        }
+        return BeanCopyUtils.copyList(list, voClass);
+    }
+
+    default V selectVoOne(Wrapper<T> wrapper) {
+        return selectVoOne(wrapper, this.currentVoClass());
+    }
+
+    /**
+     * 根据 entity 条件，查询一条记录
+     */
+    default <C> C selectVoOne(Wrapper<T> wrapper, Class<C> voClass) {
+        T obj = this.selectOne(wrapper);
+        if (ObjectUtil.isNull(obj)) {
+            return null;
+        }
+        return BeanCopyUtils.copy(obj, voClass);
+    }
+
+    default List<V> selectVoList(Wrapper<T> wrapper) {
+        return selectVoList(wrapper, this.currentVoClass());
+    }
+
+    /**
+     * 根据 entity 条件，查询全部记录
+     */
+    default <C> List<C> selectVoList(Wrapper<T> wrapper, Class<C> voClass) {
+        List<T> list = this.selectList(wrapper);
+        if (CollUtil.isEmpty(list)) {
+            return CollUtil.newArrayList();
+        }
+        return BeanCopyUtils.copyList(list, voClass);
+    }
+
+    default <P extends IPage<V>> P selectVoPage(IPage<T> page, Wrapper<T> wrapper) {
+        return selectVoPage(page, wrapper, this.currentVoClass());
+    }
+
+    /**
+     * 分页查询VO
+     */
+    default <C, P extends IPage<C>> P selectVoPage(IPage<T> page, Wrapper<T> wrapper, Class<C> voClass) {
+        IPage<T> pageData = this.selectPage(page, wrapper);
+        IPage<C> voPage = new Page<>(pageData.getCurrent(), pageData.getSize(), pageData.getTotal());
+        if (CollUtil.isEmpty(pageData.getRecords())) {
+            return (P) voPage;
+        }
+        voPage.setRecords(BeanCopyUtils.copyList(pageData.getRecords(), voClass));
+        return (P) voPage;
+    }
+
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java
@@ -1,21 +0,0 @@
-package com.ruoyi.common.core.mybatisplus.core;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Collection;
-
-/**
- * 自定义 Mapper 接口, 实现 自定义扩展
- *
- * @author Lion Li
- * @since 2021-05-13
- */
-public interface BaseMapperPlus<T> extends BaseMapper<T> {
-
-	/**
-	 * 单sql批量插入( 全量填充 )
-	 */
-	int insertAll(@Param("list") Collection<T> batchList);
-
-}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
@@ -1,175 +0,0 @@
-package com.ruoyi.common.core.mybatisplus.core;
-
-import cn.hutool.core.bean.copier.CopyOptions;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.common.core.page.PagePlus;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-/**
- * 自定义 Service 接口, 实现 数据库实体与 vo 对象转换返回
- *
- * @param <T> 数据实体类
- * @param <V> vo类
- * @author Lion Li
- */
-public interface IServicePlus<T, V> extends IService<T> {
-
-	/**
-	 * @param id          主键id
-	 * @param copyOptions copy条件
-	 * @return V对象
-	 */
-	V getVoById(Serializable id, CopyOptions copyOptions);
-
-	default V getVoById(Serializable id) {
-		return getVoById(id, new CopyOptions());
-	}
-
-	/**
-	 * @param convertor 自定义转换器
-	 */
-	default V getVoById(Serializable id, Function<T, V> convertor) {
-		return convertor.apply(getById(id));
-	}
-
-	/**
-	 * @param idList      id列表
-	 * @param copyOptions copy条件
-	 * @return V对象
-	 */
-	List<V> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions);
-
-	default List<V> listVoByIds(Collection<? extends Serializable> idList) {
-		return listVoByIds(idList, new CopyOptions());
-	}
-
-	/**
-	 * @param convertor 自定义转换器
-	 */
-	default List<V> listVoByIds(Collection<? extends Serializable> idList,
-								Function<Collection<T>, List<V>> convertor) {
-		List<T> list = getBaseMapper().selectBatchIds(idList);
-		if (list == null) {
-			return null;
-		}
-		return convertor.apply(list);
-	}
-
-	/**
-	 * @param columnMap   表字段 map 对象
-	 * @param copyOptions copy条件
-	 * @return V对象
-	 */
-	List<V> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions);
-
-	default List<V> listVoByMap(Map<String, Object> columnMap) {
-		return listVoByMap(columnMap, new CopyOptions());
-	}
-
-	/**
-	 * @param convertor 自定义转换器
-	 */
-	default List<V> listVoByMap(Map<String, Object> columnMap,
-								Function<Collection<T>, List<V>> convertor) {
-		List<T> list = getBaseMapper().selectByMap(columnMap);
-		if (list == null) {
-			return null;
-		}
-		return convertor.apply(list);
-	}
-
-	/**
-	 * @param queryWrapper 查询条件
-	 * @param copyOptions  copy条件
-	 * @return V对象
-	 */
-	V getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions);
-
-	default V getVoOne(Wrapper<T> queryWrapper) {
-		return getVoOne(queryWrapper, new CopyOptions());
-	}
-
-	/**
-	 * @param convertor 自定义转换器
-	 */
-	default V getVoOne(Wrapper<T> queryWrapper, Function<T, V> convertor) {
-		return convertor.apply(getOne(queryWrapper, true));
-	}
-
-	/**
-	 * @param queryWrapper 查询条件
-	 * @param copyOptions  copy条件
-	 * @return V对象
-	 */
-	List<V> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions);
-
-	default List<V> listVo(Wrapper<T> queryWrapper) {
-		return listVo(queryWrapper, new CopyOptions());
-	}
-
-	/**
-	 * @param convertor 自定义转换器
-	 */
-	default List<V> listVo(Wrapper<T> queryWrapper, Function<Collection<T>, List<V>> convertor) {
-		List<T> list = getBaseMapper().selectList(queryWrapper);
-		if (list == null) {
-			return null;
-		}
-		return convertor.apply(list);
-	}
-
-	default List<V> listVo() {
-		return listVo(Wrappers.emptyWrapper());
-	}
-
-	/**
-	 * @param convertor 自定义转换器
-	 */
-	default List<V> listVo(Function<Collection<T>, List<V>> convertor) {
-		return listVo(Wrappers.emptyWrapper(), convertor);
-	}
-
-	/**
-	 * @param page         分页对象
-	 * @param queryWrapper 查询条件
-	 * @param copyOptions  copy条件
-	 * @return V对象
-	 */
-	PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper, CopyOptions copyOptions);
-
-	default PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper) {
-		return pageVo(page, queryWrapper, new CopyOptions());
-	}
-
-	/**
-	 * @param convertor 自定义转换器
-	 */
-	default PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper,
-								  Function<Collection<T>, List<V>> convertor) {
-		PagePlus<T, V> result = getBaseMapper().selectPage(page, queryWrapper);
-		return result.setRecordsVo(convertor.apply(result.getRecords()));
-	}
-
-	default PagePlus<T, V> pageVo(PagePlus<T, V> page) {
-		return pageVo(page, Wrappers.emptyWrapper());
-	}
-
-	/**
-	 * @param convertor 自定义转换器
-	 */
-	default PagePlus<T, V> pageVo(PagePlus<T, V> page, Function<Collection<T>, List<V>> convertor) {
-		return pageVo(page, Wrappers.emptyWrapper(), convertor);
-	}
-
-	boolean saveAll(Collection<T> entityList);
-
-	boolean saveOrUpdateAll(Collection<T> entityList);
-}
-
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
@@ -1,241 +0,0 @@
-package com.ruoyi.common.core.mybatisplus.core;
-
-import cn.hutool.core.bean.copier.CopyOptions;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
-import com.baomidou.mybatisplus.core.toolkit.Assert;
-import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.utils.BeanCopyUtils;
-import com.ruoyi.common.utils.reflect.ReflectUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * IServicePlus 实现类
- *
- * @param <M> Mapper类
- * @param <T> 数据实体类
- * @param <V> vo类
- * @author Lion Li
- */
-@Slf4j
-@SuppressWarnings("unchecked")
-public class ServicePlusImpl<M extends BaseMapperPlus<T>, T, V> extends ServiceImpl<M, T> implements IServicePlus<T, V> {
-
-	@Autowired
-	protected M baseMapper;
-
-	@Override
-	public M getBaseMapper() {
-		return baseMapper;
-	}
-
-
-	protected Class<T> entityClass = currentModelClass();
-
-	@Override
-	public Class<T> getEntityClass() {
-		return entityClass;
-	}
-
-	protected Class<M> mapperClass = currentMapperClass();
-
-	protected Class<V> voClass = currentVoClass();
-
-	public Class<V> getVoClass() {
-		return voClass;
-	}
-
-	@Override
-	protected Class<M> currentMapperClass() {
-		return (Class<M>) ReflectionKit.getSuperClassGenericType(this.getClass(), ServicePlusImpl.class, 0);
-	}
-
-	@Override
-	protected Class<T> currentModelClass() {
-		return (Class<T>) ReflectionKit.getSuperClassGenericType(this.getClass(), ServicePlusImpl.class, 1);
-	}
-
-	protected Class<V> currentVoClass() {
-		return (Class<V>) ReflectionKit.getSuperClassGenericType(this.getClass(), ServicePlusImpl.class, 2);
-	}
-
-	/**
-	 * 单条执行性能差 适用于列表对象内容不确定
-	 */
-	@Override
-	public boolean saveBatch(Collection<T> entityList, int batchSize) {
-		return super.saveBatch(entityList, batchSize);
-	}
-
-	@Override
-	public boolean saveOrUpdate(T entity) {
-		return super.saveOrUpdate(entity);
-	}
-
-	/**
-	 * 单条执行性能差 适用于列表对象内容不确定
-	 */
-	@Override
-	public boolean saveOrUpdateBatch(Collection<T> entityList, int batchSize) {
-		return super.saveOrUpdateBatch(entityList, batchSize);
-	}
-
-	@Override
-	public boolean updateBatchById(Collection<T> entityList, int batchSize) {
-		return super.updateBatchById(entityList, batchSize);
-	}
-
-	/**
-	 * 单sql批量插入( 全量填充 无视数据库默认值 )
-	 * 适用于无脑插入
-	 */
-	@Override
-	public boolean saveBatch(Collection<T> entityList) {
-		return saveBatch(entityList, DEFAULT_BATCH_SIZE);
-	}
-
-	@Override
-	public boolean saveOrUpdateBatch(Collection<T> entityList) {
-		return saveOrUpdateBatch(entityList, DEFAULT_BATCH_SIZE);
-	}
-
-	@Override
-	public boolean updateBatchById(Collection<T> entityList) {
-		return updateBatchById(entityList, DEFAULT_BATCH_SIZE);
-	}
-
-	/**
-	 * 单sql批量插入( 全量填充 )
-	 */
-	@Override
-	public boolean saveAll(Collection<T> entityList) {
-		if (CollUtil.isEmpty(entityList)) {
-			return false;
-		}
-		return baseMapper.insertAll(entityList) == entityList.size();
-	}
-
-	/**
-	 * 全量保存或更新 ( 按主键区分 )
-	 */
-	@Override
-	public boolean saveOrUpdateAll(Collection<T> entityList) {
-		if (CollUtil.isEmpty(entityList)) {
-			return false;
-		}
-		TableInfo tableInfo = TableInfoHelper.getTableInfo(entityClass);
-		Assert.notNull(tableInfo, "error: can not execute. because can not find cache of TableInfo for entity!");
-		String keyProperty = tableInfo.getKeyProperty();
-		Assert.notEmpty(keyProperty, "error: can not execute. because can not find column for id from entity!");
-		List<T> addList = new ArrayList<>();
-		List<T> updateList = new ArrayList<>();
-		int row = 0;
-		for (T entity : entityList) {
-			Object id = ReflectUtils.invokeGetter(entity, keyProperty);
-			if (ObjectUtil.isNull(id)) {
-				addList.add(entity);
-			} else {
-				updateList.add(entity);
-			}
-		}
-		if (CollUtil.isNotEmpty(updateList) && updateBatchById(updateList)) {
-			row += updateList.size();
-		}
-        if (CollUtil.isNotEmpty(addList)) {
-            row += baseMapper.insertAll(addList);
-        }
-		return row == entityList.size();
-	}
-
-	/**
-	 * 根据 ID 查询
-	 *
-	 * @param id 主键ID
-	 */
-	@Override
-	public V getVoById(Serializable id, CopyOptions copyOptions) {
-		T t = getBaseMapper().selectById(id);
-		return BeanCopyUtils.oneCopy(t, copyOptions, voClass);
-	}
-
-	/**
-	 * 查询（根据ID 批量查询）
-	 *
-	 * @param idList 主键ID列表
-	 */
-	@Override
-	public List<V> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions) {
-		List<T> list = getBaseMapper().selectBatchIds(idList);
-		if (list == null) {
-			return null;
-		}
-		return BeanCopyUtils.listCopy(list, copyOptions, voClass);
-	}
-
-	/**
-	 * 查询（根据 columnMap 条件）
-	 *
-	 * @param columnMap 表字段 map 对象
-	 */
-	@Override
-	public List<V> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions) {
-		List<T> list = getBaseMapper().selectByMap(columnMap);
-		if (list == null) {
-			return null;
-		}
-		return BeanCopyUtils.listCopy(list, copyOptions, voClass);
-	}
-
-	/**
-	 * 根据 Wrapper，查询一条记录 <br/>
-	 * <p>结果集，如果是多个会抛出异常，随机取一条加上限制条件 wrapper.last("LIMIT 1")</p>
-	 *
-	 * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
-	 */
-	@Override
-	public V getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
-		T t = getOne(queryWrapper, true);
-		return BeanCopyUtils.oneCopy(t, copyOptions, voClass);
-	}
-
-	/**
-	 * 查询列表
-	 *
-	 * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
-	 */
-	@Override
-	public List<V> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
-		List<T> list = getBaseMapper().selectList(queryWrapper);
-		if (list == null) {
-			return null;
-		}
-		return BeanCopyUtils.listCopy(list, copyOptions, voClass);
-	}
-
-	/**
-	 * 翻页查询
-	 *
-	 * @param page         翻页对象
-	 * @param queryWrapper 实体对象封装操作类
-	 */
-	@Override
-	public PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper, CopyOptions copyOptions) {
-		PagePlus<T, V> result = getBaseMapper().selectPage(page, queryWrapper);
-		List<V> volist = BeanCopyUtils.listCopy(result.getRecords(), copyOptions, voClass);
-		result.setRecordsVo(volist);
-		return result;
-	}
-
-}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java
@@ -1,101 +0,0 @@
-package com.ruoyi.common.core.mybatisplus.methods;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.core.injector.AbstractMethod;
-import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
-import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
-import com.ruoyi.common.utils.StringUtils;
-import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
-import org.apache.ibatis.executor.keygen.KeyGenerator;
-import org.apache.ibatis.executor.keygen.NoKeyGenerator;
-import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.ibatis.mapping.SqlSource;
-
-import java.util.List;
-
-/**
- * 单sql批量插入( 全量填充 )
- *
- * @author Lion Li
- */
-public class InsertAll extends AbstractMethod {
-
-	private final static String[] FILL_PROPERTY = {"createTime", "createBy", "updateTime", "updateBy"};
-
-	@Override
-	public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) {
-		final String sql = "<script>insert into %s %s values %s</script>";
-		final String fieldSql = prepareFieldSql(tableInfo);
-		final String valueSql = prepareValuesSqlForMysqlBatch(tableInfo);
-		KeyGenerator keyGenerator = new NoKeyGenerator();
-		String sqlMethod = "insertAll";
-		String keyProperty = null;
-		String keyColumn = null;
-		// 表包含主键处理逻辑,如果不包含主键当普通字段处理
-		if (StringUtils.isNotBlank(tableInfo.getKeyProperty())) {
-			if (tableInfo.getIdType() == IdType.AUTO) {
-				/** 自增主键 */
-				keyGenerator = new Jdbc3KeyGenerator();
-				keyProperty = tableInfo.getKeyProperty();
-				keyColumn = tableInfo.getKeyColumn();
-			} else {
-				if (null != tableInfo.getKeySequence()) {
-					keyGenerator = TableInfoHelper.genKeyGenerator(sqlMethod, tableInfo, builderAssistant);
-					keyProperty = tableInfo.getKeyProperty();
-					keyColumn = tableInfo.getKeyColumn();
-				}
-			}
-		}
-		final String sqlResult = String.format(sql, tableInfo.getTableName(), fieldSql, valueSql);
-		SqlSource sqlSource = languageDriver.createSqlSource(configuration, sqlResult, modelClass);
-		return this.addInsertMappedStatement(mapperClass, modelClass, sqlMethod, sqlSource, keyGenerator, keyProperty, keyColumn);
-	}
-
-	private String prepareFieldSql(TableInfo tableInfo) {
-		StringBuilder fieldSql = new StringBuilder();
-		if (StringUtils.isNotBlank(tableInfo.getKeyColumn())) {
-			fieldSql.append(tableInfo.getKeyColumn()).append(",");
-		}
-		tableInfo.getFieldList().forEach(x -> fieldSql.append(x.getColumn()).append(","));
-		fieldSql.delete(fieldSql.length() - 1, fieldSql.length());
-		fieldSql.insert(0, "(");
-		fieldSql.append(")");
-		return fieldSql.toString();
-	}
-
-	private String prepareValuesSqlForMysqlBatch(TableInfo tableInfo) {
-		final StringBuilder valueSql = new StringBuilder();
-		valueSql.append("<foreach collection=\"list\" item=\"item\" index=\"index\" open=\"(\" separator=\"),(\" close=\")\">");
-		if (StringUtils.isNotBlank(tableInfo.getKeyColumn())) {
-			valueSql.append("\n#{item.").append(tableInfo.getKeyProperty()).append("},\n");
-		}
-		List<TableFieldInfo> fieldList = tableInfo.getFieldList();
-		int last = fieldList.size() - 1;
-		for (int i = 0; i < fieldList.size(); i++) {
-			String property = fieldList.get(i).getProperty();
-			if (!StringUtils.equalsAny(property, FILL_PROPERTY)) {
-				valueSql.append("<if test=\"item.").append(property).append(" != null\">");
-				valueSql.append("#{item.").append(property).append("}");
-				if (i != last) {
-					valueSql.append(",");
-				}
-				valueSql.append("</if>");
-				valueSql.append("<if test=\"item.").append(property).append(" == null\">");
-				valueSql.append("DEFAULT");
-				if (i != last) {
-					valueSql.append(",");
-				}
-				valueSql.append("</if>");
-			} else {
-				valueSql.append("#{item.").append(property).append("}");
-				if (i != last) {
-					valueSql.append(",");
-				}
-			}
-		}
-		valueSql.append("</foreach>");
-		return valueSql.toString();
-	}
-}
-
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java
@@ -1,156 +0,0 @@
-package com.ruoyi.common.core.page;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * 分页 Page 增强对象
- *
- * @param <T> 数据库实体
- * @param <K> vo实体
- * @author Lion Li
- */
-@Data
-@Accessors(chain = true)
-public class PagePlus<T,K> implements IPage<T> {
-
-    /**
-     * domain实体列表
-     */
-    private List<T> records = Collections.emptyList();
-
-    /**
-     * vo实体列表
-     */
-    private List<K> recordsVo = Collections.emptyList();
-
-    /**
-     * 总数
-     */
-    private long total = 0L;
-
-    /**
-     * 页长度
-     */
-    private long size = 10L;
-
-    /**
-     * 当前页
-     */
-    private long current = 1L;
-
-    /**
-     * 排序字段信息
-     */
-    private List<OrderItem> orders = new ArrayList<>();
-
-    /**
-     * 自动优化 COUNT SQL
-     */
-    private boolean optimizeCountSql = true;
-
-    /**
-     * 是否进行 count 查询
-     */
-    private boolean isSearchCount = true;
-
-    /**
-     * 是否命中count缓存
-     */
-    private boolean hitCount = false;
-
-    /**
-     * countId
-     */
-    private String countId;
-
-    /**
-     * 最大limit
-     */
-    private Long maxLimit;
-
-    public PagePlus() {
-    }
-
-    public PagePlus(long current, long size) {
-        this(current, size, 0L);
-    }
-
-    public PagePlus(long current, long size, long total) {
-        this(current, size, total, true);
-    }
-
-    public PagePlus(long current, long size, boolean isSearchCount) {
-        this(current, size, 0L, isSearchCount);
-    }
-
-    public PagePlus(long current, long size, long total, boolean isSearchCount) {
-        if (current > 1L) {
-            this.current = current;
-        }
-        this.size = size;
-        this.total = total;
-        this.isSearchCount = isSearchCount;
-    }
-
-    @Override
-    public String countId() {
-        return this.getCountId();
-    }
-
-    @Override
-    public Long maxLimit() {
-        return this.getMaxLimit();
-    }
-
-    public PagePlus<T, K> addOrder(OrderItem... items) {
-        this.orders.addAll(Arrays.asList(items));
-        return this;
-    }
-
-    public PagePlus<T, K> addOrder(List<OrderItem> items) {
-        this.orders.addAll(items);
-        return this;
-    }
-
-    @Override
-    public List<OrderItem> orders() {
-        return this.getOrders();
-    }
-
-    @Override
-    public boolean optimizeCountSql() {
-        return this.optimizeCountSql;
-    }
-
-	@Override
-	public long getPages() {
-		// 解决 github issues/3208
-		return IPage.super.getPages();
-	}
-
-	public static <T,K> PagePlus<T,K> of(long current, long size) {
-		return of(current, size, 0);
-	}
-
-	public static <T,K> PagePlus<T,K> of(long current, long size, long total) {
-		return of(current, size, total, true);
-	}
-
-	public static <T,K> PagePlus<T,K> of(long current, long size, boolean searchCount) {
-		return of(current, size, 0, searchCount);
-	}
-
-	public static <T,K> PagePlus<T,K> of(long current, long size, long total, boolean searchCount) {
-		return new PagePlus<>(current, size, total, searchCount);
-	}
-
-}
-
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
@@ -1,5 +1,7 @@
 package com.ruoyi.common.core.page;

+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,44 +19,68 @@ import java.util.List;

@Data
@NoArgsConstructor
-@Accessors(chain = true)
@ApiModel("分页响应对象")
 public class TableDataInfo<T> implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;

-	/**
-	 * 总记录数
-	 */
-	@ApiModelProperty("总记录数")
-	private long total;
+    /**
+     * 总记录数
+     */
+    @ApiModelProperty("总记录数")
+    private long total;

-	/**
-	 * 列表数据
-	 */
-	@ApiModelProperty("列表数据")
-	private List<T> rows;
+    /**
+     * 列表数据
+     */
+    @ApiModelProperty("列表数据")
+    private List<T> rows;

-	/**
-	 * 消息状态码
-	 */
-	@ApiModelProperty("消息状态码")
-	private int code;
+    /**
+     * 消息状态码
+     */
+    @ApiModelProperty("消息状态码")
+    private int code;

-	/**
-	 * 消息内容
-	 */
-	@ApiModelProperty("消息内容")
-	private String msg;
+    /**
+     * 消息内容
+     */
+    @ApiModelProperty("消息内容")
+    private String msg;

-	/**
-	 * 分页
-	 *
-	 * @param list  列表数据
-	 * @param total 总记录数
-	 */
-	public TableDataInfo(List<T> list, long total) {
-		this.rows = list;
-		this.total = total;
-	}
+    /**
+     * 分页
+     *
+     * @param list  列表数据
+     * @param total 总记录数
+     */
+    public TableDataInfo(List<T> list, long total) {
+        this.rows = list;
+        this.total = total;
+    }
+
+    public static <T> TableDataInfo<T> build(IPage<T> page) {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        rspData.setRows(page.getRecords());
+        rspData.setTotal(page.getTotal());
+        return rspData;
+    }
+
+    public static <T> TableDataInfo<T> build(List<T> list) {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(list.size());
+        return rspData;
+    }
+
+    public static <T> TableDataInfo<T> build() {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        return rspData;
+    }

 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java
@@ -0,0 +1,18 @@
+package com.ruoyi.common.core.service;
+
+/**
+ * 脱敏服务
+ * 默认管理员不过滤
+ * 需自行根据业务重写实现
+ *
+ * @author Lion Li
+ * @version 3.6.0
+ */
+public interface SensitiveService {
+
+    /**
+     * 是否脱敏
+     */
+    boolean isSensitive();
+
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/TokenService.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/TokenService.java
@@ -1,69 +0,0 @@
-package com.ruoyi.common.core.service;
-
-import com.ruoyi.common.core.domain.model.LoginUser;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * token验证处理
- *
- * @author Lion Li
- */
-public interface TokenService {
-
-    /**
-     * 获取用户身份信息
-     *
-     * @return 用户信息
-     */
-     LoginUser getLoginUser(HttpServletRequest request);
-
-    /**
-     * 设置用户身份信息
-     */
-    void setLoginUser(LoginUser loginUser);
-
-    /**
-     * 删除用户身份信息
-     */
-    void delLoginUser(String token);
-
-    /**
-     * 创建令牌
-     *
-     * @param loginUser 用户信息
-     * @return 令牌
-     */
-    String createToken(LoginUser loginUser);
-
-    /**
-     * 验证令牌有效期，相差不足20分钟，自动刷新缓存
-     *
-     * @param loginUser
-     * @return 令牌
-     */
-    void verifyToken(LoginUser loginUser);
-
-    /**
-     * 刷新令牌有效期
-     *
-     * @param loginUser 登录信息
-     */
-    void refreshToken(LoginUser loginUser);
-
-    /**
-     * 设置用户代理信息
-     *
-     * @param loginUser 登录信息
-     */
-    void setUserAgent(LoginUser loginUser);
-
-    /**
-     * 从令牌中获取用户名
-     *
-     * @param token 令牌
-     * @return 用户名
-     */
-    String getUsernameFromToken(String token);
-
-}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java
@@ -1,28 +0,0 @@
-package com.ruoyi.common.core.service;
-
-import com.ruoyi.common.core.domain.entity.SysUser;
-
-/**
- * 通用 用户业务
- *
- * @author Lion Li
- */
-public interface UserService {
-
-    /**
-     * 通过用户名查询用户
-     *
-     * @param userName 用户名
-     * @return 用户对象信息
-     */
-    SysUser selectUserByUserName(String userName);
-
-    /**
-     * 通过用户ID查询用户
-     *
-     * @param userId 用户ID
-     * @return 用户对象信息
-     */
-    SysUser selectUserById(Long userId);
-
-}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java
@@ -0,0 +1,72 @@
+package com.ruoyi.common.enums;
+
+import com.ruoyi.common.utils.StringUtils;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 数据权限类型
+ * <p>
+ * 语法支持 spel 模板表达式
+ * <p>
+ * 内置数据 user 当前用户 内容参考 LoginUser
+ * 如需扩展数据 可使用 {@link com.ruoyi.common.helper.DataPermissionHelper} 操作
+ * 内置服务 sdss 系统数据权限服务 内容参考 SysDataScopeService
+ * 如需扩展更多自定义服务 可以参考 sdss 自行编写
+ *
+ * @author Lion Li
+ * @version 3.5.0
+ */
+@Getter
+@AllArgsConstructor
+public enum DataScopeType {
+
+    /**
+     * 全部数据权限
+     */
+    ALL("1", "", ""),
+
+    /**
+     * 自定数据权限
+     */
+    CUSTOM("2", " #{#deptName} IN ( #{@sdss.getRoleCustom( #user.roleId )} ) ", ""),
+
+    /**
+     * 部门数据权限
+     */
+    DEPT("3", " #{#deptName} = #{#user.deptId} ", ""),
+
+    /**
+     * 部门及以下数据权限
+     */
+    DEPT_AND_CHILD("4", " #{#deptName} IN ( #{@sdss.getDeptAndChild( #user.deptId )} )", ""),
+
+    /**
+     * 仅本人数据权限
+     */
+    SELF("5", " #{#userName} = #{#user.userId} ", " 1 = 0 ");
+
+    private final String code;
+
+    /**
+     * 语法 采用 spel 模板表达式
+     */
+    private final String sqlTemplate;
+
+    /**
+     * 不满足 sqlTemplate 则填充
+     */
+    private final String elseSql;
+
+    public static DataScopeType findCode(String code) {
+        if (StringUtils.isBlank(code)) {
+            return null;
+        }
+        for (DataScopeType type : values()) {
+            if (type.getCode().equals(code)) {
+                return type;
+            }
+        }
+        return null;
+    }
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
@@ -4,22 +4,24 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;

 /**
- * 数据源
+ * 设备类型
+ * 针对一套 用户体系
 *
 * @author Lion Li
 */
+@Getter
@AllArgsConstructor
-public enum DataSourceType {
-    /**
-     * 主库
-     */
-    MASTER("master"),
+public enum DeviceType {

    /**
-     * 从库
+     * pc端
     */
-    SLAVE("slave");
+    PC("pc"),

-    @Getter
-    private final String source;
+    /**
+     * app端
+     */
+    APP("app");
+
+    private final String device;
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java
@@ -0,0 +1,49 @@
+package com.ruoyi.common.enums;
+
+import cn.hutool.core.util.DesensitizedUtil;
+import lombok.AllArgsConstructor;
+
+import java.util.function.Function;
+
+/**
+ * 脱敏策略
+ *
+ * @author Yjoioooo
+ * @version 3.6.0
+ */
+@AllArgsConstructor
+public enum SensitiveStrategy {
+
+    /**
+     * 身份证脱敏
+     */
+    ID_CARD(s -> DesensitizedUtil.idCardNum(s, 3, 4)),
+
+    /**
+     * 手机号脱敏
+     */
+    PHONE(DesensitizedUtil::mobilePhone),
+
+    /**
+     * 地址脱敏
+     */
+    ADDRESS(s -> DesensitizedUtil.address(s, 8)),
+
+    /**
+     * 邮箱脱敏
+     */
+    EMAIL(DesensitizedUtil::email),
+
+    /**
+     * 银行卡
+     */
+    BANK_CARD(DesensitizedUtil::bankCard);
+
+    //可自行添加其他脱敏策略
+
+    private final Function<String, String> desensitizer;
+
+    public Function<String, String> desensitizer() {
+        return desensitizer;
+    }
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java
@@ -0,0 +1,37 @@
+package com.ruoyi.common.enums;
+
+import com.ruoyi.common.utils.StringUtils;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 设备类型
+ * 针对多套 用户体系
+ *
+ * @author Lion Li
+ */
+@Getter
+@AllArgsConstructor
+public enum UserType {
+
+    /**
+     * pc端
+     */
+    SYS_USER("sys_user"),
+
+    /**
+     * app端
+     */
+    APP_USER("app_user");
+
+    private final String userType;
+
+    public static UserType getUserType(String str) {
+        for (UserType value : values()) {
+            if (StringUtils.contains(str, value.getUserType())) {
+                return value;
+            }
+        }
+        throw new RuntimeException("'UserType' not found By " + str);
+    }
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java
@@ -5,7 +5,7 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.exception.ExcelAnalysisException;
 import com.alibaba.excel.exception.ExcelDataConvertException;
-import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.common.utils.ValidatorUtils;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -84,7 +84,7 @@ public class DefaultExcelListener<T> extends AnalysisEventListener<T> implements
    @Override
    public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
        this.headMap = headMap;
-        log.debug("解析到一条表头数据: {}", JSON.toJSONString(headMap));
+        log.debug("解析到一条表头数据: {}", JsonUtils.toJsonString(headMap));
    }

    @Override
--- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
@@ -2,7 +2,9 @@ package com.ruoyi.common.exception.base;

 import com.ruoyi.common.utils.MessageUtils;
 import com.ruoyi.common.utils.StringUtils;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;

 /**
 * 基础异常
--- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java
@@ -9,6 +9,6 @@ public class CaptchaException extends UserException {
    private static final long serialVersionUID = 1L;

    public CaptchaException() {
-        super("user.jcaptcha.error", null);
+        super("user.jcaptcha.error");
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java
@@ -9,6 +9,6 @@ public class CaptchaExpireException extends UserException {
    private static final long serialVersionUID = 1L;

    public CaptchaExpireException() {
-        super("user.jcaptcha.expire", null);
+        super("user.jcaptcha.expire");
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
@@ -10,7 +10,7 @@ import com.ruoyi.common.exception.base.BaseException;
 public class UserException extends BaseException {
    private static final long serialVersionUID = 1L;

-    public UserException(String code, Object[] args) {
+    public UserException(String code, Object... args) {
        super("user", code, args, null);
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java
@@ -9,6 +9,6 @@ public class UserPasswordNotMatchException extends UserException {
    private static final long serialVersionUID = 1L;

    public UserPasswordNotMatchException() {
-        super("user.password.not.match", null);
+        super("user.password.not.match");
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java
@@ -20,10 +20,10 @@ public class RepeatableFilter implements Filter {

    @Override
    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException {
+        throws IOException, ServletException {
        ServletRequest requestWrapper = null;
        if (request instanceof HttpServletRequest
-                && StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) {
+            && StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) {
            requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response);
        }
        if (null == requestWrapper) {
--- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
@@ -33,7 +33,7 @@ public class XssFilter implements Filter {

    @Override
    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException {
+        throws IOException, ServletException {
        HttpServletRequest req = (HttpServletRequest) request;
        HttpServletResponse resp = (HttpServletResponse) response;
        if (handleExcludeURL(req, resp)) {
--- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java
@@ -0,0 +1,47 @@
+package com.ruoyi.common.helper;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.utils.ServletUtils;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 数据权限助手
+ *
+ * @author Lion Li
+ * @version 3.5.0
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@SuppressWarnings("unchecked cast")
+public class DataPermissionHelper {
+
+    private static final String DATA_PERMISSION_KEY = "data:permission";
+
+    public static <T> T getVariable(String key) {
+        Map<String, Object> context = getContext();
+        return (T) context.get(key);
+    }
+
+
+    public static void setVariable(String key, Object value) {
+        Map<String, Object> context = getContext();
+        context.put(key, value);
+    }
+
+    public static Map<String, Object> getContext() {
+        HttpServletRequest request = ServletUtils.getRequest();
+        Object attribute = request.getAttribute(DATA_PERMISSION_KEY);
+        if (ObjectUtil.isNull(attribute)) {
+            request.setAttribute(DATA_PERMISSION_KEY, new HashMap<>());
+            attribute = request.getAttribute(DATA_PERMISSION_KEY);
+        }
+        if (attribute instanceof Map) {
+            return (Map<String, Object>) attribute;
+        }
+        throw new NullPointerException("data permission context type exception");
+    }
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
@@ -0,0 +1,141 @@
+package com.ruoyi.common.helper;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.DeviceType;
+import com.ruoyi.common.enums.UserType;
+import com.ruoyi.common.exception.UtilException;
+import com.ruoyi.common.utils.StringUtils;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+/**
+ * 登录鉴权助手
+ * 
+ * user_type 为 用户类型 同一个用户表 可以有多种用户类型 例如 pc,app
+ * deivce 为 设备类型 同一个用户类型 可以有 多种设备类型 例如 web,ios
+ * 可以组成 用户类型与设备类型多对多的 权限灵活控制
+ *
+ * 多用户体系 针对 多种用户类型 但权限控制不一致
+ * 可以组成 多用户类型表与多设备类型 分别控制权限
+ *
+ * @author Lion Li
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class LoginHelper {
+
+    public static final String JOIN_CODE = ":";
+    public static final String LOGIN_USER_KEY = "loginUser";
+
+    private static final ThreadLocal<LoginUser> LOGIN_CACHE = new ThreadLocal<>();
+
+    /**
+     * 登录系统
+     *
+     * @param loginUser 登录用户信息
+     */
+    public static void login(LoginUser loginUser) {
+        LOGIN_CACHE.set(loginUser);
+        StpUtil.login(loginUser.getLoginId());
+        setLoginUser(loginUser);
+    }
+
+    /**
+     * 登录系统 基于 设备类型
+     * 针对相同用户体系不同设备
+     *
+     * @param loginUser 登录用户信息
+     */
+    public static void loginByDevice(LoginUser loginUser, DeviceType deviceType) {
+        LOGIN_CACHE.set(loginUser);
+        StpUtil.login(loginUser.getLoginId(), deviceType.getDevice());
+        setLoginUser(loginUser);
+    }
+
+    /**
+     * 设置用户数据(多级缓存)
+     */
+    public static void setLoginUser(LoginUser loginUser) {
+        StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
+    }
+
+    /**
+     * 获取用户(多级缓存)
+     */
+    public static LoginUser getLoginUser() {
+        LoginUser loginUser = LOGIN_CACHE.get();
+        if (loginUser != null) {
+            return loginUser;
+        }
+        return (LoginUser) StpUtil.getTokenSession().get(LOGIN_USER_KEY);
+    }
+
+    /**
+     * 清除一级缓存 防止内存问题
+     */
+    public static void clearCache() {
+        LOGIN_CACHE.remove();
+    }
+
+    /**
+     * 获取用户id
+     */
+    public static Long getUserId() {
+        LoginUser loginUser = getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            String loginId = StpUtil.getLoginIdAsString();
+            String userId = null;
+            for (UserType value : UserType.values()) {
+                if (StringUtils.contains(loginId, value.getUserType())) {
+                    String[] strs = StringUtils.split(loginId, JOIN_CODE);
+                    // 用户id在总是在最后
+                    userId = strs[strs.length - 1];
+                }
+            }
+            if (StringUtils.isBlank(userId)) {
+                throw new UtilException("登录用户: LoginId异常 => " + loginId);
+            }
+            return Long.parseLong(userId);
+        }
+        return loginUser.getUserId();
+    }
+
+    /**
+     * 获取部门ID
+     */
+    public static Long getDeptId() {
+        return getLoginUser().getDeptId();
+    }
+
+    /**
+     * 获取用户账户
+     */
+    public static String getUsername() {
+        return getLoginUser().getUsername();
+    }
+
+    /**
+     * 获取用户类型
+     */
+    public static UserType getUserType() {
+        String loginId = StpUtil.getLoginIdAsString();
+        return UserType.getUserType(loginId);
+    }
+
+    /**
+     * 是否为管理员
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    public static boolean isAdmin(Long userId) {
+        return UserConstants.ADMIN_ID.equals(userId);
+    }
+
+    public static boolean isAdmin() {
+        return isAdmin(getUserId());
+    }
+
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java
@@ -0,0 +1,46 @@
+package com.ruoyi.common.jackson;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.ContextualSerializer;
+import com.ruoyi.common.annotation.Sensitive;
+import com.ruoyi.common.core.service.SensitiveService;
+import com.ruoyi.common.enums.SensitiveStrategy;
+import com.ruoyi.common.utils.spring.SpringUtils;
+
+import java.io.IOException;
+import java.util.Objects;
+
+/**
+ * 数据脱敏json序列化工具
+ *
+ * @author Yjoioooo
+ */
+public class SensitiveJsonSerializer extends JsonSerializer<String> implements ContextualSerializer {
+
+    private SensitiveStrategy strategy;
+
+    @Override
+    public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        SensitiveService sensitiveService = SpringUtils.getBean(SensitiveService.class);
+        if (sensitiveService.isSensitive()) {
+            gen.writeString(value);
+        } else {
+            gen.writeString(strategy.desensitizer().apply(value));
+        }
+
+    }
+
+    @Override
+    public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property) throws JsonMappingException {
+        Sensitive annotation = property.getAnnotation(Sensitive.class);
+        if (Objects.nonNull(annotation) && Objects.equals(String.class, property.getType().getRawClass())) {
+            this.strategy = annotation.strategy();
+            return this;
+        }
+        return prov.findValueSerializer(property.getType(), property);
+    }
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/properties/TokenProperties.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/properties/TokenProperties.java
@@ -1,31 +0,0 @@
-package com.ruoyi.common.properties;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * token 配置属性
- *
- * @author Lion Li
- */
-@Data
-@Component
-@ConfigurationProperties(prefix = "token")
-public class TokenProperties {
-
-    /**
-     * 令牌自定义标识
-     */
-    private String header;
-
-    /**
-     * 令牌秘钥
-     */
-    private String secret;
-
-    /**
-     * 令牌有效期（默认30分钟）
-     */
-    private int expireTime;
-}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
@@ -1,66 +1,124 @@
 package com.ruoyi.common.utils;

-import cn.hutool.core.bean.copier.BeanCopier;
-import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.extra.cglib.CglibUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;

 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Map;

 /**
- * bean深拷贝工具
+ * bean深拷贝工具(基于 cglib 性能优异)
+ * <p>
+ * 重点 cglib 不支持 拷贝到链式对象
+ * 例如: 源对象 拷贝到 目标(链式对象)
+ * 请区分好`浅拷贝`和`深拷贝`再做使用
 *
 * @author Lion Li
 */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class BeanCopyUtils {

    /**
     * 单对象基于class创建拷贝
     *
-     * @param source      数据来源实体
-     * @param copyOptions copy条件
-     * @param desc        描述对象 转换后的对象
+     * @param source 数据来源实体
+     * @param desc   描述对象 转换后的对象
     * @return desc
     */
-    public static <T, V> V oneCopy(T source, CopyOptions copyOptions, Class<V> desc) {
-        V v = ReflectUtil.newInstanceIfPossible(desc);
-        return oneCopy(source, copyOptions, v);
+    public static <T, V> V copy(T source, Class<V> desc) {
+        if (ObjectUtil.isNull(source)) {
+            return null;
+        }
+        if (ObjectUtil.isNull(desc)) {
+            return null;
+        }
+        return CglibUtil.copy(source, desc);
    }

    /**
     * 单对象基于对象创建拷贝
     *
-     * @param source      数据来源实体
-     * @param copyOptions copy条件
-     * @param desc        转换后的对象
+     * @param source 数据来源实体
+     * @param desc   转换后的对象
     * @return desc
     */
-    public static <T, V> V oneCopy(T source, CopyOptions copyOptions, V desc) {
+    public static <T, V> V copy(T source, V desc) {
        if (ObjectUtil.isNull(source)) {
            return null;
        }
-        return BeanCopier.create(source, desc, copyOptions).copy();
+        if (ObjectUtil.isNull(desc)) {
+            return null;
+        }
+        CglibUtil.copy(source, desc);
+        return desc;
    }

    /**
     * 列表对象基于class创建拷贝
     *
-     * @param sourceList  数据来源实体列表
-     * @param copyOptions copy条件
-     * @param desc        描述对象 转换后的对象
+     * @param sourceList 数据来源实体列表
+     * @param desc       描述对象 转换后的对象
     * @return desc
     */
-    public static <T, V> List<V> listCopy(List<T> sourceList, CopyOptions copyOptions, Class<V> desc) {
+    public static <T, V> List<V> copyList(List<T> sourceList, Class<V> desc) {
        if (ObjectUtil.isNull(sourceList)) {
            return null;
        }
        if (CollUtil.isEmpty(sourceList)) {
            return CollUtil.newArrayList();
        }
-        return sourceList.stream()
-                .map(source -> oneCopy(source, copyOptions, desc))
-                .collect(Collectors.toList());
+        return CglibUtil.copyList(sourceList, () -> ReflectUtil.newInstanceIfPossible(desc));
+    }
+
+    /**
+     * bean拷贝到map
+     *
+     * @param bean 数据来源实体
+     * @return map对象
+     */
+    public static <T> Map<String, Object> copyToMap(T bean) {
+        if (ObjectUtil.isNull(bean)) {
+            return null;
+        }
+        return CglibUtil.toMap(bean);
+    }
+
+    /**
+     * map拷贝到bean
+     *
+     * @param map       数据来源
+     * @param beanClass bean类
+     * @return bean对象
+     */
+    public static <T> T mapToBean(Map<String, Object> map, Class<T> beanClass) {
+        if (MapUtil.isEmpty(map)) {
+            return null;
+        }
+        if (ObjectUtil.isNull(beanClass)) {
+            return null;
+        }
+        return CglibUtil.toBean(map, beanClass);
+    }
+
+    /**
+     * map拷贝到bean
+     *
+     * @param map  数据来源
+     * @param bean bean对象
+     * @return bean对象
+     */
+    public static <T> T mapToBean(Map<String, Object> map, T bean) {
+        if (MapUtil.isEmpty(map)) {
+            return null;
+        }
+        if (ObjectUtil.isNull(bean)) {
+            return null;
+        }
+        return CglibUtil.fillBean(map, bean);
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -1,10 +1,17 @@
 package com.ruoyi.common.utils;

+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.time.DateFormatUtils;

 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Date;

 /**
@@ -12,6 +19,7 @@ import java.util.Date;
 *
 * @author ruoyi
 */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils {

    public static String YYYY = "yyyy";
@@ -25,9 +33,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
    public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";

    private static String[] parsePatterns = {
-            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
-            "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
-            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+        "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
+        "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
+        "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};

    /**
     * 获取当前Date型日期
@@ -113,6 +121,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
        return new Date(time);
    }

+    /**
+     * 计算相差天数
+     */
+    public static int differentDaysByMillisecond(Date date1, Date date2)
+    {
+        return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
+    }
+
    /**
     * 计算两个时间差
     */
@@ -133,4 +149,21 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
        // long sec = diff % nd % nh % nm / ns;
        return day + "天" + hour + "小时" + min + "分钟";
    }
+
+    /**
+     * 增加 LocalDateTime ==> Date
+     */
+    public static Date toDate(LocalDateTime temporalAccessor) {
+        ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
+        return Date.from(zdt.toInstant());
+    }
+
+    /**
+     * 增加 LocalDate ==> Date
+     */
+    public static Date toDate(LocalDate temporalAccessor) {
+        LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
+        ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
+        return Date.from(zdt.toInstant());
+    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
@@ -1,158 +0,0 @@
-package com.ruoyi.common.utils;
-
-import cn.hutool.core.collection.CollUtil;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.entity.SysDictData;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 字典工具类
- *
- * @author ruoyi
- * @deprecated 3.5.0 版本删除 迁移至 {@link com.ruoyi.common.core.service.DictService}
- */
-@Deprecated
-public class DictUtils {
-
-    /**
-     * 分隔符
-     */
-    public static final String SEPARATOR = ",";
-
-    /**
-     * 设置字典缓存
-     *
-     * @param key       参数键
-     * @param dictDatas 字典数据列表
-     */
-    public static void setDictCache(String key, List<SysDictData> dictDatas) {
-        RedisUtils.setCacheObject(getCacheKey(key), dictDatas);
-    }
-
-    /**
-     * 获取字典缓存
-     *
-     * @param key 参数键
-     * @return dictDatas 字典数据列表
-     */
-    public static List<SysDictData> getDictCache(String key) {
-        List<SysDictData> dictDatas = RedisUtils.getCacheObject(getCacheKey(key));
-        if (StringUtils.isNotNull(dictDatas)) {
-            return dictDatas;
-        }
-        return null;
-    }
-
-    /**
-     * 根据字典类型和字典值获取字典标签
-     *
-     * @param dictType  字典类型
-     * @param dictValue 字典值
-     * @return 字典标签
-     */
-    public static String getDictLabel(String dictType, String dictValue) {
-        return getDictLabel(dictType, dictValue, SEPARATOR);
-    }
-
-    /**
-     * 根据字典类型和字典标签获取字典值
-     *
-     * @param dictType  字典类型
-     * @param dictLabel 字典标签
-     * @return 字典值
-     */
-    public static String getDictValue(String dictType, String dictLabel) {
-        return getDictValue(dictType, dictLabel, SEPARATOR);
-    }
-
-    /**
-     * 根据字典类型和字典值获取字典标签
-     *
-     * @param dictType  字典类型
-     * @param dictValue 字典值
-     * @param separator 分隔符
-     * @return 字典标签
-     */
-    public static String getDictLabel(String dictType, String dictValue, String separator) {
-        StringBuilder propertyString = new StringBuilder();
-        List<SysDictData> datas = getDictCache(dictType);
-
-        if (StringUtils.containsAny(dictValue, separator) && CollUtil.isNotEmpty(datas)) {
-            for (SysDictData dict : datas) {
-                for (String value : dictValue.split(separator)) {
-                    if (value.equals(dict.getDictValue())) {
-                        propertyString.append(dict.getDictLabel() + separator);
-                        break;
-                    }
-                }
-            }
-        } else {
-            for (SysDictData dict : datas) {
-                if (dictValue.equals(dict.getDictValue())) {
-                    return dict.getDictLabel();
-                }
-            }
-        }
-        return StringUtils.stripEnd(propertyString.toString(), separator);
-    }
-
-    /**
-     * 根据字典类型和字典标签获取字典值
-     *
-     * @param dictType  字典类型
-     * @param dictLabel 字典标签
-     * @param separator 分隔符
-     * @return 字典值
-     */
-    public static String getDictValue(String dictType, String dictLabel, String separator) {
-        StringBuilder propertyString = new StringBuilder();
-        List<SysDictData> datas = getDictCache(dictType);
-
-        if (StringUtils.containsAny(dictLabel, separator) && CollUtil.isNotEmpty(datas)) {
-            for (SysDictData dict : datas) {
-                for (String label : dictLabel.split(separator)) {
-                    if (label.equals(dict.getDictLabel())) {
-                        propertyString.append(dict.getDictValue() + separator);
-                        break;
-                    }
-                }
-            }
-        } else {
-            for (SysDictData dict : datas) {
-                if (dictLabel.equals(dict.getDictLabel())) {
-                    return dict.getDictValue();
-                }
-            }
-        }
-        return StringUtils.stripEnd(propertyString.toString(), separator);
-    }
-
-    /**
-     * 删除指定字典缓存
-     *
-     * @param key 字典键
-     */
-    public static void removeDictCache(String key) {
-        RedisUtils.deleteObject(getCacheKey(key));
-    }
-
-    /**
-     * 清空字典缓存
-     */
-    public static void clearDictCache() {
-        Collection<String> keys = RedisUtils.keys(Constants.SYS_DICT_KEY + "*");
-        RedisUtils.deleteObject(keys);
-    }
-
-    /**
-     * 设置cache key
-     *
-     * @param configKey 参数键
-     * @return 缓存键key
-     */
-    public static String getCacheKey(String configKey) {
-        return Constants.SYS_DICT_KEY + configKey;
-    }
-}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
@@ -1,6 +1,8 @@
 package com.ruoyi.common.utils;

+import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -11,7 +13,6 @@ import lombok.NoArgsConstructor;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;

 /**
 * JSON 工具类
@@ -21,14 +22,18 @@ import java.util.Map;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class JsonUtils {

-    private static ObjectMapper objectMapper = SpringUtils.getBean(ObjectMapper.class);
+    private static final ObjectMapper OBJECT_MAPPER = SpringUtils.getBean(ObjectMapper.class);
+
+    public static ObjectMapper getObjectMapper() {
+        return OBJECT_MAPPER;
+    }

    public static String toJsonString(Object object) {
-        if (StringUtils.isNull(object)) {
+        if (ObjectUtil.isNull(object)) {
            return null;
        }
        try {
-            return objectMapper.writeValueAsString(object);
+            return OBJECT_MAPPER.writeValueAsString(object);
        } catch (JsonProcessingException e) {
            throw new RuntimeException(e);
        }
@@ -39,7 +44,7 @@ public class JsonUtils {
            return null;
        }
        try {
-            return objectMapper.readValue(text, clazz);
+            return OBJECT_MAPPER.readValue(text, clazz);
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
@@ -50,7 +55,7 @@ public class JsonUtils {
            return null;
        }
        try {
-            return objectMapper.readValue(bytes, clazz);
+            return OBJECT_MAPPER.readValue(bytes, clazz);
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
@@ -61,19 +66,29 @@ public class JsonUtils {
            return null;
        }
        try {
-            return objectMapper.readValue(text, typeReference);
+            return OBJECT_MAPPER.readValue(text, typeReference);
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
    }

-    public static <T> Map<String, T> parseMap(String text) {
+    public static Dict parseMap(String text) {
        if (StringUtils.isBlank(text)) {
            return null;
        }
        try {
-            return objectMapper.readValue(text, new TypeReference<Map<String, T>>() {
-            });
+            return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructType(Dict.class));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static List<Dict> parseArrayMap(String text) {
+        if (StringUtils.isBlank(text)) {
+            return null;
+        }
+        try {
+            return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructCollectionType(List.class, Dict.class));
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
@@ -84,7 +99,7 @@ public class JsonUtils {
            return new ArrayList<>();
        }
        try {
-            return objectMapper.readValue(text, objectMapper.getTypeFactory().constructCollectionType(List.class, clazz));
+            return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructCollectionType(List.class, clazz));
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java
@@ -1,15 +1,21 @@
 package com.ruoyi.common.utils;

 import com.ruoyi.common.utils.spring.SpringUtils;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;

 /**
 * 获取i18n资源文件
 *
- * @author ruoyi
+ * @author Lion Li
 */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class MessageUtils {
+
+    private static final MessageSource MESSAGE_SOURCE = SpringUtils.getBean(MessageSource.class);
+
    /**
     * 根据消息键和参数 获取消息 委托给spring messageSource
     *
@@ -18,7 +24,6 @@ public class MessageUtils {
     * @return 获取国际化翻译值
     */
    public static String message(String code, Object... args) {
-        MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
-        return messageSource.getMessage(code, args, LocaleContextHolder.getLocale());
+        return MESSAGE_SOURCE.getMessage(code, args, LocaleContextHolder.getLocale());
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
@@ -1,152 +0,0 @@
-package com.ruoyi.common.utils;
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.http.HttpStatus;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.utils.sql.SqlUtil;
-
-import java.util.List;
-
-/**
- * 分页工具
- *
- * @author Lion Li
- */
-public class PageUtils {
-
-    /**
-     * 当前记录起始索引
-     */
-    public static final String PAGE_NUM = "pageNum";
-
-    /**
-     * 每页显示记录数
-     */
-    public static final String PAGE_SIZE = "pageSize";
-
-    /**
-     * 排序列
-     */
-    public static final String ORDER_BY_COLUMN = "orderByColumn";
-
-    /**
-     * 排序的方向 "desc" 或者 "asc".
-     */
-    public static final String IS_ASC = "isAsc";
-
-    /**
-     * 当前记录起始索引 默认值
-     */
-    public static final int DEFAULT_PAGE_NUM = 1;
-
-    /**
-     * 每页显示记录数 默认值 默认查全部
-     */
-    public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
-
-    /**
-     * 构建 plus 分页对象
-     *
-     * @param <T> domain 实体
-     * @param <K> vo 实体
-     * @return 分页对象
-     */
-    public static <T, K> PagePlus<T, K> buildPagePlus() {
-        Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM, DEFAULT_PAGE_NUM);
-        Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE);
-        String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN);
-        String isAsc = ServletUtils.getParameter(IS_ASC);
-        if (pageNum <= 0) {
-            pageNum = DEFAULT_PAGE_NUM;
-        }
-        PagePlus<T, K> page = new PagePlus<>(pageNum, pageSize);
-        OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
-        if (ObjectUtil.isNotNull(orderItem)) {
-            page.addOrder(orderItem);
-        }
-        return page;
-    }
-
-    public static <T> Page<T> buildPage() {
-        return buildPage(null, null);
-    }
-
-    /**
-     * 构建 MP 普通分页对象
-     *
-     * @param <T> domain 实体
-     * @return 分页对象
-     */
-    public static <T> Page<T> buildPage(String defaultOrderByColumn, String defaultIsAsc) {
-        Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM, DEFAULT_PAGE_NUM);
-        Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE);
-        String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN, defaultOrderByColumn);
-        String isAsc = ServletUtils.getParameter(IS_ASC, defaultIsAsc);
-        if (pageNum <= 0) {
-            pageNum = DEFAULT_PAGE_NUM;
-        }
-        Page<T> page = new Page<>(pageNum, pageSize);
-        OrderItem orderItem = buildOrderItem(orderByColumn, isAsc);
-        if (ObjectUtil.isNotNull(orderItem)) {
-            page.addOrder(orderItem);
-        }
-        return page;
-    }
-
-    private static OrderItem buildOrderItem(String orderByColumn, String isAsc) {
-        // 兼容前端排序类型
-        if ("ascending".equals(isAsc)) {
-            isAsc = "asc";
-        } else if ("descending".equals(isAsc)) {
-            isAsc = "desc";
-        }
-        if (StringUtils.isNotBlank(orderByColumn)) {
-            String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
-            orderBy = StringUtils.toUnderScoreCase(orderBy);
-            if ("asc".equals(isAsc)) {
-                return OrderItem.asc(orderBy);
-            } else if ("desc".equals(isAsc)) {
-                return OrderItem.desc(orderBy);
-            }
-        }
-        return null;
-    }
-
-    public static <T, K> TableDataInfo<K> buildDataInfo(PagePlus<T, K> page) {
-        TableDataInfo<K> rspData = new TableDataInfo<>();
-        rspData.setCode(HttpStatus.HTTP_OK);
-        rspData.setMsg("查询成功");
-        rspData.setRows(page.getRecordsVo());
-        rspData.setTotal(page.getTotal());
-        return rspData;
-    }
-
-    public static <T> TableDataInfo<T> buildDataInfo(Page<T> page) {
-        TableDataInfo<T> rspData = new TableDataInfo<>();
-        rspData.setCode(HttpStatus.HTTP_OK);
-        rspData.setMsg("查询成功");
-        rspData.setRows(page.getRecords());
-        rspData.setTotal(page.getTotal());
-        return rspData;
-    }
-
-    public static <T> TableDataInfo<T> buildDataInfo(List<T> list) {
-        TableDataInfo<T> rspData = new TableDataInfo<>();
-        rspData.setCode(HttpStatus.HTTP_OK);
-        rspData.setMsg("查询成功");
-        rspData.setRows(list);
-        rspData.setTotal(list.size());
-        return rspData;
-    }
-
-    public static <T> TableDataInfo<T> buildDataInfo() {
-        TableDataInfo<T> rspData = new TableDataInfo<>();
-        rspData.setCode(HttpStatus.HTTP_OK);
-        rspData.setMsg("查询成功");
-        return rspData;
-    }
-
-}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
@@ -1,100 +0,0 @@
-package com.ruoyi.common.utils;
-
-import cn.hutool.http.HttpStatus;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.exception.ServiceException;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-
-/**
- * 安全服务工具类
- *
- * @author ruoyi
- */
-public class SecurityUtils {
-
-    /**
-     * 用户ID
-     **/
-    public static Long getUserId() {
-        try {
-            return getLoginUser().getUserId();
-        } catch (Exception e) {
-            throw new ServiceException("获取用户ID异常", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 获取部门ID
-     **/
-    public static Long getDeptId() {
-        try {
-            return getLoginUser().getDeptId();
-        } catch (Exception e) {
-            throw new ServiceException("获取部门ID异常", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 获取用户账户
-     **/
-    public static String getUsername() {
-        try {
-            return getLoginUser().getUsername();
-        } catch (Exception e) {
-            throw new ServiceException("获取用户账户异常", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 获取用户
-     **/
-    public static LoginUser getLoginUser() {
-        try {
-            return (LoginUser) getAuthentication().getPrincipal();
-        } catch (Exception e) {
-            throw new ServiceException("获取用户信息异常", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 获取Authentication
-     */
-    public static Authentication getAuthentication() {
-        return SecurityContextHolder.getContext().getAuthentication();
-    }
-
-    /**
-     * 生成BCryptPasswordEncoder密码
-     *
-     * @param password 密码
-     * @return 加密字符串
-     */
-    public static String encryptPassword(String password) {
-        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-        return passwordEncoder.encode(password);
-    }
-
-    /**
-     * 判断密码是否相同
-     *
-     * @param rawPassword     真实密码
-     * @param encodedPassword 加密后字符
-     * @return 结果
-     */
-    public static boolean matchesPassword(String rawPassword, String encodedPassword) {
-        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-        return passwordEncoder.matches(rawPassword, encodedPassword);
-    }
-
-    /**
-     * 是否为管理员
-     *
-     * @param userId 用户ID
-     * @return 结果
-     */
-    public static boolean isAdmin(Long userId) {
-        return userId != null && 1L == userId;
-    }
-}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
@@ -3,6 +3,8 @@ package com.ruoyi.common.utils;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.http.HttpStatus;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -19,6 +21,7 @@ import java.nio.charset.StandardCharsets;
 *
 * @author ruoyi
 */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class ServletUtils extends ServletUtil {

    /**
@@ -94,9 +97,8 @@ public class ServletUtils extends ServletUtil {
     *
     * @param response 渲染对象
     * @param string   待渲染的字符串
-     * @return null
     */
-    public static String renderString(HttpServletResponse response, String string) {
+    public static void renderString(HttpServletResponse response, String string) {
        try {
            response.setStatus(HttpStatus.HTTP_OK);
            response.setContentType(MediaType.APPLICATION_JSON_VALUE);
@@ -105,7 +107,6 @@ public class ServletUtils extends ServletUtil {
        } catch (IOException e) {
            e.printStackTrace();
        }
-        return null;
    }

    /**
@@ -116,12 +117,12 @@ public class ServletUtils extends ServletUtil {
    public static boolean isAjaxRequest(HttpServletRequest request) {

        String accept = request.getHeader("accept");
-        if (accept != null && accept.indexOf("application/json") != -1) {
+        if (accept != null && accept.contains("application/json")) {
            return true;
        }

        String xRequestedWith = request.getHeader("X-Requested-With");
-        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
+        if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) {
            return true;
        }

@@ -131,10 +132,7 @@ public class ServletUtils extends ServletUtil {
        }

        String ajax = request.getParameter("__ajax");
-        if (StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml")) {
-            return true;
-        }
-        return false;
+        return StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml");
    }

    public static String getClientIP() {
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
@@ -2,353 +2,272 @@ package com.ruoyi.common.utils;

 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Validator;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.springframework.util.AntPathMatcher;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;

 /**
 * 字符串工具类
 *
 * @author Lion Li
 */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class StringUtils extends org.apache.commons.lang3.StringUtils {

-	/**
-	 * 获取参数不为空值
-	 *
-	 * @param value defaultValue 要判断的value
-	 * @return value 返回值
-	 */
-	public static <T> T nvl(T value, T defaultValue) {
-		return ObjectUtil.defaultIfNull(value, defaultValue);
-	}
+    /**
+     * 获取参数不为空值
+     *
+     * @param str defaultValue 要判断的value
+     * @return value 返回值
+     */
+    public static String blankToDefault(String str, String defaultValue) {
+        return StrUtil.blankToDefault(str, defaultValue);
+    }

-	/**
-	 * 获取参数不为空值
-	 *
-	 * @param str defaultValue 要判断的value
-	 * @return value 返回值
-	 */
-	public static String blankToDefault(String str, String defaultValue) {
-		return StrUtil.blankToDefault(str, defaultValue);
-	}
+    /**
+     * * 判断一个字符串是否为空串
+     *
+     * @param str String
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(String str) {
+        return StrUtil.isEmpty(str);
+    }

-	/**
-	 * * 判断一个Collection是否为空， 包含List，Set，Queue
-	 *
-	 * @param coll 要判断的Collection
-	 * @return true：为空 false：非空
-	 */
-	public static boolean isEmpty(Collection<?> coll) {
-		return CollUtil.isEmpty(coll);
-	}
+    /**
+     * * 判断一个字符串是否为非空串
+     *
+     * @param str String
+     * @return true：非空串 false：空串
+     */
+    public static boolean isNotEmpty(String str) {
+        return !isEmpty(str);
+    }

-	/**
-	 * * 判断一个Collection是否非空，包含List，Set，Queue
-	 *
-	 * @param coll 要判断的Collection
-	 * @return true：非空 false：空
-	 */
-	public static boolean isNotEmpty(Collection<?> coll) {
-		return !isEmpty(coll);
-	}
+    /**
+     * 去空格
+     */
+    public static String trim(String str) {
+        return StrUtil.trim(str);
+    }

-	/**
-	 * * 判断一个对象数组是否为空
-	 *
-	 * @param objects 要判断的对象数组
-	 *                * @return true：为空 false：非空
-	 */
-	public static boolean isEmpty(Object[] objects) {
-		return ArrayUtil.isEmpty(objects);
-	}
+    /**
+     * 截取字符串
+     *
+     * @param str   字符串
+     * @param start 开始
+     * @return 结果
+     */
+    public static String substring(final String str, int start) {
+        return substring(str, start, str.length());
+    }

-	/**
-	 * * 判断一个对象数组是否非空
-	 *
-	 * @param objects 要判断的对象数组
-	 * @return true：非空 false：空
-	 */
-	public static boolean isNotEmpty(Object[] objects) {
-		return !isEmpty(objects);
-	}
+    /**
+     * 截取字符串
+     *
+     * @param str   字符串
+     * @param start 开始
+     * @param end   结束
+     * @return 结果
+     */
+    public static String substring(final String str, int start, int end) {
+        return StrUtil.sub(str, start, end);
+    }

-	/**
-	 * * 判断一个对象是否为空
-	 *
-	 * @param object 要判断的对象数组
-	 *                * @return true：为空 false：非空
-	 */
-	public static boolean isEmpty(Object object) {
-		return ObjectUtil.isEmpty(object);
-	}
+    /**
+     * 格式化文本, {} 表示占位符<br>
+     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+     * 例：<br>
+     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
+     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is {} for a<br>
+     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+     *
+     * @param template 文本模板，被替换的部分用 {} 表示
+     * @param params   参数值
+     * @return 格式化后的文本
+     */
+    public static String format(String template, Object... params) {
+        return StrUtil.format(template, params);
+    }

-	/**
-	 * * 判断一个对象是否非空
-	 *
-	 * @param object 要判断的对象数组
-	 * @return true：非空 false：空
-	 */
-	public static boolean isNotEmpty(Object object) {
-		return !isEmpty(object);
-	}
+    /**
+     * 是否为http(s)://开头
+     *
+     * @param link 链接
+     * @return 结果
+     */
+    public static boolean ishttp(String link) {
+        return Validator.isUrl(link);
+    }

-	/**
-	 * * 判断一个Map是否为空
-	 *
-	 * @param map 要判断的Map
-	 * @return true：为空 false：非空
-	 */
-	public static boolean isEmpty(Map<?, ?> map) {
-		return MapUtil.isEmpty(map);
-	}
+    /**
+     * 字符串转set
+     *
+     * @param str 字符串
+     * @param sep 分隔符
+     * @return set集合
+     */
+    public static Set<String> str2Set(String str, String sep) {
+        return new HashSet<>(str2List(str, sep, true, false));
+    }

-	/**
-	 * * 判断一个Map是否为空
-	 *
-	 * @param map 要判断的Map
-	 * @return true：非空 false：空
-	 */
-	public static boolean isNotEmpty(Map<?, ?> map) {
-		return !isEmpty(map);
-	}
+    /**
+     * 字符串转list
+     *
+     * @param str         字符串
+     * @param sep         分隔符
+     * @param filterBlank 过滤纯空白
+     * @param trim        去掉首尾空白
+     * @return list集合
+     */
+    public static List<String> str2List(String str, String sep, boolean filterBlank, boolean trim) {
+        List<String> list = new ArrayList<>();
+        if (isEmpty(str)) {
+            return list;
+        }

-	/**
-	 * * 判断一个字符串是否为空串
-	 *
-	 * @param str String
-	 * @return true：为空 false：非空
-	 */
-	public static boolean isEmpty(String str) {
-		return StrUtil.isEmpty(str);
-	}
+        // 过滤空白字符串
+        if (filterBlank && isBlank(str)) {
+            return list;
+        }
+        String[] split = str.split(sep);
+        for (String string : split) {
+            if (filterBlank && isBlank(string)) {
+                continue;
+            }
+            if (trim) {
+                string = trim(string);
+            }
+            list.add(string);
+        }

-	/**
-	 * * 判断一个字符串是否为非空串
-	 *
-	 * @param str String
-	 * @return true：非空串 false：空串
-	 */
-	public static boolean isNotEmpty(String str) {
-		return !isEmpty(str);
-	}
+        return list;
+    }

-	/**
-	 * * 判断一个对象是否为空
-	 *
-	 * @param object Object
-	 * @return true：为空 false：非空
-	 */
-	public static boolean isNull(Object object) {
-		return ObjectUtil.isNull(object);
-	}
+    /**
+     * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
+     *
+     * @param cs                  指定字符串
+     * @param searchCharSequences 需要检查的字符串数组
+     * @return 是否包含任意一个字符串
+     */
+    public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) {
+        return StrUtil.containsAnyIgnoreCase(cs, searchCharSequences);
+    }

-	/**
-	 * * 判断一个对象是否非空
-	 *
-	 * @param object Object
-	 * @return true：非空 false：空
-	 */
-	public static boolean isNotNull(Object object) {
-		return !isNull(object);
-	}
+    /**
+     * 驼峰转下划线命名
+     */
+    public static String toUnderScoreCase(String str) {
+        return StrUtil.toUnderlineCase(str);
+    }

-	/**
-	 * * 判断一个对象是否是数组类型（Java基本型别的数组）
-	 *
-	 * @param object 对象
-	 * @return true：是数组 false：不是数组
-	 */
-	public static boolean isArray(Object object) {
-		return ArrayUtil.isArray(object);
-	}
+    /**
+     * 是否包含字符串
+     *
+     * @param str  验证字符串
+     * @param strs 字符串组
+     * @return 包含返回true
+     */
+    public static boolean inStringIgnoreCase(String str, String... strs) {
+        return StrUtil.equalsAnyIgnoreCase(str, strs);
+    }

-	/**
-	 * 去空格
-	 */
-	public static String trim(String str) {
-		return StrUtil.trim(str);
-	}
+    /**
+     * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
+     *
+     * @param name 转换前的下划线大写方式命名的字符串
+     * @return 转换后的驼峰式命名的字符串
+     */
+    public static String convertToCamelCase(String name) {
+        return StrUtil.upperFirst(StrUtil.toCamelCase(name));
+    }

-	/**
-	 * 截取字符串
-	 *
-	 * @param str   字符串
-	 * @param start 开始
-	 * @return 结果
-	 */
-	public static String substring(final String str, int start) {
-		return substring(str, start, str.length());
-	}
+    /**
+     * 驼峰式命名法 例如：user_name->userName
+     */
+    public static String toCamelCase(String s) {
+        return StrUtil.toCamelCase(s);
+    }

-	/**
-	 * 截取字符串
-	 *
-	 * @param str   字符串
-	 * @param start 开始
-	 * @param end   结束
-	 * @return 结果
-	 */
-	public static String substring(final String str, int start, int end) {
-		return StrUtil.sub(str, start, end);
-	}
+    /**
+     * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
+     *
+     * @param str  指定字符串
+     * @param strs 需要检查的字符串数组
+     * @return 是否匹配
+     */
+    public static boolean matches(String str, List<String> strs) {
+        if (isEmpty(str) || CollUtil.isEmpty(strs)) {
+            return false;
+        }
+        for (String pattern : strs) {
+            if (isMatch(pattern, str)) {
+                return true;
+            }
+        }
+        return false;
+    }

-	/**
-	 * 格式化文本, {} 表示占位符<br>
-	 * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
-	 * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
-	 * 例：<br>
-	 * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
-	 * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
-	 * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
-	 *
-	 * @param template 文本模板，被替换的部分用 {} 表示
-	 * @param params   参数值
-	 * @return 格式化后的文本
-	 */
-	public static String format(String template, Object... params) {
-		return StrUtil.format(template, params);
-	}
+    /**
+     * 判断url是否与规则配置:
+     * ? 表示单个字符;
+     * * 表示一层路径内的任意字符串，不可跨层级;
+     * ** 表示任意层路径;
+     *
+     * @param pattern 匹配规则
+     * @param url     需要匹配的url
+     * @return
+     */
+    public static boolean isMatch(String pattern, String url) {
+        AntPathMatcher matcher = new AntPathMatcher();
+        return matcher.match(pattern, url);
+    }

-	/**
-	 * 是否为http(s)://开头
-	 *
-	 * @param link 链接
-	 * @return 结果
-	 */
-	public static boolean ishttp(String link) {
-		return Validator.isUrl(link);
-	}
+    /**
+     * 数字左边补齐0，使之达到指定长度。注意，如果数字转换为字符串后，长度大于size，则只保留 最后size个字符。
+     *
+     * @param num 数字对象
+     * @param size 字符串指定长度
+     * @return 返回数字的字符串格式，该字符串为指定长度。
+     */
+    public static final String padl(final Number num, final int size) {
+        return padl(num.toString(), size, '0');
+    }

-	/**
-	 * 字符串转set
-	 *
-	 * @param str 字符串
-	 * @param sep 分隔符
-	 * @return set集合
-	 */
-	public static Set<String> str2Set(String str, String sep) {
-		return new HashSet<>(str2List(str, sep, true, false));
-	}
+    /**
+     * 字符串左补齐。如果原始字符串s长度大于size，则只保留最后size个字符。
+     *
+     * @param s 原始字符串
+     * @param size 字符串指定长度
+     * @param c 用于补齐的字符
+     * @return 返回指定长度的字符串，由原字符串左补齐或截取得到。
+     */
+    public static final String padl(final String s, final int size, final char c) {
+        final StringBuilder sb = new StringBuilder(size);
+        if (s != null) {
+            final int len = s.length();
+            if (s.length() <= size) {
+                for (int i = size - len; i > 0; i--) {
+                    sb.append(c);
+                }
+                sb.append(s);
+            } else {
+                return s.substring(len - size, len);
+            }
+        } else {
+            for (int i = size; i > 0; i--) {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }

-	/**
-	 * 字符串转list
-	 *
-	 * @param str         字符串
-	 * @param sep         分隔符
-	 * @param filterBlank 过滤纯空白
-	 * @param trim        去掉首尾空白
-	 * @return list集合
-	 */
-	public static List<String> str2List(String str, String sep, boolean filterBlank, boolean trim) {
-		List<String> list = new ArrayList<>();
-		if (isEmpty(str)) {
-			return list;
-		}
-
-		// 过滤空白字符串
-		if (filterBlank && isBlank(str)) {
-			return list;
-		}
-		String[] split = str.split(sep);
-		for (String string : split) {
-			if (filterBlank && isBlank(string)) {
-				continue;
-			}
-			if (trim) {
-				string = trim(string);
-			}
-			list.add(string);
-		}
-
-		return list;
-	}
-
-	/**
-	 * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
-	 *
-	 * @param cs                  指定字符串
-	 * @param searchCharSequences 需要检查的字符串数组
-	 * @return 是否包含任意一个字符串
-	 */
-	public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) {
-		return StrUtil.containsAnyIgnoreCase(cs, searchCharSequences);
-	}
-
-	/**
-	 * 驼峰转下划线命名
-	 */
-	public static String toUnderScoreCase(String str) {
-		return StrUtil.toUnderlineCase(str);
-	}
-
-	/**
-	 * 是否包含字符串
-	 *
-	 * @param str  验证字符串
-	 * @param strs 字符串组
-	 * @return 包含返回true
-	 */
-	public static boolean inStringIgnoreCase(String str, String... strs) {
-		return StrUtil.equalsAnyIgnoreCase(str, strs);
-	}
-
-	/**
-	 * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
-	 *
-	 * @param name 转换前的下划线大写方式命名的字符串
-	 * @return 转换后的驼峰式命名的字符串
-	 */
-	public static String convertToCamelCase(String name) {
-		return StrUtil.upperFirst(StrUtil.toCamelCase(name));
-	}
-
-	/**
-	 * 驼峰式命名法 例如：user_name->userName
-	 */
-	public static String toCamelCase(String s) {
-		return StrUtil.toCamelCase(s);
-	}
-
-	/**
-	 * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
-	 *
-	 * @param str  指定字符串
-	 * @param strs 需要检查的字符串数组
-	 * @return 是否匹配
-	 */
-	public static boolean matches(String str, List<String> strs) {
-		if (isEmpty(str) || isEmpty(strs)) {
-			return false;
-		}
-		for (String pattern : strs) {
-			if (isMatch(pattern, str)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * 判断url是否与规则配置:
-	 * ? 表示单个字符;
-	 * * 表示一层路径内的任意字符串，不可跨层级;
-	 * ** 表示任意层路径;
-	 *
-	 * @param pattern 匹配规则
-	 * @param url     需要匹配的url
-	 * @return
-	 */
-	public static boolean isMatch(String pattern, String url) {
-		return ReUtil.isMatch(pattern, url);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <T> T cast(Object obj) {
-		return (T) obj;
-	}
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
@@ -1,7 +1,8 @@
 package com.ruoyi.common.utils;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

 import java.util.concurrent.*;

@@ -10,8 +11,9 @@ import java.util.concurrent.*;
 *
 * @author ruoyi
 */
+@Slf4j
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class Threads {
-    private static final Logger logger = LoggerFactory.getLogger(Threads.class);

    /**
     * sleep等待,单位为毫秒
@@ -38,7 +40,7 @@ public class Threads {
                if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
                    pool.shutdownNow();
                    if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
-                        logger.info("Pool did not terminate");
+                        log.info("Pool did not terminate");
                    }
                }
            } catch (InterruptedException ie) {
@@ -67,7 +69,7 @@ public class Threads {
            }
        }
        if (t != null) {
-            logger.error(t.getMessage(), t);
+            log.error(t.getMessage(), t);
        }
    }
 }
--- a/Show More
+++ b/Show More