Merge remote-tracking branch 'origin/dev'

Merge pull request !106 from 疯狂的狮子Li/dev

.editorconfig

@@ -10,7 +10,7 @@ end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{json,yml,yaml}]
+[*.{json,yml}]
 indent_size = 2
 
 [*.md]

.gitee/ISSUE_TEMPLATE.zh-CN.md

@@ -1,13 +0,0 @@
-### 使用版本(未按照模板填写直接删除)
-
-
-### 问题描述
-
-
-### 希望结果
-
-
-### 重现步骤
-
-
-### 报错信息(截图为主 请勿发混乱格式)

.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md

@@ -1,7 +0,0 @@
-### 更改目的 解决了什么问题(请提交到dev分支)
-
-
-### 描述 做了哪些改动
-
-
-### 测试 都做了哪些测试(未经过测试不采纳)

.gitignore

@@ -25,9 +25,6 @@ target/
 *.iml
 *.ipr
 
-### JRebel ###
-rebel.xml
-
 ### NetBeans ###
 nbproject/private/
 build/*

.run/ruoyi-admin.run.xml

@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-server:4.3.0" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-monitor-admin.run.xml

@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-monitor-admin:4.3.0" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-extend/ruoyi-monitor-admin/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-xxl-job-admin.run.xml

@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-xxl-job-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-xxl-job-admin:4.3.0" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-extend/ruoyi-xxl-job-admin/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

README.md

@@ -4,33 +4,27 @@
 [![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-4.3.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.4.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
-[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.7-blue.svg)]()
+[![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 针对 `分布式集群` 场景升级(不兼容原框架)
-
-> 项目代码、文档 均开源免费可商用 遵循开源协议在项目中保留开源协议文件即可<br>
-活到老写到老 为兴趣而开源 为学习而开源 为让大家真正可以学到技术而开源
 
 > 系统演示: [传送门](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全方位升级(不兼容原框架) |
-| 微服务分支    | RuoYi-Cloud-Plus    | [微服务分支地址](https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus)                                          | 重写RuoYi-Cloud全方位升级(不兼容原框架) |
+| 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/) | 单体应用结构 |
-| 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 的高性能容器             |
+| 容器框架 | Undertow | [Undertow官网](https://undertow.io/) | 基于 Netty 的高性能容器 |
-| 权限认证框架   | Sa-Token、Jwt        | [Sa-Token官网](https://sa-token.dev33.cn/)                                                          | 强解耦、强扩展                    |
+| 权限认证框架 | Spring Security、Jwt | [SpringSecurity官网](https://spring.io/projects/spring-security#learn) | 支持多终端认证系统 |
 | 关系数据库 | MySQL | [MySQL官网](https://dev.mysql.com/) | 适配 8.X 最低 5.7 |
-| 关系数据库    | Oracle              | [Oracle官网](https://www.oracle.com/cn/database/)                                                   | 适配 11g 12c                 |
-| 关系数据库    | PostgreSQL          | [PostgreSQL官网](https://www.postgresql.org/)                                                       | 适配 13 14                   |
-| 关系数据库    | SQLServer           | [SQLServer官网](https://docs.microsoft.com/zh-cn/sql/sql-server)                                    | 适配 2017 2019               |
 | 缓存数据库 | 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 分析 |
@@ -38,18 +32,16 @@
 | 序列化框架 | 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) | 云存储 |
-| 短信模块     | 阿里、腾讯               | [短信使用文档](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=5578491&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) | 性能优异 扩展性强 |
-| 文档框架     | SpringDoc、javadoc   | [接口文档](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=5805266&doc_id=1469725)    | 无注解零入侵基于java注释             |
+| 文档框架 | 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/) | 容器编排 一键部署业务集群 |
@@ -59,14 +51,11 @@
 
 使用框架前请仔细阅读文档重点注意事项
 <br>
->[初始化项目 必看](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4164117&doc_id=1469725)
+>[初始化项目 必看](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/关于初始化项目?sort_id=4164117)
->>[https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4164117&doc_id=1469725](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4164117&doc_id=1469725)
+>>[https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/关于初始化项目?sort_id=4164117](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/关于初始化项目?sort_id=4164117)
 > 
->[专栏与视频 入门必看](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=5473272&doc_id=1469725)
+>[部署项目 必看](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/关于应用部署?sort_id=4219382)
->>[https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=5473272&doc_id=1469725](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=5473272&doc_id=1469725)
+>>[https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/关于应用部署?sort_id=4219382](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/关于应用部署?sort_id=4219382)
->
->[部署项目 必看](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4219382&doc_id=1469725)
->>[https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4219382&doc_id=1469725](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4219382&doc_id=1469725)
 > 
 >[参考文档 Wiki](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages)
 >>[https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages)
@@ -84,8 +73,8 @@
 
 * 同步升级 RuoYi-Vue
 * GitHub 地址 [RuoYi-Vue-Plus-github](https://github.com/JavaLionLi/RuoYi-Vue-Plus)
-* 单模块 分支 [RuoYi-Vue-Plus-fast](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/fast/)
+* 单模块 fast 分支 [RuoYi-Vue-Plus-fast](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/fast/)
-* 微服务 分支 [RuoYi-Cloud-Plus](https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus)
+* satoken 分支 [RuoYi-Vue-Plus-satoken](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/satoken/)
 * 用户扩展项目 [扩展项目列表](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4478302&doc_id=1469725)
 
 ## 加群与捐献
@@ -94,7 +83,7 @@
 
 ## 捐献作者
 作者为兼职做开源,平时还需要工作,如果帮到了您可以请作者吃个盒饭  
-<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/101654_451e4523_1766278.jpeg" width="300px" height="450px" />
 <img src="https://images.gitee.com/uploads/images/2021/0525/101713_3d18b119_1766278.jpeg" width="300px" height="450px" />
 
 ## 业务功能

pom.xml

@@ -6,46 +6,52 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi-vue-plus</artifactId>
-    <version>4.3.0</version>
+    <version>3.4.0</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>4.3.0</ruoyi-vue-plus.version>
+        <ruoyi-vue-plus.version>3.4.0</ruoyi-vue-plus.version>
-        <spring-boot.version>2.7.3</spring-boot.version>
+        <spring-boot.version>2.5.7</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.2</maven-jar-plugin.version>
+        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
-        <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
+        <druid.version>1.2.8</druid.version>
-        <druid.version>1.2.12</druid.version>
+        <knife4j.version>3.0.3</knife4j.version>
-        <springdoc.version>1.6.11</springdoc.version>
+        <swagger-annotations.version>1.5.22</swagger-annotations.version>
-        <poi.version>5.2.2</poi.version>
+        <poi.version>4.1.2</poi.version>
-        <easyexcel.version>3.1.1</easyexcel.version>
+        <easyexcel.version>2.2.11</easyexcel.version>
         <velocity.version>2.3</velocity.version>
-        <satoken.version>1.30.0</satoken.version>
+        <jwt.version>0.9.1</jwt.version>
-        <mybatis-plus.version>3.5.2</mybatis-plus.version>
+        <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
-        <hutool.version>5.8.6</hutool.version>
+        <hutool.version>5.7.16</hutool.version>
-        <okhttp.version>4.10.0</okhttp.version>
+        <okhttp.version>4.9.2</okhttp.version>
-        <spring-boot-admin.version>2.7.4</spring-boot-admin.version>
+        <spring-boot-admin.version>2.5.4</spring-boot-admin.version>
-        <redisson.version>3.17.6</redisson.version>
+        <redisson.version>3.16.4</redisson.version>
-        <lock4j.version>2.2.2</lock4j.version>
+        <lock4j.version>2.2.1</lock4j.version>
-        <dynamic-ds.version>3.5.2</dynamic-ds.version>
+        <dynamic-ds.version>3.4.1</dynamic-ds.version>
-        <tlog.version>1.4.3</tlog.version>
+        <tlog.version>1.3.4</tlog.version>
-        <xxl-job.version>2.3.1</xxl-job.version>
+        <xxl-job.version>2.3.0</xxl-job.version>
-        <lombok.version>1.18.24</lombok.version>
 
-        <!-- 统一 guava 版本 解决隐式漏洞问题 -->
+        <!-- jdk11 缺失依赖 jaxb-->
-        <guava.version>31.1-jre</guava.version>
+        <jaxb.version>3.0.1</jaxb.version>
 
         <!-- OSS 配置 -->
-        <aws-java-sdk-s3.version>1.12.300</aws-java-sdk-s3.version>
+        <qiniu.version>7.8.0</qiniu.version>
-        <!-- SMS 配置 -->
+        <aliyun.oss.version>3.13.1</aliyun.oss.version>
-        <aliyun.sms.version>2.0.18</aliyun.sms.version>
+        <qcloud.cos.version>5.6.58</qcloud.cos.version>
-        <tencent.sms.version>3.1.591</tencent.sms.version>
+        <minio.version>8.3.3</minio.version>
+
+        <!-- docker 配置 -->
+        <docker.registry.url>localhost</docker.registry.url>
+        <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
+        <docker.namespace>ruoyi</docker.namespace>
+        <docker.plugin.version>1.2.2</docker.plugin.version>
+
     </properties>
 
     <!-- 依赖声明 -->
@@ -61,15 +67,6 @@
                 <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>
@@ -78,38 +75,39 @@
             </dependency>
 
             <dependency>
-                <groupId>org.springdoc</groupId>
+                <groupId>com.github.xiaoymin</groupId>
-                <artifactId>springdoc-openapi-webmvc-core</artifactId>
+                <artifactId>knife4j-spring-boot-starter</artifactId>
-                <version>${springdoc.version}</version>
+                <version>${knife4j.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>swagger-annotations</artifactId>
+                        <groupId>io.swagger</groupId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>org.springdoc</groupId>
+                <groupId>io.swagger</groupId>
-                <artifactId>springdoc-openapi-javadoc</artifactId>
+                <artifactId>swagger-annotations</artifactId>
-                <version>${springdoc.version}</version>
+                <version>${swagger-annotations.version}</version>
             </dependency>
 
-            <dependency>
+            <!-- excel工具 -->
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok</artifactId>
-                <version>${lombok.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi</artifactId>
-                <version>${poi.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi-ooxml</artifactId>
                 <version>${poi.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>easyexcel</artifactId>
                 <version>${easyexcel.version}</version>
                 <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.poi</groupId>
+                        <artifactId>poi</artifactId>
+                    </exclusion>
                     <exclusion>
                         <groupId>org.apache.poi</groupId>
                         <artifactId>poi-ooxml-schemas</artifactId>
@@ -124,23 +122,18 @@
                 <version>${velocity.version}</version>
             </dependency>
 
-            <!-- Sa-Token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
+            <!-- Token生成与解析-->
             <dependency>
-                <groupId>cn.dev33</groupId>
+                <groupId>io.jsonwebtoken</groupId>
-                <artifactId>sa-token-spring-boot-starter</artifactId>
+                <artifactId>jjwt</artifactId>
-                <version>${satoken.version}</version>
+                <version>${jwt.version}</version>
             </dependency>
-            <!-- Sa-Token 整合 jwt -->
+
+            <!-- jdk11 缺失依赖 jaxb-->
             <dependency>
-                <groupId>cn.dev33</groupId>
+                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>sa-token-jwt</artifactId>
+                <artifactId>jaxb-impl</artifactId>
-                <version>${satoken.version}</version>
+                <version>${jaxb.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>cn.hutool</groupId>
-                        <artifactId>hutool-all</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
 
             <!-- dynamic-datasource 多数据源-->
@@ -167,30 +160,18 @@
                 <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>
                 <version>${okhttp.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-s3</artifactId>
-                <version>${aws-java-sdk-s3.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.aliyun</groupId>
-                <artifactId>dysmsapi20170525</artifactId>
-                <version>${aliyun.sms.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.tencentcloudapi</groupId>
-                <artifactId>tencentcloud-sdk-java</artifactId>
-                <version>${tencent.sms.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>de.codecentric</groupId>
                 <artifactId>spring-boot-admin-starter-server</artifactId>
@@ -223,37 +204,32 @@
 
             <dependency>
                 <groupId>com.yomahub</groupId>
-                <artifactId>tlog-web-spring-boot-starter</artifactId>
+                <artifactId>tlog-spring-boot-configuration</artifactId>
+                <version>${tlog.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>tlog-webroot</artifactId>
                 <version>${tlog.version}</version>
                 <exclusions>
                     <exclusion>
-                        <artifactId>log4j</artifactId>
+                        <artifactId>javassist</artifactId>
-                        <groupId>log4j</groupId>
+                        <groupId>org.javassist</groupId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>dom4j</artifactId>
+                        <artifactId>guava</artifactId>
-                        <groupId>dom4j</groupId>
+                        <groupId>com.google.guava</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>commons-beanutils</artifactId>
-                        <groupId>commons-beanutils</groupId>
                     </exclusion>
                 </exclusions>
             </dependency>
 
             <dependency>
                 <groupId>com.yomahub</groupId>
-                <artifactId>tlog-xxljob-spring-boot-starter</artifactId>
+                <artifactId>tlog-xxl-job</artifactId>
                 <version>${tlog.version}</version>
             </dependency>
 
-            <!-- 统一 guava 版本 解决隐式漏洞问题 -->
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>${guava.version}</version>
-            </dependency>
-
             <!-- 定时任务 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -296,13 +272,6 @@
                 <version>${ruoyi-vue-plus.version}</version>
             </dependency>
 
-            <!-- SMS短信模块 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-sms</artifactId>
-                <version>${ruoyi-vue-plus.version}</version>
-            </dependency>
-
             <!-- demo模块 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -323,7 +292,6 @@
         <module>ruoyi-demo</module>
         <module>ruoyi-extend</module>
         <module>ruoyi-oss</module>
-        <module>ruoyi-sms</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -332,45 +300,18 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.9.0</version>
+                <version>3.1</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>com.github.therapi</groupId>
-                            <artifactId>therapi-runtime-javadoc-scribe</artifactId>
-                            <version>0.15.0</version>
-                        </path>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                            <version>${lombok.version}</version>
-                        </path>
-                        <path>
-                            <groupId>org.springframework.boot</groupId>
-                            <artifactId>spring-boot-configuration-processor</artifactId>
-                            <version>${spring-boot.version}</version>
-                        </path>
-                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
         </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>
@@ -409,6 +350,8 @@
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>local</profiles.active>
                 <logging.level>debug</logging.level>
+                <knife4j.production>false</knife4j.production>
+                <endpoints.include>'*'</endpoints.include>
             </properties>
         </profile>
         <profile>
@@ -417,6 +360,8 @@
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
                 <logging.level>debug</logging.level>
+                <knife4j.production>false</knife4j.production>
+                <endpoints.include>'*'</endpoints.include>
             </properties>
             <activation>
                 <!-- 默认环境 -->
@@ -428,9 +373,10 @@
             <properties>
                 <profiles.active>prod</profiles.active>
                 <logging.level>warn</logging.level>
+                <knife4j.production>true</knife4j.production>
+                <endpoints.include>health, info, logfile</endpoints.include>
             </properties>
         </profile>
     </profiles>
 
 </project>
-

ruoyi-admin/Dockerfile

@@ -8,10 +8,8 @@ RUN mkdir -p /ruoyi/server/temp
 
 WORKDIR /ruoyi/server
 
-ENV SERVER_PORT=8080
+EXPOSE 8080
-
-EXPOSE ${SERVER_PORT}
 
 ADD ./target/ruoyi-admin.jar ./app.jar
 
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dserver.port=${SERVER_PORT}","-jar", "app.jar"]
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]

ruoyi-admin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>4.3.0</version>
+        <version>3.4.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -29,21 +29,6 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
-        <!-- Oracle -->
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-        </dependency>
-        <!-- PostgreSql -->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-        </dependency>
-        <!-- SqlServer -->
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-        </dependency>
 
         <!-- 核心模块-->
         <dependency>
@@ -101,12 +86,31 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.2.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>${docker.plugin.version}</version>
+                <configuration>
+                    <imageName>${docker.namespace}/ruoyi-server:${project.version}</imageName>
+                    <dockerDirectory>${project.basedir}</dockerDirectory>
+                    <dockerHost>${docker.registry.host}</dockerHost>
+                    <registryUrl>${docker.registry.url}</registryUrl>
+                    <serverId>${docker.registry.url}</serverId>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -4,89 +4,54 @@ import cn.hutool.captcha.AbstractCaptcha;
 import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.RandomUtil;
-import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 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;
-import com.ruoyi.sms.config.properties.SmsProperties;
-import com.ruoyi.sms.core.SmsTemplate;
-import com.ruoyi.sms.entity.SmsResult;
 import com.ruoyi.system.service.ISysConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+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.RestController;
 
-import javax.validation.constraints.NotBlank;
-import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 验证码操作处理
  *
  * @author Lion Li
  */
-@Anonymous
+@Api(value = "验证码操作处理", tags = {"验证码管理"})
-@Slf4j
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@Validated
-@RequiredArgsConstructor
 @RestController
 public class CaptchaController {
 
     private final CaptchaProperties captchaProperties;
-    private final SmsProperties smsProperties;
     private final ISysConfigService configService;
 
-    /**
-     * 短信验证码
-     *
-     * @param phonenumber 用户手机号
-     */
-    @GetMapping("/captchaSms")
-    public R<Void> smsCaptcha(@NotBlank(message = "{user.phonenumber.not.blank}")
-                              String phonenumber) {
-        if (!smsProperties.getEnabled()) {
-            return R.fail("当前系统没有开启短信功能！");
-        }
-        String key = CacheConstants.CAPTCHA_CODE_KEY + phonenumber;
-        String code = RandomUtil.randomNumbers(4);
-        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
-        // 验证码模板id 自行处理 (查数据库或写死均可)
-        String templateId = "";
-        Map<String, String> map = new HashMap<>(1);
-        map.put("code", code);
-        SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class);
-        SmsResult result = smsTemplate.send(phonenumber, templateId, map);
-        if (!result.isSuccess()) {
-            log.error("验证码短信发送异常 => {}", result);
-            return R.fail(result.getMessage());
-        }
-        return R.ok();
-    }
-
     /**
      * 生成验证码
      */
+    @ApiOperation("生成验证码")
     @GetMapping("/captchaImage")
-    public R<Map<String, Object>> getCode() {
+    public AjaxResult<Map<String, Object>> getCode() {
         Map<String, Object> ajax = new HashMap<>();
-        boolean captchaEnabled = configService.selectCaptchaEnabled();
+        boolean captchaOnOff = configService.selectCaptchaOnOff();
-        ajax.put("captchaEnabled", captchaEnabled);
+        ajax.put("captchaOnOff", captchaOnOff);
-        if (!captchaEnabled) {
+        if (!captchaOnOff) {
-            return R.ok(ajax);
+            return AjaxResult.success(ajax);
         }
         // 保存验证码信息
         String uuid = IdUtil.simpleUUID();
-        String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
+        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
         // 生成验证码
         CaptchaType captchaType = captchaProperties.getType();
         boolean isMath = CaptchaType.MATH == captchaType;
@@ -96,10 +61,10 @@ public class CaptchaController {
         captcha.setGenerator(codeGenerator);
         captcha.createCode();
         String code = isMath ? getCodeResult(captcha.getCode()) : captcha.getCode();
-        RedisUtils.setCacheObject(verifyKey, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
+        RedisUtils.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
         ajax.put("uuid", uuid);
         ajax.put("img", captcha.getImageBase64());
-        return R.ok(ajax);
+        return AjaxResult.success(ajax);
     }
 
     private String getCodeResult(String capStr) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -1,59 +1,41 @@
 package com.ruoyi.web.controller.monitor;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.ruoyi.common.core.domain.AjaxResult;
-import cn.hutool.core.collection.CollUtil;
-import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.constant.CacheNames;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.redis.CacheUtils;
+import io.swagger.annotations.Api;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import io.swagger.annotations.ApiOperation;
-import com.ruoyi.system.domain.SysCache;
 import lombok.RequiredArgsConstructor;
-import org.redisson.spring.data.connection.RedissonConnectionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.connection.RedisServerCommands;
-import org.springframework.web.bind.annotation.*;
+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;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 缓存监控
  *
  * @author Lion Li
  */
-@RequiredArgsConstructor
+@Api(value = "缓存监控", tags = {"缓存监控管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/monitor/cache")
 public class CacheController {
 
-    private final RedissonConnectionFactory connectionFactory;
+    private final RedisTemplate<String, String> redisTemplate;
 
-    private final static List<SysCache> CACHES = new ArrayList<>();
+    @ApiOperation("获取缓存监控详细信息")
-
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
-    static {
-        CACHES.add(new SysCache(CacheConstants.LOGIN_TOKEN_KEY, "用户信息"));
-        CACHES.add(new SysCache(CacheConstants.ONLINE_TOKEN_KEY, "在线用户"));
-        CACHES.add(new SysCache(CacheNames.SYS_CONFIG, "配置信息"));
-        CACHES.add(new SysCache(CacheNames.SYS_DICT, "数据字典"));
-        CACHES.add(new SysCache(CacheConstants.CAPTCHA_CODE_KEY, "验证码"));
-        CACHES.add(new SysCache(CacheConstants.REPEAT_SUBMIT_KEY, "防重提交"));
-        CACHES.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "限流处理"));
-        CACHES.add(new SysCache(CacheNames.SYS_OSS_CONFIG, "OSS配置"));
-        CACHES.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "密码错误次数"));
-    }
-
-    /**
-     * 获取缓存监控列表
-     */
-    @SaCheckPermission("monitor:cache:list")
     @GetMapping()
-    public R<Map<String, Object>> getInfo() throws Exception {
+    public AjaxResult<Map<String, Object>> getInfo() throws Exception {
-        RedisConnection connection = connectionFactory.getConnection();
+        Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::info);
-        Properties info = connection.info();
+        Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
-        Properties commandStats = connection.info("commandstats");
+        Object dbSize = redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::dbSize);
-        Long dbSize = connection.dbSize();
 
         Map<String, Object> result = new HashMap<>(3);
         result.put("info", info);
@@ -70,100 +52,6 @@ public class CacheController {
             });
         }
         result.put("commandStats", pieList);
-        return R.ok(result);
+        return AjaxResult.success(result);
-    }
-
-    /**
-     * 获取缓存监控缓存名列表
-     */
-    @SaCheckPermission("monitor:cache:list")
-    @GetMapping("/getNames")
-    public R<List<SysCache>> cache() {
-        return R.ok(CACHES);
-    }
-
-    /**
-     * 获取缓存监控Key列表
-     *
-     * @param cacheName 缓存名
-     */
-    @SaCheckPermission("monitor:cache:list")
-    @GetMapping("/getKeys/{cacheName}")
-    public R<Collection<String>> getCacheKeys(@PathVariable String cacheName) {
-        Collection<String> cacheKeys = new HashSet<>(0);
-        if (isCacheNames(cacheName)) {
-            Set<Object> keys = CacheUtils.keys(cacheName);
-            if (CollUtil.isNotEmpty(keys)) {
-                cacheKeys = keys.stream().map(Object::toString).collect(Collectors.toList());
-            }
-        } else {
-            cacheKeys = RedisUtils.keys(cacheName + "*");
-        }
-        return R.ok(cacheKeys);
-    }
-
-    /**
-     * 获取缓存监控缓存值详情
-     *
-     * @param cacheName 缓存名
-     * @param cacheKey  缓存key
-     */
-    @SaCheckPermission("monitor:cache:list")
-    @GetMapping("/getValue/{cacheName}/{cacheKey}")
-    public R<SysCache> getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey) {
-        Object cacheValue;
-        if (isCacheNames(cacheName)) {
-            cacheValue = CacheUtils.get(cacheName, cacheKey);
-        } else {
-            cacheValue = RedisUtils.getCacheObject(cacheKey);
-        }
-        SysCache sysCache = new SysCache(cacheName, cacheKey, JsonUtils.toJsonString(cacheValue));
-        return R.ok(sysCache);
-    }
-
-    /**
-     * 清理缓存监控缓存名
-     *
-     * @param cacheName 缓存名
-     */
-    @SaCheckPermission("monitor:cache:list")
-    @DeleteMapping("/clearCacheName/{cacheName}")
-    public R<Void> clearCacheName(@PathVariable String cacheName) {
-        if (isCacheNames(cacheName)) {
-            CacheUtils.clear(cacheName);
-        } else {
-            RedisUtils.deleteKeys(cacheName + "*");
-        }
-        return R.ok();
-    }
-
-    /**
-     * 清理缓存监控Key
-     *
-     * @param cacheKey key名
-     */
-    @SaCheckPermission("monitor:cache:list")
-    @DeleteMapping("/clearCacheKey/{cacheName}/{cacheKey}")
-    public R<Void> clearCacheKey(@PathVariable String cacheName, @PathVariable String cacheKey) {
-        if (isCacheNames(cacheName)) {
-            CacheUtils.evict(cacheName, cacheKey);
-        } else {
-            RedisUtils.deleteObject(cacheKey);
-        }
-        return R.ok();
-    }
-
-    /**
-     * 清理全部缓存监控
-     */
-    @SaCheckPermission("monitor:cache:list")
-    @DeleteMapping("/clearCacheAll")
-    public R<Void> clearCacheAll() {
-        RedisUtils.deleteKeys("*");
-        return R.ok();
-    }
-
-    private boolean isCacheNames(String cacheName) {
-        return !StringUtils.contains(cacheName, ":");
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -1,18 +1,18 @@
 package com.ruoyi.web.controller.monitor;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.system.domain.SysLogininfor;
 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.*;
 
@@ -25,64 +25,44 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "系统访问记录", tags = {"系统访问记录管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/monitor/logininfor")
 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, PageQuery pageQuery) {
+    public TableDataInfo<SysLogininfor> list(SysLogininfor logininfor) {
-        return logininforService.selectPageLogininforList(logininfor, pageQuery);
+        return logininforService.selectPageLogininforList(logininfor);
     }
 
-    /**
+    @ApiOperation("导出系统访问记录列表")
-     * 导出系统访问记录列表
-     */
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("monitor:logininfor:export")
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
     @PostMapping("/export")
     public void export(SysLogininfor logininfor, HttpServletResponse response) {
         List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
         ExcelUtil.exportExcel(list, "登录日志", SysLogininfor.class, response);
     }
 
-    /**
+    @ApiOperation("删除系统访问记录")
-     * 批量删除登录日志
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
-     * @param infoIds 日志ids
-     */
-    @SaCheckPermission("monitor:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{infoIds}")
-    public R<Void> remove(@PathVariable Long[] infoIds) {
+    public AjaxResult<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 R<Void> clean() {
+    public AjaxResult<Void> clean() {
         logininforService.cleanLogininfor();
-        return R.ok();
+        return AjaxResult.success();
     }
-
-    @SaCheckPermission("monitor:logininfor:unlock")
-    @Log(title = "账户解锁", businessType = BusinessType.OTHER)
-    @GetMapping("/unlock/{userName}")
-    public R<Void> unlock(@PathVariable("userName") String userName) {
-        String loginName = CacheConstants.PWD_ERR_CNT_KEY + userName;
-        if (RedisUtils.hasKey(loginName)) {
-            RedisUtils.deleteObject(loginName);
-        }
-        return R.ok();
-    }
-
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java

@@ -1,16 +1,18 @@
 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.PageQuery;
+import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysOperLog;
 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.*;
 
@@ -23,52 +25,44 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "操作日志记录", tags = {"操作日志记录管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/monitor/operlog")
 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, PageQuery pageQuery) {
+    public TableDataInfo<SysOperLog> list(SysOperLog operLog) {
-        return operLogService.selectPageOperLogList(operLog, pageQuery);
+        return operLogService.selectPageOperLogList(operLog);
     }
 
-    /**
+    @ApiOperation("导出操作日志记录列表")
-     * 导出操作日志记录列表
-     */
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("monitor:operlog:export")
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
     @PostMapping("/export")
     public void export(SysOperLog operLog, HttpServletResponse response) {
         List<SysOperLog> list = operLogService.selectOperLogList(operLog);
         ExcelUtil.exportExcel(list, "操作日志", SysOperLog.class, response);
     }
 
-    /**
+    @ApiOperation("删除操作日志记录")
-     * 批量删除操作日志记录
-     * @param operIds 日志ids
-     */
     @Log(title = "操作日志", businessType = BusinessType.DELETE)
-    @SaCheckPermission("monitor:operlog:remove")
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
     @DeleteMapping("/{operIds}")
-    public R<Void> remove(@PathVariable Long[] operIds) {
+    public AjaxResult<Void> remove(@PathVariable Long[] operIds) {
         return toAjax(operLogService.deleteOperLogByIds(operIds));
     }
 
-    /**
+    @ApiOperation("清空操作日志记录")
-     * 清理操作日志记录
-     */
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
-    @SaCheckPermission("monitor:operlog:remove")
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
     @DeleteMapping("/clean")
-    public R<Void> clean() {
+    public AjaxResult<Void> clean() {
         operLogService.cleanOperLog();
-        return R.ok();
+        return AjaxResult.success();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -1,24 +1,26 @@
 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.CacheConstants;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.dto.UserOnlineDTO;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StreamUtils;
+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;
 
@@ -27,64 +29,52 @@ import java.util.List;
  *
  * @author Lion Li
  */
-@RequiredArgsConstructor
+@Api(value = "在线用户监控", tags = {"在线用户监控管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/monitor/online")
 public class SysUserOnlineController extends BaseController {
 
-    /**
+    private final ISysUserOnlineService userOnlineService;
-     * 获取在线用户监控列表
+
-     *
+    @ApiOperation("在线用户列表")
-     * @param ipaddr   IP地址
+    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
-     * @param userName 用户名
-     */
-    @SaCheckPermission("monitor:online:list")
     @GetMapping("/list")
     public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
-        // 获取所有未过期的 token
+        Collection<String> keys = RedisUtils.keys(Constants.LOGIN_TOKEN_KEY + "*");
-        List<String> keys = StpUtil.searchTokenValue("", -1, 0);
+        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
-        List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>();
         for (String key : keys) {
-            String token = key.replace(CacheConstants.LOGIN_TOKEN_KEY, "");
+            LoginUser user = RedisUtils.getCacheObject(key);
-            // 如果已经过期则跳过
-            if (StpUtil.stpLogic.getTokenActivityTimeoutByToken(token) < 0) {
-                continue;
-            }
-            userOnlineDTOList.add(RedisUtils.getCacheObject(CacheConstants.ONLINE_TOKEN_KEY + token));
-        }
             if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
-            userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
+                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) {
-                StringUtils.equals(ipaddr, userOnline.getIpaddr()) &&
+                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
-                    StringUtils.equals(userName, userOnline.getUserName())
-            );
-        } else if (StringUtils.isNotEmpty(ipaddr)) {
-            userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
-                StringUtils.equals(ipaddr, userOnline.getIpaddr())
-            );
-        } else if (StringUtils.isNotEmpty(userName)) {
-            userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
-                StringUtils.equals(userName, userOnline.getUserName())
-            );
                 }
-        Collections.reverse(userOnlineDTOList);
+            } else if (StringUtils.isNotEmpty(ipaddr)) {
-        userOnlineDTOList.removeAll(Collections.singleton(null));
+                if (StringUtils.equals(ipaddr, user.getIpaddr())) {
-        List<SysUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class);
+                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
-        return TableDataInfo.build(userOnlineList);
+                }
+            } else if (StringUtils.isNotEmpty(userName)) {
+                if (StringUtils.equals(userName, user.getUsername())) {
+                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+                }
+            } else {
+                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+            }
+        }
+        Collections.reverse(userOnlineList);
+        userOnlineList.removeAll(Collections.singleton(null));
+        return PageUtils.buildDataInfo(userOnlineList);
     }
 
     /**
      * 强退用户
-     *
-     * @param tokenId token值
      */
-    @SaCheckPermission("monitor:online:forceLogout")
+    @ApiOperation("强退用户")
+    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
     @DeleteMapping("/{tokenId}")
-    public R<Void> forceLogout(@PathVariable String tokenId) {
+    public AjaxResult<Void> forceLogout(@PathVariable String tokenId) {
-        try {
+        RedisUtils.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
-            StpUtil.kickoutByTokenValue(tokenId);
+        return AjaxResult.success();
-        } catch (NotLoginException e) {
-        }
-        return R.ok();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -1,17 +1,20 @@
 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.PageQuery;
+import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.service.ISysConfigService;
+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.*;
 
@@ -24,7 +27,8 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "参数配置控制器", tags = {"参数配置管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/config")
 public class SysConfigController extends BaseController {
@@ -34,17 +38,16 @@ public class SysConfigController extends BaseController {
     /**
      * 获取参数配置列表
      */
-    @SaCheckPermission("system:config:list")
+    @ApiOperation("获取参数配置列表")
+    @PreAuthorize("@ss.hasPermi('system:config:list')")
     @GetMapping("/list")
-    public TableDataInfo<SysConfig> list(SysConfig config, PageQuery pageQuery) {
+    public TableDataInfo<SysConfig> list(SysConfig config) {
-        return configService.selectPageConfigList(config, pageQuery);
+        return configService.selectPageConfigList(config);
     }
 
-    /**
+    @ApiOperation("导出参数配置列表")
-     * 导出参数配置列表
-     */
     @Log(title = "参数管理", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("system:config:export")
+    @PreAuthorize("@ss.hasPermi('system:config:export')")
     @PostMapping("/export")
     public void export(SysConfig config, HttpServletResponse response) {
         List<SysConfig> list = configService.selectConfigList(config);
@@ -53,85 +56,72 @@ public class SysConfigController extends BaseController {
 
     /**
      * 根据参数编号获取详细信息
-     *
-     * @param configId 参数ID
      */
-    @SaCheckPermission("system:config:query")
+    @ApiOperation("根据参数编号获取详细信息")
+    @PreAuthorize("@ss.hasPermi('system:config:query')")
     @GetMapping(value = "/{configId}")
-    public R<SysConfig> getInfo(@PathVariable Long configId) {
+    public AjaxResult<SysConfig> getInfo(@ApiParam("参数ID") @PathVariable Long configId) {
-        return R.ok(configService.selectConfigById(configId));
+        return AjaxResult.success(configService.selectConfigById(configId));
     }
 
     /**
      * 根据参数键名查询参数值
-     *
-     * @param configKey 参数Key
      */
+    @ApiOperation("根据参数键名查询参数值")
     @GetMapping(value = "/configKey/{configKey}")
-    public R<Void> getConfigKey(@PathVariable String configKey) {
+    public AjaxResult<Void> getConfigKey(@ApiParam("参数Key") @PathVariable String configKey) {
-        return R.ok(configService.selectConfigByKey(configKey));
+        return AjaxResult.success(configService.selectConfigByKey(configKey));
     }
 
     /**
      * 新增参数配置
      */
-    @SaCheckPermission("system:config:add")
+    @ApiOperation("新增参数配置")
+    @PreAuthorize("@ss.hasPermi('system:config:add')")
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysConfig config) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysConfig config) {
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
-            return R.fail("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+            return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
-        configService.insertConfig(config);
+        return toAjax(configService.insertConfig(config));
-        return R.ok();
     }
 
     /**
      * 修改参数配置
      */
-    @SaCheckPermission("system:config:edit")
+    @ApiOperation("修改参数配置")
+    @PreAuthorize("@ss.hasPermi('system:config:edit')")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysConfig config) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysConfig config) {
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
-            return R.fail("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+            return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
-        configService.updateConfig(config);
+        return toAjax(configService.updateConfig(config));
-        return R.ok();
-    }
-
-    /**
-     * 根据参数键名修改参数配置
-     */
-    @SaCheckPermission("system:config:edit")
-    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/updateByKey")
-    public R<Void> updateByKey(@RequestBody SysConfig config) {
-        configService.updateConfig(config);
-        return R.ok();
     }
 
     /**
      * 删除参数配置
-     *
-     * @param configIds 参数ID串
      */
-    @SaCheckPermission("system:config:remove")
+    @ApiOperation("删除参数配置")
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
-    public R<Void> remove(@PathVariable Long[] configIds) {
+    public AjaxResult<Void> remove(@ApiParam("参数ID串") @PathVariable Long[] configIds) {
         configService.deleteConfigByIds(configIds);
-        return R.ok();
+        return success();
     }
 
     /**
      * 刷新参数缓存
      */
-    @SaCheckPermission("system:config:remove")
+    @ApiOperation("刷新参数缓存")
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
-    public R<Void> refreshCache() {
+    public AjaxResult<Void> refreshCache() {
         configService.resetConfigCache();
-        return R.ok();
+        return AjaxResult.success();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -1,20 +1,27 @@
 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.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
+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.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 部门信息
@@ -22,7 +29,8 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "部门控制器", tags = {"部门管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/dept")
 public class SysDeptController extends BaseController {
@@ -32,48 +40,71 @@ public class SysDeptController extends BaseController {
     /**
      * 获取部门列表
      */
-    @SaCheckPermission("system:dept:list")
+    @ApiOperation("获取部门列表")
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
-    public R<List<SysDept>> list(SysDept dept) {
+    public AjaxResult<List<SysDept>> list(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
-        return R.ok(depts);
+        return AjaxResult.success(depts);
     }
 
     /**
      * 查询部门列表（排除节点）
-     *
-     * @param deptId 部门ID
      */
-    @SaCheckPermission("system:dept:list")
+    @ApiOperation("查询部门列表（排除节点）")
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list/exclude/{deptId}")
-    public R<List<SysDept>> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
+    public AjaxResult<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 R.ok(depts);
+        return AjaxResult.success(depts);
     }
 
     /**
      * 根据部门编号获取详细信息
-     *
-     * @param deptId 部门ID
      */
-    @SaCheckPermission("system:dept:query")
+    @ApiOperation("根据部门编号获取详细信息")
+    @PreAuthorize("@ss.hasPermi('system:dept:query')")
     @GetMapping(value = "/{deptId}")
-    public R<SysDept> getInfo(@PathVariable Long deptId) {
+    public AjaxResult<SysDept> getInfo(@ApiParam("部门ID") @PathVariable Long deptId) {
         deptService.checkDeptDataScope(deptId);
-        return R.ok(deptService.selectDeptById(deptId));
+        return AjaxResult.success(deptService.selectDeptById(deptId));
+    }
+
+    /**
+     * 获取部门下拉树列表
+     */
+    @ApiOperation("获取部门下拉树列表")
+    @GetMapping("/treeselect")
+    public AjaxResult<List<Tree<Long>>> treeselect(SysDept dept) {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+    }
+
+    /**
+     * 加载对应角色部门列表树
+     */
+    @ApiOperation("加载对应角色部门列表树")
+    @GetMapping(value = "/roleDeptTreeselect/{roleId}")
+    public AjaxResult<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);
     }
 
     /**
      * 新增部门
      */
-    @SaCheckPermission("system:dept:add")
+    @ApiOperation("新增部门")
+    @PreAuthorize("@ss.hasPermi('system:dept:add')")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysDept dept) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysDept dept) {
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
-            return R.fail("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+            return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         return toAjax(deptService.insertDept(dept));
     }
@@ -81,39 +112,36 @@ public class SysDeptController extends BaseController {
     /**
      * 修改部门
      */
-    @SaCheckPermission("system:dept:edit")
+    @ApiOperation("修改部门")
+    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysDept dept) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysDept dept) {
-        Long deptId = dept.getDeptId();
-        deptService.checkDeptDataScope(deptId);
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
-            return R.fail("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        } else if (dept.getParentId().equals(deptId)) {
+        } else if (dept.getParentId().equals(dept.getDeptId())) {
-            return R.fail("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
         } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-            && deptService.selectNormalChildrenDeptById(deptId) > 0) {
+                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) {
-            return R.fail("该部门包含未停用的子部门！");
+            return AjaxResult.error("该部门包含未停用的子部门！");
         }
         return toAjax(deptService.updateDept(dept));
     }
 
     /**
      * 删除部门
-     *
-     * @param deptId 部门ID
      */
-    @SaCheckPermission("system:dept:remove")
+    @ApiOperation("删除部门")
+    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
-    public R<Void> remove(@PathVariable Long deptId) {
+    public AjaxResult<Void> remove(@ApiParam("部门ID串") @PathVariable Long deptId) {
         if (deptService.hasChildByDeptId(deptId)) {
-            return R.fail("存在下级部门,不允许删除");
+            return AjaxResult.error("存在下级部门,不允许删除");
         }
         if (deptService.checkDeptExistUser(deptId)) {
-            return R.fail("部门存在用户,不允许删除");
+            return AjaxResult.error("部门存在用户,不允许删除");
         }
-        deptService.checkDeptDataScope(deptId);
         return toAjax(deptService.deleteDeptById(deptId));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -1,18 +1,21 @@
 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.PageQuery;
+import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.R;
 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;
+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.*;
 
@@ -26,7 +29,8 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/dict/data")
 public class SysDictDataController extends BaseController {
@@ -34,20 +38,16 @@ public class SysDictDataController extends BaseController {
     private final ISysDictDataService dictDataService;
     private final ISysDictTypeService dictTypeService;
 
-    /**
+    @ApiOperation("查询字典数据列表")
-     * 查询字典数据列表
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
-     */
-    @SaCheckPermission("system:dict:list")
     @GetMapping("/list")
-    public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) {
+    public TableDataInfo<SysDictData> list(SysDictData dictData) {
-        return dictDataService.selectPageDictDataList(dictData, pageQuery);
+        return dictDataService.selectPageDictDataList(dictData);
     }
 
-    /**
+    @ApiOperation("导出字典数据列表")
-     * 导出字典数据列表
-     */
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("system:dict:export")
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
     public void export(SysDictData dictData, HttpServletResponse response) {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
@@ -56,61 +56,58 @@ public class SysDictDataController extends BaseController {
 
     /**
      * 查询字典数据详细
-     *
-     * @param dictCode 字典code
      */
-    @SaCheckPermission("system:dict:query")
+    @ApiOperation("查询字典数据详细")
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictCode}")
-    public R<SysDictData> getInfo(@PathVariable Long dictCode) {
+    public AjaxResult<SysDictData> getInfo(@ApiParam("字典code") @PathVariable Long dictCode) {
-        return R.ok(dictDataService.selectDictDataById(dictCode));
+        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
     }
 
     /**
      * 根据字典类型查询字典数据信息
-     *
-     * @param dictType 字典类型
      */
+    @ApiOperation("根据字典类型查询字典数据信息")
     @GetMapping(value = "/type/{dictType}")
-    public R<List<SysDictData>> dictType(@PathVariable String dictType) {
+    public AjaxResult<List<SysDictData>> dictType(@ApiParam("字典类型") @PathVariable String dictType) {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
-        if (ObjectUtil.isNull(data)) {
+        if (StringUtils.isNull(data)) {
             data = new ArrayList<>();
         }
-        return R.ok(data);
+        return AjaxResult.success(data);
     }
 
     /**
      * 新增字典类型
      */
-    @SaCheckPermission("system:dict:add")
+    @ApiOperation("新增字典类型")
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysDictData dict) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysDictData dict) {
-        dictDataService.insertDictData(dict);
+        return toAjax(dictDataService.insertDictData(dict));
-        return R.ok();
     }
 
     /**
      * 修改保存字典类型
      */
-    @SaCheckPermission("system:dict:edit")
+    @ApiOperation("修改保存字典类型")
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysDictData dict) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysDictData dict) {
-        dictDataService.updateDictData(dict);
+        return toAjax(dictDataService.updateDictData(dict));
-        return R.ok();
     }
 
     /**
      * 删除字典类型
-     *
-     * @param dictCodes 字典code串
      */
-    @SaCheckPermission("system:dict:remove")
+    @ApiOperation("删除字典类型")
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
-    public R<Void> remove(@PathVariable Long[] dictCodes) {
+    public AjaxResult<Void> remove(@ApiParam("字典code串") @PathVariable Long[] dictCodes) {
         dictDataService.deleteDictDataByIds(dictCodes);
-        return R.ok();
+        return success();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -1,17 +1,20 @@
 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.PageQuery;
+import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysDictType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictTypeService;
+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.*;
 
@@ -24,27 +27,24 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/dict/type")
 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, PageQuery pageQuery) {
+    public TableDataInfo<SysDictType> list(SysDictType dictType) {
-        return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
+        return dictTypeService.selectPageDictTypeList(dictType);
     }
 
-    /**
+    @ApiOperation("导出字典类型列表")
-     * 导出字典类型列表
-     */
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("system:dict:export")
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
     public void export(SysDictType dictType, HttpServletResponse response) {
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
@@ -53,73 +53,73 @@ public class SysDictTypeController extends BaseController {
 
     /**
      * 查询字典类型详细
-     *
-     * @param dictId 字典ID
      */
-    @SaCheckPermission("system:dict:query")
+    @ApiOperation("查询字典类型详细")
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictId}")
-    public R<SysDictType> getInfo(@PathVariable Long dictId) {
+    public AjaxResult<SysDictType> getInfo(@ApiParam("字典ID") @PathVariable Long dictId) {
-        return R.ok(dictTypeService.selectDictTypeById(dictId));
+        return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
     }
 
     /**
      * 新增字典类型
      */
-    @SaCheckPermission("system:dict:add")
+    @ApiOperation("新增字典类型")
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysDictType dict) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysDictType dict) {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-            return R.fail("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+            return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
-        dictTypeService.insertDictType(dict);
+        return toAjax(dictTypeService.insertDictType(dict));
-        return R.ok();
     }
 
     /**
      * 修改字典类型
      */
-    @SaCheckPermission("system:dict:edit")
+    @ApiOperation("修改字典类型")
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysDictType dict) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysDictType dict) {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-            return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+            return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
-        dictTypeService.updateDictType(dict);
+        return toAjax(dictTypeService.updateDictType(dict));
-        return R.ok();
     }
 
     /**
      * 删除字典类型
-     *
-     * @param dictIds 字典ID串
      */
-    @SaCheckPermission("system:dict:remove")
+    @ApiOperation("删除字典类型")
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
-    public R<Void> remove(@PathVariable Long[] dictIds) {
+    public AjaxResult<Void> remove(@ApiParam("字典ID串") @PathVariable Long[] dictIds) {
         dictTypeService.deleteDictTypeByIds(dictIds);
-        return R.ok();
+        return success();
     }
 
     /**
      * 刷新字典缓存
      */
-    @SaCheckPermission("system:dict:remove")
+    @ApiOperation("刷新字典缓存")
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
-    public R<Void> refreshCache() {
+    public AjaxResult<Void> refreshCache() {
         dictTypeService.resetDictCache();
-        return R.ok();
+        return AjaxResult.success();
     }
 
     /**
      * 获取字典选择框列表
      */
+    @ApiOperation("获取字典选择框列表")
     @GetMapping("/optionselect")
-    public R<List<SysDictType>> optionselect() {
+    public AjaxResult<List<SysDictType>> optionselect() {
         List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
-        return R.ok(dictTypes);
+        return AjaxResult.success(dictTypes);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java

@@ -1,9 +1,11 @@
 package com.ruoyi.web.controller.system;
 
-import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.config.RuoYiConfig;
 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;
 
@@ -12,7 +14,8 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author Lion Li
  */
-@RequiredArgsConstructor
+@Api(value = "首页控制器", tags = {"首页管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 public class SysIndexController {
 
@@ -24,7 +27,7 @@ public class SysIndexController {
     /**
      * 访问首页，提示语
      */
-    @Anonymous
+    @ApiOperation("访问首页，提示语")
     @GetMapping("/")
     public String index() {
         return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -1,26 +1,26 @@
 package com.ruoyi.web.controller.system;
 
-import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 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.core.domain.model.SmsLoginBody;
+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;
 import com.ruoyi.system.service.SysLoginService;
 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;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotBlank;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,7 +32,8 @@ import java.util.Set;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "登录验证控制器", tags = {"登录验证管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 public class SysLoginController {
 
@@ -47,57 +48,15 @@ public class SysLoginController {
      * @param loginBody 登录信息
      * @return 结果
      */
-    @Anonymous
+    @ApiOperation("登录方法")
     @PostMapping("/login")
-    public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) {
+    public AjaxResult<Map<String, Object>> login(@RequestBody LoginBody loginBody) {
         Map<String, Object> ajax = new HashMap<>();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
         ajax.put(Constants.TOKEN, token);
-        return R.ok(ajax);
+        return AjaxResult.success(ajax);
-    }
-
-    /**
-     * 短信登录(示例)
-     *
-     * @param smsLoginBody 登录信息
-     * @return 结果
-     */
-    @Anonymous
-    @PostMapping("/smsLogin")
-    public R<Map<String, Object>> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
-        Map<String, Object> ajax = new HashMap<>();
-        // 生成令牌
-        String token = loginService.smsLogin(smsLoginBody.getPhonenumber(), smsLoginBody.getSmsCode());
-        ajax.put(Constants.TOKEN, token);
-        return R.ok(ajax);
-    }
-
-    /**
-     * 小程序登录(示例)
-     *
-     * @param xcxCode 小程序code
-     * @return 结果
-     */
-    @Anonymous
-    @PostMapping("/xcxLogin")
-    public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
-        Map<String, Object> ajax = new HashMap<>();
-        // 生成令牌
-        String token = loginService.xcxLogin(xcxCode);
-        ajax.put(Constants.TOKEN, token);
-        return R.ok(ajax);
-    }
-
-    /**
-     * 退出登录
-     */
-    @Anonymous
-    @PostMapping("/logout")
-    public R<Void> logout() {
-        loginService.logout();
-        return R.ok("退出成功");
     }
 
     /**
@@ -105,9 +64,10 @@ public class SysLoginController {
      *
      * @return 用户信息
      */
+    @ApiOperation("获取用户信息")
     @GetMapping("getInfo")
-    public R<Map<String, Object>> getInfo() {
+    public AjaxResult<Map<String, Object>> getInfo() {
-        SysUser user = userService.selectUserById(LoginHelper.getUserId());
+        SysUser user = userService.selectUserById(SecurityUtils.getUserId());
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
@@ -116,7 +76,7 @@ public class SysLoginController {
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
-        return R.ok(ajax);
+        return AjaxResult.success(ajax);
     }
 
     /**
@@ -124,10 +84,11 @@ public class SysLoginController {
      *
      * @return 路由信息
      */
+    @ApiOperation("获取路由信息")
     @GetMapping("getRouters")
-    public R<List<RouterVo>> getRouters() {
+    public AjaxResult<List<RouterVo>> getRouters() {
-        Long userId = LoginHelper.getUserId();
+        Long userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
-        return R.ok(menuService.buildMenus(menus));
+        return AjaxResult.success(menuService.buildMenus(menus));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -1,16 +1,20 @@
 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.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysMenuService;
+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.*;
 
@@ -24,7 +28,8 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "菜单信息控制器", tags = {"菜单信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/menu")
 public class SysMenuController extends BaseController {
@@ -34,58 +39,59 @@ public class SysMenuController extends BaseController {
     /**
      * 获取菜单列表
      */
-    @SaCheckPermission("system:menu:list")
+    @ApiOperation("获取菜单列表")
+    @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
-    public R<List<SysMenu>> list(SysMenu menu) {
+    public AjaxResult<List<SysMenu>> list(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
-        return R.ok(menus);
+        return AjaxResult.success(menus);
     }
 
     /**
      * 根据菜单编号获取详细信息
-     *
-     * @param menuId 菜单ID
      */
-    @SaCheckPermission("system:menu:query")
+    @ApiOperation("根据菜单编号获取详细信息")
+    @PreAuthorize("@ss.hasPermi('system:menu:query')")
     @GetMapping(value = "/{menuId}")
-    public R<SysMenu> getInfo(@PathVariable Long menuId) {
+    public AjaxResult<SysMenu> getInfo(@ApiParam("菜单ID") @PathVariable Long menuId) {
-        return R.ok(menuService.selectMenuById(menuId));
+        return AjaxResult.success(menuService.selectMenuById(menuId));
     }
 
     /**
      * 获取菜单下拉树列表
      */
+    @ApiOperation("获取菜单下拉树列表")
     @GetMapping("/treeselect")
-    public R<List<Tree<Long>>> treeselect(SysMenu menu) {
+    public AjaxResult<List<Tree<Long>>> treeselect(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
-        return R.ok(menuService.buildMenuTreeSelect(menus));
+        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
     }
 
     /**
      * 加载对应角色菜单列表树
-     *
-     * @param roleId 角色ID
      */
+    @ApiOperation("加载对应角色菜单列表树")
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
-    public R<Map<String, Object>> roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
+    public AjaxResult<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 R.ok(ajax);
+        return AjaxResult.success(ajax);
     }
 
     /**
      * 新增菜单
      */
-    @SaCheckPermission("system:menu:add")
+    @ApiOperation("新增菜单")
+    @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysMenu menu) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysMenu menu) {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
-            return R.fail("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
-            return R.fail("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
         return toAjax(menuService.insertMenu(menu));
     }
@@ -93,34 +99,34 @@ public class SysMenuController extends BaseController {
     /**
      * 修改菜单
      */
-    @SaCheckPermission("system:menu:edit")
+    @ApiOperation("修改菜单")
+    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysMenu menu) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysMenu menu) {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
-            return R.fail("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
-            return R.fail("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         } else if (menu.getMenuId().equals(menu.getParentId())) {
-            return R.fail("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
         }
         return toAjax(menuService.updateMenu(menu));
     }
 
     /**
      * 删除菜单
-     *
-     * @param menuId 菜单ID
      */
-    @SaCheckPermission("system:menu:remove")
+    @ApiOperation("删除菜单")
+    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
-    public R<Void> remove(@PathVariable("menuId") Long menuId) {
+    public AjaxResult<Void> remove(@ApiParam("菜单ID") @PathVariable("menuId") Long menuId) {
         if (menuService.hasChildByMenuId(menuId)) {
-            return R.fail("存在子菜单,不允许删除");
+            return AjaxResult.error("存在子菜单,不允许删除");
         }
         if (menuService.checkMenuExistRole(menuId)) {
-            return R.fail("菜单已分配,不允许删除");
+            return AjaxResult.error("菜单已分配,不允许删除");
         }
         return toAjax(menuService.deleteMenuById(menuId));
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -1,15 +1,18 @@
 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.PageQuery;
+import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
+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.*;
 
@@ -19,7 +22,8 @@ import org.springframework.web.bind.annotation.*;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "公告信息控制器", tags = {"公告信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/notice")
 public class SysNoticeController extends BaseController {
@@ -29,52 +33,53 @@ public class SysNoticeController extends BaseController {
     /**
      * 获取通知公告列表
      */
-    @SaCheckPermission("system:notice:list")
+    @ApiOperation("获取通知公告列表")
+    @PreAuthorize("@ss.hasPermi('system:notice:list')")
     @GetMapping("/list")
-    public TableDataInfo<SysNotice> list(SysNotice notice, PageQuery pageQuery) {
+    public TableDataInfo<SysNotice> list(SysNotice notice) {
-        return noticeService.selectPageNoticeList(notice, pageQuery);
+        return noticeService.selectPageNoticeList(notice);
     }
 
     /**
      * 根据通知公告编号获取详细信息
-     *
-     * @param noticeId 公告ID
      */
-    @SaCheckPermission("system:notice:query")
+    @ApiOperation("根据通知公告编号获取详细信息")
+    @PreAuthorize("@ss.hasPermi('system:notice:query')")
     @GetMapping(value = "/{noticeId}")
-    public R<SysNotice> getInfo(@PathVariable Long noticeId) {
+    public AjaxResult<SysNotice> getInfo(@ApiParam("公告ID") @PathVariable Long noticeId) {
-        return R.ok(noticeService.selectNoticeById(noticeId));
+        return AjaxResult.success(noticeService.selectNoticeById(noticeId));
     }
 
     /**
      * 新增通知公告
      */
-    @SaCheckPermission("system:notice:add")
+    @ApiOperation("新增通知公告")
+    @PreAuthorize("@ss.hasPermi('system:notice:add')")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysNotice notice) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysNotice notice) {
         return toAjax(noticeService.insertNotice(notice));
     }
 
     /**
      * 修改通知公告
      */
-    @SaCheckPermission("system:notice:edit")
+    @ApiOperation("修改通知公告")
+    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysNotice notice) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysNotice notice) {
         return toAjax(noticeService.updateNotice(notice));
     }
 
     /**
      * 删除通知公告
-     *
-     * @param noticeIds 公告ID串
      */
-    @SaCheckPermission("system:notice:remove")
+    @ApiOperation("删除通知公告")
+    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")
-    public R<Void> remove(@PathVariable Long[] noticeIds) {
+    public AjaxResult<Void> remove(@ApiParam("公告ID串") @PathVariable Long[] noticeIds) {
         return toAjax(noticeService.deleteNoticeByIds(noticeIds));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java

@@ -1,11 +1,9 @@
 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.PageQuery;
+import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
@@ -14,7 +12,12 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.bo.SysOssConfigBo;
 import com.ruoyi.system.domain.vo.SysOssConfigVo;
 import com.ruoyi.system.service.ISysOssConfigService;
+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,14 +26,15 @@ import javax.validation.constraints.NotNull;
 import java.util.Arrays;
 
 /**
- * 对象存储配置
+ * 对象存储配置Controller
  *
  * @author Lion Li
  * @author 孤舟烟雨
  * @date 2021-08-13
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "对象存储配置控制器", tags = {"对象存储配置管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/oss/config")
 public class SysOssConfigController extends BaseController {
@@ -40,55 +44,58 @@ public class SysOssConfigController extends BaseController {
     /**
      * 查询对象存储配置列表
      */
-    @SaCheckPermission("system:oss:list")
+    @ApiOperation("查询对象存储配置列表")
+    @PreAuthorize("@ss.hasPermi('system:oss:list')")
     @GetMapping("/list")
-    public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
+    public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo) {
-        return iSysOssConfigService.queryPageList(bo, pageQuery);
+        return iSysOssConfigService.queryPageList(bo);
     }
 
     /**
      * 获取对象存储配置详细信息
-     *
-     * @param ossConfigId OSS配置ID
      */
-    @SaCheckPermission("system:oss:query")
+    @ApiOperation("获取对象存储配置详细信息")
+    @PreAuthorize("@ss.hasPermi('system:oss:query')")
     @GetMapping("/{ossConfigId}")
-    public R<SysOssConfigVo> getInfo(@NotNull(message = "主键不能为空")
+    public AjaxResult<SysOssConfigVo> getInfo(@ApiParam("OSS配置ID")
-                                     @PathVariable Long ossConfigId) {
+                                              @NotNull(message = "主键不能为空")
-        return R.ok(iSysOssConfigService.queryById(ossConfigId));
+                                              @PathVariable("ossConfigId") Integer ossConfigId) {
+        return AjaxResult.success(iSysOssConfigService.queryById(ossConfigId));
     }
 
     /**
      * 新增对象存储配置
      */
-    @SaCheckPermission("system:oss:add")
+    @ApiOperation("新增对象存储配置")
+    @PreAuthorize("@ss.hasPermi('system:oss:add')")
     @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
         return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
     }
 
     /**
      * 修改对象存储配置
      */
-    @SaCheckPermission("system:oss:edit")
+    @ApiOperation("修改对象存储配置")
+    @PreAuthorize("@ss.hasPermi('system:oss:edit')")
     @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
         return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
     }
 
     /**
      * 删除对象存储配置
-     *
-     * @param ossConfigIds OSS配置ID串
      */
-    @SaCheckPermission("system:oss:remove")
+    @ApiOperation("删除对象存储配置")
+    @PreAuthorize("@ss.hasPermi('system:oss:remove')")
     @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ossConfigIds}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+    public AjaxResult<Void> remove(@ApiParam("OSS配置ID串")
+                                   @NotEmpty(message = "主键不能为空")
                                    @PathVariable Long[] ossConfigIds) {
         return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
     }
@@ -96,10 +103,11 @@ public class SysOssConfigController extends BaseController {
     /**
      * 状态修改
      */
-    @SaCheckPermission("system:oss:edit")
+    @ApiOperation("状态修改")
+    @PreAuthorize("@ss.hasPermi('system:oss:edit')")
     @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public R<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
+    public AjaxResult<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
         return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java

@@ -1,36 +1,43 @@
 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.PageQuery;
+import com.ruoyi.common.core.domain.AjaxResult;
-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;
+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;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
+import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -39,64 +46,52 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "OSS对象存储控制器", tags = {"OSS对象存储管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/oss")
 public class SysOssController extends BaseController {
 
     private final ISysOssService iSysOssService;
+    private final ISysConfigService iSysConfigService;
 
     /**
      * 查询OSS对象存储列表
      */
-    @SaCheckPermission("system:oss:list")
+    @ApiOperation("查询OSS对象存储列表")
+    @PreAuthorize("@ss.hasPermi('system:oss:list')")
     @GetMapping("/list")
-    public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
+    public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo) {
-        return iSysOssService.queryPageList(bo, pageQuery);
+        return iSysOssService.queryPageList(bo);
-    }
-
-    /**
-     * 查询OSS对象基于id串
-     *
-     * @param ossIds OSS对象ID串
-     */
-    @SaCheckPermission("system:oss:list")
-    @GetMapping("/listByIds/{ossIds}")
-    public R<List<SysOssVo>> listByIds(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ossIds) {
-        List<SysOssVo> list = iSysOssService.listByIds(Arrays.asList(ossIds));
-        return R.ok(list);
     }
 
     /**
      * 上传OSS对象存储
-     *
-     * @param file 文件
      */
-    @SaCheckPermission("system:oss:upload")
+    @ApiOperation("上传OSS对象存储")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "file", value = "文件", dataTypeClass = File.class, required = true),
+    })
+    @PreAuthorize("@ss.hasPermi('system:oss:upload')")
     @Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
-    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @RepeatSubmit
-    public R<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
+    @PostMapping("/upload")
+    public AjaxResult<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
         if (ObjectUtil.isNull(file)) {
             throw new ServiceException("上传文件不能为空");
         }
         SysOss oss = iSysOssService.upload(file);
         Map<String, String> map = new HashMap<>(2);
         map.put("url", oss.getUrl());
-        map.put("fileName", oss.getOriginalName());
+        map.put("fileName", oss.getFileName());
-        map.put("ossId", oss.getOssId().toString());
+        return AjaxResult.success(map);
-        return R.ok(map);
     }
 
-    /**
+    @ApiOperation("下载OSS对象存储")
-     * 下载OSS对象
+    @PreAuthorize("@ss.hasPermi('system:oss:download')")
-     *
-     * @param ossId OSS对象ID
-     */
-    @SaCheckPermission("system:oss:download")
     @GetMapping("/download/{ossId}")
-    public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
+    public void download(@ApiParam("OSS对象ID") @PathVariable Long ossId, HttpServletResponse response) throws IOException {
-        SysOssVo sysOss = iSysOssService.getById(ossId);
+        SysOss sysOss = iSysOssService.getById(ossId);
         if (ObjectUtil.isNull(sysOss)) {
             throw new ServiceException("文件数据不存在!");
         }
@@ -118,15 +113,30 @@ public class SysOssController extends BaseController {
 
     /**
      * 删除OSS对象存储
-     *
-     * @param ossIds OSS对象ID串
      */
-    @SaCheckPermission("system:oss:remove")
+    @ApiOperation("删除OSS对象存储")
+    @PreAuthorize("@ss.hasPermi('system:oss:remove')")
     @Log(title = "OSS对象存储", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ossIds}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+    public AjaxResult<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));
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -1,17 +1,20 @@
 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.PageQuery;
+import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.service.ISysPostService;
+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.*;
 
@@ -24,7 +27,8 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "岗位信息控制器", tags = {"岗位信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/post")
 public class SysPostController extends BaseController {
@@ -34,17 +38,16 @@ public class SysPostController extends BaseController {
     /**
      * 获取岗位列表
      */
-    @SaCheckPermission("system:post:list")
+    @ApiOperation("获取岗位列表")
+    @PreAuthorize("@ss.hasPermi('system:post:list')")
     @GetMapping("/list")
-    public TableDataInfo<SysPost> list(SysPost post, PageQuery pageQuery) {
+    public TableDataInfo<SysPost> list(SysPost post) {
-        return postService.selectPagePostList(post, pageQuery);
+        return postService.selectPagePostList(post);
     }
 
-    /**
+    @ApiOperation("导出岗位列表")
-     * 导出岗位列表
-     */
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("system:post:export")
+    @PreAuthorize("@ss.hasPermi('system:post:export')")
     @PostMapping("/export")
     public void export(SysPost post, HttpServletResponse response) {
         List<SysPost> list = postService.selectPostList(post);
@@ -53,26 +56,26 @@ public class SysPostController extends BaseController {
 
     /**
      * 根据岗位编号获取详细信息
-     *
-     * @param postId 岗位ID
      */
-    @SaCheckPermission("system:post:query")
+    @ApiOperation("根据岗位编号获取详细信息")
+    @PreAuthorize("@ss.hasPermi('system:post:query')")
     @GetMapping(value = "/{postId}")
-    public R<SysPost> getInfo(@PathVariable Long postId) {
+    public AjaxResult<SysPost> getInfo(@ApiParam("岗位ID") @PathVariable Long postId) {
-        return R.ok(postService.selectPostById(postId));
+        return AjaxResult.success(postService.selectPostById(postId));
     }
 
     /**
      * 新增岗位
      */
-    @SaCheckPermission("system:post:add")
+    @ApiOperation("新增岗位")
+    @PreAuthorize("@ss.hasPermi('system:post:add')")
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysPost post) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysPost post) {
         if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
-            return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
         } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
-            return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
         return toAjax(postService.insertPost(post));
     }
@@ -80,36 +83,37 @@ public class SysPostController extends BaseController {
     /**
      * 修改岗位
      */
-    @SaCheckPermission("system:post:edit")
+    @ApiOperation("修改岗位")
+    @PreAuthorize("@ss.hasPermi('system:post:edit')")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysPost post) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysPost post) {
         if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
-            return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
         } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
-            return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
         return toAjax(postService.updatePost(post));
     }
 
     /**
      * 删除岗位
-     *
-     * @param postIds 岗位ID串
      */
-    @SaCheckPermission("system:post:remove")
+    @ApiOperation("删除岗位")
+    @PreAuthorize("@ss.hasPermi('system:post:remove')")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{postIds}")
-    public R<Void> remove(@PathVariable Long[] postIds) {
+    public AjaxResult<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] postIds) {
         return toAjax(postService.deletePostByIds(postIds));
     }
 
     /**
      * 获取岗位选择框列表
      */
+    @ApiOperation("获取岗位选择框列表")
     @GetMapping("/optionselect")
-    public R<List<SysPost>> optionselect() {
+    public AjaxResult<List<SysPost>> optionselect() {
         List<SysPost> posts = postService.selectPostAll();
-        return R.ok(posts);
+        return AjaxResult.success(posts);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -1,26 +1,26 @@
 package com.ruoyi.web.controller.system;
 
-import cn.dev33.satoken.secure.BCrypt;
-import cn.hutool.core.io.FileUtil;
 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.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 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.helper.LoginHelper;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.MimeTypeUtils;
 import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.service.ISysOssService;
 import com.ruoyi.system.service.ISysUserService;
+import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.MediaType;
+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;
 
-import java.util.Arrays;
+import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -30,98 +30,106 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "个人信息控制器", tags = {"个人信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/user/profile")
 public class SysProfileController extends BaseController {
 
     private final ISysUserService userService;
+    private final TokenService tokenService;
     private final ISysOssService iSysOssService;
 
     /**
      * 个人信息
      */
+    @ApiOperation("个人信息")
     @GetMapping
-    public R<Map<String, Object>> profile() {
+    public AjaxResult<Map<String, Object>> profile() {
-        SysUser user = userService.selectUserById(getUserId());
+        LoginUser loginUser = getLoginUser();
+        SysUser user = userService.selectUserById(loginUser.getUserId());
         Map<String, Object> ajax = new HashMap<>();
         ajax.put("user", user);
-        ajax.put("roleGroup", userService.selectUserRoleGroup(user.getUserName()));
+        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
-        ajax.put("postGroup", userService.selectUserPostGroup(user.getUserName()));
+        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
-        return R.ok(ajax);
+        return AjaxResult.success(ajax);
     }
 
     /**
      * 修改用户
      */
+    @ApiOperation("修改用户")
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> updateProfile(@RequestBody SysUser user) {
+    public AjaxResult<Void> updateProfile(@RequestBody SysUser user) {
         if (StringUtils.isNotEmpty(user.getPhonenumber())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-            return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
         if (StringUtils.isNotEmpty(user.getEmail())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-            return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
-        user.setUserId(getUserId());
+        LoginUser loginUser = getLoginUser();
+        SysUser sysUser = userService.selectUserById(loginUser.getUserId());
+        user.setUserId(sysUser.getUserId());
         user.setUserName(null);
         user.setPassword(null);
-        user.setAvatar(null);
-        user.setDeptId(null);
         if (userService.updateUserProfile(user) > 0) {
-            return R.ok();
+            return AjaxResult.success();
         }
-        return R.fail("修改个人信息异常，请联系管理员");
+        return AjaxResult.error("修改个人信息异常，请联系管理员");
     }
 
     /**
      * 重置密码
-     *
-     * @param newPassword 旧密码
-     * @param oldPassword 新密码
      */
+    @ApiOperation("重置密码")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "oldPassword", value = "旧密码", paramType = "query", dataTypeClass = String.class),
+        @ApiImplicitParam(name = "newPassword", value = "新密码", paramType = "query", dataTypeClass = String.class)
+    })
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
-    public R<Void> updatePwd(String oldPassword, String newPassword) {
+    public AjaxResult<Void> updatePwd(String oldPassword, String newPassword) {
-        SysUser user = userService.selectUserById(LoginHelper.getUserId());
+        LoginUser loginUser = getLoginUser();
-        String userName = user.getUserName();
+        String userName = loginUser.getUsername();
-        String password = user.getPassword();
+        String password = loginUser.getPassword();
-        if (!BCrypt.checkpw(oldPassword, password)) {
+        if (!SecurityUtils.matchesPassword(oldPassword, password)) {
-            return R.fail("修改密码失败，旧密码错误");
+            return AjaxResult.error("修改密码失败，旧密码错误");
         }
-        if (BCrypt.checkpw(newPassword, password)) {
+        if (SecurityUtils.matchesPassword(newPassword, password)) {
-            return R.fail("新密码不能与旧密码相同");
+            return AjaxResult.error("新密码不能与旧密码相同");
         }
-
+        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {
-        if (userService.resetUserPwd(userName, BCrypt.hashpw(newPassword)) > 0) {
+            // 更新缓存用户密码
-            return R.ok();
+            loginUser.setPassword(SecurityUtils.encryptPassword(newPassword));
+            tokenService.setLoginUser(loginUser);
+            return AjaxResult.success();
         }
-        return R.fail("修改密码异常，请联系管理员");
+        return AjaxResult.error("修改密码异常，请联系管理员");
     }
 
     /**
      * 头像上传
-     *
-     * @param avatarfile 用户头像
      */
+    @ApiOperation("头像上传")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "avatarfile", value = "用户头像", dataTypeClass = File.class, required = true),
+    })
     @Log(title = "用户头像", businessType = BusinessType.UPDATE)
-    @PostMapping(value = "/avatar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping("/avatar")
-    public R<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile avatarfile) {
+    public AjaxResult<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) {
         Map<String, Object> ajax = new HashMap<>();
-        if (!avatarfile.isEmpty()) {
+        if (!file.isEmpty()) {
-            String extension = FileUtil.extName(avatarfile.getOriginalFilename());
+            LoginUser loginUser = getLoginUser();
-            if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
+            SysOss oss = iSysOssService.upload(file);
-                return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");
-            }
-            SysOss oss = iSysOssService.upload(avatarfile);
             String avatar = oss.getUrl();
-            if (userService.updateUserAvatar(getUsername(), avatar)) {
+            if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) {
                 ajax.put("imgUrl", avatar);
-                return R.ok(ajax);
+                return AjaxResult.success(ajax);
             }
         }
-        return R.fail("上传图片异常，请联系管理员");
+        return AjaxResult.error("上传图片异常，请联系管理员", ajax);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java

@@ -1,12 +1,15 @@
 package com.ruoyi.web.controller.system;
 
-import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 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;
@@ -18,23 +21,21 @@ import org.springframework.web.bind.annotation.RestController;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "注册验证控制器", tags = {"注册验证管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 public class SysRegisterController extends BaseController {
 
     private final SysRegisterService registerService;
     private final ISysConfigService configService;
 
-    /**
+    @ApiOperation("用户注册")
-     * 用户注册
-     */
-    @Anonymous
     @PostMapping("/register")
-    public R<Void> register(@Validated @RequestBody RegisterBody user) {
+    public AjaxResult<Void> register(@RequestBody RegisterBody user) {
         if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
-            return R.fail("当前系统没有开启注册功能！");
+            return error("当前系统没有开启注册功能！");
         }
-        registerService.register(user);
+        String msg = registerService.register(user);
-        return R.ok();
+        return StringUtils.isEmpty(msg) ? success() : error(msg);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -1,33 +1,30 @@
 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.PageQuery;
+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.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.helper.LoginHelper;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysRoleService;
 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.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 角色信息
@@ -35,30 +32,27 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "角色信息控制器", tags = {"角色信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/role")
 public class SysRoleController extends BaseController {
 
     private final ISysRoleService roleService;
+    private final TokenService tokenService;
     private final ISysUserService userService;
-    private final ISysDeptService deptService;
     private final SysPermissionService permissionService;
 
-    /**
+    @ApiOperation("查询角色信息列表")
-     * 获取角色信息列表
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
-     */
-    @SaCheckPermission("system:role:list")
     @GetMapping("/list")
-    public TableDataInfo<SysRole> list(SysRole role, PageQuery pageQuery) {
+    public TableDataInfo<SysRole> list(SysRole role) {
-        return roleService.selectPageRoleList(role, pageQuery);
+        return roleService.selectPageRoleList(role);
     }
 
-    /**
+    @ApiOperation("导出角色信息列表")
-     * 导出角色信息列表
-     */
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("system:role:export")
+    @PreAuthorize("@ss.hasPermi('system:role:export')")
     @PostMapping("/export")
     public void export(SysRole role, HttpServletResponse response) {
         List<SysRole> list = roleService.selectRoleList(role);
@@ -67,27 +61,27 @@ public class SysRoleController extends BaseController {
 
     /**
      * 根据角色编号获取详细信息
-     *
-     * @param roleId 角色ID
      */
-    @SaCheckPermission("system:role:query")
+    @ApiOperation("根据角色编号获取详细信息")
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
-    public R<SysRole> getInfo(@PathVariable Long roleId) {
+    public AjaxResult<SysRole> getInfo(@ApiParam("角色ID") @PathVariable Long roleId) {
         roleService.checkRoleDataScope(roleId);
-        return R.ok(roleService.selectRoleById(roleId));
+        return AjaxResult.success(roleService.selectRoleById(roleId));
     }
 
     /**
      * 新增角色
      */
-    @SaCheckPermission("system:role:add")
+    @ApiOperation("新增角色")
+    @PreAuthorize("@ss.hasPermi('system:role:add')")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysRole role) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysRole role) {
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
-            return R.fail("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
         } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
-            return R.fail("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         return toAjax(roleService.insertRole(role));
 
@@ -96,142 +90,134 @@ public class SysRoleController extends BaseController {
     /**
      * 修改保存角色
      */
-    @SaCheckPermission("system:role:edit")
+    @ApiOperation("修改保存角色")
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysRole role) {
+    public AjaxResult<Void> edit(@Validated @RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
-        roleService.checkRoleDataScope(role.getRoleId());
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
-            return R.fail("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
         } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
-            return R.fail("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
 
         if (roleService.updateRole(role) > 0) {
             // 更新缓存用户权限
             LoginUser loginUser = getLoginUser();
             SysUser sysUser = userService.selectUserById(loginUser.getUserId());
-            if (ObjectUtil.isNotNull(sysUser) && !sysUser.isAdmin()) {
+            if (StringUtils.isNotNull(sysUser) && !sysUser.isAdmin()) {
-                loginUser.setMenuPermission(permissionService.getMenuPermission(sysUser));
+                loginUser.setPermissions(permissionService.getMenuPermission(sysUser));
-                LoginHelper.setLoginUser(loginUser);
+                tokenService.setLoginUser(loginUser);
             }
-            return R.ok();
+            return AjaxResult.success();
         }
-        return R.fail("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+        return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
     }
 
     /**
      * 修改保存数据权限
      */
-    @SaCheckPermission("system:role:edit")
+    @ApiOperation("修改保存数据权限")
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
-    public R<Void> dataScope(@RequestBody SysRole role) {
+    public AjaxResult<Void> dataScope(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
-        roleService.checkRoleDataScope(role.getRoleId());
         return toAjax(roleService.authDataScope(role));
     }
 
     /**
      * 状态修改
      */
-    @SaCheckPermission("system:role:edit")
+    @ApiOperation("状态修改")
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public R<Void> changeStatus(@RequestBody SysRole role) {
+    public AjaxResult<Void> changeStatus(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
-        roleService.checkRoleDataScope(role.getRoleId());
         return toAjax(roleService.updateRoleStatus(role));
     }
 
     /**
      * 删除角色
-     *
-     * @param roleIds 角色ID串
      */
-    @SaCheckPermission("system:role:remove")
+    @ApiOperation("删除角色")
+    @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
-    public R<Void> remove(@PathVariable Long[] roleIds) {
+    public AjaxResult<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] roleIds) {
         return toAjax(roleService.deleteRoleByIds(roleIds));
     }
 
     /**
      * 获取角色选择框列表
      */
-    @SaCheckPermission("system:role:query")
+    @ApiOperation("获取角色选择框列表")
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping("/optionselect")
-    public R<List<SysRole>> optionselect() {
+    public AjaxResult<List<SysRole>> optionselect() {
-        return R.ok(roleService.selectRoleAll());
+        return AjaxResult.success(roleService.selectRoleAll());
     }
 
     /**
      * 查询已分配用户角色列表
      */
-    @SaCheckPermission("system:role:list")
+    @ApiOperation("查询已分配用户角色列表")
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/allocatedList")
-    public TableDataInfo<SysUser> allocatedList(SysUser user, PageQuery pageQuery) {
+    public TableDataInfo<SysUser> allocatedList(SysUser user) {
-        return userService.selectAllocatedList(user, pageQuery);
+        return userService.selectAllocatedList(user);
     }
 
     /**
      * 查询未分配用户角色列表
      */
-    @SaCheckPermission("system:role:list")
+    @ApiOperation("查询未分配用户角色列表")
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/unallocatedList")
-    public TableDataInfo<SysUser> unallocatedList(SysUser user, PageQuery pageQuery) {
+    public TableDataInfo<SysUser> unallocatedList(SysUser user) {
-        return userService.selectUnallocatedList(user, pageQuery);
+        return userService.selectUnallocatedList(user);
     }
 
     /**
      * 取消授权用户
      */
-    @SaCheckPermission("system:role:edit")
+    @ApiOperation("取消授权用户")
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
-    public R<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
+    public AjaxResult<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
         return toAjax(roleService.deleteAuthUser(userRole));
     }
 
     /**
      * 批量取消授权用户
-     *
-     * @param roleId  角色ID
-     * @param userIds 用户ID串
      */
-    @SaCheckPermission("system:role:edit")
+    @ApiOperation("批量取消授权用户")
+    @ApiImplicitParams({
+        @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')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
-    public R<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
+    public AjaxResult<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
         return toAjax(roleService.deleteAuthUsers(roleId, userIds));
     }
 
     /**
      * 批量选择用户授权
-     *
-     * @param roleId  角色ID
-     * @param userIds 用户ID串
      */
-    @SaCheckPermission("system:role:edit")
+    @ApiOperation("批量选择用户授权")
+    @ApiImplicitParams({
+        @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')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
-    public R<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
+    public AjaxResult<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
-        roleService.checkRoleDataScope(roleId);
         return toAjax(roleService.insertAuthUsers(roleId, userIds));
     }
-
-    /**
-     * 获取对应角色部门树列表
-     *
-     * @param roleId 角色ID
-     */
-    @SaCheckPermission("system:role:list")
-    @GetMapping(value = "/deptTree/{roleId}")
-    public R<Map<String, Object>> roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
-        Map<String, Object> ajax = new HashMap<>();
-        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
-        ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
-        return R.ok(ajax);
-    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -1,35 +1,31 @@
 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.lang.tree.Tree;
 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.PageQuery;
+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.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.helper.LoginHelper;
+import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StreamUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.vo.SysUserExportVo;
 import com.ruoyi.system.domain.vo.SysUserImportVo;
 import com.ruoyi.system.listener.SysUserImportListener;
-import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
+import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.MediaType;
+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;
@@ -39,6 +35,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 用户信息
@@ -46,7 +43,8 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@RequiredArgsConstructor
+@Api(value = "用户信息控制器", tags = {"用户信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/user")
 public class SysUserController extends BaseController {
@@ -54,22 +52,20 @@ public class SysUserController extends BaseController {
     private final ISysUserService userService;
     private final ISysRoleService roleService;
     private final ISysPostService postService;
-    private final ISysDeptService deptService;
 
     /**
      * 获取用户列表
      */
-    @SaCheckPermission("system:user:list")
+    @ApiOperation("获取用户列表")
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
-    public TableDataInfo<SysUser> list(SysUser user, PageQuery pageQuery) {
+    public TableDataInfo<SysUser> list(SysUser user) {
-        return userService.selectPageUserList(user, pageQuery);
+        return userService.selectPageUserList(user);
     }
 
-    /**
+    @ApiOperation("导出用户列表")
-     * 导出用户列表
-     */
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-    @SaCheckPermission("system:user:export")
+    @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
     public void export(SysUser user, HttpServletResponse response) {
         List<SysUser> list = userService.selectUserList(user);
@@ -85,23 +81,19 @@ public class SysUserController extends BaseController {
         ExcelUtil.exportExcel(listVo, "用户数据", SysUserExportVo.class, response);
     }
 
-    /**
+    @ApiOperation("导入用户列表")
-     * 导入数据
+    @ApiImplicitParams({
-     *
+            @ApiImplicitParam(name = "file", value = "导入文件", dataType = "java.io.File", required = true),
-     * @param file          导入文件
+    })
-     * @param updateSupport 是否更新已存在数据
-     */
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-    @SaCheckPermission("system:user:import")
+    @PreAuthorize("@ss.hasPermi('system:user:import')")
-    @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping("/importData")
-    public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
+    public AjaxResult<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
         ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
-        return R.ok(result.getAnalysis());
+        return AjaxResult.success(result.getAnalysis());
     }
 
-    /**
+    @ApiOperation("下载导入模板")
-     * 获取导入模板
-     */
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response) {
         ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response);
@@ -109,76 +101,74 @@ public class SysUserController extends BaseController {
 
     /**
      * 根据用户编号获取详细信息
-     *
-     * @param userId 用户ID
      */
-    @SaCheckPermission("system:user:query")
+    @ApiOperation("根据用户编号获取详细信息")
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = {"/", "/{userId}"})
-    public R<Map<String, Object>> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
+    public AjaxResult<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", LoginHelper.isAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isAdmin()));
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", postService.selectPostAll());
-        if (ObjectUtil.isNotNull(userId)) {
+        if (StringUtils.isNotNull(userId)) {
-            SysUser sysUser = userService.selectUserById(userId);
+            ajax.put("user", userService.selectUserById(userId));
-            ajax.put("user", sysUser);
             ajax.put("postIds", postService.selectPostListByUserId(userId));
-            ajax.put("roleIds", StreamUtils.toList(sysUser.getRoles(), SysRole::getRoleId));
+            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
         }
-        return R.ok(ajax);
+        return AjaxResult.success(ajax);
     }
 
     /**
      * 新增用户
      */
-    @SaCheckPermission("system:user:add")
+    @ApiOperation("新增用户")
+    @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysUser user) {
+    public AjaxResult<Void> add(@Validated @RequestBody SysUser user) {
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
-            return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         } else if (StringUtils.isNotEmpty(user.getPhonenumber())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-            return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
         } else if (StringUtils.isNotEmpty(user.getEmail())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-            return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
-        user.setPassword(BCrypt.hashpw(user.getPassword()));
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         return toAjax(userService.insertUser(user));
     }
 
     /**
      * 修改用户
      */
-    @SaCheckPermission("system:user:edit")
+    @ApiOperation("修改用户")
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysUser user) {
+    public AjaxResult<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 R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         } else if (StringUtils.isNotEmpty(user.getEmail())
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-            return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         return toAjax(userService.updateUser(user));
     }
 
     /**
      * 删除用户
-     *
-     * @param userIds 角色ID串
      */
-    @SaCheckPermission("system:user:remove")
+    @ApiOperation("删除用户")
+    @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
-    public R<Void> remove(@PathVariable Long[] userIds) {
+    public AjaxResult<Void> remove(@ApiParam("角色ID串") @PathVariable Long[] userIds) {
         if (ArrayUtil.contains(userIds, getUserId())) {
-            return R.fail("当前用户不能删除");
+            return error("当前用户不能删除");
         }
         return toAjax(userService.deleteUserByIds(userIds));
     }
@@ -186,66 +176,56 @@ public class SysUserController extends BaseController {
     /**
      * 重置密码
      */
-    @SaCheckPermission("system:user:resetPwd")
+    @ApiOperation("重置密码")
+    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
-    public R<Void> resetPwd(@RequestBody SysUser user) {
+    public AjaxResult<Void> resetPwd(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
-        userService.checkUserDataScope(user.getUserId());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        user.setPassword(BCrypt.hashpw(user.getPassword()));
         return toAjax(userService.resetPwd(user));
     }
 
     /**
      * 状态修改
      */
-    @SaCheckPermission("system:user:edit")
+    @ApiOperation("状态修改")
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public R<Void> changeStatus(@RequestBody SysUser user) {
+    public AjaxResult<Void> changeStatus(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
-        userService.checkUserDataScope(user.getUserId());
         return toAjax(userService.updateUserStatus(user));
     }
 
     /**
      * 根据用户编号获取授权角色
-     *
-     * @param userId 用户ID
      */
-    @SaCheckPermission("system:user:query")
+    @ApiOperation("根据用户编号获取授权角色")
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
-    public R<Map<String, Object>> authRole(@PathVariable Long userId) {
+    public AjaxResult<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", LoginHelper.isAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isAdmin()));
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        return R.ok(ajax);
+        return AjaxResult.success(ajax);
     }
 
     /**
      * 用户授权角色
-     *
-     * @param userId  用户Id
-     * @param roleIds 角色ID串
      */
-    @SaCheckPermission("system:user:edit")
+    @ApiOperation("用户授权角色")
+    @ApiImplicitParams({
+        @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')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
-    public R<Void> insertAuthRole(Long userId, Long[] roleIds) {
+    public AjaxResult<Void> insertAuthRole(Long userId, Long[] roleIds) {
-        userService.checkUserDataScope(userId);
         userService.insertUserAuth(userId, roleIds);
-        return R.ok();
+        return success();
     }
-
-    /**
-     * 获取部门树列表
-     */
-    @SaCheckPermission("system:user:list")
-    @GetMapping("/deptTree")
-    public R<List<Tree<Long>>> deptTree(SysDept dept) {
-        return R.ok(deptService.selectDeptTreeList(dept));
-    }
-
 }

ruoyi-admin/src/main/resources/application-dev.yml

@@ -1,21 +1,28 @@
---- # 监控中心配置
+--- # 监控配置
-spring.boot.admin.client:
+spring:
+  boot:
+    admin:
+      # Spring Boot Admin Client 客户端的相关配置
+      client:
         # 增加客户端开关
         enabled: true
+        # 设置 Spring Boot Admin Server 地址
         url: http://localhost:9090/admin
         instance:
-    service-host-type: IP
+          prefer-ip: true # 注册实例时，优先使用 IP
         username: ruoyi
         password: 123456
 
 --- # xxl-job 配置
-xxl.job:
+xxl:
+  job:
     # 执行器开关
     enabled: true
     # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
     admin-addresses: http://localhost:9100/xxl-job-admin
     # 执行器通讯TOKEN：非空时启用
     access-token: xxl-job
+    # 执行器配置
     executor:
       # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
       appname: xxl-job-executor
@@ -40,15 +47,11 @@ spring:
       p6spy: true
       # 设置默认的数据源或者数据源组,默认值即为 master
       primary: master
-      # 严格模式 匹配不到数据源则报错
-      strict: true
       datasource:
         # 主库数据源
         master:
           driverClassName: com.mysql.cj.jdbc.Driver
-          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
+          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-          # 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
         # 从库数据源
@@ -58,23 +61,6 @@ spring:
           url:
           username:
           password:
-#        oracle:
-#          driverClassName: oracle.jdbc.OracleDriver
-#          url: jdbc:oracle:thin:@//localhost:1521/XE
-#          username: ROOT
-#          password: root
-#          druid:
-#            validationQuery: SELECT 1 FROM DUAL
-#        postgres:
-#          driverClassName: org.postgresql.Driver
-#          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
-#          username: root
-#          password: root
-#        sqlserver:
-#          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;rewriteBatchedStatements=true
-#          username: SA
-#          password: root
       druid:
         # 初始连接数
         initialSize: 5
@@ -91,7 +77,7 @@ spring:
         # 配置一个连接在池中最大生存的时间，单位是毫秒
         maxEvictableIdleTimeMillis: 900000
         # 配置检测连接是否有效
-        validationQuery: SELECT 1
+        validationQuery: SELECT 1 FROM DUAL
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -99,7 +85,9 @@ spring:
         filters: stat
 
 --- # druid 配置
-spring.datasource.druid:
+spring:
+  datasource:
+    druid:
       webStatFilter:
         enabled: true
       statViewServlet:
@@ -130,65 +118,41 @@ spring:
     port: 6379
     # 数据库索引
     database: 0
-    # 密码(如没有密码请注释掉)
+    # 密码
-    # password:
+    password:
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
     ssl: false
 
 redisson:
-  # redis key前缀
-  keyPrefix:
   # 线程池数量
-  threads: 4
+  threads: 16
   # Netty线程池数量
-  nettyThreads: 8
+  nettyThreads: 32
+  # 传输模式
+  transportMode: "NIO"
   # 单节点配置
   singleServerConfig:
     # 客户端名称
     clientName: ${ruoyi.name}
     # 最小空闲连接数
-    connectionMinimumIdleSize: 8
+    connectionMinimumIdleSize: 32
     # 连接池大小
-    connectionPoolSize: 32
+    connectionPoolSize: 64
     # 连接空闲超时，单位：毫秒
     idleConnectionTimeout: 10000
     # 命令等待超时，单位：毫秒
     timeout: 3000
+    # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
+    retryAttempts: 3
+    # 命令重试发送时间间隔，单位：毫秒
+    retryInterval: 1500
+    # 发布和订阅连接的最小空闲连接数
+    subscriptionConnectionMinimumIdleSize: 1
     # 发布和订阅连接池大小
     subscriptionConnectionPoolSize: 50
-
+    # 单个连接最大订阅数量
---- # mail 邮件发送
+    subscriptionsPerConnection: 5
-mail:
+    # DNS监测时间间隔，单位：毫秒
-  enabled: false
+    dnsMonitoringInterval: 5000
-  host: smtp.163.com
-  port: 465
-  # 是否需要用户名密码验证
-  auth: true
-  # 发送方，遵循RFC-822标准
-  from: xxx@163.com
-  # 用户名（注意：如果使用foxmail邮箱，此处user为qq号）
-  user: xxx@163.com
-  # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助）
-  pass: xxxxxxxxxx
-  # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。
-  starttlsEnable: true
-  # 使用SSL安全连接
-  sslEnable: true
-  # SMTP超时时长，单位毫秒，缺省值不超时
-  timeout: 0
-  # Socket连接超时值，单位毫秒，缺省值不超时
-  connectionTimeout: 0
-
---- # sms 短信
-sms:
-  enabled: false
-  # 阿里云 dysmsapi.aliyuncs.com
-  # 腾讯云 sms.tencentcloudapi.com
-  endpoint: "dysmsapi.aliyuncs.com"
-  accessKeyId: xxxxxxx
-  accessKeySecret: xxxxxx
-  signName: 测试
-  # 腾讯专用
-  sdkAppId:

ruoyi-admin/src/main/resources/application-prod.yml

@@ -1,24 +1,35 @@
---- # 临时文件存储位置 避免临时文件被系统清理报错
+--- # 配置临时路径存储
-spring.servlet.multipart.location: /ruoyi/server/temp
+spring:
+  servlet:
+    multipart:
+      # 临时文件存储位置 避免临时文件被系统清理报错
+      location: /ruoyi/server/temp
 
---- # 监控中心配置
+--- # 监控配置
-spring.boot.admin.client:
+spring:
+  boot:
+    admin:
+      # Spring Boot Admin Client 客户端的相关配置
+      client:
         # 增加客户端开关
         enabled: true
-  url: http://localhost:9090/admin
+        # 设置 Spring Boot Admin Server 地址
+        url: http://172.30.0.90:9090/admin
         instance:
-    service-host-type: IP
+          prefer-ip: true # 注册实例时，优先使用 IP
         username: ruoyi
         password: 123456
 
 --- # xxl-job 配置
-xxl.job:
+xxl:
+  job:
     # 执行器开关
     enabled: true
     # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
-  admin-addresses: http://localhost:9100/xxl-job-admin
+    admin-addresses: http://172.30.0.92:9100/xxl-job-admin
     # 执行器通讯TOKEN：非空时启用
     access-token: xxl-job
+    # 执行器配置
     executor:
       # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
       appname: xxl-job-executor
@@ -43,15 +54,11 @@ spring:
       p6spy: false
       # 设置默认的数据源或者数据源组,默认值即为 master
       primary: master
-      # 严格模式 匹配不到数据源则报错
-      strict: true
       datasource:
         # 主库数据源
         master:
           driverClassName: com.mysql.cj.jdbc.Driver
-          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
+          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 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          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
         # 从库数据源
@@ -61,23 +68,6 @@ spring:
           url:
           username:
           password:
-#        oracle:
-#          driverClassName: oracle.jdbc.OracleDriver
-#          url: jdbc:oracle:thin:@//localhost:1521/XE
-#          username: ROOT
-#          password: root
-#          druid:
-#            validationQuery: SELECT 1 FROM DUAL
-#        postgres:
-#          driverClassName: org.postgresql.Driver
-#          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
-#          username: root
-#          password: root
-#        sqlserver:
-#          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;rewriteBatchedStatements=true
-#          username: SA
-#          password: root
       druid:
         # 初始连接数
         initialSize: 5
@@ -94,7 +84,7 @@ spring:
         # 配置一个连接在池中最大生存的时间，单位是毫秒
         maxEvictableIdleTimeMillis: 900000
         # 配置检测连接是否有效
-        validationQuery: SELECT 1
+        validationQuery: SELECT 1 FROM DUAL
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -102,7 +92,9 @@ spring:
         filters: stat
 
 --- # druid 配置
-spring.datasource.druid:
+spring:
+  datasource:
+    druid:
       webStatFilter:
         enabled: true
       statViewServlet:
@@ -128,25 +120,25 @@ spring.datasource.druid:
 spring:
   redis:
     # 地址
-    host: localhost
+    host: 172.30.0.48
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
-    # 密码(如没有密码请注释掉)
+    # 密码
-    # password:
+    password:
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
     ssl: false
 
 redisson:
-  # redis key前缀
-  keyPrefix:
   # 线程池数量
   threads: 16
   # Netty线程池数量
   nettyThreads: 32
+  # 传输模式
+  transportMode: "NIO"
   # 单节点配置
   singleServerConfig:
     # 客户端名称
@@ -159,39 +151,15 @@ redisson:
     idleConnectionTimeout: 10000
     # 命令等待超时，单位：毫秒
     timeout: 3000
+    # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
+    retryAttempts: 3
+    # 命令重试发送时间间隔，单位：毫秒
+    retryInterval: 1500
+    # 发布和订阅连接的最小空闲连接数
+    subscriptionConnectionMinimumIdleSize: 1
     # 发布和订阅连接池大小
     subscriptionConnectionPoolSize: 50
-
+    # 单个连接最大订阅数量
---- # mail 邮件发送
+    subscriptionsPerConnection: 5
-mail:
+    # DNS监测时间间隔，单位：毫秒
-  enabled: false
+    dnsMonitoringInterval: 5000
-  host: smtp.163.com
-  port: 465
-  # 是否需要用户名密码验证
-  auth: true
-  # 发送方，遵循RFC-822标准
-  from: xxx@163.com
-  # 用户名（注意：如果使用foxmail邮箱，此处user为qq号）
-  user: xxx@163.com
-  # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助）
-  pass: xxxxxxxxxx
-  # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。
-  starttlsEnable: true
-  # 使用SSL安全连接
-  sslEnable: true
-  # SMTP超时时长，单位毫秒，缺省值不超时
-  timeout: 0
-  # Socket连接超时值，单位毫秒，缺省值不超时
-  connectionTimeout: 0
-
---- # sms 短信
-sms:
-  enabled: false
-  # 阿里云 dysmsapi.aliyuncs.com
-  # 腾讯云 sms.tencentcloudapi.com
-  endpoint: "dysmsapi.aliyuncs.com"
-  accessKeyId: xxxxxxx
-  accessKeySecret: xxxxxx
-  signName: 测试
-  # 腾讯专用
-  sdkAppId:

ruoyi-admin/src/main/resources/application.yml

@@ -5,13 +5,13 @@ ruoyi:
   # 版本
   version: ${ruoyi-vue-plus.version}
   # 版权年份
-  copyrightYear: 2022
+  copyrightYear: 2021
   # 实例演示开关
   demoEnabled: true
   # 获取ip地址开关
   addressEnabled: true
   # 缓存懒加载
-  cacheLazy: false
+  cacheLazy: true
 
 captcha:
   # 页面 <参数设置> 可开启关闭 验证码校验
@@ -53,13 +53,9 @@ logging:
     org.springframework: warn
   config: classpath:logback.xml
 
-# 用户配置
+# tlog 全局访问性能拦截
-user:
+tlog:
-  password:
+  enable-invoke-time-print: true
-    # 密码最大错误次数
-    maxRetryCount: 5
-    # 密码锁定时间（默认10分钟）
-    lockTime: 10
 
 # Spring配置
 spring:
@@ -83,6 +79,10 @@ spring:
     restart:
       # 热部署开关
       enabled: true
+  # 与vue整合部署使用
+  thymeleaf:
+    # 将系统模板放置到最前面 否则会与 springboot-admin 页面冲突
+    template-resolver-order: 1
   jackson:
     # 日期格式化
     date-format: yyyy-MM-dd HH:mm:ss
@@ -95,47 +95,41 @@ spring:
       # 允许对象忽略json中不存在的属性
       fail_on_unknown_properties: false
 
-# Sa-Token配置
+# token配置
-sa-token:
+token:
-  # token名称 (同时也是cookie名称)
+  # 令牌自定义标识
-  token-name: Authorization
+  header: Authorization
-  # token有效期 设为一天 (必定过期) 单位: 秒
+  # 令牌密钥
-  timeout: 86400
+  secret: abcdefghijklmnopqrstuvwxyz
-  # token临时有效期 (指定时间无操作就过期) 单位: 秒
+  # 令牌有效期（默认30分钟）
-  activity-timeout: 1800
+  expireTime: 30
-  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
-  is-concurrent: true
-  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
-  is-share: false
-  # 是否尝试从header里读取token
-  is-read-head: true
-  # 是否尝试从cookie里读取token
-  is-read-cookie: false
-  # token前缀
-  token-prefix: "Bearer"
-  # jwt秘钥
-  jwt-secret-key: abcdefghijklmnopqrstuvwxyz
-  # 是否输出操作日志
-  is-log: true
 
 # security配置
 security:
-  # 排除路径
+  # 登出路径
-  excludes:
+  logout-url: /logout
-    # 静态资源
+  # 匿名路径
-    - /*.html
+  anonymous:
-    - /**/*.html
+    - /login
-    - /**/*.css
+    - /register
-    - /**/*.js
+    - /captchaImage
     # swagger 文档配置
-    - /favicon.ico
+    - /doc.html
+    - /swagger-resources/**
+    - /webjars/**
     - /*/api-docs
-    - /*/api-docs/**
     # druid 监控配置
     - /druid/**
     # actuator 监控配置
     - /actuator
     - /actuator/**
+  # 用户放行
+  permit-all:
+
+# 重复提交
+repeat-submit:
+  # 全局间隔时间(毫秒)
+  interval: 5000
 
 # MyBatisPlus配置
 # https://baomidou.com/config/
@@ -149,15 +143,25 @@ mybatis-plus:
   typeAliasesPackage: com.ruoyi.**.domain
   # 启动时是否检查 MyBatis XML 文件的存在，默认不检查
   checkConfigLocation: false
+  # 通过该属性可指定 MyBatis 的执行器，MyBatis 的执行器总共有三种：
+  # SIMPLE：每个语句创建新的预处理器 REUSE：会复用预处理器 BATCH：批量执行所有的更新
+  executorType: SIMPLE
   configuration:
     # 自动驼峰命名规则（camel case）映射
     mapUnderscoreToCamelCase: true
+    # 当设置为 true 的时候，懒加载的对象可能被任何懒属性全部加载，否则，每个属性都按需加载。需要和 lazyLoadingEnabled 一起使用。
+    aggressiveLazyLoading: true
     # MyBatis 自动映射策略
     # NONE：不启用 PARTIAL：只对非嵌套 resultMap 自动映射 FULL：对所有 resultMap 自动映射
     autoMappingBehavior: PARTIAL
     # MyBatis 自动映射时未知列或未知属性处理策
     # NONE：不做处理 WARNING：打印相关警告 FAILING：抛出异常和详细信息
     autoMappingUnknownColumnBehavior: NONE
+    # Mybatis一级缓存，默认为 SESSION
+    # SESSION session级别缓存 STATEMENT 关闭一级缓存
+    localCacheScope: SESSION
+    # 开启Mybatis二级缓存，默认为 true
+    cacheEnabled: false
     # 更详细的日志输出 会有性能损耗 org.apache.ibatis.logging.stdout.StdOutImpl
     # 关闭日志记录 (可单纯使用 p6spy 分析) org.apache.ibatis.logging.nologging.NoLoggingImpl
     # 默认日志输出 org.apache.ibatis.logging.slf4j.Slf4jImpl
@@ -165,10 +169,16 @@ mybatis-plus:
   global-config:
     # 是否打印 Logo banner
     banner: true
+    # 是否初始化 SqlRunner
+    enableSqlRunner: false
     dbConfig:
       # 主键类型
       # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
-      idType: ASSIGN_ID
+      idType: AUTO
+      # 表名是否使用驼峰转下划线命名,只对表名生效
+      tableUnderline: true
+      # 大写命名,对表名和字段名均生效
+      capitalMode: false
       # 逻辑已删除值
       logicDeleteValue: 2
       # 逻辑未删除值
@@ -185,7 +195,8 @@ mybatis-plus:
 swagger:
   # 是否开启swagger
   enabled: true
-  info:
+  # 请求前缀
+  pathMapping: /dev-api
   # 标题
   title: '标题：${ruoyi.name}后台管理系统_接口文档'
   # 描述
@@ -197,23 +208,29 @@ swagger:
     name: Lion Li
     email: crazylionli@163.com
     url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
-  components:
+  groups:
-    # 鉴权方式配置
+    - name: 1.演示案例
-    security-schemes:
+      basePackage: com.ruoyi.demo
-      apiKey:
+    - name: 2.系统模块
-        type: APIKEY
+      basePackage: com.ruoyi.web
-        in: HEADER
+    - name: 3.代码生成模块
-        name: ${sa-token.token-name}
+      basePackage: com.ruoyi.generator
 
-springdoc:
+knife4j:
-  #这里定义了两个分组，可定义多个，也可以不定义
+  # 是否开启Knife4j增强模式
-  group-configs:
+  enable: true
-    - group: 1.演示模块
+  # 是否开启生产环境保护策略
-      packages-to-scan: com.ruoyi.demo
+  production: @knife4j.production@
-    - group: 2.系统模块
+  # 前端Ui的个性化配置属性
-      packages-to-scan: com.ruoyi.web
+  setting:
-    - group: 3.代码生成模块
+    # 默认语言
-      packages-to-scan: com.ruoyi.generator
+    language: zh-CN
+    # 是否显示Footer
+    enableFooter: false
+    # 是否开启动态参数调试功能
+    enableDynamicParameter: true
+    # 是否在每个Debug调试栏后显示刷新变量按钮
+    enableReloadCacheParameter: true
 
 # 防止XSS攻击
 xss:
@@ -228,26 +245,53 @@ xss:
 thread-pool:
   # 是否开启线程池
   enabled: false
+  # 核心线程池大小
+  corePoolSize: 8
+  # 最大可创建的线程数
+  maxPoolSize: 16
   # 队列最大长度
   queueCapacity: 128
   # 线程池维护线程所允许的空闲时间
   keepAliveSeconds: 300
+  # 线程池对拒绝任务(无线程可用)的处理策略
+  # CALLER_RUNS_POLICY 调用方执行
+  # DISCARD_OLDEST_POLICY 放弃最旧的
+  # DISCARD_POLICY 丢弃
+  # ABORT_POLICY 中止
+  rejectedExecutionHandler: CALLER_RUNS_POLICY
+
+--- # redisson 缓存配置
+redisson:
+  cacheGroup:
+    # 用例: @Cacheable(cacheNames="groupId", key="#XXX") 方可使用缓存组配置
+    - groupId: redissonCacheMap
+      # 组过期时间(脚本监控)
+      ttl: 60000
+      # 组最大空闲时间(脚本监控)
+      maxIdleTime: 60000
+      # 组最大长度
+      maxSize: 0
+    - groupId: testCache
+      ttl: 1000
+      maxIdleTime: 500
 
 --- # 分布式锁 lock4j 全局配置
 lock4j:
   # 获取分布式锁超时时间，默认为 3000 毫秒
   acquire-timeout: 3000
-  # 分布式锁的超时时间，默认为 30 秒
+  # 分布式锁的超时时间，默认为 30 毫秒
   expire: 30000
 
 --- # Actuator 监控端点的配置项
 management:
   endpoints:
     web:
+      # Actuator 提供的 API 接口的根目录。默认为 /actuator
+      base-path: /actuator
       exposure:
-        include: '*'
+        # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。
+        # 生产环境不建议放开所有 根据项目需求放开即可
+        include: @endpoints.include@
   endpoint:
-    health:
-      show-details: ALWAYS
     logfile:
       external-file: ./logs/sys-console.log

ruoyi-admin/src/main/resources/i18n/messages.properties

@@ -2,28 +2,21 @@
 not.null=* 必须填写
 user.jcaptcha.error=验证码错误
 user.jcaptcha.expire=验证码已失效
-user.not.exists=对不起, 您的账号：{0} 不存在.
+user.not.exists=用户不存在/密码错误
 user.password.not.match=用户不存在/密码错误
 user.password.retry.limit.count=密码输入错误{0}次
-user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
-user.password.delete=对不起，您的账号：{0} 已被删除
+user.password.delete=对不起，您的账号已被删除
-user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员
+user.blocked=用户已封禁，请联系管理员
 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.phonenumber.not.blank=用户手机号不能为空
 user.mobile.phone.number.not.valid=手机号格式错误
 user.login.success=登录成功
 user.register.success=注册成功
-user.register.save.error=保存用户 {0} 失败，注册账号已存在
-user.register.error=注册失败，请联系系统管理人员
 user.notfound=请重新登录
 user.forcelogout=管理员强制退出，请重新登录
 user.unknown.error=未知错误，请重新登录
@@ -37,9 +30,3 @@ no.update.permission=您没有修改数据的权限，请联系管理员添加
 no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
 no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
 no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
-repeat.submit.message=不允许重复提交，请稍候再试
-rate.limiter.message=访问过于频繁，请稍候再试
-sms.code.not.blank=短信验证码不能为空
-sms.code.retry.limit.count=短信验证码输入错误{0}次
-sms.code.retry.limit.exceed=短信验证码输入错误{0}次，帐户锁定{0}分钟
-xcx.code.not.blank=小程序code不能为空

ruoyi-admin/src/main/resources/i18n/messages_en_US.properties

@@ -2,28 +2,21 @@
 not.null=* Required fill in
 user.jcaptcha.error=Captcha error
 user.jcaptcha.expire=Captcha invalid
-user.not.exists=Sorry, your account: {0} does not exist
+user.not.exists=User does not exist/Password error
 user.password.not.match=User does not exist/Password error
 user.password.retry.limit.count=Password input error {0} times
-user.password.retry.limit.exceed=Password input error {0} times, account locked for {1} minutes
+user.password.retry.limit.exceed=Password input error {0} times, account locked for 10 minutes
-user.password.delete=Sorry, your account：{0} has been deleted
+user.password.delete=Sorry, your account has been deleted
-user.blocked=Sorry, your account: {0} has been disabled. Please contact the administrator
+user.blocked=User disabled，please contact administrators
 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.phonenumber.not.blank=Phone number cannot be blank
 user.mobile.phone.number.not.valid=Phone number format error
 user.login.success=Login successful
 user.register.success=Register successful
-user.register.save.error=Failed to save user {0}, The registered account already exists
-user.register.error=Register failed, please contact system administrator
 user.notfound=Please login again
 user.forcelogout=The administrator is forced to exit，please login again
 user.unknown.error=Unknown error, please login again
@@ -37,9 +30,3 @@ no.update.permission=You do not have permission to modify data，please contact
 no.delete.permission=You do not have permission to delete data，please contact your administrator to add permissions [{0}]
 no.export.permission=You do not have permission to export data，please contact your administrator to add permissions [{0}]
 no.view.permission=You do not have permission to view data，please contact your administrator to add permissions [{0}]
-repeat.submit.message=Repeat submit is not allowed, please try again later
-rate.limiter.message=Visit too frequently, please try again later
-sms.code.not.blank=Sms code cannot be blank
-sms.code.retry.limit.count=Sms code input error {0} times
-sms.code.retry.limit.exceed=Sms code input error {0} times, account locked for {0} minutes
-xcx.code.not.blank=Mini program code cannot be blank

ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -2,28 +2,21 @@
 not.null=* 必须填写
 user.jcaptcha.error=验证码错误
 user.jcaptcha.expire=验证码已失效
-user.not.exists=对不起, 您的账号：{0} 不存在.
+user.not.exists=用户不存在/密码错误
 user.password.not.match=用户不存在/密码错误
 user.password.retry.limit.count=密码输入错误{0}次
-user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
-user.password.delete=对不起，您的账号：{0} 已被删除
+user.password.delete=对不起，您的账号已被删除
-user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员
+user.blocked=用户已封禁，请联系管理员
 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.phonenumber.not.blank=用户手机号不能为空
 user.mobile.phone.number.not.valid=手机号格式错误
 user.login.success=登录成功
 user.register.success=注册成功
-user.register.save.error=保存用户 {0} 失败，注册账号已存在
-user.register.error=注册失败，请联系系统管理人员
 user.notfound=请重新登录
 user.forcelogout=管理员强制退出，请重新登录
 user.unknown.error=未知错误，请重新登录
@@ -37,9 +30,3 @@ no.update.permission=您没有修改数据的权限，请联系管理员添加
 no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
 no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
 no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
-repeat.submit.message=不允许重复提交，请稍候再试
-rate.limiter.message=访问过于频繁，请稍候再试
-sms.code.not.blank=短信验证码不能为空
-sms.code.retry.limit.count=短信验证码输入错误{0}次
-sms.code.retry.limit.exceed=短信验证码输入错误{0}次，帐户锁定{0}分钟
-xcx.code.not.blank=小程序code不能为空

ruoyi-admin/src/main/resources/logback.xml

@@ -77,31 +77,19 @@
         </filter>
     </appender>
 
-    <!-- info异步输出 -->
+	<!-- 系统模块日志级别控制  -->
-    <appender name="async_info" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
+	<logger name="com.ruoyi" level="info" />
-        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+	<!-- Spring日志级别控制  -->
-        <discardingThreshold>0</discardingThreshold>
+	<logger name="org.springframework" level="warn" />
-        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
-        <queueSize>512</queueSize>
-        <!-- 添加附加的appender,最多只能添加一个 -->
-        <appender-ref ref="file_info"/>
-    </appender>
 
-    <!-- error异步输出 -->
+	<root level="info">
-    <appender name="async_error" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
+		<appender-ref ref="console" />
-        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+	</root>
-        <discardingThreshold>0</discardingThreshold>
-        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
-        <queueSize>512</queueSize>
-        <!-- 添加附加的appender,最多只能添加一个 -->
-        <appender-ref ref="file_error"/>
-    </appender>
 
 	<!--系统操作日志-->
     <root level="info">
-        <appender-ref ref="console" />
+        <appender-ref ref="file_info" />
-        <appender-ref ref="async_info" />
+        <appender-ref ref="file_error" />
-        <appender-ref ref="async_error" />
         <appender-ref ref="file_console" />
     </root>
 

ruoyi-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>4.3.0</version>
+        <version>3.4.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,15 +29,10 @@
             <artifactId>spring-web</artifactId>
         </dependency>
 
-        <!-- Sa-Token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
+        <!-- spring security 安全认证 -->
         <dependency>
-            <groupId>cn.dev33</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>sa-token-spring-boot-starter</artifactId>
+            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <!-- Sa-Token 整合 jwt -->
-        <dependency>
-            <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-jwt</artifactId>
         </dependency>
 
         <!-- 自定义验证注解 -->
@@ -58,6 +53,12 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
 
+        <!-- excel工具 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
@@ -69,6 +70,18 @@
             <artifactId>snakeyaml</artifactId>
         </dependency>
 
+        <!-- Token生成与解析-->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+        </dependency>
+
+        <!-- jdk11 缺失依赖 jaxb-->
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+
         <!-- servlet包 -->
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -83,58 +96,34 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
         </dependency>
-
-        <!-- dynamic-datasource 多数据源-->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>cn.hutool</groupId>
-            <artifactId>hutool-core</artifactId>
+            <artifactId>hutool-all</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>com.sun.mail</groupId>
-            <artifactId>jakarta.mail</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.springdoc</groupId>
+            <groupId>de.codecentric</groupId>
-            <artifactId>springdoc-openapi-webmvc-core</artifactId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.springdoc</groupId>
+            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>springdoc-openapi-javadoc</artifactId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <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>
@@ -152,6 +141,16 @@
             <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>

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java

@@ -1,18 +0,0 @@
-package com.ruoyi.common.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 匿名访问不鉴权注解
- *
- * @author ruoyi
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface Anonymous {
-}

ruoyi-common/src/main/java/com/ruoyi/common/annotation/CellMerge.java

@@ -1,24 +0,0 @@
-package com.ruoyi.common.annotation;
-
-import com.ruoyi.common.excel.CellMergeStrategy;
-
-import java.lang.annotation.*;
-
-/**
- * excel 列单元格合并(合并列相同项)
- *
- * 需搭配 {@link CellMergeStrategy} 策略使用
- *
- * @author Lion Li
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-public @interface CellMerge {
-
-	/**
-	 * col index
-	 */
-	int index() default -1;
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java

@@ -1,28 +0,0 @@
-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";
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataPermission.java

@@ -1,18 +0,0 @@
-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();
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java

@@ -0,0 +1,28 @@
+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;
+}

ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java

@@ -0,0 +1,23 @@
+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;
+}

ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java

@@ -1,6 +1,6 @@
 package com.ruoyi.common.annotation;
 
-import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.enums.LimitType;
 
 import java.lang.annotation.*;
@@ -17,7 +17,7 @@ public @interface RateLimiter {
     /**
      * 限流key
      */
-    String key() default CacheConstants.RATE_LIMIT_KEY;
+    String key() default Constants.RATE_LIMIT_KEY;
 
     /**
      * 限流时间,单位秒

ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java

@@ -22,8 +22,8 @@ public @interface RepeatSubmit {
     TimeUnit timeUnit() default TimeUnit.MILLISECONDS;
 
     /**
-     * 提示消息 支持国际化 格式为 {code}
+     * 提示消息
      */
-    String message() default "{repeat.submit.message}";
+    String message() default "不允许重复提交，请稍候再试";
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java

@@ -1,24 +0,0 @@
-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();
-}

ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java

@@ -15,7 +15,7 @@ public class UnsignedMathGenerator implements CodeGenerator {
 
 	private static final long serialVersionUID = -5514819971774091076L;
 
-    private static final String OPERATORS = "+-*";
+	private static final String operators = "+-*";
 
 	/**
 	 * 参与计算数字最大长度
@@ -41,14 +41,14 @@ public class UnsignedMathGenerator implements CodeGenerator {
 	@Override
 	public String generate() {
 		final int limit = getLimit();
-        int a = RandomUtil.randomInt(limit);
+		int min = RandomUtil.randomInt(limit);
-        int b = RandomUtil.randomInt(limit);
+		int max = RandomUtil.randomInt(min, limit);
-        String max = Integer.toString(Math.max(a,b));
+		String number1 = Integer.toString(max);
-        String min = Integer.toString(Math.min(a,b));
+		String number2 = Integer.toString(min);
-        max = StringUtils.rightPad(max, this.numberLength, CharUtil.SPACE);
+		number1 = StringUtils.rightPad(number1, this.numberLength, CharUtil.SPACE);
-        min = StringUtils.rightPad(min, this.numberLength, CharUtil.SPACE);
+		number2 = StringUtils.rightPad(number2, this.numberLength, CharUtil.SPACE);
 
-        return max + RandomUtil.randomChar(OPERATORS) + min + '=';
+		return number1 + RandomUtil.randomChar(operators) + number2 + '=';
 	}
 
 	@Override

ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java

@@ -2,6 +2,7 @@ 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;
 
@@ -12,6 +13,7 @@ import org.springframework.stereotype.Component;
  */
 
 @Data
+@Accessors(chain = true)
 @Component
 @ConfigurationProperties(prefix = "ruoyi")
 public class RuoYiConfig {

ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java

@@ -1,49 +0,0 @@
-package com.ruoyi.common.constant;
-
-/**
- * 缓存的key 常量
- *
- * @author ruoyi
- */
-public interface CacheConstants {
-
-    /**
-     * 登录用户 redis key
-     */
-    String LOGIN_TOKEN_KEY = "Authorization:login:token:";
-
-    /**
-     * 在线用户 redis key
-     */
-    String ONLINE_TOKEN_KEY = "online_tokens:";
-
-    /**
-     * 验证码 redis key
-     */
-    String CAPTCHA_CODE_KEY = "captcha_codes:";
-
-    /**
-     * 参数管理 cache key
-     */
-    String SYS_CONFIG_KEY = "sys_config:";
-
-    /**
-     * 字典管理 cache key
-     */
-    String SYS_DICT_KEY = "sys_dict:";
-
-    /**
-     * 防重提交 redis key
-     */
-    String REPEAT_SUBMIT_KEY = "repeat_submit:";
-
-    /**
-     * 限流 redis key
-     */
-    String RATE_LIMIT_KEY = "rate_limit:";
-
-    /**
-     * 登录账户密码错误次数 redis key
-     */
-    String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
-}

ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheNames.java

@@ -1,48 +0,0 @@
-package com.ruoyi.common.constant;
-
-/**
- * 缓存组名称常量
- * <p>
- * key 格式为 cacheNames#ttl#maxIdleTime#maxSize
- * <p>
- * ttl 过期时间 如果设置为0则不过期 默认为0
- * maxIdleTime 最大空闲时间 根据LRU算法清理空闲数据 如果设置为0则不检测 默认为0
- * maxSize 组最大长度 根据LRU算法清理溢出数据 如果设置为0则无限长 默认为0
- * <p>
- * 例子: test#60s、test#0#60s、test#0#1m#1000、test#1h#0#500
- *
- * @author Lion Li
- */
-public interface CacheNames {
-
-    /**
-     * 演示案例
-     */
-    String DEMO_CACHE = "demo:cache#60s#10m#20";
-
-    /**
-     * 系统配置
-     */
-    String SYS_CONFIG = "sys_config";
-
-    /**
-     * 数据字典
-     */
-    String SYS_DICT = "sys_dict";
-
-    /**
-     * OSS内容
-     */
-    String SYS_OSS = "sys_oss#30d";
-
-    /**
-     * OSS配置
-     */
-    String SYS_OSS_CONFIG = "sys_oss_config";
-
-    /**
-     * 在线用户
-     */
-    String ONLINE_TOKEN = "online_tokens";
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -1,76 +1,136 @@
 package com.ruoyi.common.constant;
 
+import io.jsonwebtoken.Claims;
+
 /**
  * 通用常量信息
  *
  * @author ruoyi
  */
-public interface Constants {
+public class Constants {
-
     /**
      * UTF-8 字符集
      */
-    String UTF8 = "UTF-8";
+    public static final String UTF8 = "UTF-8";
 
     /**
      * GBK 字符集
      */
-    String GBK = "GBK";
+    public static final String GBK = "GBK";
-
-    /**
-     * www主域
-     */
-    String WWW = "www.";
 
     /**
      * http请求
      */
-    String HTTP = "http://";
+    public static final String HTTP = "http://";
 
     /**
      * https请求
      */
-    String HTTPS = "https://";
+    public static final String HTTPS = "https://";
 
     /**
      * 通用成功标识
      */
-    String SUCCESS = "0";
+    public static final String SUCCESS = "0";
 
     /**
      * 通用失败标识
      */
-    String FAIL = "1";
+    public static final String FAIL = "1";
 
     /**
      * 登录成功
      */
-    String LOGIN_SUCCESS = "Success";
+    public static final String LOGIN_SUCCESS = "Success";
 
     /**
      * 注销
      */
-    String LOGOUT = "Logout";
+    public static final String LOGOUT = "Logout";
 
     /**
      * 注册
      */
-    String REGISTER = "Register";
+    public static final String REGISTER = "Register";
 
     /**
      * 登录失败
      */
-    String LOGIN_FAIL = "Error";
+    public static final String LOGIN_FAIL = "Error";
+
+    /**
+     * 验证码 redis key
+     */
+    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
+
+    /**
+     * 登录用户 redis key
+     */
+    public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+
+    /**
+     * 防重提交 redis key
+     */
+    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
+
+    /**
+     * 限流 redis key
+     */
+    public static final String RATE_LIMIT_KEY = "rate_limit:";
 
     /**
      * 验证码有效期（分钟）
      */
-    Integer CAPTCHA_EXPIRATION = 2;
+    public static final Integer CAPTCHA_EXPIRATION = 2;
 
     /**
      * 令牌
      */
-    String TOKEN = "token";
+    public static final 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";
+
+    /**
+     * 参数管理 cache key
+     */
+    public static final String SYS_CONFIG_KEY = "sys_config:";
+
+    /**
+     * 字典管理 cache key
+     */
+    public static final String SYS_DICT_KEY = "sys_dict:";
 
 }
-

ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java

@@ -5,189 +5,184 @@ package com.ruoyi.common.constant;
  *
  * @author ruoyi
  */
-public interface GenConstants {
+public class GenConstants {
     /**
      * 单表（增删改查）
      */
-    String TPL_CRUD = "crud";
+    public static final String TPL_CRUD = "crud";
 
     /**
      * 树表（增删改查）
      */
-    String TPL_TREE = "tree";
+    public static final String TPL_TREE = "tree";
 
     /**
      * 主子表（增删改查）
      */
-    String TPL_SUB = "sub";
+    public static final String TPL_SUB = "sub";
 
     /**
      * 树编码字段
      */
-    String TREE_CODE = "treeCode";
+    public static final String TREE_CODE = "treeCode";
 
     /**
      * 树父编码字段
      */
-    String TREE_PARENT_CODE = "treeParentCode";
+    public static final String TREE_PARENT_CODE = "treeParentCode";
 
     /**
      * 树名称字段
      */
-    String TREE_NAME = "treeName";
+    public static final String TREE_NAME = "treeName";
 
     /**
      * 上级菜单ID字段
      */
-    String PARENT_MENU_ID = "parentMenuId";
+    public static final String PARENT_MENU_ID = "parentMenuId";
 
     /**
      * 上级菜单名称字段
      */
-    String PARENT_MENU_NAME = "parentMenuName";
+    public static final String PARENT_MENU_NAME = "parentMenuName";
 
     /**
      * 数据库字符串类型
      */
-    String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
+    public static final String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
 
     /**
      * 数据库文本类型
      */
-    String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
+    public static final String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
 
     /**
      * 数据库时间类型
      */
-    String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
+    public static final String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
 
     /**
      * 数据库数字类型
      */
-    String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
+    public static final String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
             "bit", "bigint", "float", "double", "decimal"};
 
     /**
      * BO对象 不需要添加字段
      */
-    String[] COLUMNNAME_NOT_ADD = {"create_by", "create_time", "del_flag", "update_by",
+    public static final String[] COLUMNNAME_NOT_ADD = {"create_by", "create_time", "del_flag", "update_by",
             "update_time", "version"};
 
     /**
      * BO对象 不需要编辑字段
      */
-    String[] COLUMNNAME_NOT_EDIT = {"create_by", "create_time", "del_flag", "update_by",
+    public static final String[] COLUMNNAME_NOT_EDIT = {"create_by", "create_time", "del_flag", "update_by",
             "update_time", "version"};
 
     /**
      * VO对象 不需要返回字段
      */
-    String[] COLUMNNAME_NOT_LIST = {"create_by", "create_time", "del_flag", "update_by",
+    public static final String[] COLUMNNAME_NOT_LIST = {"create_by", "create_time", "del_flag", "update_by",
             "update_time", "version"};
 
     /**
      * BO对象 不需要查询字段
      */
-    String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by",
+    public static final String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by",
             "update_time", "remark", "version"};
 
     /**
      * Entity基类字段
      */
-    String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime"};
+    public static final String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime"};
 
     /**
      * Tree基类字段
      */
-    String[] TREE_ENTITY = {"parentName", "parentId", "children"};
+    public static final String[] TREE_ENTITY = {"parentName", "parentId", "children"};
 
     /**
      * 文本框
      */
-    String HTML_INPUT = "input";
+    public static final String HTML_INPUT = "input";
 
     /**
      * 文本域
      */
-    String HTML_TEXTAREA = "textarea";
+    public static final String HTML_TEXTAREA = "textarea";
 
     /**
      * 下拉框
      */
-    String HTML_SELECT = "select";
+    public static final String HTML_SELECT = "select";
 
     /**
      * 单选框
      */
-    String HTML_RADIO = "radio";
+    public static final String HTML_RADIO = "radio";
 
     /**
      * 复选框
      */
-    String HTML_CHECKBOX = "checkbox";
+    public static final String HTML_CHECKBOX = "checkbox";
 
     /**
      * 日期控件
      */
-    String HTML_DATETIME = "datetime";
+    public static final String HTML_DATETIME = "datetime";
 
     /**
      * 图片上传控件
      */
-    String HTML_IMAGE_UPLOAD = "imageUpload";
+    public static final String HTML_IMAGE_UPLOAD = "imageUpload";
 
     /**
      * 文件上传控件
      */
-    String HTML_FILE_UPLOAD = "fileUpload";
+    public static final String HTML_FILE_UPLOAD = "fileUpload";
 
     /**
      * 富文本控件
      */
-    String HTML_EDITOR = "editor";
+    public static final String HTML_EDITOR = "editor";
 
     /**
      * 字符串类型
      */
-    String TYPE_STRING = "String";
+    public static final String TYPE_STRING = "String";
 
     /**
      * 整型
      */
-    String TYPE_INTEGER = "Integer";
+    public static final String TYPE_INTEGER = "Integer";
 
     /**
      * 长整型
      */
-    String TYPE_LONG = "Long";
+    public static final String TYPE_LONG = "Long";
 
     /**
      * 浮点型
      */
-    String TYPE_DOUBLE = "Double";
+    public static final String TYPE_DOUBLE = "Double";
 
     /**
      * 高精度计算类型
      */
-    String TYPE_BIGDECIMAL = "BigDecimal";
+    public static final String TYPE_BIGDECIMAL = "BigDecimal";
 
     /**
      * 时间类型
      */
-    String TYPE_DATE = "Date";
+    public static final String TYPE_DATE = "Date";
 
     /**
      * 模糊查询
      */
-    String QUERY_LIKE = "LIKE";
+    public static final String QUERY_LIKE = "LIKE";
-
-    /**
-     * 相等查询
-     */
-    String QUERY_EQ = "EQ";
 
     /**
      * 需要
      */
-    String REQUIRE = "1";
+    public static final String REQUIRE = "1";
 }

ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java

@@ -5,134 +5,108 @@ package com.ruoyi.common.constant;
  *
  * @author ruoyi
  */
-public interface UserConstants {
+public class UserConstants {
 
     /**
      * 平台内系统用户的唯一标志
      */
-    String SYS_USER = "SYS_USER";
+    public static final String SYS_USER = "SYS_USER";
 
     /**
      * 正常状态
      */
-    String NORMAL = "0";
+    public static final String NORMAL = "0";
 
     /**
      * 异常状态
      */
-    String EXCEPTION = "1";
+    public static final String EXCEPTION = "1";
-
-    /**
-     * 用户正常状态
-     */
-    String USER_NORMAL = "0";
 
     /**
      * 用户封禁状态
      */
-    String USER_DISABLE = "1";
+    public static final String USER_DISABLE = "1";
-
-    /**
-     * 角色正常状态
-     */
-    String ROLE_NORMAL = "0";
 
     /**
      * 角色封禁状态
      */
-    String ROLE_DISABLE = "1";
+    public static final String ROLE_DISABLE = "1";
 
     /**
      * 部门正常状态
      */
-    String DEPT_NORMAL = "0";
+    public static final String DEPT_NORMAL = "0";
 
     /**
      * 部门停用状态
      */
-    String DEPT_DISABLE = "1";
+    public static final String DEPT_DISABLE = "1";
 
     /**
      * 字典正常状态
      */
-    String DICT_NORMAL = "0";
+    public static final String DICT_NORMAL = "0";
 
     /**
      * 是否为系统默认（是）
      */
-    String YES = "Y";
+    public static final String YES = "Y";
 
     /**
      * 是否菜单外链（是）
      */
-    String YES_FRAME = "0";
+    public static final String YES_FRAME = "0";
 
     /**
      * 是否菜单外链（否）
      */
-    String NO_FRAME = "1";
+    public static final String NO_FRAME = "1";
-
-    /**
-     * 菜单正常状态
-     */
-    String MENU_NORMAL = "0";
-
-    /**
-     * 菜单停用状态
-     */
-    String MENU_DISABLE = "1";
 
     /**
      * 菜单类型（目录）
      */
-    String TYPE_DIR = "M";
+    public static final String TYPE_DIR = "M";
 
     /**
      * 菜单类型（菜单）
      */
-    String TYPE_MENU = "C";
+    public static final String TYPE_MENU = "C";
 
     /**
      * 菜单类型（按钮）
      */
-    String TYPE_BUTTON = "F";
+    public static final String TYPE_BUTTON = "F";
 
     /**
      * Layout组件标识
      */
-    String LAYOUT = "Layout";
+    public final static String LAYOUT = "Layout";
 
     /**
      * ParentView组件标识
      */
-    String PARENT_VIEW = "ParentView";
+    public final static String PARENT_VIEW = "ParentView";
 
     /**
      * InnerLink组件标识
      */
-    String INNER_LINK = "InnerLink";
+    public final static String INNER_LINK = "InnerLink";
 
     /**
      * 校验返回结果码
      */
-    String UNIQUE = "0";
+    public final static String UNIQUE = "0";
-    String NOT_UNIQUE = "1";
+    public final static String NOT_UNIQUE = "1";
 
     /**
      * 用户名长度限制
      */
-    int USERNAME_MIN_LENGTH = 2;
+    public static final int USERNAME_MIN_LENGTH = 2;
-    int USERNAME_MAX_LENGTH = 20;
+    public static final int USERNAME_MAX_LENGTH = 20;
 
     /**
      * 密码长度限制
      */
-    int PASSWORD_MIN_LENGTH = 5;
+    public static final int PASSWORD_MIN_LENGTH = 5;
-    int PASSWORD_MAX_LENGTH = 20;
+    public static final int PASSWORD_MAX_LENGTH = 20;
-
-    /**
-     * 管理员ID
-     */
-    Long ADMIN_ID = 1L;
-
 }

ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java

@@ -4,9 +4,8 @@ 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;
 
@@ -32,19 +31,19 @@ public class ExcelBigNumberConvert implements Converter<Long> {
 	}
 
 	@Override
-    public Long convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+	public Long convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
 		return Convert.toLong(cellData.getData());
 	}
 
 	@Override
-    public WriteCellData<Object> convertToExcelData(Long object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+	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 WriteCellData<>(str);
+				return new CellData<>(str);
 			}
 		}
-        WriteCellData<Object> cellData = new WriteCellData<>(new BigDecimal(object));
+		CellData<Object> cellData = new CellData<>(new BigDecimal(object));
 		cellData.setType(CellDataTypeEnum.NUMBER);
 		return cellData;
 	}

ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java

@@ -2,12 +2,10 @@ 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;
@@ -37,7 +35,7 @@ public class ExcelDictConvert implements Converter<Object> {
 	}
 
 	@Override
-    public Object convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+	public Object convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
 		ExcelDictFormat anno = getAnnotation(contentProperty.getField());
 		String type = anno.dictType();
 		String label = cellData.getStringValue();
@@ -51,9 +49,9 @@ public class ExcelDictConvert implements Converter<Object> {
 	}
 
 	@Override
-    public WriteCellData<String> convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+	public CellData<String> convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
-        if (ObjectUtil.isNull(object)) {
+		if (StringUtils.isNull(object)) {
-            return new WriteCellData<>("");
+			return new CellData<>("");
 		}
 		ExcelDictFormat anno = getAnnotation(contentProperty.getField());
 		String type = anno.dictType();
@@ -64,7 +62,7 @@ public class ExcelDictConvert implements Converter<Object> {
 		} else {
 			label = SpringUtils.getBean(DictService.class).getDictLabel(type, value, anno.separator());
 		}
-        return new WriteCellData<>(label);
+		return new CellData<>(label);
 	}
 
 	private ExcelDictFormat getAnnotation(Field field) {

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -1,25 +1,53 @@
 package com.ruoyi.common.core.controller;
 
-import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.helper.LoginHelper;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 
 /**
  * web层通用数据处理
  *
- * @author Lion Li
+ * @author ruoyi
  */
 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 R<Void> toAjax(int rows) {
+    protected AjaxResult<Void> toAjax(int rows) {
-        return rows > 0 ? R.ok() : R.fail();
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
     /**
@@ -28,8 +56,8 @@ public class BaseController {
      * @param result 结果
      * @return 操作结果
      */
-    protected R<Void> toAjax(boolean result) {
+    protected AjaxResult<Void> toAjax(boolean result) {
-        return result ? R.ok() : R.fail();
+        return result ? success() : error();
     }
 
     /**
@@ -43,27 +71,27 @@ public class BaseController {
      * 获取用户缓存信息
      */
     public LoginUser getLoginUser() {
-        return LoginHelper.getLoginUser();
+        return SecurityUtils.getLoginUser();
     }
 
     /**
      * 获取登录用户id
      */
     public Long getUserId() {
-        return LoginHelper.getUserId();
+        return getLoginUser().getUserId();
     }
 
     /**
      * 获取登录部门id
      */
     public Long getDeptId() {
-        return LoginHelper.getDeptId();
+        return getLoginUser().getDeptId();
     }
 
     /**
      * 获取登录用户名
      */
     public String getUsername() {
-        return LoginHelper.getUsername();
+        return getLoginUser().getUsername();
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java

@@ -0,0 +1,134 @@
+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);
+	}
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -2,7 +2,9 @@ package com.ruoyi.common.core.domain;
 
 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;
@@ -16,6 +18,7 @@ import java.util.Map;
  */
 
 @Data
+@Accessors(chain = true)
 public class BaseEntity implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -23,36 +26,42 @@ public class BaseEntity implements Serializable {
 	/**
 	 * 搜索值
 	 */
+	@ApiModelProperty(value = "搜索值")
 	@TableField(exist = false)
 	private String searchValue;
 
 	/**
 	 * 创建者
 	 */
+	@ApiModelProperty(value = "创建者")
 	@TableField(fill = FieldFill.INSERT)
 	private String createBy;
 
 	/**
 	 * 创建时间
 	 */
+	@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 Date updateTime;
 
 	/**
 	 * 请求参数
 	 */
+	@ApiModelProperty(value = "请求参数")
 	@TableField(exist = false)
 	private Map<String, Object> params = new HashMap<>();
 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java

@@ -1,86 +0,0 @@
-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 lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 分页查询实体类
- *
- * @author Lion Li
- */
-
-@Data
-public class PageQuery implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 分页大小
-     */
-    private Integer pageSize;
-
-    /**
-     * 当前页数
-     */
-    private Integer pageNum;
-
-    /**
-     * 排序列
-     */
-    private String orderByColumn;
-
-    /**
-     * 排序的方向desc或者asc
-     */
-    private String isAsc;
-
-    /**
-     * 当前记录起始索引 默认值
-     */
-    public static final int DEFAULT_PAGE_NUM = 1;
-
-    /**
-     * 每页显示记录数 默认值 默认查全部
-     */
-    public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
-
-    public <T> Page<T> build() {
-        Integer pageNum = ObjectUtil.defaultIfNull(getPageNum(), DEFAULT_PAGE_NUM);
-        Integer pageSize = ObjectUtil.defaultIfNull(getPageSize(), DEFAULT_PAGE_SIZE);
-        if (pageNum <= 0) {
-            pageNum = DEFAULT_PAGE_NUM;
-        }
-        Page<T> page = new Page<>(pageNum, pageSize);
-        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;
-    }
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java

@@ -1,85 +0,0 @@
-package com.ruoyi.common.core.domain;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * 响应信息主体
- *
- * @author Lion Li
- */
-@Data
-@NoArgsConstructor
-public class R<T> implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 成功
-     */
-    public static final int SUCCESS = 200;
-
-    /**
-     * 失败
-     */
-    public static final int FAIL = 500;
-
-    private int code;
-
-    private String msg;
-
-    private T data;
-
-    public static <T> R<T> ok() {
-        return restResult(null, SUCCESS, "操作成功");
-    }
-
-    public static <T> R<T> ok(T data) {
-        return restResult(data, SUCCESS, "操作成功");
-    }
-
-    public static <T> R<T> ok(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;
-    }
-
-    public Boolean isError() {
-        return !isSuccess();
-    }
-
-    public Boolean isSuccess() {
-        return R.SUCCESS == getCode();
-    }
-}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java

@@ -1,8 +1,10 @@
 package com.ruoyi.common.core.domain;
 
 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;
@@ -15,7 +17,8 @@ import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class TreeEntity<T> extends BaseEntity {
+@Accessors(chain = true)
+public class TreeEntity extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
@@ -23,17 +26,20 @@ public class TreeEntity<T> extends BaseEntity {
 	 * 父菜单名称
 	 */
 	@TableField(exist = false)
+	@ApiModelProperty(value = "父菜单名称")
 	private String parentName;
 
 	/**
 	 * 父菜单ID
 	 */
+	@ApiModelProperty(value = "父菜单ID")
 	private Long parentId;
 
 	/**
 	 * 子部门
 	 */
 	@TableField(exist = false)
-    private List<T> children = new ArrayList<>();
+	@ApiModelProperty(value = "子部门")
+	private List<?> children = new ArrayList<>();
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java

@@ -1,6 +1,8 @@
 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;
@@ -12,6 +14,8 @@ import java.util.Date;
  */
 
 @Data
+@NoArgsConstructor
+@Accessors(chain = true)
 public class OperLogDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/RoleDTO.java

@@ -1,38 +0,0 @@
-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;
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java

@@ -1,61 +0,0 @@
-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;
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.TreeEntity;
+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;
 
 /**
@@ -20,19 +22,23 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
 @TableName("sys_dept")
-public class SysDept extends TreeEntity<SysDept> {
+@ApiModel("部门业务对象")
+public class SysDept extends TreeEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 * 部门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;
@@ -40,23 +46,27 @@ public class SysDept extends TreeEntity<SysDept> {
 	/**
 	 * 显示顺序
 	 */
-    @NotNull(message = "显示顺序不能为空")
+	@ApiModelProperty(value = "显示顺序")
-    private Integer orderNum;
+	@NotBlank(message = "显示顺序不能为空")
+	private String orderNum;
 
 	/**
 	 * 负责人
 	 */
+	@ApiModelProperty(value = "负责人")
 	private String leader;
 
 	/**
 	 * 联系电话
 	 */
+	@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;
@@ -64,17 +74,20 @@ public class SysDept extends TreeEntity<SysDept> {
 	/**
 	 * 部门状态:0正常,1停用
 	 */
+	@ApiModelProperty(value = "部门状态:0正常,1停用")
 	private String status;
 
 	/**
 	 * 删除标志（0代表存在 2代表删除）
 	 */
+	@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
 	@TableLogic
 	private String delFlag;
 
 	/**
 	 * 祖级列表
 	 */
+	@ApiModelProperty(value = "祖级列表")
 	private String ancestors;
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java

@@ -8,8 +8,11 @@ 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.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;
@@ -22,13 +25,16 @@ 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;
@@ -36,12 +42,14 @@ public class SysDictData extends BaseEntity {
 	/**
 	 * 字典排序
 	 */
+	@ApiModelProperty(value = "字典排序")
 	@ExcelProperty(value = "字典排序")
-    private Integer dictSort;
+	private Long dictSort;
 
 	/**
 	 * 字典标签
 	 */
+	@ApiModelProperty(value = "字典标签")
 	@ExcelProperty(value = "字典标签")
 	@NotBlank(message = "字典标签不能为空")
 	@Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
@@ -50,6 +58,7 @@ public class SysDictData extends BaseEntity {
 	/**
 	 * 字典键值
 	 */
+	@ApiModelProperty(value = "字典键值")
 	@ExcelProperty(value = "字典键值")
 	@NotBlank(message = "字典键值不能为空")
 	@Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
@@ -58,6 +67,7 @@ public class SysDictData extends BaseEntity {
 	/**
 	 * 字典类型
 	 */
+	@ApiModelProperty(value = "字典类型")
 	@ExcelProperty(value = "字典类型")
 	@NotBlank(message = "字典类型不能为空")
 	@Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
@@ -66,17 +76,20 @@ public class SysDictData extends BaseEntity {
 	/**
 	 * 样式属性（其他样式扩展）
 	 */
+	@ApiModelProperty(value = "样式属性（其他样式扩展）")
 	@Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
 	private String cssClass;
 
 	/**
 	 * 表格字典样式
 	 */
+	@ApiModelProperty(value = "表格字典样式")
 	private String listClass;
 
 	/**
 	 * 是否默认（Y是 N否）
 	 */
+	@ApiModelProperty(value = "是否默认（Y是 N否）")
 	@ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class)
 	@ExcelDictFormat(dictType = "sys_yes_no")
 	private String isDefault;
@@ -84,6 +97,7 @@ public class SysDictData extends BaseEntity {
 	/**
 	 * 状态（0正常 1停用）
 	 */
+	@ApiModelProperty(value = "状态（0正常 1停用）")
 	@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
 	@ExcelDictFormat(dictType = "sys_normal_disable")
 	private String status;
@@ -91,6 +105,7 @@ public class SysDictData extends BaseEntity {
 	/**
 	 * 备注
 	 */
+	@ApiModelProperty(value = "备注")
 	private String remark;
 
 	public boolean getDefault() {

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java

@@ -7,11 +7,13 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.core.domain.BaseEntity;
+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.Pattern;
 import javax.validation.constraints.Size;
 
 /**
@@ -22,13 +24,16 @@ 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;
@@ -36,6 +41,7 @@ public class SysDictType extends BaseEntity {
 	/**
 	 * 字典名称
 	 */
+	@ApiModelProperty(value = "字典名称")
 	@ExcelProperty(value = "字典名称")
 	@NotBlank(message = "字典名称不能为空")
 	@Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
@@ -44,15 +50,16 @@ public class SysDictType extends BaseEntity {
 	/**
 	 * 字典类型
 	 */
+	@ApiModelProperty(value = "字典类型")
 	@ExcelProperty(value = "字典类型")
 	@NotBlank(message = "字典类型不能为空")
 	@Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
-    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
 	private String dictType;
 
 	/**
 	 * 状态（0正常 1停用）
 	 */
+	@ApiModelProperty(value = "状态（0正常 1停用）")
 	@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
 	@ExcelDictFormat(dictType = "sys_normal_disable")
 	private String status;
@@ -60,6 +67,7 @@ public class SysDictType extends BaseEntity {
 	/**
 	 * 备注
 	 */
+	@ApiModelProperty(value = "备注")
 	private String remark;
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java

@@ -2,13 +2,14 @@ package com.ruoyi.common.core.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ruoyi.common.core.domain.TreeEntity;
+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;
 
 /**
@@ -19,18 +20,22 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
 @TableName("sys_menu")
-public class SysMenu extends TreeEntity<SysMenu> {
+@ApiModel("菜单权限业务对象")
+public class SysMenu extends TreeEntity {
 
 	/**
 	 * 菜单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;
@@ -38,67 +43,78 @@ public class SysMenu extends TreeEntity<SysMenu> {
 	/**
 	 * 显示顺序
 	 */
-    @NotNull(message = "显示顺序不能为空")
+	@ApiModelProperty(value = "显示顺序")
-    private Integer orderNum;
+	@NotBlank(message = "显示顺序不能为空")
+	private String orderNum;
 
 	/**
 	 * 路由地址
 	 */
+	@ApiModelProperty(value = "路由地址")
 	@Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
 	private String path;
 
 	/**
 	 * 组件路径
 	 */
+	@ApiModelProperty(value = "组件路径")
 	@Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
 	private String component;
 
     /**
      * 路由参数
      */
-    private String queryParam;
+	@ApiModelProperty(value = "路由参数")
+    private String query;
 
 	/**
 	 * 是否为外链（0是 1否）
 	 */
+	@ApiModelProperty(value = "是否为外链（0是 1否）")
 	private String isFrame;
 
 	/**
 	 * 是否缓存（0缓存 1不缓存）
 	 */
+	@ApiModelProperty(value = "是否缓存（0缓存 1不缓存）")
 	private String isCache;
 
 	/**
 	 * 类型（M目录 C菜单 F按钮）
 	 */
+	@ApiModelProperty(value = "类型（M目录 C菜单 F按钮）")
 	@NotBlank(message = "菜单类型不能为空")
 	private String menuType;
 
 	/**
 	 * 显示状态（0显示 1隐藏）
 	 */
+	@ApiModelProperty(value = "显示状态（0显示 1隐藏）")
 	private String visible;
 
 	/**
-     * 菜单状态（0正常 1停用）
+	 * 菜单状态（0显示 1隐藏）
 	 */
+	@ApiModelProperty(value = "菜单状态（0显示 1隐藏）")
 	private String status;
 
 	/**
 	 * 权限字符串
 	 */
-    @JsonInclude(JsonInclude.Include.NON_NULL)
+	@ApiModelProperty(value = "权限字符串")
 	@Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
 	private String perms;
 
 	/**
 	 * 菜单图标
 	 */
+	@ApiModelProperty(value = "菜单图标")
 	private String icon;
 
 	/**
 	 * 备注
 	 */
+	@ApiModelProperty(value = "备注")
 	private String remark;
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

@@ -7,17 +7,16 @@ 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.NotNull;
 import javax.validation.constraints.Size;
-import java.util.Set;
 
 /**
  * 角色表 sys_role
@@ -28,6 +27,7 @@ import java.util.Set;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
 @TableName("sys_role")
 @ExcelIgnoreUnannotated
 public class SysRole extends BaseEntity {
@@ -35,6 +35,7 @@ public class SysRole extends BaseEntity {
 	/**
 	 * 角色ID
 	 */
+	@ApiModelProperty(value = "角色ID")
 	@ExcelProperty(value = "角色序号")
 	@TableId(value = "role_id")
 	private Long roleId;
@@ -42,6 +43,7 @@ public class SysRole extends BaseEntity {
 	/**
 	 * 角色名称
 	 */
+	@ApiModelProperty(value = "角色名称")
 	@ExcelProperty(value = "角色名称")
 	@NotBlank(message = "角色名称不能为空")
 	@Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
@@ -50,6 +52,7 @@ public class SysRole extends BaseEntity {
 	/**
 	 * 角色权限
 	 */
+	@ApiModelProperty(value = "角色权限")
 	@ExcelProperty(value = "角色权限")
 	@NotBlank(message = "权限字符不能为空")
 	@Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
@@ -58,13 +61,15 @@ public class SysRole extends BaseEntity {
 	/**
 	 * 角色排序
 	 */
+	@ApiModelProperty(value = "角色排序")
 	@ExcelProperty(value = "角色排序")
-    @NotNull(message = "显示顺序不能为空")
+	@NotBlank(message = "显示顺序不能为空")
-    private Integer roleSort;
+	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;
@@ -72,60 +77,68 @@ public class SysRole extends BaseEntity {
 	/**
 	 * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
 	 */
-    private Boolean menuCheckStrictly;
+	@ApiModelProperty(value = "菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）")
+	private boolean menuCheckStrictly;
 
 	/**
 	 * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
 	 */
-    private Boolean deptCheckStrictly;
+	@ApiModelProperty(value = "部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）")
+	private boolean deptCheckStrictly;
 
 	/**
 	 * 角色状态（0正常 1停用）
 	 */
+	@ApiModelProperty(value = "角色状态（0正常 1停用）")
 	@ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_normal_disable")
+	@ExcelDictFormat(dictType = "sys_common_status")
 	private String status;
 
 	/**
 	 * 删除标志（0代表存在 2代表删除）
 	 */
+	@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
 	@TableLogic
 	private String delFlag;
 
 	/**
 	 * 备注
 	 */
+	@ApiModelProperty(value = "备注")
 	private String remark;
 
 	/**
 	 * 用户是否存在此角色标识 默认不存在
 	 */
+	@ApiModelProperty(value = "用户是否存在此角色标识 默认不存在")
 	@TableField(exist = false)
 	private boolean flag = false;
 
 	/**
 	 * 菜单组
 	 */
+	@ApiModelProperty(value = "菜单组")
 	@TableField(exist = false)
 	private Long[] menuIds;
 
 	/**
 	 * 部门组（数据权限）
 	 */
+	@ApiModelProperty(value = "部门组（数据权限）")
 	@TableField(exist = false)
 	private Long[] deptIds;
 
-    /**
-     * 角色菜单权限
-     */
-    @TableField(exist = false)
-    private Set<String> permissions;
-
 	public SysRole(Long roleId) {
 		this.roleId = roleId;
 	}
 
+	@ApiModelProperty(value = "是否管理员")
 	public boolean isAdmin() {
-        return UserConstants.ADMIN_ID.equals(this.roleId);
+		return isAdmin(this.roleId);
 	}
+
+	public static boolean isAdmin(Long roleId) {
+		return roleId != null && 1L == roleId;
+	}
+
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -1,14 +1,15 @@
 package com.ruoyi.common.core.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.ruoyi.common.annotation.Sensitive;
+import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ruoyi.common.constant.UserConstants;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.enums.SensitiveStrategy;
+import io.swagger.annotations.ApiModel;
-import com.ruoyi.common.xss.Xss;
+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;
@@ -25,24 +26,28 @@ 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")
 	private Long deptId;
 
 	/**
 	 * 用户账号
 	 */
-    @Xss(message = "用户账号不能包含脚本字符")
+	@ApiModelProperty(value = "用户账号")
 	@NotBlank(message = "用户账号不能为空")
 	@Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
 	private String userName;
@@ -50,19 +55,14 @@ public class SysUser extends BaseEntity {
 	/**
 	 * 用户昵称
 	 */
-    @Xss(message = "用户昵称不能包含脚本字符")
+	@ApiModelProperty(value = "用户昵称")
 	@Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
 	private String nickName;
 
-    /**
-     * 用户类型（sys_user系统用户）
-     */
-    private String userType;
-
 	/**
 	 * 用户邮箱
 	 */
-    @Sensitive(strategy = SensitiveStrategy.EMAIL)
+	@ApiModelProperty(value = "用户邮箱")
 	@Email(message = "邮箱格式不正确")
 	@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
 	private String email;
@@ -70,22 +70,25 @@ public class SysUser extends BaseEntity {
 	/**
 	 * 手机号码
 	 */
-    @Sensitive(strategy = SensitiveStrategy.PHONE)
+	@ApiModelProperty(value = "手机号码")
 	private String phonenumber;
 
 	/**
 	 * 用户性别
 	 */
+	@ApiModelProperty(value = "用户性别")
 	private String sex;
 
 	/**
 	 * 用户头像
 	 */
+	@ApiModelProperty(value = "用户头像")
 	private String avatar;
 
 	/**
 	 * 密码
 	 */
+	@ApiModelProperty(value = "密码")
 	@TableField(
 			insertStrategy = FieldStrategy.NOT_EMPTY,
 			updateStrategy = FieldStrategy.NOT_EMPTY,
@@ -93,59 +96,75 @@ public class SysUser extends BaseEntity {
 	)
 	private String password;
 
+	@JsonIgnore
+	@JsonProperty
+	public String getPassword() {
+		return password;
+	}
+
 	/**
 	 * 帐号状态（0正常 1停用）
 	 */
+	@ApiModelProperty(value = "帐号状态（0正常 1停用）")
 	private String status;
 
 	/**
 	 * 删除标志（0代表存在 2代表删除）
 	 */
+	@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
 	@TableLogic
 	private String delFlag;
 
 	/**
 	 * 最后登录IP
 	 */
+	@ApiModelProperty(value = "最后登录IP")
 	private String loginIp;
 
 	/**
 	 * 最后登录时间
 	 */
+	@ApiModelProperty(value = "最后登录时间")
 	private Date loginDate;
 
 	/**
 	 * 备注
 	 */
+	@ApiModelProperty(value = "备注")
 	private String remark;
 
 	/**
 	 * 部门对象
 	 */
+	@ApiModelProperty(value = "部门对象")
 	@TableField(exist = false)
 	private SysDept dept;
 
 	/**
 	 * 角色对象
 	 */
+	@ApiModelProperty(value = "角色对象")
 	@TableField(exist = false)
 	private List<SysRole> roles;
 
 	/**
 	 * 角色组
 	 */
+	@ApiModelProperty(value = "角色组")
 	@TableField(exist = false)
 	private Long[] roleIds;
 
 	/**
 	 * 岗位组
 	 */
+	@ApiModelProperty(value = "岗位组")
 	@TableField(exist = false)
 	private Long[] postIds;
 
 	/**
-     * 数据权限 当前角色ID
+	 * 角色ID
 	 */
+	@ApiModelProperty(value = "角色ID")
 	@TableField(exist = false)
 	private Long roleId;
 
@@ -153,8 +172,13 @@ public class SysUser extends BaseEntity {
 		this.userId = userId;
 	}
 
+	@ApiModelProperty(value = "是否管理员")
 	public boolean isAdmin() {
-        return UserConstants.ADMIN_ID.equals(this.userId);
+		return isAdmin(this.userId);
+	}
+
+	public static boolean isAdmin(Long userId) {
+		return userId != null && 1L == userId;
 	}
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java

@@ -1,10 +1,9 @@
 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 lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotBlank;
 
 /**
  * 用户登录对象
@@ -13,30 +12,32 @@ import javax.validation.constraints.NotBlank;
  */
 
 @Data
+@Accessors(chain = true)
+@ApiModel("用户登录对象")
 public class LoginBody {
 
     /**
      * 用户名
      */
-    @NotBlank(message = "{user.username.not.blank}")
+    @ApiModelProperty(value = "用户名")
-    @Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}")
     private String username;
 
     /**
      * 用户密码
      */
-    @NotBlank(message = "{user.password.not.blank}")
+    @ApiModelProperty(value = "用户密码")
-    @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
     private String password;
 
     /**
      * 验证码
      */
+    @ApiModelProperty(value = "验证码")
     private String code;
 
     /**
      * 唯一标识
      */
-    private String uuid;
+    @ApiModelProperty(value = "唯一标识")
+    private String uuid = "";
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -1,12 +1,13 @@
 package com.ruoyi.common.core.domain.model;
 
-import com.ruoyi.common.core.domain.dto.RoleDTO;
+import com.fasterxml.jackson.annotation.JsonIgnore;
-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.io.Serializable;
+import java.util.Collection;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -17,7 +18,8 @@ import java.util.Set;
 
 @Data
 @NoArgsConstructor
-public class LoginUser implements Serializable {
+@Accessors(chain = true)
+public class LoginUser implements UserDetails {
 
     private static final long serialVersionUID = 1L;
 
@@ -31,21 +33,11 @@ public class LoginUser implements Serializable {
      */
     private Long deptId;
 
-    /**
-     * 部门名
-     */
-    private String deptName;
-
     /**
      * 用户唯一标识
      */
     private String token;
 
-    /**
-     * 用户类型
-     */
-    private String userType;
-
     /**
      * 登录时间
      */
@@ -77,14 +69,9 @@ public class LoginUser implements Serializable {
     private String os;
 
     /**
-     * 菜单权限
+     * 权限列表
      */
-    private Set<String> menuPermission;
+    private Set<String> permissions;
-
-    /**
-     * 角色权限
-     */
-    private Set<String> rolePermission;
 
     /**
      * 用户名
@@ -92,26 +79,73 @@ public class LoginUser implements Serializable {
     private String username;
 
     /**
-     * 角色对象
+     * 密码
      */
-    private List<RoleDTO> roles;
+    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;
+    }
 
     /**
-     * 数据权限 当前角色ID
+     * 账户是否未过期,过期无法验证
      */
-    private Long roleId;
+    @JsonIgnore
+    @Override
+    public boolean isAccountNonExpired() {
+        return true;
+    }
 
     /**
-     * 获取登录id
+     * 指定用户是否解锁,锁定的用户无法进行身份验证
      */
-    public String getLoginId() {
+    @JsonIgnore
-        if (userType == null) {
+    @Override
-            throw new IllegalArgumentException("用户类型不能为空");
+    public boolean isAccountNonLocked() {
-        }
+        return true;
-        if (userId == null) {
-            throw new IllegalArgumentException("用户ID不能为空");
-        }
-        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;
+    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java

@@ -1,17 +1,13 @@
 package com.ruoyi.common.core.domain.model;
 
-import lombok.Data;
+import io.swagger.annotations.ApiModel;
-import lombok.EqualsAndHashCode;
 
 /**
  * 用户注册对象
  *
  * @author Lion Li
  */
-@Data
+@ApiModel("用户注册对象")
-@EqualsAndHashCode(callSuper = true)
 public class RegisterBody extends LoginBody {
 
-    private String userType;
-
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java

@@ -1,28 +0,0 @@
-package com.ruoyi.common.core.domain.model;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * 短信登录对象
- *
- * @author Lion Li
- */
-
-@Data
-public class SmsLoginBody {
-
-    /**
-     * 用户名
-     */
-    @NotBlank(message = "{user.phonenumber.not.blank}")
-    private String phonenumber;
-
-    /**
-     * 用户密码
-     */
-    @NotBlank(message = "{sms.code.not.blank}")
-    private String smsCode;
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java

@@ -1,24 +0,0 @@
-package com.ruoyi.common.core.domain.model;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * 小程序登录用户身份权限
- *
- * @author Lion Li
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-public class XcxLoginUser extends LoginUser {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * openid
-     */
-    private String openid;
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java

@@ -1,229 +0,0 @@
-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> selectVoBatchIds(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;
-    }
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java

@@ -0,0 +1,21 @@
+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);
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java

@@ -0,0 +1,175 @@
+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);
+}
+

ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java

@@ -0,0 +1,241 @@
+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;
+	}
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java

@@ -0,0 +1,101 @@
+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();
+	}
+}
+

ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java

@@ -0,0 +1,156 @@
+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);
+	}
+
+}
+

ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java

@@ -1,9 +1,10 @@
 package com.ruoyi.common.core.page;
 
-import cn.hutool.http.HttpStatus;
+import io.swagger.annotations.ApiModel;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.List;
@@ -16,27 +17,33 @@ import java.util.List;
 
 @Data
 @NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("分页响应对象")
 public class TableDataInfo<T> implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 * 总记录数
 	 */
+	@ApiModelProperty("总记录数")
 	private long total;
 
 	/**
 	 * 列表数据
 	 */
+	@ApiModelProperty("列表数据")
 	private List<T> rows;
 
 	/**
 	 * 消息状态码
 	 */
+	@ApiModelProperty("消息状态码")
 	private int code;
 
 	/**
 	 * 消息内容
 	 */
+	@ApiModelProperty("消息内容")
 	private String msg;
 
 	/**
@@ -50,29 +57,4 @@ public class TableDataInfo<T> implements Serializable {
 		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;
-    }
-
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java

@@ -1,18 +0,0 @@
-package com.ruoyi.common.core.service;
-
-/**
- * 脱敏服务
- * 默认管理员不过滤
- * 需自行根据业务重写实现
- *
- * @author Lion Li
- * @version 3.6.0
- */
-public interface SensitiveService {
-
-    /**
-     * 是否脱敏
-     */
-    boolean isSensitive();
-
-}

ruoyi-common/src/main/java/com/ruoyi/common/core/service/TokenService.java

@@ -0,0 +1,69 @@
+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);
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java

@@ -0,0 +1,28 @@
+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);
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/enums/DataBaseType.java

@@ -1,49 +0,0 @@
-package com.ruoyi.common.enums;
-
-import com.ruoyi.common.utils.StringUtils;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 数据库类型
- *
- * @author Lion Li
- */
-@Getter
-@AllArgsConstructor
-public enum DataBaseType {
-
-    /**
-     * MySQL
-     */
-    MY_SQL("MySQL"),
-
-    /**
-     * Oracle
-     */
-    ORACLE("Oracle"),
-
-    /**
-     * PostgreSQL
-     */
-    POSTGRE_SQL("PostgreSQL"),
-
-    /**
-     * SQL Server
-     */
-    SQL_SERVER("Microsoft SQL Server");
-
-    private final String type;
-
-    public static DataBaseType find(String databaseProductName) {
-        if (StringUtils.isBlank(databaseProductName)) {
-            return null;
-        }
-        for (DataBaseType type : values()) {
-            if (type.getType().equals(databaseProductName)) {
-                return type;
-            }
-        }
-        return null;
-    }
-}

ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java

@@ -1,72 +0,0 @@
-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;
-    }
-}

ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java

@@ -0,0 +1,25 @@
+package com.ruoyi.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 数据源
+ *
+ * @author Lion Li
+ */
+@AllArgsConstructor
+public enum DataSourceType {
+    /**
+     * 主库
+     */
+    MASTER("master"),
+
+    /**
+     * 从库
+     */
+    SLAVE("slave");
+
+    @Getter
+    private final String source;
+}

ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java

@@ -1,32 +0,0 @@
-package com.ruoyi.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 设备类型
- * 针对一套 用户体系
- *
- * @author Lion Li
- */
-@Getter
-@AllArgsConstructor
-public enum DeviceType {
-
-    /**
-     * pc端
-     */
-    PC("pc"),
-
-    /**
-     * app端
-     */
-    APP("app"),
-
-    /**
-     * 小程序端
-     */
-    XCX("xcx");
-
-    private final String device;
-}

ruoyi-common/src/main/java/com/ruoyi/common/enums/LoginType.java

@@ -1,39 +0,0 @@
-package com.ruoyi.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 登录类型
- *
- * @author Lion Li
- */
-@Getter
-@AllArgsConstructor
-public enum LoginType {
-
-    /**
-     * 密码登录
-     */
-    PASSWORD("user.password.retry.limit.exceed", "user.password.retry.limit.count"),
-
-    /**
-     * 短信登录
-     */
-    SMS("sms.code.retry.limit.exceed", "sms.code.retry.limit.count"),
-
-    /**
-     * 小程序登录
-     */
-    XCX("", "");
-
-    /**
-     * 登录重试超出限制提示
-     */
-    final String retryLimitExceed;
-
-    /**
-     * 登录重试限制计数提示
-     */
-    final String retryLimitCount;
-}

ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java

@@ -1,49 +0,0 @@
-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;
-    }
-}

ruoyi-common/src/main/java/com/ruoyi/common/enums/ThreadPoolRejectedPolicy.java

@@ -0,0 +1,26 @@
+package com.ruoyi.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * 线程池 拒绝策略 泛型
+ *
+ * @author Lion Li
+ */
+@Getter
+@AllArgsConstructor
+public enum ThreadPoolRejectedPolicy {
+
+    CALLER_RUNS_POLICY("调用方执行", ThreadPoolExecutor.CallerRunsPolicy.class),
+    DISCARD_OLDEST_POLICY("放弃最旧的", ThreadPoolExecutor.DiscardOldestPolicy.class),
+    DISCARD_POLICY("丢弃", ThreadPoolExecutor.DiscardPolicy.class),
+    ABORT_POLICY("中止", ThreadPoolExecutor.AbortPolicy.class);
+
+    private final String name;
+    private final Class<? extends RejectedExecutionHandler> clazz;
+
+}

ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java

@@ -1,37 +0,0 @@
-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);
-    }
-}

ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java

@@ -1,114 +0,0 @@
-package com.ruoyi.common.excel;
-
-import com.alibaba.excel.metadata.Head;
-import com.alibaba.excel.write.merge.AbstractMergeStrategy;
-import com.ruoyi.common.annotation.CellMerge;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 列值重复合并策略
- *
- * @author Lion Li
- */
-@AllArgsConstructor
-@Slf4j
-public class CellMergeStrategy extends AbstractMergeStrategy {
-
-	private List<?> list;
-	private boolean hasTitle;
-
-	@Override
-	protected void merge(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) {
-		List<CellRangeAddress> cellList = handle(list, hasTitle);
-		// judge the list is not null
-		if (CollectionUtils.isNotEmpty(cellList)) {
-			// the judge is necessary
-			if (cell.getRowIndex() == 1 && cell.getColumnIndex() == 0) {
-				for (CellRangeAddress item : cellList) {
-					sheet.addMergedRegion(item);
-				}
-			}
-		}
-	}
-
-	@SneakyThrows
-	private static List<CellRangeAddress> handle(List<?> list, boolean hasTitle) {
-		List<CellRangeAddress> cellList = new ArrayList<>();
-		if (CollectionUtils.isEmpty(list)) {
-			return cellList;
-		}
-		Class<?> clazz = list.get(0).getClass();
-		Field[] fields = clazz.getDeclaredFields();
-		// 有注解的字段
-		List<Field> mergeFields = new ArrayList<>();
-		List<Integer> mergeFieldsIndex = new ArrayList<>();
-		for (int i = 0; i < fields.length; i++) {
-			Field field = fields[i];
-			if (field.isAnnotationPresent(CellMerge.class)) {
-				CellMerge cm = field.getAnnotation(CellMerge.class);
-				mergeFields.add(field);
-				mergeFieldsIndex.add(cm.index() == -1 ? i : cm.index());
-			}
-		}
-		// 行合并开始下标
-		int rowIndex = hasTitle ? 1 : 0;
-		Map<Field, RepeatCell> map = new HashMap<>();
-		// 生成两两合并单元格
-		for (int i = 0; i < list.size(); i++) {
-			for (int j = 0; j < mergeFields.size(); j++) {
-				Field field = mergeFields.get(j);
-				String name = field.getName();
-				String methodName = "get" + name.substring(0, 1).toUpperCase() + name.substring(1);
-				Method readMethod = clazz.getMethod(methodName);
-				Object val = readMethod.invoke(list.get(i));
-
-				int colNum = mergeFieldsIndex.get(j);
-				if (!map.containsKey(field)) {
-					map.put(field, new RepeatCell(val, i));
-				} else {
-					RepeatCell repeatCell = map.get(field);
-					Object cellValue = repeatCell.getValue();
-					if (cellValue == null || "".equals(cellValue)) {
-						// 空值跳过不合并
-						continue;
-					}
-					if (cellValue != val) {
-						if (i - repeatCell.getCurrent() > 1) {
-							cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex - 1, colNum, colNum));
-						}
-						map.put(field, new RepeatCell(val, i));
-					} else if (i == list.size() - 1) {
-						if (i > repeatCell.getCurrent()) {
-							cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex, colNum, colNum));
-						}
-					}
-				}
-			}
-		}
-		return cellList;
-	}
-
-	@Data
-	@AllArgsConstructor
-	static class RepeatCell {
-
-		private Object value;
-
-		private int current;
-
-	}
-}

ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java

@@ -5,8 +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.ruoyi.common.utils.JsonUtils;
+import com.alibaba.fastjson.JSON;
-import com.ruoyi.common.utils.StreamUtils;
 import com.ruoyi.common.utils.ValidatorUtils;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -15,6 +14,7 @@ import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Excel 导入监听
@@ -69,7 +69,9 @@ public class DefaultExcelListener<T> extends AnalysisEventListener<T> implements
         if (exception instanceof ConstraintViolationException) {
             ConstraintViolationException constraintViolationException = (ConstraintViolationException) exception;
             Set<ConstraintViolation<?>> constraintViolations = constraintViolationException.getConstraintViolations();
-            String constraintViolationsMsg = StreamUtils.join(constraintViolations, ConstraintViolation::getMessage, ", ");
+            String constraintViolationsMsg = constraintViolations.stream()
+                .map(ConstraintViolation::getMessage)
+                .collect(Collectors.joining(", "));
             errMsg = StrUtil.format("第{}行数据校验异常: {}", context.readRowHolder().getRowIndex() + 1, constraintViolationsMsg);
             if (log.isDebugEnabled()) {
                 log.error(errMsg);
@@ -82,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("解析到一条表头数据: {}", JsonUtils.toJsonString(headMap));
+        log.debug("解析到一条表头数据: {}", JSON.toJSONString(headMap));
     }
 
     @Override

ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java

@@ -2,9 +2,7 @@ package com.ruoyi.common.exception.base;
 
 import com.ruoyi.common.utils.MessageUtils;
 import com.ruoyi.common.utils.StringUtils;
-import lombok.Data;
+import lombok.*;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 /**
  * 基础异常

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");
+        super("user.jcaptcha.error", null);
     }
 }

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");
+        super("user.jcaptcha.expire", null);
     }
 }