Merge remote-tracking branch 'origin/dev'

# Conflicts: # ruoyi-ui/package.json
发布 v3.5.0-release 正式版
2025-09-24 07:19:46 +08:00 · 2021-12-28 10:37:00 +08:00 · 2021-12-28 10:35:52 +08:00 · 2021-12-27 11:43:59 +08:00 · 2021-12-27 11:06:12 +08:00 · 2021-12-27 09:30:12 +08:00
813 changed files with 92260 additions and 50673 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,18 @@
 # http://editorconfig.org
 root = true
 # 空格替代Tab缩进在各种编辑工具下效果一致
 [*]
 indent_style = space
 indent_size = 4
 charset = utf-8
 end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
 [*.{json,yml}]
 indent_size = 2
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false
--- a/.gitignore
+++ b/.gitignore
@ -1,44 +1,43 @@
-######################################################################
+######################################################################
-# Build Tools
+# Build Tools
-
+
-.gradle
+.gradle
-/build/
+/build/
-!gradle/wrapper/gradle-wrapper.jar
+!gradle/wrapper/gradle-wrapper.jar
-
+
-target/
+target/
-!.mvn/wrapper/maven-wrapper.jar
+!.mvn/wrapper/maven-wrapper.jar
-
+
-######################################################################
+######################################################################
-# IDE
+# IDE
-
+
-### STS ###
+### STS ###
-.apt_generated
+.apt_generated
-.classpath
+.classpath
-.factorypath
+.factorypath
-.project
+.project
-.settings
+.settings
-.springBeans
+.springBeans
-
+
-### IntelliJ IDEA ###
+### IntelliJ IDEA ###
-.idea
+.idea
-*.iws
+*.iws
-*.iml
+*.iml
-*.ipr
+*.ipr
-
+
-### NetBeans ###
+### NetBeans ###
-nbproject/private/
+nbproject/private/
-build/*
+build/*
-nbbuild/
+nbbuild/
-dist/
+nbdist/
-nbdist/
+.nb-gradle/
-.nb-gradle/
+
-
+######################################################################
-######################################################################
+# Others
-# Others
+*.log
-*.log
+*.xml.versionsBackup
-*.xml.versionsBackup
+*.swp
-*.swp
+
-
+!*/build/*.java
-!*/build/*.java
+!*/build/*.html
-!*/build/*.html
+!*/build/*.xml
 !*/build/*.xml
--- a/4
+++ b/4
@ -1,6 +1,6 @@
 The MIT License (MIT)
-Copyright (c) 2018 RuoYi
+Copyright (c) 2019 RuoYi-Vue-Plus
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@ -17,4 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/README.md
+++ b/README.md
@ -1,85 +1,153 @@
 ## 平台简介
 [![码云Gitee](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/badge/star.svg?theme=blue)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
 [![GitHub](https://img.shields.io/github/stars/JavaLionLi/RuoYi-Vue-Plus.svg?style=social&label=Stars)](https://github.com/JavaLionLi/RuoYi-Vue-Plus)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE)
 [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
 <br>
 [![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.5.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
 [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.5-blue.svg)]()
 [![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]()
 [![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()
-若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
+> RuoYi-Vue-Plus 是重写 RuoYi-Vue 针对 `分布式集群` 场景全方位升级(不兼容原框架)
-* 前端采用Vue、Element UI。
+> 系统演示: [传送门](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/系统演示?sort_id=4836388)
 * 后端采用Spring Boot、Spring Security、Redis & Jwt。
 * 权限认证使用Jwt，支持多终端认证系统。
 * 支持加载动态权限菜单，多方式轻松权限控制。
 * 高效率开发，使用代码生成器可以一键生成前后端代码。
 * 提供了单应用版本[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast)，Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。
 * 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
 * 特别鸣谢：[element](https://github.com/ElemeFE/element)，[vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)，[eladmin-web](https://github.com/elunez/eladmin-web)。
 * 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp;
 * 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)&nbsp;&nbsp;
-## 内置功能
+| 功能介绍 | 使用技术 | 文档地址 | 特性注意事项 |
 |---|---|---|---|
 | 当前框架 | RuoYi-Vue-Plus | [RuoYi-Vue-Plus文档](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages) | 重写RuoYi-Vue全方位升级(不兼容原框架) |
 | satoken分支 | RuoYi-Vue-Plus-satoken | [satoken分支地址](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/satoken/) | 高可读性 扩展性(推荐使用) |
 | 单体分支 | 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 的高性能容器 |
 | 权限认证框架 | Spring Security、Jwt | [SpringSecurity官网](https://spring.io/projects/spring-security#learn) | 支持多终端认证系统 |
 | 权限认证框架 | Sa-Token、Jwt | [Sa-Token官网](https://sa-token.dev33.cn/) | 强解耦、强扩展 |
 | 关系数据库 | MySQL | [MySQL官网](https://dev.mysql.com/) | 适配 8.X 最低 5.7 |
 | 缓存数据库 | Redis | [Redis官网](https://redis.io/) | 适配 6.X 最低 4.X |
 | 数据库框架 | Mybatis-Plus | [Mybatis-Plus文档](https://baomidou.com/guide/) | 快速 CRUD 增加开发效率 |
 | 数据库框架 | p6spy | [p6spy官网](https://p6spy.readthedocs.io/) | 更强劲的 SQL 分析 |
 | 多数据源框架 | dynamic-datasource | [dynamic-ds文档](https://www.kancloud.cn/tracy5546/dynamic-datasource/content) | 支持主从与多种类数据库异构 |
 | 序列化框架 | Jackson | [Jackson官网](https://github.com/FasterXML/jackson) | 统一使用 jackson 高效可靠 |
 | Redis客户端 | Redisson | [Redisson文档](https://github.com/redisson/redisson/wiki/%E7%9B%AE%E5%BD%95) | 支持单机、集群配置 |
 | 分布式限流 | Redisson | [Redisson文档](https://github.com/redisson/redisson/wiki/%E7%9B%AE%E5%BD%95) | 全局、请求IP、集群ID 多种限流 |
 | 分布式锁 | Lock4j | [Lock4j官网](https://gitee.com/baomidou/lock4j) | 注解锁、工具锁 多种多样 |
 | 分布式幂等 | Redisson | [Lock4j文档](https://gitee.com/baomidou/lock4j) | 拦截重复提交 |
 | 分布式日志 | TLog | [TLog文档](https://yomahub.com/tlog/docs) | 支持跟踪链路日志记录、性能分析、链路排查 |
 | 分布式任务调度 | Xxl-Job | [Xxl-Job官网](https://www.xuxueli.com/xxl-job/) | 高性能 高可靠 易扩展 |
 | 文件存储 | Minio | [Minio文档](https://docs.min.io/) | 本地存储 |
 | 文件存储 | 七牛、阿里、腾讯 | [OSS使用文档](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4359146&doc_id=1469725) | 云存储 |
 | 监控框架 | SpringBoot-Admin | [SpringBoot-Admin文档](https://codecentric.github.io/spring-boot-admin/current/) | 全方位服务监控 |
 | 校验框架 | Validation | [Validation文档](https://docs.jboss.org/hibernate/stable/validator/reference/en-US/html_single/) | 增强接口安全性、严谨性 支持国际化 |
 | Excel框架 | Alibaba EasyExcel | [EasyExcel文档](https://www.yuque.com/easyexcel/doc/easyexcel) | 性能优异 扩展性强 |
 | 文档框架 | Knife4j | [Knife4j文档](https://doc.xiaominfo.com/knife4j/documentation/) | 美化接口文档 |
 | 工具类框架 | Hutool、Lombok | [Hutool文档](https://www.hutool.cn/docs/) | 减少代码冗余 增加安全性 |
 | 代码生成器 | 适配MP、Knife4j规范化代码 | [Hutool文档](https://www.hutool.cn/docs/) | 一键生成前后端代码 |
 | 部署方式 | Docker | [Docker文档](https://docs.docker.com/) | 容器编排 一键部署业务集群 |
 | 国际化 | SpringMessage | [SpringMVC文档](https://docs.spring.io/spring-framework/docs/current/reference/html/web.html#mvc) | Spring标准国际化方案 |
-1.  用户管理：用户是系统操作者，该功能主要完成系统用户配置。
+## 参考文档
 2.  部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。
 3.  岗位管理：配置系统用户所属担任职务。
 4.  菜单管理：配置系统菜单，操作权限，按钮权限标识等。
 5.  角色管理：角色菜单权限分配、设置角色按机构进行数据范围权限划分。
 6.  字典管理：对系统中经常使用的一些较为固定的数据进行维护。
 7.  参数管理：对系统动态配置常用参数。
 8.  通知公告：系统通知公告信息发布维护。
 9.  操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。
 10. 登录日志：系统登录日志记录查询包含登录异常。
 11. 在线用户：当前系统中活跃用户状态监控。
 12. 定时任务：在线（添加、修改、删除)任务调度包含执行结果日志。
 13. 代码生成：前后端代码的生成（java、html、xml、sql）支持CRUD下载 。
 14. 系统接口：根据业务代码自动生成相关的api接口文档。
 15. 服务监控：监视当前系统CPU、内存、磁盘、堆栈等相关信息。
 16. 缓存监控：对系统的缓存信息查询，命令统计等。
 17. 在线构建器：拖动表单元素生成相应的HTML代码。
 18. 连接池监视：监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。
-## 在线体验
+使用框架前请仔细阅读文档重点注意事项
 <br>
 >[初始化项目 必看](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/关于初始化项目?sort_id=4164117)
 > 
 >[部署项目 必看](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/关于应用部署?sort_id=4219382)
 > 
 >[参考文档 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)
- admin/admin123  
+## 软件架构图
 - 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。
-演示地址：http://vue.ruoyi.vip  
+![Plus部署架构图](https://images.gitee.com/uploads/images/2021/1112/202137_673ac5d2_1766278.png "Plus部署架构图.png")
-文档地址：http://doc.ruoyi.vip
+## 贡献代码
-## 演示图
+欢迎各路英雄豪杰 `PR` 代码 请提交到 `dev` 开发分支 统一测试发版
-<table>
+框架定位为 `通用后台管理系统(分布式集群强化)` 原则上不接受业务 `PR`
-    <tr>
+
-        <td><img src="https://oscimg.oschina.net/oscnet/cd1f90be5f2684f4560c9519c0f2a232ee8.jpg"/></td>
+### 其他
-        <td><img src="https://oscimg.oschina.net/oscnet/1cbcf0e6f257c7d3a063c0e3f2ff989e4b3.jpg"/></td>
+
-    </tr>
+* 同步升级 RuoYi-Vue
-    <tr>
+* GitHub 地址 [RuoYi-Vue-Plus-github](https://github.com/JavaLionLi/RuoYi-Vue-Plus)
-        <td><img src="https://oscimg.oschina.net/oscnet/up-8074972883b5ba0622e13246738ebba237a.png"/></td>
+* 单模块 fast 分支 [RuoYi-Vue-Plus-fast](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/fast/)
-        <td><img src="https://oscimg.oschina.net/oscnet/up-9f88719cdfca9af2e58b352a20e23d43b12.png"/></td>
+* satoken 分支 [RuoYi-Vue-Plus-satoken](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/satoken/)
-    </tr>
+* 用户扩展项目 [扩展项目列表](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4478302&doc_id=1469725)
-    <tr>
+
-        <td><img src="https://oscimg.oschina.net/oscnet/up-39bf2584ec3a529b0d5a3b70d15c9b37646.png"/></td>
+## 加群与捐献
-        <td><img src="https://oscimg.oschina.net/oscnet/up-936ec82d1f4872e1bc980927654b6007307.png"/></td>
+>[加群与捐献](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/加群与捐献?sort_id=4104598)
-    </tr>
+>>[https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/加群与捐献?sort_id=4104598](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/加群与捐献?sort_id=4104598)
-	<tr>
+
-        <td><img src="https://oscimg.oschina.net/oscnet/up-b2d62ceb95d2dd9b3fbe157bb70d26001e9.png"/></td>
+## 捐献作者
-        <td><img src="https://oscimg.oschina.net/oscnet/up-d67451d308b7a79ad6819723396f7c3d77a.png"/></td>
+作者为兼职做开源,平时还需要工作,如果帮到了您可以请作者吃个盒饭  
-    </tr>	 
+<img src="https://images.gitee.com/uploads/images/2021/0525/101654_451e4523_1766278.jpeg" width="300px" height="450px" />
-    <tr>
+<img src="https://images.gitee.com/uploads/images/2021/0525/101713_3d18b119_1766278.jpeg" width="300px" height="450px" />
-        <td><img src="https://oscimg.oschina.net/oscnet/5e8c387724954459291aafd5eb52b456f53.jpg"/></td>
+
-        <td><img src="https://oscimg.oschina.net/oscnet/644e78da53c2e92a95dfda4f76e6d117c4b.jpg"/></td>
+## 业务功能
-    </tr>
+
-	<tr>
+| 功能 | 介绍 |
-        <td><img src="https://oscimg.oschina.net/oscnet/up-8370a0d02977eebf6dbf854c8450293c937.png"/></td>
+|---|---|
-        <td><img src="https://oscimg.oschina.net/oscnet/up-49003ed83f60f633e7153609a53a2b644f7.png"/></td>
+| 用户管理 | 用户是系统操作者，该功能主要完成系统用户配置。 |
-    </tr>
+| 部门管理 | 配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。 |
-	<tr>
+| 岗位管理 | 配置系统用户所属担任职务。 |
-        <td><img src="https://oscimg.oschina.net/oscnet/up-d4fe726319ece268d4746602c39cffc0621.png"/></td>
+| 菜单管理 | 配置系统菜单，操作权限，按钮权限标识等。 |
-        <td><img src="https://oscimg.oschina.net/oscnet/up-c195234bbcd30be6927f037a6755e6ab69c.png"/></td>
+| 角色管理 | 角色菜单权限分配、设置角色按机构进行数据范围权限划分。 |
-    </tr>
+| 字典管理 | 对系统中经常使用的一些较为固定的数据进行维护。 |
-    <tr>
+| 参数管理 | 对系统动态配置常用参数。 |
-        <td><img src="https://oscimg.oschina.net/oscnet/b6115bc8c31de52951982e509930b20684a.jpg"/></td>
+| 通知公告 | 系统通知公告信息发布维护。 |
-        <td><img src="https://oscimg.oschina.net/oscnet/up-5e4daac0bb59612c5038448acbcef235e3a.png"/></td>
+| 操作日志 | 系统正常操作日志记录和查询；系统异常信息日志记录和查询。 |
-    </tr>
+| 登录日志 | 系统登录日志记录查询包含登录异常。 |
 | 文件管理 | 系统文件上传、下载等管理。 |
 | 定时任务 | 在线（添加、修改、删除)任务调度包含执行结果日志。 |
 | 代码生成 | 前后端代码的生成（java、html、xml、sql）支持CRUD下载 。 |
 | 系统接口 | 根据业务代码自动生成相关的api接口文档。 |
 | 服务监控 | 监视集群系统CPU、内存、磁盘、堆栈、在线日志、Spring相关配置等。 |
 | 缓存监控 | 对系统的缓存信息查询，命令统计等。 |
 | 在线构建器 | 拖动表单元素生成相应的HTML代码。 |
 | 连接池监视 | 监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。 |
 | 使用案例 | 系统的一些功能案例 |
 ## 演示图例
 <table border="1" cellpadding="1" cellspacing="1" style="width:500px">
 	<tbody>
 		<tr>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-972235bcbe3518dedd351ff0e2ee7d1031c.png" width="1920" /></td>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-5e0097702fa91e2e36391de8127676a7fa1.png" width="1920" /></td>
 		</tr>
 		<tr>
 			<td>
 			<p><img src="https://oscimg.oschina.net/oscnet/up-e56e3828f48cd9886d88731766f06d5f3c1.png" width="1920" /></p>
 			</td>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-0715990ea1a9f254ec2138fcd063c1f556a.png" width="1920" /></td>
 		</tr>
 		<tr>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-eaf5417ccf921bb64abb959e3d8e290467f.png" width="1920" /></td>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-fc285cf33095ebf8318de6999af0f473861.png" width="1920" /></td>
 		</tr>
 		<tr>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-60c83fd8bd61c29df6dbf47c88355e9c272.png" width="1920" /></td>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-7f731948c8b73c7d90f67f9e1c7a534d5c3.png" width="1920" /></td>
 		</tr>
 		<tr>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-e4de89b5e2d20c52d3c3a47f9eb88eb8526.png" width="1920" /></td>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-8791d823a508eb90e67c604f36f57491a67.png" width="1920" /></td>
 		</tr>
 		<tr>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-4589afd99982ead331785299b894174feb6.png" width="1920" /></td>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-8ea177cdacaea20995daf2f596b15232561.png" width="1920" /></td>
 		</tr>
 		<tr>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-32d1d04c55c11f74c9129fbbc58399728c4.png" width="1920" /></td>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-04fa118f7631b7ae6fd72299ca0a1430a63.png" width="1920" /></td>
 		</tr>
 		<tr>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-fe7e85b65827802bfaadf3acd42568b58c7.png" width="1920" /></td>
 			<td><img src="https://oscimg.oschina.net/oscnet/up-eff2b02a54f8188022d8498cfe6af6fcc06.png" width="1920" /></td>
 		</tr>
 	</tbody>
 </table>
 ## 若依前后端分离交流群
 QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) 点击按钮入群。
--- a/bin/clean.bat
+++ b/bin/clean.bat
@ -1,12 +0,0 @@
@echo off
 echo.
 echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><C2B7><EFBFBD><EFBFBD>
 echo.
 %~d0
 cd %~dp0
 cd ..
 call mvn clean
 pause
--- a/bin/package.bat
+++ b/bin/package.bat
@ -1,12 +0,0 @@
@echo off
 echo.
 echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD>Web<65><62><EFBFBD>̣<EFBFBD><CCA3><EFBFBD><EFBFBD><EFBFBD>war/jar<61><72><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>
 echo.
 %~d0
 cd %~dp0
 cd ..
 call mvn clean package -Dmaven.test.skip=true
 pause
--- a/bin/run.bat
+++ b/bin/run.bat
@ -1,14 +0,0 @@
@echo off
 echo.
 echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD>Web<65><62><EFBFBD>̡<EFBFBD>
 echo.
 cd %~dp0
 cd ../ruoyi-admin/target
 set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
 java -jar %JAVA_OPTS% ruoyi-admin.jar
 cd bin
 pause
--- a/doc/若依环境使用手册.docx
+++ b/doc/若依环境使用手册.docx
--- a/pom.xml
+++ b/pom.xml
@ -1,277 +1,389 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+	<modelVersion>4.0.0</modelVersion>
-	
+
-    <groupId>com.ruoyi</groupId>
+    <groupId>com.ruoyi</groupId>
-    <artifactId>ruoyi</artifactId>
+    <artifactId>ruoyi-vue-plus</artifactId>
-    <version>3.4.0</version>
+    <version>3.5.0</version>
-
+
-    <name>ruoyi</name>
+    <name>RuoYi-Vue-Plus</name>
-    <url>http://www.ruoyi.vip</url>
+    <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
-    <description>若依管理系统</description>
+    <description>RuoYi-Vue-Plus后台管理系统</description>
-    
+
-    <properties>
+    <properties>
-        <ruoyi.version>3.4.0</ruoyi.version>
+        <ruoyi-vue-plus.version>3.5.0</ruoyi-vue-plus.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <spring-boot.version>2.5.8</spring-boot.version>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+        <java.version>1.8</java.version>
-        <druid.version>1.2.4</druid.version>
+        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
-        <bitwalker.version>1.21</bitwalker.version>
+        <druid.version>1.2.8</druid.version>
-        <swagger.version>2.9.2</swagger.version>
+        <knife4j.version>3.0.3</knife4j.version>
-		<kaptcha.version>2.3.2</kaptcha.version>
+        <swagger-annotations.version>1.5.22</swagger-annotations.version>
-		<mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
+        <poi.version>4.1.2</poi.version>
-        <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
+        <easyexcel.version>2.2.11</easyexcel.version>
-        <fastjson.version>1.2.75</fastjson.version>
+        <cglib.version>3.3.0</cglib.version>
-        <oshi.version>5.6.0</oshi.version>
+        <velocity.version>2.3</velocity.version>
-        <jna.version>5.7.0</jna.version>
+        <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
-        <commons.io.version>2.5</commons.io.version>
+        <p6spy.version>3.9.1</p6spy.version>
-        <commons.fileupload.version>1.3.3</commons.fileupload.version>
+        <hutool.version>5.7.18</hutool.version>
-        <commons.collections.version>3.2.2</commons.collections.version>
+        <okhttp.version>4.9.2</okhttp.version>
-        <poi.version>4.1.2</poi.version>
+        <spring-boot-admin.version>2.5.5</spring-boot-admin.version>
-        <velocity.version>1.7</velocity.version>
+        <redisson.version>3.16.7</redisson.version>
-        <jwt.version>0.9.1</jwt.version>
+        <lock4j.version>2.2.1</lock4j.version>
-    </properties>
+        <dynamic-ds.version>3.5.0</dynamic-ds.version>
-	
+        <tlog.version>1.3.6</tlog.version>
-    <!-- 依赖声明 -->
+        <xxl-job.version>2.3.0</xxl-job.version>
-    <dependencyManagement>
+
-        <dependencies>
+        <!-- jdk11 缺失依赖 jaxb-->
-
+        <jaxb.version>3.0.1</jaxb.version>
-            <!-- SpringBoot的依赖配置-->
+
-            <dependency>
+        <!-- OSS 配置 -->
-                <groupId>org.springframework.boot</groupId>
+        <qiniu.version>7.9.0</qiniu.version>
-                <artifactId>spring-boot-dependencies</artifactId>
+        <aliyun.oss.version>3.13.1</aliyun.oss.version>
-                <version>2.2.13.RELEASE</version>
+        <qcloud.cos.version>5.6.58</qcloud.cos.version>
-                <type>pom</type>
+        <minio.version>8.3.4</minio.version>
-                <scope>import</scope>
+
-            </dependency>
+        <!-- docker 配置 -->
-
+        <docker.registry.url>localhost</docker.registry.url>
-            <!--阿里数据库连接池 -->
+        <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
-            <dependency>
+        <docker.namespace>ruoyi</docker.namespace>
-                <groupId>com.alibaba</groupId>
+        <docker.plugin.version>1.2.2</docker.plugin.version>
-                <artifactId>druid-spring-boot-starter</artifactId>
+
-                <version>${druid.version}</version>
+    </properties>
-            </dependency>
+
-
+    <!-- 依赖声明 -->
-            <!-- 解析客户端操作系统、浏览器等 -->
+    <dependencyManagement>
-            <dependency>
+        <dependencies>
-                <groupId>eu.bitwalker</groupId>
+
-                <artifactId>UserAgentUtils</artifactId>
+            <!-- SpringBoot的依赖配置-->
-                <version>${bitwalker.version}</version>
+            <dependency>
-            </dependency>
+                <groupId>org.springframework.boot</groupId>
-
+                <artifactId>spring-boot-dependencies</artifactId>
-            <!-- SpringBoot集成mybatis框架 -->
+                <version>${spring-boot.version}</version>
-            <dependency>
+                <type>pom</type>
-                <groupId>org.mybatis.spring.boot</groupId>
+                <scope>import</scope>
-                <artifactId>mybatis-spring-boot-starter</artifactId>
+            </dependency>
-                <version>${mybatis-spring-boot.version}</version>
+
-            </dependency>
+            <!-- 阿里数据库连接池 -->
-
+            <dependency>
-            <!-- pagehelper 分页插件 -->
+                <groupId>com.alibaba</groupId>
-            <dependency>
+                <artifactId>druid-spring-boot-starter</artifactId>
-                <groupId>com.github.pagehelper</groupId>
+                <version>${druid.version}</version>
-                <artifactId>pagehelper-spring-boot-starter</artifactId>
+            </dependency>
-                <version>${pagehelper.boot.version}</version>
+
-            </dependency>
+            <dependency>
-
+                <groupId>com.github.xiaoymin</groupId>
-            <!-- 获取系统信息 -->
+                <artifactId>knife4j-spring-boot-starter</artifactId>
-            <dependency>
+                <version>${knife4j.version}</version>
-                <groupId>com.github.oshi</groupId>
+                <exclusions>
-                <artifactId>oshi-core</artifactId>
+                    <exclusion>
-                <version>${oshi.version}</version>
+                        <artifactId>swagger-annotations</artifactId>
-            </dependency>
+                        <groupId>io.swagger</groupId>
-
+                    </exclusion>
-            <dependency>
+                </exclusions>
-                <groupId>net.java.dev.jna</groupId>
+            </dependency>
-                <artifactId>jna</artifactId>
+
-                <version>${jna.version}</version>
+            <dependency>
-            </dependency>
+                <groupId>io.swagger</groupId>
-
+                <artifactId>swagger-annotations</artifactId>
-            <dependency>
+                <version>${swagger-annotations.version}</version>
-                <groupId>net.java.dev.jna</groupId>
+            </dependency>
-                <artifactId>jna-platform</artifactId>
+
-                <version>${jna.version}</version>
+            <!-- excel工具 -->
-            </dependency>
+            <dependency>
-
+                <groupId>org.apache.poi</groupId>
-            <!-- swagger2-->
+                <artifactId>poi-ooxml</artifactId>
-            <dependency>
+                <version>${poi.version}</version>
-                <groupId>io.springfox</groupId>
+            </dependency>
-                <artifactId>springfox-swagger2</artifactId>
+
-                <version>${swagger.version}</version>
+            <dependency>
-                <exclusions>
+                <groupId>com.alibaba</groupId>
-                    <exclusion>
+                <artifactId>easyexcel</artifactId>
-                        <groupId>io.swagger</groupId>
+                <version>${easyexcel.version}</version>
-                        <artifactId>swagger-annotations</artifactId>
+                <exclusions>
-                    </exclusion>
+                    <exclusion>
-                    <exclusion>
+                        <groupId>org.apache.poi</groupId>
-                        <groupId>io.swagger</groupId>
+                        <artifactId>poi</artifactId>
-                        <artifactId>swagger-models</artifactId>
+                    </exclusion>
-                    </exclusion>
+                    <exclusion>
-                </exclusions>
+                        <groupId>org.apache.poi</groupId>
-            </dependency>
+                        <artifactId>poi-ooxml-schemas</artifactId>
-
+                    </exclusion>
-            <!-- swagger2-UI-->
+                </exclusions>
-            <dependency>
+            </dependency>
-                <groupId>io.springfox</groupId>
+
-                <artifactId>springfox-swagger-ui</artifactId>
+            <dependency>
-                <version>${swagger.version}</version>
+                <groupId>cglib</groupId>
-            </dependency>
+                <artifactId>cglib</artifactId>
-
+                <version>${cglib.version}</version>
-            <!--io常用工具类 -->
+            </dependency>
-            <dependency>
+
-                <groupId>commons-io</groupId>
+            <!-- velocity代码生成使用模板 -->
-                <artifactId>commons-io</artifactId>
+            <dependency>
-                <version>${commons.io.version}</version>
+                <groupId>org.apache.velocity</groupId>
-            </dependency>
+                <artifactId>velocity-engine-core</artifactId>
-
+                <version>${velocity.version}</version>
-            <!--文件上传工具类 -->
+            </dependency>
-            <dependency>
+
-                <groupId>commons-fileupload</groupId>
+            <!-- jdk11 缺失依赖 jaxb-->
-                <artifactId>commons-fileupload</artifactId>
+            <dependency>
-                <version>${commons.fileupload.version}</version>
+                <groupId>com.sun.xml.bind</groupId>
-            </dependency>
+                <artifactId>jaxb-impl</artifactId>
-
+                <version>${jaxb.version}</version>
-            <!-- excel工具 -->
+            </dependency>
-            <dependency>
+
-                <groupId>org.apache.poi</groupId>
+            <!-- dynamic-datasource 多数据源-->
-                <artifactId>poi-ooxml</artifactId>
+            <dependency>
-                <version>${poi.version}</version>
+                <groupId>com.baomidou</groupId>
-            </dependency>
+                <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-
+                <version>${dynamic-ds.version}</version>
-            <!--velocity代码生成使用模板 -->
+            </dependency>
-            <dependency>
+
-                <groupId>org.apache.velocity</groupId>
+            <dependency>
-                <artifactId>velocity</artifactId>
+                <groupId>com.baomidou</groupId>
-                <version>${velocity.version}</version>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
-                <exclusions>
+                <version>${mybatis-plus.version}</version>
-                    <exclusion>
+            </dependency>
-                        <groupId>commons-collections</groupId>
+            <dependency>
-                        <artifactId>commons-collections</artifactId>
+                <groupId>com.baomidou</groupId>
-                    </exclusion>
+                <artifactId>mybatis-plus-extension</artifactId>
-                </exclusions>
+                <version>${mybatis-plus.version}</version>
-            </dependency>
+            </dependency>
-
+            <!-- sql性能分析插件 -->
-            <!-- collections工具类 -->
+            <dependency>
-            <dependency>
+                <groupId>p6spy</groupId>
-                <groupId>commons-collections</groupId>
+                <artifactId>p6spy</artifactId>
-                <artifactId>commons-collections</artifactId>
+                <version>${p6spy.version}</version>
-                <version>${commons.collections.version}</version>
+            </dependency>
-            </dependency>
+
-
+            <dependency>
-            <!-- 阿里JSON解析器 -->
+                <groupId>cn.hutool</groupId>
-            <dependency>
+                <artifactId>hutool-core</artifactId>
-                <groupId>com.alibaba</groupId>
+                <version>${hutool.version}</version>
-                <artifactId>fastjson</artifactId>
+            </dependency>
-                <version>${fastjson.version}</version>
+
-            </dependency>
+            <dependency>
-
+                <groupId>cn.hutool</groupId>
-            <!--Token生成与解析-->
+                <artifactId>hutool-http</artifactId>
-            <dependency>
+                <version>${hutool.version}</version>
-                <groupId>io.jsonwebtoken</groupId>
+            </dependency>
-                <artifactId>jjwt</artifactId>
+
-                <version>${jwt.version}</version>
+            <dependency>
-            </dependency>
+                <groupId>cn.hutool</groupId>
-
+                <artifactId>hutool-captcha</artifactId>
-            <!--验证码 -->
+                <version>${hutool.version}</version>
-            <dependency>
+            </dependency>
-                <groupId>com.github.penggle</groupId>
+
-                <artifactId>kaptcha</artifactId>
+            <dependency>
-                <version>${kaptcha.version}</version>
+                <groupId>cn.hutool</groupId>
-            </dependency>
+                <artifactId>hutool-extra</artifactId>
-
+                <version>${hutool.version}</version>
-            <!-- 定时任务-->
+            </dependency>
-            <dependency>
+
-                <groupId>com.ruoyi</groupId>
+            <dependency>
-                <artifactId>ruoyi-quartz</artifactId>
+                <groupId>cn.hutool</groupId>
-                <version>${ruoyi.version}</version>
+                <artifactId>hutool-jwt</artifactId>
-            </dependency>
+                <version>${hutool.version}</version>
-
+            </dependency>
-            <!-- 代码生成-->
+
-            <dependency>
+            <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>com.squareup.okhttp3</groupId>
-                <artifactId>ruoyi-generator</artifactId>
+                <artifactId>okhttp</artifactId>
-                <version>${ruoyi.version}</version>
+                <version>${okhttp.version}</version>
-            </dependency>
+            </dependency>
-
+
-            <!-- 核心模块-->
+            <dependency>
-            <dependency>
+                <groupId>de.codecentric</groupId>
-                <groupId>com.ruoyi</groupId>
+                <artifactId>spring-boot-admin-starter-server</artifactId>
-                <artifactId>ruoyi-framework</artifactId>
+                <version>${spring-boot-admin.version}</version>
-                <version>${ruoyi.version}</version>
+            </dependency>
-            </dependency>
+            <dependency>
-
+                <groupId>de.codecentric</groupId>
-            <!-- 系统模块-->
+                <artifactId>spring-boot-admin-starter-client</artifactId>
-            <dependency>
+                <version>${spring-boot-admin.version}</version>
-                <groupId>com.ruoyi</groupId>
+            </dependency>
-                <artifactId>ruoyi-system</artifactId>
+
-                <version>${ruoyi.version}</version>
+            <!--redisson-->
-            </dependency>
+            <dependency>
-
+                <groupId>org.redisson</groupId>
-            <!-- 通用工具-->
+                <artifactId>redisson-spring-boot-starter</artifactId>
-            <dependency>
+                <version>${redisson.version}</version>
-                <groupId>com.ruoyi</groupId>
+            </dependency>
-                <artifactId>ruoyi-common</artifactId>
+            <dependency>
-                <version>${ruoyi.version}</version>
+                <groupId>com.baomidou</groupId>
-            </dependency>
+                <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
-
+                <version>${lock4j.version}</version>
-        </dependencies>
+            </dependency>
-    </dependencyManagement>
+
-
+            <!-- xxl-job-core -->
-    <modules>
+            <dependency>
-        <module>ruoyi-admin</module>
+                <groupId>com.xuxueli</groupId>
-        <module>ruoyi-framework</module>
+                <artifactId>xxl-job-core</artifactId>
-        <module>ruoyi-system</module>
+                <version>${xxl-job.version}</version>
-        <module>ruoyi-quartz</module>
+            </dependency>
-        <module>ruoyi-generator</module>
+
-        <module>ruoyi-common</module>
+            <dependency>
-    </modules>
+                <groupId>com.yomahub</groupId>
-    <packaging>pom</packaging>
+                <artifactId>tlog-web-spring-boot-starter</artifactId>
-
+                <version>${tlog.version}</version>
-
+            </dependency>
-    <dependencies>
+
-
+            <dependency>
-    </dependencies>
+                <groupId>com.yomahub</groupId>
-
+                <artifactId>tlog-xxljob-spring-boot-starter</artifactId>
-    <build>
+                <version>${tlog.version}</version>
-        <plugins>
+            </dependency>
-            <plugin>
+
-                <groupId>org.apache.maven.plugins</groupId>
+            <!-- 定时任务 -->
-                <artifactId>maven-compiler-plugin</artifactId>
+            <dependency>
-                <version>3.1</version>
+                <groupId>com.ruoyi</groupId>
-                <configuration>
+                <artifactId>ruoyi-job</artifactId>
-                    <source>${java.version}</source>
+                <version>${ruoyi-vue-plus.version}</version>
-                    <target>${java.version}</target>
+            </dependency>
-                    <encoding>${project.build.sourceEncoding}</encoding>
+
-                </configuration>
+            <!-- 代码生成-->
-            </plugin>
+            <dependency>
-        </plugins>
+                <groupId>com.ruoyi</groupId>
-    </build>
+                <artifactId>ruoyi-generator</artifactId>
-
+                <version>${ruoyi-vue-plus.version}</version>
-    <repositories>
+            </dependency>
-        <repository>
+
-            <id>public</id>
+            <!-- 核心模块-->
-            <name>aliyun nexus</name>
+            <dependency>
-            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+                <groupId>com.ruoyi</groupId>
-            <releases>
+                <artifactId>ruoyi-framework</artifactId>
-                <enabled>true</enabled>
+                <version>${ruoyi-vue-plus.version}</version>
-            </releases>
+            </dependency>
-        </repository>
+
-    </repositories>
+            <!-- 系统模块-->
-
+            <dependency>
-    <pluginRepositories>
+                <groupId>com.ruoyi</groupId>
-        <pluginRepository>
+                <artifactId>ruoyi-system</artifactId>
-            <id>public</id>
+                <version>${ruoyi-vue-plus.version}</version>
-            <name>aliyun nexus</name>
+            </dependency>
-            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+
-            <releases>
+            <!-- 通用工具-->
-                <enabled>true</enabled>
+            <dependency>
-            </releases>
+                <groupId>com.ruoyi</groupId>
-            <snapshots>
+                <artifactId>ruoyi-common</artifactId>
-                <enabled>false</enabled>
+                <version>${ruoyi-vue-plus.version}</version>
-            </snapshots>
+            </dependency>
-        </pluginRepository>
+
-    </pluginRepositories>
+            <!-- OSS对象存储模块 -->
-
+            <dependency>
-</project>
+                <groupId>com.ruoyi</groupId>
                <artifactId>ruoyi-oss</artifactId>
                <version>${ruoyi-vue-plus.version}</version>
            </dependency>
            <!-- demo模块 -->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>ruoyi-demo</artifactId>
                <version>${ruoyi-vue-plus.version}</version>
            </dependency>
        </dependencies>
    </dependencyManagement>
    <modules>
        <module>ruoyi-admin</module>
        <module>ruoyi-framework</module>
        <module>ruoyi-system</module>
        <module>ruoyi-job</module>
        <module>ruoyi-generator</module>
        <module>ruoyi-common</module>
        <module>ruoyi-demo</module>
        <module>ruoyi-extend</module>
        <module>ruoyi-oss</module>
    </modules>
    <packaging>pom</packaging>
    <build>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
                <version>3.1</version>
                <configuration>
                    <source>${java.version}</source>
                    <target>${java.version}</target>
                    <encoding>${project.build.sourceEncoding}</encoding>
                </configuration>
            </plugin>
        </plugins>
        <resources>
            <resource>
                <!--打包该目录下的 application.yml -->
                <directory>src/main/resources</directory>
                <!-- 启用过滤 即该资源中的变量将会被过滤器中的值替换 -->
                <filtering>true</filtering>
            </resource>
        </resources>
    </build>
    <repositories>
        <repository>
            <id>public</id>
            <name>aliyun nexus</name>
            <url>https://maven.aliyun.com/repository/public/</url>
            <releases>
                <enabled>true</enabled>
            </releases>
        </repository>
    </repositories>
    <pluginRepositories>
        <pluginRepository>
            <id>public</id>
            <name>aliyun nexus</name>
            <url>https://maven.aliyun.com/repository/public/</url>
            <releases>
                <enabled>true</enabled>
            </releases>
            <snapshots>
                <enabled>false</enabled>
            </snapshots>
        </pluginRepository>
    </pluginRepositories>
    <profiles>
        <profile>
            <id>local</id>
            <properties>
                <!-- 环境标识，需要与配置文件的名称相对应 -->
                <profiles.active>local</profiles.active>
                <logging.level>debug</logging.level>
                <knife4j.production>false</knife4j.production>
                <endpoints.include>'*'</endpoints.include>
            </properties>
        </profile>
        <profile>
            <id>dev</id>
            <properties>
                <!-- 环境标识，需要与配置文件的名称相对应 -->
                <profiles.active>dev</profiles.active>
                <logging.level>debug</logging.level>
                <knife4j.production>false</knife4j.production>
                <endpoints.include>'*'</endpoints.include>
            </properties>
            <activation>
                <!-- 默认环境 -->
                <activeByDefault>true</activeByDefault>
            </activation>
        </profile>
        <profile>
            <id>prod</id>
            <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>
--- a/ruoyi-admin/Dockerfile
+++ b/ruoyi-admin/Dockerfile
@ -0,0 +1,15 @@
 FROM anapsix/alpine-java:8_server-jre_unlimited
 MAINTAINER Lion Li
 RUN mkdir -p /ruoyi/server
 RUN mkdir -p /ruoyi/server/logs
 RUN mkdir -p /ruoyi/server/temp
 WORKDIR /ruoyi/server
 EXPOSE 8080
 ADD ./target/ruoyi-admin.jar ./app.jar
 ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@ -1,108 +1,117 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
+    <parent>
-        <artifactId>ruoyi</artifactId>
+        <artifactId>ruoyi-vue-plus</artifactId>
-        <groupId>com.ruoyi</groupId>
+        <groupId>com.ruoyi</groupId>
-        <version>3.4.0</version>
+        <version>3.5.0</version>
-    </parent>
+    </parent>
-    <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
+    <packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>ruoyi-admin</artifactId>
-
+
-    <description>
+    <description>
-        web服务入口
+        web服务入口
-    </description>
+    </description>
-
+
-    <dependencies>
+    <dependencies>
-
+
-        <!-- spring-boot-devtools -->
+        <!-- spring-boot-devtools -->
-        <dependency>
+        <dependency>
-            <groupId>org.springframework.boot</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
+            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional> <!-- 表示依赖不会传递 -->
+            <optional>true</optional> <!-- 表示依赖不会传递 -->
-        </dependency>
+        </dependency>
-
+
-        <!-- swagger2-->
+        <!-- Mysql驱动包 -->
-        <dependency>
+        <dependency>
-            <groupId>io.springfox</groupId>
+            <groupId>mysql</groupId>
-            <artifactId>springfox-swagger2</artifactId>
+            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
+        </dependency>
-
+
-        <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
+        <!-- 核心模块-->
-        <dependency>
+        <dependency>
-            <groupId>io.swagger</groupId>
+            <groupId>com.ruoyi</groupId>
-            <artifactId>swagger-annotations</artifactId>
+            <artifactId>ruoyi-framework</artifactId>
-            <version>1.5.21</version>
+        </dependency>
-        </dependency>
+
-
+        <dependency>
-        <dependency>
+            <groupId>com.ruoyi</groupId>
-            <groupId>io.swagger</groupId>
+            <artifactId>ruoyi-system</artifactId>
-            <artifactId>swagger-models</artifactId>
+        </dependency>
-            <version>1.5.21</version>
+
-        </dependency>
+        <dependency>
-
+            <groupId>com.ruoyi</groupId>
-        <!-- swagger2-UI-->
+            <artifactId>ruoyi-job</artifactId>
-        <dependency>
+        </dependency>
-            <groupId>io.springfox</groupId>
+
-            <artifactId>springfox-swagger-ui</artifactId>
+        <dependency>
-        </dependency>
+            <groupId>com.ruoyi</groupId>
-
+            <artifactId>ruoyi-oss</artifactId>
-         <!-- Mysql驱动包 -->
+        </dependency>
-        <dependency>
+
-            <groupId>mysql</groupId>
+        <!-- 代码生成-->
-            <artifactId>mysql-connector-java</artifactId>
+        <dependency>
-        </dependency>
+            <groupId>com.ruoyi</groupId>
-
+            <artifactId>ruoyi-generator</artifactId>
-        <!-- 核心模块-->
+        </dependency>
-        <dependency>
+
-            <groupId>com.ruoyi</groupId>
+        <!--  demo模块  -->
-            <artifactId>ruoyi-framework</artifactId>
+        <dependency>
-        </dependency>
+            <groupId>com.ruoyi</groupId>
-
+            <artifactId>ruoyi-demo</artifactId>
-        <!-- 定时任务-->
+        </dependency>
-        <dependency>
+
-            <groupId>com.ruoyi</groupId>
+    </dependencies>
-            <artifactId>ruoyi-quartz</artifactId>
+
-        </dependency>
+    <build>
-
+        <finalName>${project.artifactId}</finalName>
-        <!-- 代码生成-->
+        <plugins>
-        <dependency>
+            <plugin>
-            <groupId>com.ruoyi</groupId>
+                <groupId>org.springframework.boot</groupId>
-            <artifactId>ruoyi-generator</artifactId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
-        </dependency>
+                <version>${spring-boot.version}</version>
-
+                <configuration>
-    </dependencies>
+                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-
+                </configuration>
-    <build>
+                <executions>
-        <plugins>
+                    <execution>
-            <plugin>
+                        <goals>
-                <groupId>org.springframework.boot</groupId>
+                            <goal>repackage</goal>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                        </goals>
-                <version>2.1.1.RELEASE</version>
+                    </execution>
-                <configuration>
+                </executions>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+            </plugin>
-                </configuration>
+            <plugin>
-                <executions>
+                <groupId>org.apache.maven.plugins</groupId>
-                    <execution>
+                <artifactId>maven-war-plugin</artifactId>
-                        <goals>
+                <version>3.2.0</version>
-                            <goal>repackage</goal>
+                <configuration>
-                        </goals>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    </execution>
+                    <warName>${project.artifactId}</warName>
-                </executions>
+                </configuration>
-            </plugin>
+            </plugin>
-            <plugin>   
+            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>   
+                <groupId>com.spotify</groupId>
-                <artifactId>maven-war-plugin</artifactId>   
+                <artifactId>docker-maven-plugin</artifactId>
-                <version>3.1.0</version>   
+                <version>${docker.plugin.version}</version>
-                <configuration>
+                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <imageName>${docker.namespace}/ruoyi-server:${project.version}</imageName>
-                    <warName>${project.artifactId}</warName>
+                    <dockerDirectory>${project.basedir}</dockerDirectory>
-                </configuration>   
+                    <dockerHost>${docker.registry.host}</dockerHost>
-           </plugin>   
+                    <registryUrl>${docker.registry.url}</registryUrl>
-        </plugins>
+                    <serverId>${docker.registry.url}</serverId>
-        <finalName>${project.artifactId}</finalName>
+                    <resources>
-    </build>
+                        <resource>
-
+                            <targetPath>/</targetPath>
-</project>
+                            <directory>${project.build.directory}</directory>
                            <include>${project.build.finalName}.jar</include>
                        </resource>
                    </resources>
                </configuration>
            </plugin>
        </plugins>
    </build>
 </project>
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@ -1,30 +1,24 @@
-package com.ruoyi;
+package com.ruoyi;
-
+
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
-
+
-/**
+/**
- * 启动程序
+ * 启动程序
- * 
+ *
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+
-public class RuoYiApplication
+@SpringBootApplication
-{
+public class RuoYiApplication {
-    public static void main(String[] args)
+
-    {
+    public static void main(String[] args) {
-        // System.setProperty("spring.devtools.restart.enabled", "false");
+        System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(RuoYiApplication.class, args);
+        SpringApplication application = new SpringApplication(RuoYiApplication.class);
-        System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+        application.setApplicationStartup(new BufferingApplicationStartup(2048));
-                " .-------.       ____     __        \n" +
+        application.run(args);
-                " |  _ _   \\      \\   \\   /  /    \n" +
+        System.out.println("(♥◠‿◠)ﾉﾞ  RuoYi-Vue-Plus启动成功   ლ(´ڡ`ლ)ﾞ");
-                " | ( ' )  |       \\  _. /  '       \n" +
+    }
-                " |(_ o _) /        _( )_ .'         \n" +
+
-                " | (_,_).' __  ___(_ o _)'          \n" +
+}
                " |  |\\ \\  |  ||   |(_,_)'         \n" +
                " |  | \\ `'   /|   `-'  /           \n" +
                " |  |  \\    /  \\      /           \n" +
                " ''-'   `'-'    `-..-'              ");
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java
@ -1,18 +1,18 @@
-package com.ruoyi;
+package com.ruoyi;
-
+
-import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
+
-/**
+/**
- * web容器中进行部署
+ * web容器中进行部署
- * 
+ *
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-public class RuoYiServletInitializer extends SpringBootServletInitializer
+public class RuoYiServletInitializer extends SpringBootServletInitializer {
-{
+
-    @Override
+    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-    {
+        return application.sources(RuoYiApplication.class);
-        return application.sources(RuoYiApplication.class);
+    }
-    }
+
-}
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
@ -1,86 +1,87 @@
-package com.ruoyi.web.controller.common;
+package com.ruoyi.web.controller.common;
-
+
-import java.awt.image.BufferedImage;
+import cn.hutool.captcha.AbstractCaptcha;
-import java.io.IOException;
+import cn.hutool.captcha.generator.CodeGenerator;
-import java.util.concurrent.TimeUnit;
+import cn.hutool.core.convert.Convert;
-import javax.annotation.Resource;
+import cn.hutool.core.util.IdUtil;
-import javax.imageio.ImageIO;
+import com.ruoyi.common.constant.Constants;
-import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.enums.CaptchaType;
-import org.springframework.beans.factory.annotation.Value;
+import com.ruoyi.common.utils.RedisUtils;
-import org.springframework.util.FastByteArrayOutputStream;
+import com.ruoyi.common.utils.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.utils.reflect.ReflectUtils;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.spring.SpringUtils;
-import com.google.code.kaptcha.Producer;
+import com.ruoyi.framework.config.properties.CaptchaProperties;
-import com.ruoyi.common.constant.Constants;
+import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.common.core.domain.AjaxResult;
+import io.swagger.annotations.Api;
-import com.ruoyi.common.core.redis.RedisCache;
+import io.swagger.annotations.ApiOperation;
-import com.ruoyi.common.utils.sign.Base64;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.utils.uuid.IdUtils;
+import org.springframework.beans.factory.annotation.Autowired;
-
+import org.springframework.web.bind.annotation.GetMapping;
-/**
+import org.springframework.web.bind.annotation.RestController;
- * 验证码操作处理
+
- * 
+import java.util.HashMap;
- * @author ruoyi
+import java.util.Map;
- */
+import java.util.concurrent.TimeUnit;
-@RestController
+
-public class CaptchaController
+/**
-{
+ * 验证码操作处理
-    @Resource(name = "captchaProducer")
+ *
-    private Producer captchaProducer;
+ * @author Lion Li
-
+ */
-    @Resource(name = "captchaProducerMath")
+@Api(value = "验证码操作处理", tags = {"验证码管理"})
-    private Producer captchaProducerMath;
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-
+@RestController
-    @Autowired
+public class CaptchaController {
-    private RedisCache redisCache;
+
-    
+    private final CaptchaProperties captchaProperties;
-    // 验证码类型
+    private final ISysConfigService configService;
-    @Value("${ruoyi.captchaType}")
+
-    private String captchaType;
+    /**
-
+     * 生成验证码
-    /**
+     */
-     * 生成验证码
+    @ApiOperation("生成验证码")
-     */
+    @GetMapping("/captchaImage")
-    @GetMapping("/captchaImage")
+    public AjaxResult<Map<String, Object>> getCode() {
-    public AjaxResult getCode(HttpServletResponse response) throws IOException
+        Map<String, Object> ajax = new HashMap<>();
-    {
+        boolean captchaOnOff = configService.selectCaptchaOnOff();
-        // 保存验证码信息
+        ajax.put("captchaOnOff", captchaOnOff);
-        String uuid = IdUtils.simpleUUID();
+        if (!captchaOnOff) {
-        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+            return AjaxResult.success(ajax);
-
+        }
-        String capStr = null, code = null;
+        // 保存验证码信息
-        BufferedImage image = null;
+        String uuid = IdUtil.simpleUUID();
-
+        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        // 生成验证码
+        // 生成验证码
-        if ("math".equals(captchaType))
+        CaptchaType captchaType = captchaProperties.getType();
-        {
+        boolean isMath = CaptchaType.MATH == captchaType;
-            String capText = captchaProducerMath.createText();
+        Integer length = isMath ? captchaProperties.getNumberLength() : captchaProperties.getCharLength();
-            capStr = capText.substring(0, capText.lastIndexOf("@"));
+        CodeGenerator codeGenerator = ReflectUtils.newInstance(captchaType.getClazz(), length);
-            code = capText.substring(capText.lastIndexOf("@") + 1);
+        AbstractCaptcha captcha = SpringUtils.getBean(captchaProperties.getCategory().getClazz());
-            image = captchaProducerMath.createImage(capStr);
+        captcha.setGenerator(codeGenerator);
-        }
+        captcha.createCode();
-        else if ("char".equals(captchaType))
+        String code = isMath ? getCodeResult(captcha.getCode()) : captcha.getCode();
-        {
+        RedisUtils.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
-            capStr = code = captchaProducer.createText();
+        ajax.put("uuid", uuid);
-            image = captchaProducer.createImage(capStr);
+        ajax.put("img", captcha.getImageBase64());
-        }
+        return AjaxResult.success(ajax);
-
+    }
-        redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+
-        // 转换流信息写出
+    private String getCodeResult(String capStr) {
-        FastByteArrayOutputStream os = new FastByteArrayOutputStream();
+        int numberLength = captchaProperties.getNumberLength();
-        try
+        int a = Convert.toInt(StringUtils.substring(capStr, 0, numberLength).trim());
-        {
+        char operator = capStr.charAt(numberLength);
-            ImageIO.write(image, "jpg", os);
+        int b = Convert.toInt(StringUtils.substring(capStr, numberLength + 1, numberLength + 1 + numberLength).trim());
-        }
+        switch (operator) {
-        catch (IOException e)
+            case '*':
-        {
+                return Convert.toStr(a * b);
-            return AjaxResult.error(e.getMessage());
+            case '+':
-        }
+                return Convert.toStr(a + b);
-
+            case '-':
-        AjaxResult ajax = AjaxResult.success();
+                return Convert.toStr(a - b);
-        ajax.put("uuid", uuid);
+            default:
-        ajax.put("img", Base64.encode(os.toByteArray()));
+                return StringUtils.EMPTY;
-        return ajax;
+        }
-    }
+    }
-}
+
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@ -1,118 +0,0 @@
 package com.ruoyi.web.controller.common;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.framework.config.ServerConfig;
 /**
 * 通用请求处理
 * 
 * @author ruoyi
 */
@RestController
 public class CommonController
 {
    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
    @Autowired
    private ServerConfig serverConfig;
    /**
     * 通用下载请求
     * 
     * @param fileName 文件名称
     * @param delete 是否删除
     */
    @GetMapping("common/download")
    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
    {
        try
        {
            if (!FileUtils.checkAllowDownload(fileName))
            {
                throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
            }
            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
            String filePath = RuoYiConfig.getDownloadPath() + fileName;
            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
            FileUtils.setAttachmentResponseHeader(response, realFileName);
            FileUtils.writeBytes(filePath, response.getOutputStream());
            if (delete)
            {
                FileUtils.deleteFile(filePath);
            }
        }
        catch (Exception e)
        {
            log.error("下载文件失败", e);
        }
    }
    /**
     * 通用上传请求
     */
    @PostMapping("/common/upload")
    public AjaxResult uploadFile(MultipartFile file) throws Exception
    {
        try
        {
            // 上传文件路径
            String filePath = RuoYiConfig.getUploadPath();
            // 上传并返回新文件名称
            String fileName = FileUploadUtils.upload(filePath, file);
            String url = serverConfig.getUrl() + fileName;
            AjaxResult ajax = AjaxResult.success();
            ajax.put("fileName", fileName);
            ajax.put("url", url);
            return ajax;
        }
        catch (Exception e)
        {
            return AjaxResult.error(e.getMessage());
        }
    }
    /**
     * 本地资源通用下载
     */
    @GetMapping("/common/download/resource")
    public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
            throws Exception
    {
        try
        {
            if (!FileUtils.checkAllowDownload(resource))
            {
                throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
            }
            // 本地资源路径
            String localPath = RuoYiConfig.getProfile();
            // 数据库资源地址
            String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
            // 下载名称
            String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
            FileUtils.setAttachmentResponseHeader(response, downloadName);
            FileUtils.writeBytes(downloadPath, response.getOutputStream());
        }
        catch (Exception e)
        {
            log.error("下载文件失败", e);
        }
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
@ -1,53 +1,57 @@
-package com.ruoyi.web.controller.monitor;
+package com.ruoyi.web.controller.monitor;
-
+
-import java.util.ArrayList;
+import com.ruoyi.common.core.domain.AjaxResult;
-import java.util.HashMap;
+import com.ruoyi.common.utils.StringUtils;
-import java.util.List;
+import io.swagger.annotations.Api;
-import java.util.Map;
+import io.swagger.annotations.ApiOperation;
-import java.util.Properties;
+import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.connection.RedisServerCommands;
-import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.RedisCallback;
-import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMapping;
-import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.StringUtils;
+
-
+import java.util.*;
-/**
+
- * 缓存监控
+/**
- * 
+ * 缓存监控
- * @author ruoyi
+ *
- */
+ * @author Lion Li
-@RestController
+ */
-@RequestMapping("/monitor/cache")
+@Api(value = "缓存监控", tags = {"缓存监控管理"})
-public class CacheController
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-{
+@RestController
-    @Autowired
+@RequestMapping("/monitor/cache")
-    private RedisTemplate<String, String> redisTemplate;
+public class CacheController {
-
+
-    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    private final RedisTemplate<String, String> redisTemplate;
-    @GetMapping()
+
-    public AjaxResult getInfo() throws Exception
+    @ApiOperation("获取缓存监控详细信息")
-    {
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
-        Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
+    @GetMapping()
-        Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
+    public AjaxResult<Map<String, Object>> getInfo() throws Exception {
-        Object dbSize = redisTemplate.execute((RedisCallback<Object>) connection -> connection.dbSize());
+        Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::info);
-
+        Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
-        Map<String, Object> result = new HashMap<>(3);
+        Object dbSize = redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::dbSize);
-        result.put("info", info);
+
-        result.put("dbSize", dbSize);
+        Map<String, Object> result = new HashMap<>(3);
-
+        result.put("info", info);
-        List<Map<String, String>> pieList = new ArrayList<>();
+        result.put("dbSize", dbSize);
-        commandStats.stringPropertyNames().forEach(key -> {
+
-            Map<String, String> data = new HashMap<>(2);
+        List<Map<String, String>> pieList = new ArrayList<>();
-            String property = commandStats.getProperty(key);
+        if (commandStats != null) {
-            data.put("name", StringUtils.removeStart(key, "cmdstat_"));
+            commandStats.stringPropertyNames().forEach(key -> {
-            data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
+                Map<String, String> data = new HashMap<>(2);
-            pieList.add(data);
+                String property = commandStats.getProperty(key);
-        });
+                data.put("name", StringUtils.removeStart(key, "cmdstat_"));
-        result.put("commandStats", pieList);
+                data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
-        return AjaxResult.success(result);
+                pieList.add(data);
-    }
+            });
-}
+        }
        result.put("commandStats", pieList);
        return AjaxResult.success(result);
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
@ -1,27 +0,0 @@
 package com.ruoyi.web.controller.monitor;
 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 com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.framework.web.domain.Server;
 /**
 * 服务器监控
 * 
 * @author ruoyi
 */
@RestController
@RequestMapping("/monitor/server")
 public class ServerController
 {
    @PreAuthorize("@ss.hasPermi('monitor:server:list')")
    @GetMapping()
    public AjaxResult getInfo() throws Exception
    {
        Server server = new Server();
        server.copyTo();
        return AjaxResult.success(server);
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
@ -1,67 +1,69 @@
-package com.ruoyi.web.controller.monitor;
+package com.ruoyi.web.controller.monitor;
-
+
-import java.util.List;
+import com.ruoyi.common.annotation.Log;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.core.controller.BaseController;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import com.ruoyi.common.core.domain.PageQuery;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.bind.annotation.PathVariable;
+import com.ruoyi.common.enums.BusinessType;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.utils.poi.ExcelUtil;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.system.domain.SysLogininfor;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.system.service.ISysLogininforService;
-import com.ruoyi.common.core.controller.BaseController;
+import io.swagger.annotations.Api;
-import com.ruoyi.common.core.domain.AjaxResult;
+import io.swagger.annotations.ApiOperation;
-import com.ruoyi.common.core.page.TableDataInfo;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.enums.BusinessType;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.security.access.prepost.PreAuthorize;
-import com.ruoyi.system.domain.SysLogininfor;
+import org.springframework.validation.annotation.Validated;
-import com.ruoyi.system.service.ISysLogininforService;
+import org.springframework.web.bind.annotation.*;
-
+
-/**
+import javax.servlet.http.HttpServletResponse;
- * 系统访问记录
+import java.util.List;
- * 
+
- * @author ruoyi
+/**
- */
+ * 系统访问记录
-@RestController
+ *
-@RequestMapping("/monitor/logininfor")
+ * @author Lion Li
-public class SysLogininforController extends BaseController
+ */
-{
+@Validated
-    @Autowired
+@Api(value = "系统访问记录", tags = {"系统访问记录管理"})
-    private ISysLogininforService logininforService;
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-
+@RestController
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+@RequestMapping("/monitor/logininfor")
-    @GetMapping("/list")
+public class SysLogininforController extends BaseController {
-    public TableDataInfo list(SysLogininfor logininfor)
+
-    {
+    private final ISysLogininforService logininforService;
-        startPage();
+
-        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+    @ApiOperation("查询系统访问记录列表")
-        return getDataTable(list);
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
-    }
+    @GetMapping("/list")
-
+    public TableDataInfo<SysLogininfor> list(SysLogininfor logininfor, PageQuery pageQuery) {
-    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
+        return logininforService.selectPageLogininforList(logininfor, pageQuery);
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+    }
-    @GetMapping("/export")
+
-    public AjaxResult export(SysLogininfor logininfor)
+    @ApiOperation("导出系统访问记录列表")
-    {
+    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
-        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
-        ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
+    @PostMapping("/export")
-        return util.exportExcel(list, "登录日志");
+    public void export(SysLogininfor logininfor, HttpServletResponse response) {
-    }
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
-
+        ExcelUtil.exportExcel(list, "登录日志", SysLogininfor.class, response);
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    }
-    @Log(title = "登录日志", businessType = BusinessType.DELETE)
+
-    @DeleteMapping("/{infoIds}")
+    @ApiOperation("删除系统访问记录")
-    public AjaxResult remove(@PathVariable Long[] infoIds)
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
-    {
+    @Log(title = "登录日志", businessType = BusinessType.DELETE)
-        return toAjax(logininforService.deleteLogininforByIds(infoIds));
+    @DeleteMapping("/{infoIds}")
-    }
+    public AjaxResult<Void> remove(@PathVariable Long[] infoIds) {
-
+        return toAjax(logininforService.deleteLogininforByIds(infoIds));
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    }
-    @Log(title = "登录日志", businessType = BusinessType.CLEAN)
+
-    @DeleteMapping("/clean")
+    @ApiOperation("清空系统访问记录")
-    public AjaxResult clean()
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
-    {
+    @Log(title = "登录日志", businessType = BusinessType.CLEAN)
-        logininforService.cleanLogininfor();
+    @DeleteMapping("/clean")
-        return AjaxResult.success();
+    public AjaxResult<Void> clean() {
-    }
+        logininforService.cleanLogininfor();
-}
+        return AjaxResult.success();
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
@ -1,66 +1,69 @@
-package com.ruoyi.web.controller.monitor;
+package com.ruoyi.web.controller.monitor;
-
+
-import java.util.List;
+import com.ruoyi.common.annotation.Log;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.core.controller.BaseController;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import com.ruoyi.common.core.domain.PageQuery;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.bind.annotation.PathVariable;
+import com.ruoyi.common.enums.BusinessType;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.utils.poi.ExcelUtil;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.system.domain.SysOperLog;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.system.service.ISysOperLogService;
-import com.ruoyi.common.core.controller.BaseController;
+import io.swagger.annotations.Api;
-import com.ruoyi.common.core.domain.AjaxResult;
+import io.swagger.annotations.ApiOperation;
-import com.ruoyi.common.core.page.TableDataInfo;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.enums.BusinessType;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.security.access.prepost.PreAuthorize;
-import com.ruoyi.system.domain.SysOperLog;
+import org.springframework.validation.annotation.Validated;
-import com.ruoyi.system.service.ISysOperLogService;
+import org.springframework.web.bind.annotation.*;
-
+
-/**
+import javax.servlet.http.HttpServletResponse;
- * 操作日志记录
+import java.util.List;
- * 
+
- * @author ruoyi
+/**
- */
+ * 操作日志记录
-@RestController
+ *
-@RequestMapping("/monitor/operlog")
+ * @author Lion Li
-public class SysOperlogController extends BaseController
+ */
-{
+@Validated
-    @Autowired
+@Api(value = "操作日志记录", tags = {"操作日志记录管理"})
-    private ISysOperLogService operLogService;
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-
+@RestController
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+@RequestMapping("/monitor/operlog")
-    @GetMapping("/list")
+public class SysOperlogController extends BaseController {
-    public TableDataInfo list(SysOperLog operLog)
+
-    {
+    private final ISysOperLogService operLogService;
-        startPage();
+
-        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+    @ApiOperation("查询操作日志记录列表")
-        return getDataTable(list);
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
-    }
+    @GetMapping("/list")
-
+    public TableDataInfo<SysOperLog> list(SysOperLog operLog, PageQuery pageQuery) {
-    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
+        return operLogService.selectPageOperLogList(operLog, pageQuery);
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+    }
-    @GetMapping("/export")
+
-    public AjaxResult export(SysOperLog operLog)
+    @ApiOperation("导出操作日志记录列表")
-    {
+    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
-        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
-        ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
+    @PostMapping("/export")
-        return util.exportExcel(list, "操作日志");
+    public void export(SysOperLog operLog, HttpServletResponse response) {
-    }
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
-
+        ExcelUtil.exportExcel(list, "操作日志", SysOperLog.class, response);
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    }
-    @DeleteMapping("/{operIds}")
+
-    public AjaxResult remove(@PathVariable Long[] operIds)
+    @ApiOperation("删除操作日志记录")
-    {
+    @Log(title = "操作日志", businessType = BusinessType.DELETE)
-        return toAjax(operLogService.deleteOperLogByIds(operIds));
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
-    }
+    @DeleteMapping("/{operIds}")
-
+    public AjaxResult<Void> remove(@PathVariable Long[] operIds) {
-    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
+        return toAjax(operLogService.deleteOperLogByIds(operIds));
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    }
-    @DeleteMapping("/clean")
+
-    public AjaxResult clean()
+    @ApiOperation("清空操作日志记录")
-    {
+    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
-        operLogService.cleanOperLog();
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
-        return AjaxResult.success();
+    @DeleteMapping("/clean")
-    }
+    public AjaxResult<Void> clean() {
-}
+        operLogService.cleanOperLog();
        return AjaxResult.success();
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
@ -1,92 +1,79 @@
-package com.ruoyi.web.controller.monitor;
+package com.ruoyi.web.controller.monitor;
-
+
-import java.util.ArrayList;
+import com.ruoyi.common.annotation.Log;
-import java.util.Collection;
+import com.ruoyi.common.constant.Constants;
-import java.util.Collections;
+import com.ruoyi.common.core.controller.BaseController;
-import java.util.List;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.core.domain.model.LoginUser;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import com.ruoyi.common.enums.BusinessType;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.utils.RedisUtils;
-import org.springframework.web.bind.annotation.PathVariable;
+import com.ruoyi.common.utils.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.system.domain.SysUserOnline;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.system.service.ISysUserOnlineService;
-import com.ruoyi.common.annotation.Log;
+import io.swagger.annotations.Api;
-import com.ruoyi.common.constant.Constants;
+import io.swagger.annotations.ApiOperation;
-import com.ruoyi.common.core.controller.BaseController;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import org.springframework.security.access.prepost.PreAuthorize;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.core.redis.RedisCache;
+
-import com.ruoyi.common.enums.BusinessType;
+import java.util.ArrayList;
-import com.ruoyi.common.utils.StringUtils;
+import java.util.Collection;
-import com.ruoyi.system.domain.SysUserOnline;
+import java.util.Collections;
-import com.ruoyi.system.service.ISysUserOnlineService;
+import java.util.List;
-
+
-/**
+/**
- * 在线用户监控
+ * 在线用户监控
- * 
+ *
- * @author ruoyi
+ * @author Lion Li
- */
+ */
-@RestController
+@Api(value = "在线用户监控", tags = {"在线用户监控管理"})
-@RequestMapping("/monitor/online")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-public class SysUserOnlineController extends BaseController
+@RestController
-{
+@RequestMapping("/monitor/online")
-    @Autowired
+public class SysUserOnlineController extends BaseController {
-    private ISysUserOnlineService userOnlineService;
+
-
+    private final ISysUserOnlineService userOnlineService;
-    @Autowired
+
-    private RedisCache redisCache;
+    @ApiOperation("在线用户列表")
-
+    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
-    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+    @GetMapping("/list")
-    @GetMapping("/list")
+    public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
-    public TableDataInfo list(String ipaddr, String userName)
+        Collection<String> keys = RedisUtils.keys(Constants.LOGIN_TOKEN_KEY + "*");
-    {
+        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
-        Collection<String> keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*");
+        for (String key : keys) {
-        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
+            LoginUser user = RedisUtils.getCacheObject(key);
-        for (String key : keys)
+            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
-        {
+                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) {
-            LoginUser user = redisCache.getCacheObject(key);
+                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
-            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
+                }
-            {
+            } else if (StringUtils.isNotEmpty(ipaddr)) {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
+                if (StringUtils.equals(ipaddr, user.getIpaddr())) {
-                {
+                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
-                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
+                }
-                }
+            } else if (StringUtils.isNotEmpty(userName)) {
-            }
+                if (StringUtils.equals(userName, user.getUsername())) {
-            else if (StringUtils.isNotEmpty(ipaddr))
+                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
-            {
+                }
-                if (StringUtils.equals(ipaddr, user.getIpaddr()))
+            } else {
-                {
+                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
-                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
+            }
-                }
+        }
-            }
+        Collections.reverse(userOnlineList);
-            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
+        userOnlineList.removeAll(Collections.singleton(null));
-            {
+        return TableDataInfo.build(userOnlineList);
-                if (StringUtils.equals(userName, user.getUsername()))
+    }
-                {
+
-                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+    /**
-                }
+     * 强退用户
-            }
+     */
-            else
+    @ApiOperation("强退用户")
-            {
+    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
-                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+    @Log(title = "在线用户", businessType = BusinessType.FORCE)
-            }
+    @DeleteMapping("/{tokenId}")
-        }
+    public AjaxResult<Void> forceLogout(@PathVariable String tokenId) {
-        Collections.reverse(userOnlineList);
+        RedisUtils.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
-        userOnlineList.removeAll(Collections.singleton(null));
+        return AjaxResult.success();
-        return getDataTable(userOnlineList);
+    }
-    }
+}
    /**
     * 强退用户
     */
    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
    @Log(title = "在线用户", businessType = BusinessType.FORCE)
    @DeleteMapping("/{tokenId}")
    public AjaxResult forceLogout(@PathVariable String tokenId)
    {
        redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
        return AjaxResult.success();
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@ -1,135 +1,128 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.controller.system;
-
+
-import java.util.List;
+import com.ruoyi.common.annotation.Log;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.constant.UserConstants;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.core.controller.BaseController;
-import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import com.ruoyi.common.core.domain.PageQuery;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.bind.annotation.PathVariable;
+import com.ruoyi.common.enums.BusinessType;
-import org.springframework.web.bind.annotation.PostMapping;
+import com.ruoyi.common.utils.poi.ExcelUtil;
-import org.springframework.web.bind.annotation.PutMapping;
+import com.ruoyi.system.domain.SysConfig;
-import org.springframework.web.bind.annotation.RequestBody;
+import com.ruoyi.system.service.ISysConfigService;
-import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
-import com.ruoyi.common.annotation.Log;
+import io.swagger.annotations.ApiParam;
-import com.ruoyi.common.annotation.RepeatSubmit;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.constant.UserConstants;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.controller.BaseController;
+import org.springframework.security.access.prepost.PreAuthorize;
-import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.enums.BusinessType;
+
-import com.ruoyi.common.utils.SecurityUtils;
+import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import java.util.List;
-import com.ruoyi.system.domain.SysConfig;
+
-import com.ruoyi.system.service.ISysConfigService;
+/**
-
+ * 参数配置 信息操作处理
-/**
+ *
- * 参数配置 信息操作处理
+ * @author Lion Li
- * 
+ */
- * @author ruoyi
+@Validated
- */
+@Api(value = "参数配置控制器", tags = {"参数配置管理"})
-@RestController
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RequestMapping("/system/config")
+@RestController
-public class SysConfigController extends BaseController
+@RequestMapping("/system/config")
-{
+public class SysConfigController extends BaseController {
-    @Autowired
+
-    private ISysConfigService configService;
+    private final ISysConfigService configService;
-
+
-    /**
+    /**
-     * 获取参数配置列表
+     * 获取参数配置列表
-     */
+     */
-    @PreAuthorize("@ss.hasPermi('system:config:list')")
+    @ApiOperation("获取参数配置列表")
-    @GetMapping("/list")
+    @PreAuthorize("@ss.hasPermi('system:config:list')")
-    public TableDataInfo list(SysConfig config)
+    @GetMapping("/list")
-    {
+    public TableDataInfo<SysConfig> list(SysConfig config, PageQuery pageQuery) {
-        startPage();
+        return configService.selectPageConfigList(config, pageQuery);
-        List<SysConfig> list = configService.selectConfigList(config);
+    }
-        return getDataTable(list);
+
-    }
+    @ApiOperation("导出参数配置列表")
-
+    @Log(title = "参数管理", businessType = BusinessType.EXPORT)
-    @Log(title = "参数管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:config:export')")
-    @PreAuthorize("@ss.hasPermi('system:config:export')")
+    @PostMapping("/export")
-    @GetMapping("/export")
+    public void export(SysConfig config, HttpServletResponse response) {
-    public AjaxResult export(SysConfig config)
+        List<SysConfig> list = configService.selectConfigList(config);
-    {
+        ExcelUtil.exportExcel(list, "参数数据", SysConfig.class, response);
-        List<SysConfig> list = configService.selectConfigList(config);
+    }
-        ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
+
-        return util.exportExcel(list, "参数数据");
+    /**
-    }
+     * 根据参数编号获取详细信息
-
+     */
-    /**
+    @ApiOperation("根据参数编号获取详细信息")
-     * 根据参数编号获取详细信息
+    @PreAuthorize("@ss.hasPermi('system:config:query')")
-     */
+    @GetMapping(value = "/{configId}")
-    @PreAuthorize("@ss.hasPermi('system:config:query')")
+    public AjaxResult<SysConfig> getInfo(@ApiParam("参数ID") @PathVariable Long configId) {
-    @GetMapping(value = "/{configId}")
+        return AjaxResult.success(configService.selectConfigById(configId));
-    public AjaxResult getInfo(@PathVariable Long configId)
+    }
-    {
+
-        return AjaxResult.success(configService.selectConfigById(configId));
+    /**
-    }
+     * 根据参数键名查询参数值
-
+     */
-    /**
+    @ApiOperation("根据参数键名查询参数值")
-     * 根据参数键名查询参数值
+    @GetMapping(value = "/configKey/{configKey}")
-     */
+    public AjaxResult<Void> getConfigKey(@ApiParam("参数Key") @PathVariable String configKey) {
-    @GetMapping(value = "/configKey/{configKey}")
+        return AjaxResult.success(configService.selectConfigByKey(configKey));
-    public AjaxResult getConfigKey(@PathVariable String configKey)
+    }
-    {
+
-        return AjaxResult.success(configService.selectConfigByKey(configKey));
+    /**
-    }
+     * 新增参数配置
-
+     */
-    /**
+    @ApiOperation("新增参数配置")
-     * 新增参数配置
+    @PreAuthorize("@ss.hasPermi('system:config:add')")
-     */
+    @Log(title = "参数管理", businessType = BusinessType.INSERT)
-    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    @PostMapping
-    @Log(title = "参数管理", businessType = BusinessType.INSERT)
+    public AjaxResult<Void> add(@Validated @RequestBody SysConfig config) {
-    @PostMapping
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
-    @RepeatSubmit
+            return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
-    public AjaxResult add(@Validated @RequestBody SysConfig config)
+        }
-    {
+        return toAjax(configService.insertConfig(config));
-        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+    }
-        {
+
-            return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+    /**
-        }
+     * 修改参数配置
-        config.setCreateBy(SecurityUtils.getUsername());
+     */
-        return toAjax(configService.insertConfig(config));
+    @ApiOperation("修改参数配置")
-    }
+    @PreAuthorize("@ss.hasPermi('system:config:edit')")
-
+    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
-    /**
+    @PutMapping
-     * 修改参数配置
+    public AjaxResult<Void> edit(@Validated @RequestBody SysConfig config) {
-     */
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
-    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+            return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
-    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+        }
-    @PutMapping
+        return toAjax(configService.updateConfig(config));
-    public AjaxResult edit(@Validated @RequestBody SysConfig config)
+    }
-    {
+
-        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+    /**
-        {
+     * 删除参数配置
-            return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+     */
-        }
+    @ApiOperation("删除参数配置")
-        config.setUpdateBy(SecurityUtils.getUsername());
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
-        return toAjax(configService.updateConfig(config));
+    @Log(title = "参数管理", businessType = BusinessType.DELETE)
-    }
+    @DeleteMapping("/{configIds}")
-
+    public AjaxResult<Void> remove(@ApiParam("参数ID串") @PathVariable Long[] configIds) {
-    /**
+        configService.deleteConfigByIds(configIds);
-     * 删除参数配置
+        return success();
-     */
+    }
-    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+
-    @Log(title = "参数管理", businessType = BusinessType.DELETE)
+    /**
-    @DeleteMapping("/{configIds}")
+     * 刷新参数缓存
-    public AjaxResult remove(@PathVariable Long[] configIds)
+     */
-    {
+    @ApiOperation("刷新参数缓存")
-        return toAjax(configService.deleteConfigByIds(configIds));
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
-    }
+    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
-
+    @DeleteMapping("/refreshCache")
-    /**
+    public AjaxResult<Void> refreshCache() {
-     * 清空缓存
+        configService.resetConfigCache();
-     */
+        return AjaxResult.success();
-    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    }
-    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
+}
    @DeleteMapping("/clearCache")
    public AjaxResult clearCache()
    {
        configService.clearCache();
        return AjaxResult.success();
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@ -1,163 +1,147 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.controller.system;
-
+
-import java.util.Iterator;
+import cn.hutool.core.lang.tree.Tree;
-import java.util.List;
+import cn.hutool.core.util.ArrayUtil;
-import org.apache.commons.lang3.ArrayUtils;
+import com.ruoyi.common.annotation.Log;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.constant.UserConstants;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.core.controller.BaseController;
-import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import com.ruoyi.common.core.domain.entity.SysDept;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.enums.BusinessType;
-import org.springframework.web.bind.annotation.PathVariable;
+import com.ruoyi.common.utils.StringUtils;
-import org.springframework.web.bind.annotation.PostMapping;
+import com.ruoyi.system.service.ISysDeptService;
-import org.springframework.web.bind.annotation.PutMapping;
+import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestBody;
+import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.RestController;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.annotation.Log;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.constant.UserConstants;
+import org.springframework.security.access.prepost.PreAuthorize;
-import com.ruoyi.common.core.controller.BaseController;
+import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.core.domain.entity.SysDept;
+
-import com.ruoyi.common.enums.BusinessType;
+import java.util.HashMap;
-import com.ruoyi.common.utils.SecurityUtils;
+import java.util.List;
-import com.ruoyi.common.utils.StringUtils;
+import java.util.Map;
-import com.ruoyi.system.service.ISysDeptService;
+
-
+/**
-/**
+ * 部门信息
- * 部门信息
+ *
- * 
+ * @author Lion Li
- * @author ruoyi
+ */
- */
+@Validated
-@RestController
+@Api(value = "部门控制器", tags = {"部门管理"})
-@RequestMapping("/system/dept")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-public class SysDeptController extends BaseController
+@RestController
-{
+@RequestMapping("/system/dept")
-    @Autowired
+public class SysDeptController extends BaseController {
-    private ISysDeptService deptService;
+
-
+    private final ISysDeptService deptService;
-    /**
+
-     * 获取部门列表
+    /**
-     */
+     * 获取部门列表
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+     */
-    @GetMapping("/list")
+    @ApiOperation("获取部门列表")
-    public AjaxResult list(SysDept dept)
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
-    {
+    @GetMapping("/list")
-        List<SysDept> depts = deptService.selectDeptList(dept);
+    public AjaxResult<List<SysDept>> list(SysDept dept) {
-        return AjaxResult.success(depts);
+        List<SysDept> depts = deptService.selectDeptList(dept);
-    }
+        return AjaxResult.success(depts);
-
+    }
-    /**
+
-     * 查询部门列表（排除节点）
+    /**
-     */
+     * 查询部门列表（排除节点）
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+     */
-    @GetMapping("/list/exclude/{deptId}")
+    @ApiOperation("查询部门列表（排除节点）")
-    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
-    {
+    @GetMapping("/list/exclude/{deptId}")
-        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+    public AjaxResult<List<SysDept>> excludeChild(@ApiParam("部门ID") @PathVariable(value = "deptId", required = false) Long deptId) {
-        Iterator<SysDept> it = depts.iterator();
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
-        while (it.hasNext())
+        depts.removeIf(d -> d.getDeptId().equals(deptId)
-        {
+                || ArrayUtil.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
-            SysDept d = (SysDept) it.next();
+        return AjaxResult.success(depts);
-            if (d.getDeptId().intValue() == deptId
+    }
-                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
+
-            {
+    /**
-                it.remove();
+     * 根据部门编号获取详细信息
-            }
+     */
-        }
+    @ApiOperation("根据部门编号获取详细信息")
-        return AjaxResult.success(depts);
+    @PreAuthorize("@ss.hasPermi('system:dept:query')")
-    }
+    @GetMapping(value = "/{deptId}")
-
+    public AjaxResult<SysDept> getInfo(@ApiParam("部门ID") @PathVariable Long deptId) {
-    /**
+        deptService.checkDeptDataScope(deptId);
-     * 根据部门编号获取详细信息
+        return AjaxResult.success(deptService.selectDeptById(deptId));
-     */
+    }
-    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+
-    @GetMapping(value = "/{deptId}")
+    /**
-    public AjaxResult getInfo(@PathVariable Long 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));
-     */
+    }
-    @GetMapping("/treeselect")
+
-    public AjaxResult 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));
-    @GetMapping(value = "/roleDeptTreeselect/{roleId}")
+        ajax.put("depts", deptService.buildDeptTreeSelect(depts));
-    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
+        return AjaxResult.success(ajax);
-    {
+    }
-        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+
-        AjaxResult ajax = AjaxResult.success();
+    /**
-        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+     * 新增部门
-        ajax.put("depts", deptService.buildDeptTreeSelect(depts));
+     */
-        return ajax;
+    @ApiOperation("新增部门")
-    }
+    @PreAuthorize("@ss.hasPermi('system:dept:add')")
-
+    @Log(title = "部门管理", businessType = BusinessType.INSERT)
-    /**
+    @PostMapping
-     * 新增部门
+    public AjaxResult<Void> add(@Validated @RequestBody SysDept dept) {
-     */
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
-    @PreAuthorize("@ss.hasPermi('system:dept:add')")
+            return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-    @Log(title = "部门管理", businessType = BusinessType.INSERT)
+        }
-    @PostMapping
+        return toAjax(deptService.insertDept(dept));
-    public AjaxResult add(@Validated @RequestBody SysDept dept)
+    }
-    {
+
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+    /**
-        {
+     * 修改部门
-            return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+     */
-        }
+    @ApiOperation("修改部门")
-        dept.setCreateBy(SecurityUtils.getUsername());
+    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
-        return toAjax(deptService.insertDept(dept));
+    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
-    }
+    @PutMapping
-
+    public AjaxResult<Void> edit(@Validated @RequestBody SysDept dept) {
-    /**
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
-     * 修改部门
+            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-     */
+        } else if (dept.getParentId().equals(dept.getDeptId())) {
-    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
-    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+        } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-    @PutMapping
+                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) {
-    public AjaxResult edit(@Validated @RequestBody SysDept dept)
+            return AjaxResult.error("该部门包含未停用的子部门！");
-    {
+        }
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        return toAjax(deptService.updateDept(dept));
-        {
+    }
-            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+
-        }
+    /**
-        else if (dept.getParentId().equals(dept.getDeptId()))
+     * 删除部门
-        {
+     */
-            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+    @ApiOperation("删除部门")
-        }
+    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
-        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
+    @Log(title = "部门管理", businessType = BusinessType.DELETE)
-                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
+    @DeleteMapping("/{deptId}")
-        {
+    public AjaxResult<Void> remove(@ApiParam("部门ID串") @PathVariable Long deptId) {
-            return AjaxResult.error("该部门包含未停用的子部门！");
+        if (deptService.hasChildByDeptId(deptId)) {
-        }
+            return AjaxResult.error("存在下级部门,不允许删除");
-        dept.setUpdateBy(SecurityUtils.getUsername());
+        }
-        return toAjax(deptService.updateDept(dept));
+        if (deptService.checkDeptExistUser(deptId)) {
-    }
+            return AjaxResult.error("部门存在用户,不允许删除");
-
+        }
-    /**
+        return toAjax(deptService.deleteDeptById(deptId));
-     * 删除部门
+    }
-     */
+}
    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
    @Log(title = "部门管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{deptId}")
    public AjaxResult remove(@PathVariable Long deptId)
    {
        if (deptService.hasChildByDeptId(deptId))
        {
            return AjaxResult.error("存在下级部门,不允许删除");
        }
        if (deptService.checkDeptExistUser(deptId))
        {
            return AjaxResult.error("部门存在用户,不允许删除");
        }
        return toAjax(deptService.deleteDeptById(deptId));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@ -1,120 +1,114 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.controller.system;
-
+
-import java.util.ArrayList;
+import com.ruoyi.common.annotation.Log;
-import java.util.List;
+import com.ruoyi.common.core.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.core.domain.PageQuery;
-import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.core.domain.entity.SysDictData;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.enums.BusinessType;
-import org.springframework.web.bind.annotation.PathVariable;
+import com.ruoyi.common.utils.StringUtils;
-import org.springframework.web.bind.annotation.PostMapping;
+import com.ruoyi.common.utils.poi.ExcelUtil;
-import org.springframework.web.bind.annotation.PutMapping;
+import com.ruoyi.system.service.ISysDictDataService;
-import org.springframework.web.bind.annotation.RequestBody;
+import com.ruoyi.system.service.ISysDictTypeService;
-import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
-import com.ruoyi.common.annotation.Log;
+import io.swagger.annotations.ApiParam;
-import com.ruoyi.common.core.controller.BaseController;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.domain.entity.SysDictData;
+import org.springframework.security.access.prepost.PreAuthorize;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.enums.BusinessType;
+import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.utils.SecurityUtils;
+
-import com.ruoyi.common.utils.StringUtils;
+import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import java.util.ArrayList;
-import com.ruoyi.system.service.ISysDictDataService;
+import java.util.List;
-import com.ruoyi.system.service.ISysDictTypeService;
+
-
+/**
-/**
+ * 数据字典信息
- * 数据字典信息
+ *
- * 
+ * @author Lion Li
- * @author ruoyi
+ */
- */
+@Validated
-@RestController
+@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
-@RequestMapping("/system/dict/data")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-public class SysDictDataController extends BaseController
+@RestController
-{
+@RequestMapping("/system/dict/data")
-    @Autowired
+public class SysDictDataController extends BaseController {
-    private ISysDictDataService dictDataService;
+
-
+    private final ISysDictDataService dictDataService;
-    @Autowired
+    private final ISysDictTypeService dictTypeService;
-    private ISysDictTypeService dictTypeService;
+
-
+    @ApiOperation("查询字典数据列表")
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
-    @GetMapping("/list")
+    @GetMapping("/list")
-    public TableDataInfo list(SysDictData dictData)
+    public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) {
-    {
+        return dictDataService.selectPageDictDataList(dictData, pageQuery);
-        startPage();
+    }
-        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+
-        return getDataTable(list);
+    @ApiOperation("导出字典数据列表")
-    }
+    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
-
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
-    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
-    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    public void export(SysDictData dictData, HttpServletResponse response) {
-    @GetMapping("/export")
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
-    public AjaxResult export(SysDictData dictData)
+        ExcelUtil.exportExcel(list, "字典数据", SysDictData.class, response);
-    {
+    }
-        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+
-        ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
+    /**
-        return util.exportExcel(list, "字典数据");
+     * 查询字典数据详细
-    }
+     */
-
+    @ApiOperation("查询字典数据详细")
-    /**
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
-     * 查询字典数据详细
+    @GetMapping(value = "/{dictCode}")
-     */
+    public AjaxResult<SysDictData> getInfo(@ApiParam("字典code") @PathVariable Long dictCode) {
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
-    @GetMapping(value = "/{dictCode}")
+    }
-    public AjaxResult getInfo(@PathVariable Long dictCode)
+
-    {
+    /**
-        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
+     * 根据字典类型查询字典数据信息
-    }
+     */
-
+    @ApiOperation("根据字典类型查询字典数据信息")
-    /**
+    @GetMapping(value = "/type/{dictType}")
-     * 根据字典类型查询字典数据信息
+    public AjaxResult<List<SysDictData>> dictType(@ApiParam("字典类型") @PathVariable String dictType) {
-     */
+        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
-    @GetMapping(value = "/type/{dictType}")
+        if (StringUtils.isNull(data)) {
-    public AjaxResult dictType(@PathVariable String dictType)
+            data = new ArrayList<>();
-    {
+        }
-        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+        return AjaxResult.success(data);
-        if (StringUtils.isNull(data))
+    }
-        {
+
-            data = new ArrayList<SysDictData>();
+    /**
-        }
+     * 新增字典类型
-        return AjaxResult.success(data);
+     */
-    }
+    @ApiOperation("新增字典类型")
-
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
-    /**
+    @Log(title = "字典数据", businessType = BusinessType.INSERT)
-     * 新增字典类型
+    @PostMapping
-     */
+    public AjaxResult<Void> add(@Validated @RequestBody SysDictData dict) {
-    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+        return toAjax(dictDataService.insertDictData(dict));
-    @Log(title = "字典数据", businessType = BusinessType.INSERT)
+    }
-    @PostMapping
+
-    public AjaxResult add(@Validated @RequestBody SysDictData dict)
+    /**
-    {
+     * 修改保存字典类型
-        dict.setCreateBy(SecurityUtils.getUsername());
+     */
-        return toAjax(dictDataService.insertDictData(dict));
+    @ApiOperation("修改保存字典类型")
-    }
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
-
+    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
-    /**
+    @PutMapping
-     * 修改保存字典类型
+    public AjaxResult<Void> edit(@Validated @RequestBody SysDictData dict) {
-     */
+        return toAjax(dictDataService.updateDictData(dict));
-    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    }
-    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
+
-    @PutMapping
+    /**
-    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
+     * 删除字典类型
-    {
+     */
-        dict.setUpdateBy(SecurityUtils.getUsername());
+    @ApiOperation("删除字典类型")
-        return toAjax(dictDataService.updateDictData(dict));
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
-    }
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
-
+    @DeleteMapping("/{dictCodes}")
-    /**
+    public AjaxResult<Void> remove(@ApiParam("字典code串") @PathVariable Long[] dictCodes) {
-     * 删除字典类型
+        dictDataService.deleteDictDataByIds(dictCodes);
-     */
+        return success();
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    }
-    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+}
    @DeleteMapping("/{dictCodes}")
    public AjaxResult remove(@PathVariable Long[] dictCodes)
    {
        return toAjax(dictDataService.deleteDictDataByIds(dictCodes));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
@ -1,131 +1,126 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.controller.system;
-
+
-import java.util.List;
+import com.ruoyi.common.annotation.Log;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.constant.UserConstants;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.core.controller.BaseController;
-import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import com.ruoyi.common.core.domain.PageQuery;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.core.domain.entity.SysDictType;
-import org.springframework.web.bind.annotation.PathVariable;
+import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.bind.annotation.PostMapping;
+import com.ruoyi.common.enums.BusinessType;
-import org.springframework.web.bind.annotation.PutMapping;
+import com.ruoyi.common.utils.poi.ExcelUtil;
-import org.springframework.web.bind.annotation.RequestBody;
+import com.ruoyi.system.service.ISysDictTypeService;
-import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
-import com.ruoyi.common.annotation.Log;
+import io.swagger.annotations.ApiParam;
-import com.ruoyi.common.constant.UserConstants;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.core.controller.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.security.access.prepost.PreAuthorize;
-import com.ruoyi.common.core.domain.entity.SysDictType;
+import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.enums.BusinessType;
+
-import com.ruoyi.common.utils.SecurityUtils;
+import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import java.util.List;
-import com.ruoyi.system.service.ISysDictTypeService;
+
-
+/**
-/**
+ * 数据字典信息
- * 数据字典信息
+ *
- * 
+ * @author Lion Li
- * @author ruoyi
+ */
- */
+@Validated
-@RestController
+@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
-@RequestMapping("/system/dict/type")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-public class SysDictTypeController extends BaseController
+@RestController
-{
+@RequestMapping("/system/dict/type")
-    @Autowired
+public class SysDictTypeController extends BaseController {
-    private ISysDictTypeService dictTypeService;
+
-
+    private final ISysDictTypeService dictTypeService;
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+
-    @GetMapping("/list")
+    @ApiOperation("查询字典类型列表")
-    public TableDataInfo list(SysDictType dictType)
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
-    {
+    @GetMapping("/list")
-        startPage();
+    public TableDataInfo<SysDictType> list(SysDictType dictType, PageQuery pageQuery) {
-        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
-        return getDataTable(list);
+    }
-    }
+
-
+    @ApiOperation("导出字典类型列表")
-    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
+    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
-    @GetMapping("/export")
+    @PostMapping("/export")
-    public AjaxResult export(SysDictType dictType)
+    public void export(SysDictType dictType, HttpServletResponse response) {
-    {
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
-        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        ExcelUtil.exportExcel(list, "字典类型", SysDictType.class, response);
-        ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
+    }
-        return util.exportExcel(list, "字典类型");
+
-    }
+    /**
-
+     * 查询字典类型详细
-    /**
+     */
-     * 查询字典类型详细
+    @ApiOperation("查询字典类型详细")
-     */
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @GetMapping(value = "/{dictId}")
-    @GetMapping(value = "/{dictId}")
+    public AjaxResult<SysDictType> getInfo(@ApiParam("字典ID") @PathVariable Long dictId) {
-    public AjaxResult getInfo(@PathVariable Long dictId)
+        return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
-    {
+    }
-        return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
+
-    }
+    /**
-
+     * 新增字典类型
-    /**
+     */
-     * 新增字典类型
+    @ApiOperation("新增字典类型")
-     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
-    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典类型", businessType = BusinessType.INSERT)
-    @Log(title = "字典类型", businessType = BusinessType.INSERT)
+    @PostMapping
-    @PostMapping
+    public AjaxResult<Void> add(@Validated @RequestBody SysDictType dict) {
-    public AjaxResult add(@Validated @RequestBody SysDictType dict)
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-    {
+            return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
-        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
+        }
-        {
+        return toAjax(dictTypeService.insertDictType(dict));
-            return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+    }
-        }
+
-        dict.setCreateBy(SecurityUtils.getUsername());
+    /**
-        return toAjax(dictTypeService.insertDictType(dict));
+     * 修改字典类型
-    }
+     */
-
+    @ApiOperation("修改字典类型")
-    /**
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
-     * 修改字典类型
+    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
-     */
+    @PutMapping
-    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    public AjaxResult<Void> edit(@Validated @RequestBody SysDictType dict) {
-    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-    @PutMapping
+            return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
-    public AjaxResult edit(@Validated @RequestBody SysDictType dict)
+        }
-    {
+        return toAjax(dictTypeService.updateDictType(dict));
-        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
+    }
-        {
+
-            return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+    /**
-        }
+     * 删除字典类型
-        dict.setUpdateBy(SecurityUtils.getUsername());
+     */
-        return toAjax(dictTypeService.updateDictType(dict));
+    @ApiOperation("删除字典类型")
-    }
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
-
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    /**
+    @DeleteMapping("/{dictIds}")
-     * 删除字典类型
+    public AjaxResult<Void> remove(@ApiParam("字典ID串") @PathVariable Long[] dictIds) {
-     */
+        dictTypeService.deleteDictTypeByIds(dictIds);
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+        return success();
-    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    }
-    @DeleteMapping("/{dictIds}")
+
-    public AjaxResult remove(@PathVariable Long[] dictIds)
+    /**
-    {
+     * 刷新字典缓存
-        return toAjax(dictTypeService.deleteDictTypeByIds(dictIds));
+     */
-    }
+    @ApiOperation("刷新字典缓存")
-
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
-    /**
+    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
-     * 清空缓存
+    @DeleteMapping("/refreshCache")
-     */
+    public AjaxResult<Void> refreshCache() {
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+        dictTypeService.resetDictCache();
-    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
+        return AjaxResult.success();
-    @DeleteMapping("/clearCache")
+    }
-    public AjaxResult clearCache()
+
-    {
+    /**
-        dictTypeService.clearCache();
+     * 获取字典选择框列表
-        return AjaxResult.success();
+     */
-    }
+    @ApiOperation("获取字典选择框列表")
-
+    @GetMapping("/optionselect")
-    /**
+    public AjaxResult<List<SysDictType>> optionselect() {
-     * 获取字典选择框列表
+        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
-     */
+        return AjaxResult.success(dictTypes);
-    @GetMapping("/optionselect")
+    }
-    public AjaxResult optionselect()
+}
    {
        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
        return AjaxResult.success(dictTypes);
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
@ -0,0 +1,35 @@
 package com.ruoyi.web.controller.system;
 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;
 /**
 * 首页
 *
 * @author Lion Li
 */
@Api(value = "首页控制器", tags = {"首页管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
 public class SysIndexController {
    /**
     * 系统基础配置
     */
    private final RuoYiConfig ruoyiConfig;
    /**
     * 访问首页，提示语
     */
    @ApiOperation("访问首页，提示语")
    @GetMapping("/")
    public String index() {
        return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@ -1,94 +1,94 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.controller.system;
-
+
-import java.util.List;
+import com.ruoyi.common.constant.Constants;
-import java.util.Set;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.core.domain.entity.SysMenu;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.core.domain.entity.SysUser;
-import org.springframework.web.bind.annotation.PostMapping;
+import com.ruoyi.common.core.domain.model.LoginBody;
-import org.springframework.web.bind.annotation.RequestBody;
+import com.ruoyi.common.utils.SecurityUtils;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.system.domain.vo.RouterVo;
-import com.ruoyi.common.constant.Constants;
+import com.ruoyi.system.service.ISysMenuService;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.system.service.SysLoginService;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.service.SysPermissionService;
-import com.ruoyi.common.core.domain.model.LoginBody;
+import io.swagger.annotations.Api;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import io.swagger.annotations.ApiOperation;
-import com.ruoyi.common.utils.ServletUtils;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.framework.web.service.SysLoginService;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.framework.web.service.SysPermissionService;
+import org.springframework.validation.annotation.Validated;
-import com.ruoyi.framework.web.service.TokenService;
+import org.springframework.web.bind.annotation.GetMapping;
-import com.ruoyi.system.service.ISysMenuService;
+import org.springframework.web.bind.annotation.PostMapping;
-
+import org.springframework.web.bind.annotation.RequestBody;
-/**
+import org.springframework.web.bind.annotation.RestController;
- * 登录验证
+
- * 
+import java.util.HashMap;
- * @author ruoyi
+import java.util.List;
- */
+import java.util.Map;
-@RestController
+import java.util.Set;
-public class SysLoginController
+
-{
+/**
-    @Autowired
+ * 登录验证
-    private SysLoginService loginService;
+ *
-
+ * @author Lion Li
-    @Autowired
+ */
-    private ISysMenuService menuService;
+@Validated
-
+@Api(value = "登录验证控制器", tags = {"登录验证管理"})
-    @Autowired
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-    private SysPermissionService permissionService;
+@RestController
-
+public class SysLoginController {
-    @Autowired
+
-    private TokenService tokenService;
+    private final SysLoginService loginService;
-
+    private final ISysMenuService menuService;
-    /**
+    private final ISysUserService userService;
-     * 登录方法
+    private final SysPermissionService permissionService;
-     * 
+
-     * @param loginBody 登录信息
+    /**
-     * @return 结果
+     * 登录方法
-     */
+     *
-    @PostMapping("/login")
+     * @param loginBody 登录信息
-    public AjaxResult login(@RequestBody LoginBody loginBody)
+     * @return 结果
-    {
+     */
-        AjaxResult ajax = AjaxResult.success();
+    @ApiOperation("登录方法")
-        // 生成令牌
+    @PostMapping("/login")
-        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+    public AjaxResult<Map<String, Object>> login(@RequestBody LoginBody loginBody) {
-                loginBody.getUuid());
+        Map<String, Object> ajax = new HashMap<>();
-        ajax.put(Constants.TOKEN, token);
+        // 生成令牌
-        return ajax;
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-    }
+                loginBody.getUuid());
-
+        ajax.put(Constants.TOKEN, token);
-    /**
+        return AjaxResult.success(ajax);
-     * 获取用户信息
+    }
-     * 
+
-     * @return 用户信息
+    /**
-     */
+     * 获取用户信息
-    @GetMapping("getInfo")
+     *
-    public AjaxResult getInfo()
+     * @return 用户信息
-    {
+     */
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+    @ApiOperation("获取用户信息")
-        SysUser user = loginUser.getUser();
+    @GetMapping("getInfo")
-        // 角色集合
+    public AjaxResult<Map<String, Object>> getInfo() {
-        Set<String> roles = permissionService.getRolePermission(user);
+        SysUser user = userService.selectUserById(SecurityUtils.getUserId());
-        // 权限集合
+        // 角色集合
-        Set<String> permissions = permissionService.getMenuPermission(user);
+        Set<String> roles = permissionService.getRolePermission(user);
-        AjaxResult ajax = AjaxResult.success();
+        // 权限集合
-        ajax.put("user", user);
+        Set<String> permissions = permissionService.getMenuPermission(user);
-        ajax.put("roles", roles);
+        Map<String, Object> ajax = new HashMap<>();
-        ajax.put("permissions", permissions);
+        ajax.put("user", user);
-        return ajax;
+        ajax.put("roles", roles);
-    }
+        ajax.put("permissions", permissions);
-
+        return AjaxResult.success(ajax);
-    /**
+    }
-     * 获取路由信息
+
-     * 
+    /**
-     * @return 路由信息
+     * 获取路由信息
-     */
+     *
-    @GetMapping("getRouters")
+     * @return 路由信息
-    public AjaxResult getRouters()
+     */
-    {
+    @ApiOperation("获取路由信息")
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+    @GetMapping("getRouters")
-        // 用户信息
+    public AjaxResult<List<RouterVo>> getRouters() {
-        SysUser user = loginUser.getUser();
+        Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
-        return AjaxResult.success(menuService.buildMenus(menus));
+        return AjaxResult.success(menuService.buildMenus(menus));
-    }
+    }
-}
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@ -1,157 +1,133 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.controller.system;
-
+
-import java.util.List;
+import cn.hutool.core.lang.tree.Tree;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.annotation.Log;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.constant.UserConstants;
-import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.core.controller.BaseController;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.core.domain.entity.SysMenu;
-import org.springframework.web.bind.annotation.PathVariable;
+import com.ruoyi.common.enums.BusinessType;
-import org.springframework.web.bind.annotation.PostMapping;
+import com.ruoyi.common.utils.StringUtils;
-import org.springframework.web.bind.annotation.PutMapping;
+import com.ruoyi.system.service.ISysMenuService;
-import org.springframework.web.bind.annotation.RequestBody;
+import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiParam;
-import com.ruoyi.common.annotation.Log;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.constant.Constants;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.constant.UserConstants;
+import org.springframework.security.access.prepost.PreAuthorize;
-import com.ruoyi.common.core.controller.BaseController;
+import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.core.domain.entity.SysMenu;
+
-import com.ruoyi.common.core.domain.model.LoginUser;
+import java.util.HashMap;
-import com.ruoyi.common.enums.BusinessType;
+import java.util.List;
-import com.ruoyi.common.utils.SecurityUtils;
+import java.util.Map;
-import com.ruoyi.common.utils.ServletUtils;
+
-import com.ruoyi.common.utils.StringUtils;
+/**
-import com.ruoyi.framework.web.service.TokenService;
+ * 菜单信息
-import com.ruoyi.system.service.ISysMenuService;
+ *
-
+ * @author Lion Li
-/**
+ */
- * 菜单信息
+@Validated
- * 
+@Api(value = "菜单信息控制器", tags = {"菜单信息管理"})
- * @author ruoyi
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
- */
+@RestController
-@RestController
+@RequestMapping("/system/menu")
-@RequestMapping("/system/menu")
+public class SysMenuController extends BaseController {
-public class SysMenuController extends BaseController
+
-{
+    private final ISysMenuService menuService;
-    @Autowired
+
-    private ISysMenuService menuService;
+    /**
-
+     * 获取菜单列表
-    @Autowired
+     */
-    private TokenService tokenService;
+    @ApiOperation("获取菜单列表")
-
+    @PreAuthorize("@ss.hasPermi('system:menu:list')")
-    /**
+    @GetMapping("/list")
-     * 获取菜单列表
+    public AjaxResult<List<SysMenu>> list(SysMenu menu) {
-     */
+        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
-    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+        return AjaxResult.success(menus);
-    @GetMapping("/list")
+    }
-    public AjaxResult list(SysMenu menu)
+
-    {
+    /**
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+     * 根据菜单编号获取详细信息
-        Long userId = loginUser.getUser().getUserId();
+     */
-        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+    @ApiOperation("根据菜单编号获取详细信息")
-        return AjaxResult.success(menus);
+    @PreAuthorize("@ss.hasPermi('system:menu:query')")
-    }
+    @GetMapping(value = "/{menuId}")
-
+    public AjaxResult<SysMenu> getInfo(@ApiParam("菜单ID") @PathVariable Long menuId) {
-    /**
+        return AjaxResult.success(menuService.selectMenuById(menuId));
-     * 根据菜单编号获取详细信息
+    }
-     */
+
-    @PreAuthorize("@ss.hasPermi('system:menu:query')")
+    /**
-    @GetMapping(value = "/{menuId}")
+     * 获取菜单下拉树列表
-    public AjaxResult getInfo(@PathVariable Long menuId)
+     */
-    {
+    @ApiOperation("获取菜单下拉树列表")
-        return AjaxResult.success(menuService.selectMenuById(menuId));
+    @GetMapping("/treeselect")
-    }
+    public AjaxResult<List<Tree<Long>>> treeselect(SysMenu menu) {
-
+        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
-    /**
+        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
-     * 获取菜单下拉树列表
+    }
-     */
+
-    @GetMapping("/treeselect")
+    /**
-    public AjaxResult treeselect(SysMenu menu)
+     * 加载对应角色菜单列表树
-    {
+     */
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+    @ApiOperation("加载对应角色菜单列表树")
-        Long userId = loginUser.getUser().getUserId();
+    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
-        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+    public AjaxResult<Map<String, Object>> roleMenuTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) {
-        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
+        List<SysMenu> menus = menuService.selectMenuList(getUserId());
-    }
+        Map<String, Object> ajax = new HashMap<>();
-
+        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
-    /**
+        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
-     * 加载对应角色菜单列表树
+        return AjaxResult.success(ajax);
-     */
+    }
-    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+
-    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+    /**
-    {
+     * 新增菜单
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+     */
-        List<SysMenu> menus = menuService.selectMenuList(loginUser.getUser().getUserId());
+    @ApiOperation("新增菜单")
-        AjaxResult ajax = AjaxResult.success();
+    @PreAuthorize("@ss.hasPermi('system:menu:add')")
-        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+    @Log(title = "菜单管理", businessType = BusinessType.INSERT)
-        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+    @PostMapping
-        return ajax;
+    public AjaxResult<Void> add(@Validated @RequestBody SysMenu menu) {
-    }
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
-
+            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
-    /**
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
-     * 新增菜单
+            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
-     */
+        }
-    @PreAuthorize("@ss.hasPermi('system:menu:add')")
+        return toAjax(menuService.insertMenu(menu));
-    @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+    }
-    @PostMapping
+
-    public AjaxResult add(@Validated @RequestBody SysMenu menu)
+    /**
-    {
+     * 修改菜单
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+     */
-        {
+    @ApiOperation("修改菜单")
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
-        }
+    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
+    @PutMapping
-                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
+    public AjaxResult<Void> edit(@Validated @RequestBody SysMenu menu) {
-        {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
-        }
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
-        menu.setCreateBy(SecurityUtils.getUsername());
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
-        return toAjax(menuService.insertMenu(menu));
+        } else if (menu.getMenuId().equals(menu.getParentId())) {
-    }
+            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
-
+        }
-    /**
+        return toAjax(menuService.updateMenu(menu));
-     * 修改菜单
+    }
-     */
+
-    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+    /**
-    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+     * 删除菜单
-    @PutMapping
+     */
-    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
+    @ApiOperation("删除菜单")
-    {
+    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
-        {
+    @DeleteMapping("/{menuId}")
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+    public AjaxResult<Void> remove(@ApiParam("菜单ID") @PathVariable("menuId") Long menuId) {
-        }
+        if (menuService.hasChildByMenuId(menuId)) {
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
+            return AjaxResult.error("存在子菜单,不允许删除");
-                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
+        }
-        {
+        if (menuService.checkMenuExistRole(menuId)) {
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+            return AjaxResult.error("菜单已分配,不允许删除");
-        }
+        }
-        else if (menu.getMenuId().equals(menu.getParentId()))
+        return toAjax(menuService.deleteMenuById(menuId));
-        {
+    }
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+}
        }
        menu.setUpdateBy(SecurityUtils.getUsername());
        return toAjax(menuService.updateMenu(menu));
    }
    /**
     * 删除菜单
     */
    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{menuId}")
    public AjaxResult remove(@PathVariable("menuId") Long menuId)
    {
        if (menuService.hasChildByMenuId(menuId))
        {
            return AjaxResult.error("存在子菜单,不允许删除");
        }
        if (menuService.checkMenuExistRole(menuId))
        {
            return AjaxResult.error("菜单已分配,不允许删除");
        }
        return toAjax(menuService.deleteMenuById(menuId));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
@ -1,92 +1,86 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.controller.system;
-
+
-import java.util.List;
+import com.ruoyi.common.annotation.Log;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.core.controller.BaseController;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.core.domain.PageQuery;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.enums.BusinessType;
-import org.springframework.web.bind.annotation.PathVariable;
+import com.ruoyi.system.domain.SysNotice;
-import org.springframework.web.bind.annotation.PostMapping;
+import com.ruoyi.system.service.ISysNoticeService;
-import org.springframework.web.bind.annotation.PutMapping;
+import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestBody;
+import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.RestController;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.annotation.Log;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.controller.BaseController;
+import org.springframework.security.access.prepost.PreAuthorize;
-import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.enums.BusinessType;
+
-import com.ruoyi.common.utils.SecurityUtils;
+/**
-import com.ruoyi.system.domain.SysNotice;
+ * 公告 信息操作处理
-import com.ruoyi.system.service.ISysNoticeService;
+ *
-
+ * @author Lion Li
-/**
+ */
- * 公告 信息操作处理
+@Validated
- * 
+@Api(value = "公告信息控制器", tags = {"公告信息管理"})
- * @author ruoyi
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
- */
+@RestController
-@RestController
+@RequestMapping("/system/notice")
-@RequestMapping("/system/notice")
+public class SysNoticeController extends BaseController {
-public class SysNoticeController extends BaseController
+
-{
+    private final ISysNoticeService noticeService;
-    @Autowired
+
-    private ISysNoticeService noticeService;
+    /**
-
+     * 获取通知公告列表
-    /**
+     */
-     * 获取通知公告列表
+    @ApiOperation("获取通知公告列表")
-     */
+    @PreAuthorize("@ss.hasPermi('system:notice:list')")
-    @PreAuthorize("@ss.hasPermi('system:notice:list')")
+    @GetMapping("/list")
-    @GetMapping("/list")
+    public TableDataInfo<SysNotice> list(SysNotice notice, PageQuery pageQuery) {
-    public TableDataInfo list(SysNotice notice)
+        return noticeService.selectPageNoticeList(notice, pageQuery);
-    {
+    }
-        startPage();
+
-        List<SysNotice> list = noticeService.selectNoticeList(notice);
+    /**
-        return getDataTable(list);
+     * 根据通知公告编号获取详细信息
-    }
+     */
-
+    @ApiOperation("根据通知公告编号获取详细信息")
-    /**
+    @PreAuthorize("@ss.hasPermi('system:notice:query')")
-     * 根据通知公告编号获取详细信息
+    @GetMapping(value = "/{noticeId}")
-     */
+    public AjaxResult<SysNotice> getInfo(@ApiParam("公告ID") @PathVariable Long noticeId) {
-    @PreAuthorize("@ss.hasPermi('system:notice:query')")
+        return AjaxResult.success(noticeService.selectNoticeById(noticeId));
-    @GetMapping(value = "/{noticeId}")
+    }
-    public AjaxResult getInfo(@PathVariable Long noticeId)
+
-    {
+    /**
-        return AjaxResult.success(noticeService.selectNoticeById(noticeId));
+     * 新增通知公告
-    }
+     */
-
+    @ApiOperation("新增通知公告")
-    /**
+    @PreAuthorize("@ss.hasPermi('system:notice:add')")
-     * 新增通知公告
+    @Log(title = "通知公告", businessType = BusinessType.INSERT)
-     */
+    @PostMapping
-    @PreAuthorize("@ss.hasPermi('system:notice:add')")
+    public AjaxResult<Void> add(@Validated @RequestBody SysNotice notice) {
-    @Log(title = "通知公告", businessType = BusinessType.INSERT)
+        return toAjax(noticeService.insertNotice(notice));
-    @PostMapping
+    }
-    public AjaxResult add(@Validated @RequestBody SysNotice notice)
+
-    {
+    /**
-        notice.setCreateBy(SecurityUtils.getUsername());
+     * 修改通知公告
-        return toAjax(noticeService.insertNotice(notice));
+     */
-    }
+    @ApiOperation("修改通知公告")
-
+    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
-    /**
+    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
-     * 修改通知公告
+    @PutMapping
-     */
+    public AjaxResult<Void> edit(@Validated @RequestBody SysNotice notice) {
-    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+        return toAjax(noticeService.updateNotice(notice));
-    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
+    }
-    @PutMapping
+
-    public AjaxResult edit(@Validated @RequestBody SysNotice notice)
+    /**
-    {
+     * 删除通知公告
-        notice.setUpdateBy(SecurityUtils.getUsername());
+     */
-        return toAjax(noticeService.updateNotice(notice));
+    @ApiOperation("删除通知公告")
-    }
+    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
-
+    @Log(title = "通知公告", businessType = BusinessType.DELETE)
-    /**
+    @DeleteMapping("/{noticeIds}")
-     * 删除通知公告
+    public AjaxResult<Void> remove(@ApiParam("公告ID串") @PathVariable Long[] noticeIds) {
-     */
+        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
-    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+    }
-    @Log(title = "通知公告", businessType = BusinessType.DELETE)
+}
    @DeleteMapping("/{noticeIds}")
    public AjaxResult remove(@PathVariable Long[] noticeIds)
    {
        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
@ -0,0 +1,114 @@
 package com.ruoyi.web.controller.system;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 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.*;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Arrays;
 /**
 * 对象存储配置Controller
 *
 * @author Lion Li
 * @author 孤舟烟雨
 * @date 2021-08-13
 */
@Validated
@Api(value = "对象存储配置控制器", tags = {"对象存储配置管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/system/oss/config")
 public class SysOssConfigController extends BaseController {
    private final ISysOssConfigService iSysOssConfigService;
    /**
     * 查询对象存储配置列表
     */
    @ApiOperation("查询对象存储配置列表")
    @PreAuthorize("@ss.hasPermi('system:oss:list')")
    @GetMapping("/list")
    public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
        return iSysOssConfigService.queryPageList(bo, pageQuery);
    }
    /**
     * 获取对象存储配置详细信息
     */
    @ApiOperation("获取对象存储配置详细信息")
    @PreAuthorize("@ss.hasPermi('system:oss:query')")
    @GetMapping("/{ossConfigId}")
    public AjaxResult<SysOssConfigVo> getInfo(@ApiParam("OSS配置ID")
                                              @NotNull(message = "主键不能为空")
                                              @PathVariable("ossConfigId") Integer ossConfigId) {
        return AjaxResult.success(iSysOssConfigService.queryById(ossConfigId));
    }
    /**
     * 新增对象存储配置
     */
    @ApiOperation("新增对象存储配置")
    @PreAuthorize("@ss.hasPermi('system:oss:add')")
    @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
        return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
    }
    /**
     * 修改对象存储配置
     */
    @ApiOperation("修改对象存储配置")
    @PreAuthorize("@ss.hasPermi('system:oss:edit')")
    @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
        return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
    }
    /**
     * 删除对象存储配置
     */
    @ApiOperation("删除对象存储配置")
    @PreAuthorize("@ss.hasPermi('system:oss:remove')")
    @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ossConfigIds}")
    public AjaxResult<Void> remove(@ApiParam("OSS配置ID串")
                                   @NotEmpty(message = "主键不能为空")
                                   @PathVariable Long[] ossConfigIds) {
        return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
    }
    /**
     * 状态修改
     */
    @ApiOperation("状态修改")
    @PreAuthorize("@ss.hasPermi('system:oss:edit')")
    @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
    @PutMapping("/changeStatus")
    public AjaxResult<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
        return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
@ -0,0 +1,143 @@
 package com.ruoyi.web.controller.system;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpException;
 import cn.hutool.http.HttpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.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.Map;
 /**
 * 文件上传 控制层
 *
 * @author Lion Li
 */
@Validated
@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对象存储列表
     */
    @ApiOperation("查询OSS对象存储列表")
    @PreAuthorize("@ss.hasPermi('system:oss:list')")
    @GetMapping("/list")
    public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
        return iSysOssService.queryPageList(bo, pageQuery);
    }
    /**
     * 上传OSS对象存储
     */
    @ApiOperation("上传OSS对象存储")
    @ApiImplicitParams({
        @ApiImplicitParam(name = "file", value = "文件", dataTypeClass = File.class, required = true),
    })
    @PreAuthorize("@ss.hasPermi('system:oss:upload')")
    @Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
    @RepeatSubmit
    @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.getFileName());
        return AjaxResult.success(map);
    }
    @ApiOperation("下载OSS对象存储")
    @PreAuthorize("@ss.hasPermi('system:oss:download')")
    @GetMapping("/download/{ossId}")
    public void download(@ApiParam("OSS对象ID") @PathVariable Long ossId, HttpServletResponse response) throws IOException {
        SysOss sysOss = iSysOssService.getById(ossId);
        if (ObjectUtil.isNull(sysOss)) {
            throw new ServiceException("文件数据不存在!");
        }
        response.reset();
        FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
        long data;
        try {
            data = HttpUtil.download(sysOss.getUrl(), response.getOutputStream(), false);
        } catch (HttpException e) {
            if (e.getMessage().contains("403")) {
                throw new ServiceException("无读取权限, 请在对应的OSS开启'公有读'权限!");
            } else {
                throw new ServiceException(e.getMessage());
            }
        }
        response.setContentLength(Convert.toInt(data));
    }
    /**
     * 删除OSS对象存储
     */
    @ApiOperation("删除OSS对象存储")
    @PreAuthorize("@ss.hasPermi('system:oss:remove')")
    @Log(title = "OSS对象存储", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ossIds}")
    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));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
@ -1,130 +1,120 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.controller.system;
-
+
-import java.util.List;
+import com.ruoyi.common.annotation.Log;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.constant.UserConstants;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.core.controller.BaseController;
-import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import com.ruoyi.common.core.domain.PageQuery;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.bind.annotation.PathVariable;
+import com.ruoyi.common.enums.BusinessType;
-import org.springframework.web.bind.annotation.PostMapping;
+import com.ruoyi.common.utils.poi.ExcelUtil;
-import org.springframework.web.bind.annotation.PutMapping;
+import com.ruoyi.system.domain.SysPost;
-import org.springframework.web.bind.annotation.RequestBody;
+import com.ruoyi.system.service.ISysPostService;
-import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
-import com.ruoyi.common.annotation.Log;
+import io.swagger.annotations.ApiParam;
-import com.ruoyi.common.constant.UserConstants;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.core.controller.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.security.access.prepost.PreAuthorize;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.enums.BusinessType;
+import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.utils.SecurityUtils;
+
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.system.domain.SysPost;
+import java.util.List;
-import com.ruoyi.system.service.ISysPostService;
+
-
+/**
-/**
+ * 岗位信息操作处理
- * 岗位信息操作处理
+ *
- * 
+ * @author Lion Li
- * @author ruoyi
+ */
- */
+@Validated
-@RestController
+@Api(value = "岗位信息控制器", tags = {"岗位信息管理"})
-@RequestMapping("/system/post")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-public class SysPostController extends BaseController
+@RestController
-{
+@RequestMapping("/system/post")
-    @Autowired
+public class SysPostController extends BaseController {
-    private ISysPostService postService;
+
-
+    private final ISysPostService postService;
-    /**
+
-     * 获取岗位列表
+    /**
-     */
+     * 获取岗位列表
-    @PreAuthorize("@ss.hasPermi('system:post:list')")
+     */
-    @GetMapping("/list")
+    @ApiOperation("获取岗位列表")
-    public TableDataInfo list(SysPost post)
+    @PreAuthorize("@ss.hasPermi('system:post:list')")
-    {
+    @GetMapping("/list")
-        startPage();
+    public TableDataInfo<SysPost> list(SysPost post, PageQuery pageQuery) {
-        List<SysPost> list = postService.selectPostList(post);
+        return postService.selectPagePostList(post, pageQuery);
-        return getDataTable(list);
+    }
-    }
+
-    
+    @ApiOperation("导出岗位列表")
-    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
+    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:post:export')")
+    @PreAuthorize("@ss.hasPermi('system:post:export')")
-    @GetMapping("/export")
+    @PostMapping("/export")
-    public AjaxResult export(SysPost post)
+    public void export(SysPost post, HttpServletResponse response) {
-    {
+        List<SysPost> list = postService.selectPostList(post);
-        List<SysPost> list = postService.selectPostList(post);
+        ExcelUtil.exportExcel(list, "岗位数据", SysPost.class, response);
-        ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
+    }
-        return util.exportExcel(list, "岗位数据");
+
-    }
+    /**
-
+     * 根据岗位编号获取详细信息
-    /**
+     */
-     * 根据岗位编号获取详细信息
+    @ApiOperation("根据岗位编号获取详细信息")
-     */
+    @PreAuthorize("@ss.hasPermi('system:post:query')")
-    @PreAuthorize("@ss.hasPermi('system:post:query')")
+    @GetMapping(value = "/{postId}")
-    @GetMapping(value = "/{postId}")
+    public AjaxResult<SysPost> getInfo(@ApiParam("岗位ID") @PathVariable Long postId) {
-    public AjaxResult getInfo(@PathVariable Long postId)
+        return AjaxResult.success(postService.selectPostById(postId));
-    {
+    }
-        return AjaxResult.success(postService.selectPostById(postId));
+
-    }
+    /**
-
+     * 新增岗位
-    /**
+     */
-     * 新增岗位
+    @ApiOperation("新增岗位")
-     */
+    @PreAuthorize("@ss.hasPermi('system:post:add')")
-    @PreAuthorize("@ss.hasPermi('system:post:add')")
+    @Log(title = "岗位管理", businessType = BusinessType.INSERT)
-    @Log(title = "岗位管理", businessType = BusinessType.INSERT)
+    @PostMapping
-    @PostMapping
+    public AjaxResult<Void> add(@Validated @RequestBody SysPost post) {
-    public AjaxResult add(@Validated @RequestBody SysPost post)
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
-    {
+            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
-        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
+        } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
-        {
+            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
-            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        }
-        }
+        return toAjax(postService.insertPost(post));
-        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+    }
-        {
+
-            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+    /**
-        }
+     * 修改岗位
-        post.setCreateBy(SecurityUtils.getUsername());
+     */
-        return toAjax(postService.insertPost(post));
+    @ApiOperation("修改岗位")
-    }
+    @PreAuthorize("@ss.hasPermi('system:post:edit')")
-
+    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
-    /**
+    @PutMapping
-     * 修改岗位
+    public AjaxResult<Void> edit(@Validated @RequestBody SysPost post) {
-     */
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
-    @PreAuthorize("@ss.hasPermi('system:post:edit')")
+            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
-    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
+        } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
-    @PutMapping
+            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
-    public AjaxResult edit(@Validated @RequestBody SysPost post)
+        }
-    {
+        return toAjax(postService.updatePost(post));
-        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
+    }
-        {
+
-            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+    /**
-        }
+     * 删除岗位
-        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+     */
-        {
+    @ApiOperation("删除岗位")
-            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+    @PreAuthorize("@ss.hasPermi('system:post:remove')")
-        }
+    @Log(title = "岗位管理", businessType = BusinessType.DELETE)
-        post.setUpdateBy(SecurityUtils.getUsername());
+    @DeleteMapping("/{postIds}")
-        return toAjax(postService.updatePost(post));
+    public AjaxResult<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] postIds) {
-    }
+        return toAjax(postService.deletePostByIds(postIds));
-
+    }
-    /**
+
-     * 删除岗位
+    /**
-     */
+     * 获取岗位选择框列表
-    @PreAuthorize("@ss.hasPermi('system:post:remove')")
+     */
-    @Log(title = "岗位管理", businessType = BusinessType.DELETE)
+    @ApiOperation("获取岗位选择框列表")
-    @DeleteMapping("/{postIds}")
+    @GetMapping("/optionselect")
-    public AjaxResult remove(@PathVariable Long[] postIds)
+    public AjaxResult<List<SysPost>> optionselect() {
-    {
+        List<SysPost> posts = postService.selectPostAll();
-        return toAjax(postService.deletePostByIds(postIds));
+        return AjaxResult.success(posts);
-    }
+    }
-
+}
    /**
     * 获取岗位选择框列表
     */
    @GetMapping("/optionselect")
    public AjaxResult optionselect()
    {
        List<SysPost> posts = postService.selectPostAll();
        return AjaxResult.success(posts);
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@ -1,139 +1,135 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.controller.system;
-
+
-import java.io.IOException;
+import com.ruoyi.common.annotation.Log;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.constant.UserConstants;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.core.controller.BaseController;
-import org.springframework.web.bind.annotation.PostMapping;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.web.bind.annotation.PutMapping;
+import com.ruoyi.common.core.domain.entity.SysUser;
-import org.springframework.web.bind.annotation.RequestBody;
+import com.ruoyi.common.core.domain.model.LoginUser;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.core.service.TokenService;
-import org.springframework.web.bind.annotation.RequestParam;
+import com.ruoyi.common.enums.BusinessType;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.SecurityUtils;
-import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.system.domain.SysOss;
-import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.system.service.ISysOssService;
-import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.common.core.controller.BaseController;
+import io.swagger.annotations.Api;
-import com.ruoyi.common.core.domain.AjaxResult;
+import io.swagger.annotations.ApiImplicitParam;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import io.swagger.annotations.ApiImplicitParams;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import io.swagger.annotations.ApiOperation;
-import com.ruoyi.common.enums.BusinessType;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.utils.ServletUtils;
+import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.utils.StringUtils;
+import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.utils.file.FileUploadUtils;
+import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.framework.web.service.TokenService;
+
-import com.ruoyi.system.service.ISysUserService;
+import java.io.File;
-
+import java.util.HashMap;
-/**
+import java.util.Map;
- * 个人信息 业务处理
+
- * 
+/**
- * @author ruoyi
+ * 个人信息 业务处理
- */
+ *
-@RestController
+ * @author Lion Li
-@RequestMapping("/system/user/profile")
+ */
-public class SysProfileController extends BaseController
+@Validated
-{
+@Api(value = "个人信息控制器", tags = {"个人信息管理"})
-    @Autowired
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-    private ISysUserService userService;
+@RestController
-
+@RequestMapping("/system/user/profile")
-    @Autowired
+public class SysProfileController extends BaseController {
-    private TokenService tokenService;
+
-
+    private final ISysUserService userService;
-    /**
+    private final TokenService tokenService;
-     * 个人信息
+    private final ISysOssService iSysOssService;
-     */
+
-    @GetMapping
+    /**
-    public AjaxResult profile()
+     * 个人信息
-    {
+     */
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+    @ApiOperation("个人信息")
-        SysUser user = loginUser.getUser();
+    @GetMapping
-        AjaxResult ajax = AjaxResult.success(user);
+    public AjaxResult<Map<String, Object>> profile() {
-        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
+        LoginUser loginUser = getLoginUser();
-        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+        SysUser user = userService.selectUserById(loginUser.getUserId());
-        return ajax;
+        Map<String, Object> ajax = new HashMap<>();
-    }
+        ajax.put("user", user);
-
+        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
-    /**
+        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
-     * 修改用户
+        return AjaxResult.success(ajax);
-     */
+    }
-    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+
-    @PutMapping
+    /**
-    public AjaxResult updateProfile(@RequestBody SysUser user)
+     * 修改用户
-    {
+     */
-        if (StringUtils.isNotEmpty(user.getPhonenumber())
+    @ApiOperation("修改用户")
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
-        {
+    @PutMapping
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+    public AjaxResult<Void> updateProfile(@RequestBody SysUser user) {
-        }
+        if (StringUtils.isNotEmpty(user.getPhonenumber())
-        if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        {
+        }
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        if (StringUtils.isNotEmpty(user.getEmail())
-        }
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-        if (userService.updateUserProfile(user) > 0)
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        {
+        }
-            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        LoginUser loginUser = getLoginUser();
-            // 更新缓存用户信息
+        SysUser sysUser = userService.selectUserById(loginUser.getUserId());
-            loginUser.getUser().setNickName(user.getNickName());
+        user.setUserId(sysUser.getUserId());
-            loginUser.getUser().setPhonenumber(user.getPhonenumber());
+        user.setUserName(null);
-            loginUser.getUser().setEmail(user.getEmail());
+        user.setPassword(null);
-            loginUser.getUser().setSex(user.getSex());
+        if (userService.updateUserProfile(user) > 0) {
-            tokenService.setLoginUser(loginUser);
+            return AjaxResult.success();
-            return AjaxResult.success();
+        }
-        }
+        return AjaxResult.error("修改个人信息异常，请联系管理员");
-        return AjaxResult.error("修改个人信息异常，请联系管理员");
+    }
-    }
+
-
+    /**
-    /**
+     * 重置密码
-     * 重置密码
+     */
-     */
+    @ApiOperation("重置密码")
-    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @ApiImplicitParams({
-    @PutMapping("/updatePwd")
+        @ApiImplicitParam(name = "oldPassword", value = "旧密码", paramType = "query", dataTypeClass = String.class),
-    public AjaxResult updatePwd(String oldPassword, String newPassword)
+        @ApiImplicitParam(name = "newPassword", value = "新密码", paramType = "query", dataTypeClass = String.class)
-    {
+    })
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
-        String userName = loginUser.getUsername();
+    @PutMapping("/updatePwd")
-        String password = loginUser.getPassword();
+    public AjaxResult<Void> updatePwd(String oldPassword, String newPassword) {
-        if (!SecurityUtils.matchesPassword(oldPassword, password))
+        SysUser user = userService.selectUserById(SecurityUtils.getUserId());
-        {
+        String userName = user.getUserName();
-            return AjaxResult.error("修改密码失败，旧密码错误");
+        String password = user.getPassword();
-        }
+        if (!SecurityUtils.matchesPassword(oldPassword, password)) {
-        if (SecurityUtils.matchesPassword(newPassword, password))
+            return AjaxResult.error("修改密码失败，旧密码错误");
-        {
+        }
-            return AjaxResult.error("新密码不能与旧密码相同");
+        if (SecurityUtils.matchesPassword(newPassword, password)) {
-        }
+            return AjaxResult.error("新密码不能与旧密码相同");
-        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
+        }
-        {
+        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {
-            // 更新缓存用户密码
+            return AjaxResult.success();
-            loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+        }
-            tokenService.setLoginUser(loginUser);
+        return AjaxResult.error("修改密码异常，请联系管理员");
-            return AjaxResult.success();
+    }
-        }
+
-        return AjaxResult.error("修改密码异常，请联系管理员");
+    /**
-    }
+     * 头像上传
-
+     */
-    /**
+    @ApiOperation("头像上传")
-     * 头像上传
+    @ApiImplicitParams({
-     */
+        @ApiImplicitParam(name = "avatarfile", value = "用户头像", dataTypeClass = File.class, required = true),
-    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
+    })
-    @PostMapping("/avatar")
+    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
-    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
+    @PostMapping("/avatar")
-    {
+    public AjaxResult<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) {
-        if (!file.isEmpty())
+        Map<String, Object> ajax = new HashMap<>();
-        {
+        if (!file.isEmpty()) {
-            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            LoginUser loginUser = getLoginUser();
-            String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file);
+            SysOss oss = iSysOssService.upload(file);
-            if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
+            String avatar = oss.getUrl();
-            {
+            if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) {
-                AjaxResult ajax = AjaxResult.success();
+                ajax.put("imgUrl", avatar);
-                ajax.put("imgUrl", avatar);
+                return AjaxResult.success(ajax);
-                // 更新缓存用户头像
+            }
-                loginUser.getUser().setAvatar(avatar);
+        }
-                tokenService.setLoginUser(loginUser);
+        return AjaxResult.error("上传图片异常，请联系管理员", ajax);
-                return ajax;
+    }
-            }
+}
        }
        return AjaxResult.error("上传图片异常，请联系管理员");
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
@ -0,0 +1,41 @@
 package com.ruoyi.web.controller.system;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.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;
 import org.springframework.web.bind.annotation.RestController;
 /**
 * 注册验证
 *
 * @author Lion Li
 */
@Validated
@Api(value = "注册验证控制器", tags = {"注册验证管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
 public class SysRegisterController extends BaseController {
    private final SysRegisterService registerService;
    private final ISysConfigService configService;
    @ApiOperation("用户注册")
    @PostMapping("/register")
    public AjaxResult<Void> register(@RequestBody RegisterBody user) {
        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
            return error("当前系统没有开启注册功能！");
        }
        String msg = registerService.register(user);
        return StringUtils.isEmpty(msg) ? success() : error(msg);
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@ -1,182 +1,224 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.controller.system;
-
+
-import java.util.List;
+import com.ruoyi.common.annotation.Log;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.constant.UserConstants;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.core.controller.BaseController;
-import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import com.ruoyi.common.core.domain.PageQuery;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.core.domain.entity.SysRole;
-import org.springframework.web.bind.annotation.PathVariable;
+import com.ruoyi.common.core.domain.entity.SysUser;
-import org.springframework.web.bind.annotation.PostMapping;
+import com.ruoyi.common.core.domain.model.LoginUser;
-import org.springframework.web.bind.annotation.PutMapping;
+import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.bind.annotation.RequestBody;
+import com.ruoyi.common.core.service.TokenService;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.enums.BusinessType;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.system.service.SysPermissionService;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import io.swagger.annotations.*;
-import com.ruoyi.common.core.page.TableDataInfo;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.enums.BusinessType;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
-import com.ruoyi.common.utils.ServletUtils;
+import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.utils.StringUtils;
+import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+
-import com.ruoyi.framework.web.service.SysPermissionService;
+import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.framework.web.service.TokenService;
+import java.util.List;
-import com.ruoyi.system.service.ISysRoleService;
+
-import com.ruoyi.system.service.ISysUserService;
+/**
-
+ * 角色信息
-/**
+ *
- * 角色信息
+ * @author Lion Li
- * 
+ */
- * @author ruoyi
+@Validated
- */
+@Api(value = "角色信息控制器", tags = {"角色信息管理"})
-@RestController
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RequestMapping("/system/role")
+@RestController
-public class SysRoleController extends BaseController
+@RequestMapping("/system/role")
-{
+public class SysRoleController extends BaseController {
-    @Autowired
+
-    private ISysRoleService roleService;
+    private final ISysRoleService roleService;
-
+    private final TokenService tokenService;
-    @Autowired
+    private final ISysUserService userService;
-    private TokenService tokenService;
+    private final SysPermissionService permissionService;
-    
+
-    @Autowired
+    @ApiOperation("查询角色信息列表")
-    private SysPermissionService permissionService;
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
-    
+    @GetMapping("/list")
-    @Autowired
+    public TableDataInfo<SysRole> list(SysRole role, PageQuery pageQuery) {
-    private ISysUserService userService;
+        return roleService.selectPageRoleList(role, pageQuery);
-
+    }
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+
-    @GetMapping("/list")
+    @ApiOperation("导出角色信息列表")
-    public TableDataInfo list(SysRole role)
+    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
-    {
+    @PreAuthorize("@ss.hasPermi('system:role:export')")
-        startPage();
+    @PostMapping("/export")
-        List<SysRole> list = roleService.selectRoleList(role);
+    public void export(SysRole role, HttpServletResponse response) {
-        return getDataTable(list);
+        List<SysRole> list = roleService.selectRoleList(role);
-    }
+        ExcelUtil.exportExcel(list, "角色数据", SysRole.class, response);
-
+    }
-    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
+
-    @PreAuthorize("@ss.hasPermi('system:role:export')")
+    /**
-    @GetMapping("/export")
+     * 根据角色编号获取详细信息
-    public AjaxResult export(SysRole role)
+     */
-    {
+    @ApiOperation("根据角色编号获取详细信息")
-        List<SysRole> list = roleService.selectRoleList(role);
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
-        ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+    @GetMapping(value = "/{roleId}")
-        return util.exportExcel(list, "角色数据");
+    public AjaxResult<SysRole> getInfo(@ApiParam("角色ID") @PathVariable Long roleId) {
-    }
+        roleService.checkRoleDataScope(roleId);
-
+        return AjaxResult.success(roleService.selectRoleById(roleId));
-    /**
+    }
-     * 根据角色编号获取详细信息
+
-     */
+    /**
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
+     * 新增角色
-    @GetMapping(value = "/{roleId}")
+     */
-    public AjaxResult getInfo(@PathVariable Long roleId)
+    @ApiOperation("新增角色")
-    {
+    @PreAuthorize("@ss.hasPermi('system:role:add')")
-        return AjaxResult.success(roleService.selectRoleById(roleId));
+    @Log(title = "角色管理", businessType = BusinessType.INSERT)
-    }
+    @PostMapping
-
+    public AjaxResult<Void> add(@Validated @RequestBody SysRole role) {
-    /**
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
-     * 新增角色
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
-     */
+        } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
-    @PreAuthorize("@ss.hasPermi('system:role:add')")
+            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
-    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+        }
-    @PostMapping
+        return toAjax(roleService.insertRole(role));
-    public AjaxResult add(@Validated @RequestBody SysRole role)
+
-    {
+    }
-        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+
-        {
+    /**
-            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+     * 修改保存角色
-        }
+     */
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+    @ApiOperation("修改保存角色")
-        {
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
-            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-        }
+    @PutMapping
-        role.setCreateBy(SecurityUtils.getUsername());
+    public AjaxResult<Void> edit(@Validated @RequestBody SysRole role) {
-        return toAjax(roleService.insertRole(role));
+        roleService.checkRoleAllowed(role);
-
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
-    }
+            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
-
+        } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
-    /**
+            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
-     * 修改保存角色
+        }
-     */
+
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+        if (roleService.updateRole(role) > 0) {
-    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+            // 更新缓存用户权限
-    @PutMapping
+            LoginUser loginUser = getLoginUser();
-    public AjaxResult edit(@Validated @RequestBody SysRole role)
+            SysUser sysUser = userService.selectUserById(loginUser.getUserId());
-    {
+            if (StringUtils.isNotNull(sysUser) && !sysUser.isAdmin()) {
-        roleService.checkRoleAllowed(role);
+                loginUser.setMenuPermissions(permissionService.getMenuPermission(sysUser));
-        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+                tokenService.setLoginUser(loginUser);
-        {
+            }
-            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+            return AjaxResult.success();
-        }
+        }
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+        return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
-        {
+    }
-            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+
-        }
+    /**
-        role.setUpdateBy(SecurityUtils.getUsername());
+     * 修改保存数据权限
-        
+     */
-        if (roleService.updateRole(role) > 0)
+    @ApiOperation("修改保存数据权限")
-        {
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
-            // 更新缓存用户权限
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+    @PutMapping("/dataScope")
-            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+    public AjaxResult<Void> dataScope(@RequestBody SysRole role) {
-            {
+        roleService.checkRoleAllowed(role);
-                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+        return toAjax(roleService.authDataScope(role));
-                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+    }
-                tokenService.setLoginUser(loginUser);
+
-            }
+    /**
-            return AjaxResult.success();
+     * 状态修改
-        }
+     */
-        return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+    @ApiOperation("状态修改")
-    }
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
-
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    /**
+    @PutMapping("/changeStatus")
-     * 修改保存数据权限
+    public AjaxResult<Void> changeStatus(@RequestBody SysRole role) {
-     */
+        roleService.checkRoleAllowed(role);
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+        return toAjax(roleService.updateRoleStatus(role));
-    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    }
-    @PutMapping("/dataScope")
+
-    public AjaxResult dataScope(@RequestBody SysRole role)
+    /**
-    {
+     * 删除角色
-        roleService.checkRoleAllowed(role);
+     */
-        return toAjax(roleService.authDataScope(role));
+    @ApiOperation("删除角色")
-    }
+    @PreAuthorize("@ss.hasPermi('system:role:remove')")
-
+    @Log(title = "角色管理", businessType = BusinessType.DELETE)
-    /**
+    @DeleteMapping("/{roleIds}")
-     * 状态修改
+    public AjaxResult<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] roleIds) {
-     */
+        return toAjax(roleService.deleteRoleByIds(roleIds));
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    }
-    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+
-    @PutMapping("/changeStatus")
+    /**
-    public AjaxResult changeStatus(@RequestBody SysRole role)
+     * 获取角色选择框列表
-    {
+     */
-        roleService.checkRoleAllowed(role);
+    @ApiOperation("获取角色选择框列表")
-        role.setUpdateBy(SecurityUtils.getUsername());
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
-        return toAjax(roleService.updateRoleStatus(role));
+    @GetMapping("/optionselect")
-    }
+    public AjaxResult<List<SysRole>> optionselect() {
-
+        return AjaxResult.success(roleService.selectRoleAll());
-    /**
+    }
-     * 删除角色
+
-     */
+    /**
-    @PreAuthorize("@ss.hasPermi('system:role:remove')")
+     * 查询已分配用户角色列表
-    @Log(title = "角色管理", businessType = BusinessType.DELETE)
+     */
-    @DeleteMapping("/{roleIds}")
+    @ApiOperation("查询已分配用户角色列表")
-    public AjaxResult remove(@PathVariable Long[] roleIds)
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
-    {
+    @GetMapping("/authUser/allocatedList")
-        return toAjax(roleService.deleteRoleByIds(roleIds));
+    public TableDataInfo<SysUser> allocatedList(SysUser user, PageQuery pageQuery) {
-    }
+        return userService.selectAllocatedList(user, pageQuery);
-
+    }
-    /**
+
-     * 获取角色选择框列表
+    /**
-     */
+     * 查询未分配用户角色列表
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
+     */
-    @GetMapping("/optionselect")
+    @ApiOperation("查询未分配用户角色列表")
-    public AjaxResult optionselect()
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
-    {
+    @GetMapping("/authUser/unallocatedList")
-        return AjaxResult.success(roleService.selectRoleAll());
+    public TableDataInfo<SysUser> unallocatedList(SysUser user, PageQuery pageQuery) {
-    }
+        return userService.selectUnallocatedList(user, pageQuery);
-}
+    }
    /**
     * 取消授权用户
     */
    @ApiOperation("取消授权用户")
    @PreAuthorize("@ss.hasPermi('system:role:edit')")
    @Log(title = "角色管理", businessType = BusinessType.GRANT)
    @PutMapping("/authUser/cancel")
    public AjaxResult<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
        return toAjax(roleService.deleteAuthUser(userRole));
    }
    /**
     * 批量取消授权用户
     */
    @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 AjaxResult<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
        return toAjax(roleService.deleteAuthUsers(roleId, userIds));
    }
    /**
     * 批量选择用户授权
     */
    @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 AjaxResult<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
        return toAjax(roleService.insertAuthUsers(roleId, userIds));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@ -1,205 +1,232 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.controller.system;
-
+
-import java.util.List;
+import cn.hutool.core.bean.BeanUtil;
-import java.util.stream.Collectors;
+import cn.hutool.core.util.ArrayUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import cn.hutool.core.util.ObjectUtil;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.annotation.Log;
-import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.constant.UserConstants;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import com.ruoyi.common.core.controller.BaseController;
-import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.core.domain.AjaxResult;
-import org.springframework.web.bind.annotation.PathVariable;
+import com.ruoyi.common.core.domain.PageQuery;
-import org.springframework.web.bind.annotation.PostMapping;
+import com.ruoyi.common.core.domain.entity.SysDept;
-import org.springframework.web.bind.annotation.PutMapping;
+import com.ruoyi.common.core.domain.entity.SysRole;
-import org.springframework.web.bind.annotation.RequestBody;
+import com.ruoyi.common.core.domain.entity.SysUser;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.enums.BusinessType;
-import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.excel.ExcelResult;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.vo.SysUserExportVo;
-import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.system.domain.vo.SysUserImportVo;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.listener.SysUserImportListener;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.system.service.ISysPostService;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.common.utils.SecurityUtils;
+import io.swagger.annotations.*;
-import com.ruoyi.common.utils.ServletUtils;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.security.access.prepost.PreAuthorize;
-import com.ruoyi.framework.web.service.TokenService;
+import org.springframework.validation.annotation.Validated;
-import com.ruoyi.system.service.ISysPostService;
+import org.springframework.web.bind.annotation.*;
-import com.ruoyi.system.service.ISysRoleService;
+import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.system.service.ISysUserService;
+
-
+import javax.servlet.http.HttpServletResponse;
-/**
+import java.util.ArrayList;
- * 用户信息
+import java.util.HashMap;
- * 
+import java.util.List;
- * @author ruoyi
+import java.util.Map;
- */
+import java.util.stream.Collectors;
-@RestController
+
-@RequestMapping("/system/user")
+/**
-public class SysUserController extends BaseController
+ * 用户信息
-{
+ *
-    @Autowired
+ * @author Lion Li
-    private ISysUserService userService;
+ */
-
+@Validated
-    @Autowired
+@Api(value = "用户信息控制器", tags = {"用户信息管理"})
-    private ISysRoleService roleService;
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
-
+@RestController
-    @Autowired
+@RequestMapping("/system/user")
-    private ISysPostService postService;
+public class SysUserController extends BaseController {
-
+
-    @Autowired
+    private final ISysUserService userService;
-    private TokenService tokenService;
+    private final ISysRoleService roleService;
-
+    private final ISysPostService postService;
-    /**
+
-     * 获取用户列表
+    /**
-     */
+     * 获取用户列表
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+     */
-    @GetMapping("/list")
+    @ApiOperation("获取用户列表")
-    public TableDataInfo list(SysUser user)
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
-    {
+    @GetMapping("/list")
-        startPage();
+    public TableDataInfo<SysUser> list(SysUser user, PageQuery pageQuery) {
-        List<SysUser> list = userService.selectUserList(user);
+        return userService.selectPageUserList(user, pageQuery);
-        return getDataTable(list);
+    }
-    }
+
-
+    @ApiOperation("导出用户列表")
-    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
+    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    @PreAuthorize("@ss.hasPermi('system:user:export')")
-    @GetMapping("/export")
+    @PostMapping("/export")
-    public AjaxResult export(SysUser user)
+    public void export(SysUser user, HttpServletResponse response) {
-    {
+        List<SysUser> list = userService.selectUserList(user);
-        List<SysUser> list = userService.selectUserList(user);
+        List<SysUserExportVo> listVo = BeanUtil.copyToList(list, SysUserExportVo.class);
-        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        for (int i = 0; i < list.size(); i++) {
-        return util.exportExcel(list, "用户数据");
+            SysDept dept = list.get(i).getDept();
-    }
+            SysUserExportVo vo = listVo.get(i);
-
+            if (ObjectUtil.isNotEmpty(dept)) {
-    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+                vo.setDeptName(dept.getDeptName());
-    @PreAuthorize("@ss.hasPermi('system:user:import')")
+                vo.setLeader(dept.getLeader());
-    @PostMapping("/importData")
+            }
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+        }
-    {
+        ExcelUtil.exportExcel(listVo, "用户数据", SysUserExportVo.class, response);
-        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+    }
-        List<SysUser> userList = util.importExcel(file.getInputStream());
+
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+    @ApiOperation("导入用户列表")
-        String operName = loginUser.getUsername();
+    @ApiImplicitParams({
-        String message = userService.importUser(userList, updateSupport, operName);
+            @ApiImplicitParam(name = "file", value = "导入文件", dataType = "java.io.File", required = true),
-        return AjaxResult.success(message);
+    })
-    }
+    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-
+    @PreAuthorize("@ss.hasPermi('system:user:import')")
-    @GetMapping("/importTemplate")
+    @PostMapping("/importData")
-    public AjaxResult importTemplate()
+    public AjaxResult<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
-    {
+        ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
-        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        return AjaxResult.success(result.getAnalysis());
-        return util.importTemplateExcel("用户数据");
+    }
-    }
+
-
+    @ApiOperation("下载导入模板")
-    /**
+    @PostMapping("/importTemplate")
-     * 根据用户编号获取详细信息
+    public void importTemplate(HttpServletResponse response) {
-     */
+        ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response);
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    }
-    @GetMapping(value = { "/", "/{userId}" })
+
-    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
+    /**
-    {
+     * 根据用户编号获取详细信息
-        AjaxResult ajax = AjaxResult.success();
+     */
-        List<SysRole> roles = roleService.selectRoleAll();
+    @ApiOperation("根据用户编号获取详细信息")
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
-        ajax.put("posts", postService.selectPostAll());
+    @GetMapping(value = {"/", "/{userId}"})
-        if (StringUtils.isNotNull(userId))
+    public AjaxResult<Map<String, Object>> getInfo(@ApiParam("用户ID") @PathVariable(value = "userId", required = false) Long userId) {
-        {
+        userService.checkUserDataScope(userId);
-            ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));
+        Map<String, Object> ajax = new HashMap<>();
-            ajax.put("postIds", postService.selectPostListByUserId(userId));
+        List<SysRole> roles = roleService.selectRoleAll();
-            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        }
+        ajax.put("posts", postService.selectPostAll());
-        return ajax;
+        if (StringUtils.isNotNull(userId)) {
-    }
+            ajax.put("user", userService.selectUserById(userId));
-
+            ajax.put("postIds", postService.selectPostListByUserId(userId));
-    /**
+            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
-     * 新增用户
+        }
-     */
+        return AjaxResult.success(ajax);
-    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    }
-    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+
-    @PostMapping
+    /**
-    public AjaxResult add(@Validated @RequestBody SysUser user)
+     * 新增用户
-    {
+     */
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
+    @ApiOperation("新增用户")
-        {
+    @PreAuthorize("@ss.hasPermi('system:user:add')")
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+    @Log(title = "用户管理", businessType = BusinessType.INSERT)
-        }
+    @PostMapping
-        else if (StringUtils.isNotEmpty(user.getPhonenumber())
+    public AjaxResult<Void> add(@Validated @RequestBody SysUser user) {
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
-        {
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber())
-        }
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-        else if (StringUtils.isNotEmpty(user.getEmail())
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        } else if (StringUtils.isNotEmpty(user.getEmail())
-        {
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        }
+        }
-        user.setCreateBy(SecurityUtils.getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        return toAjax(userService.insertUser(user));
-        return toAjax(userService.insertUser(user));
+    }
-    }
+
-
+    /**
-    /**
+     * 修改用户
-     * 修改用户
+     */
-     */
+    @ApiOperation("修改用户")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysUser user)
+    public AjaxResult<Void> edit(@Validated @RequestBody SysUser user) {
-    {
+        userService.checkUserAllowed(user);
-        userService.checkUserAllowed(user);
+        if (StringUtils.isNotEmpty(user.getPhonenumber())
-        if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        {
+        } else if (StringUtils.isNotEmpty(user.getEmail())
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-        }
+            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        else if (StringUtils.isNotEmpty(user.getEmail())
+        }
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        return toAjax(userService.updateUser(user));
-        {
+    }
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+
-        }
+    /**
-        user.setUpdateBy(SecurityUtils.getUsername());
+     * 删除用户
-        return toAjax(userService.updateUser(user));
+     */
-    }
+    @ApiOperation("删除用户")
-
+    @PreAuthorize("@ss.hasPermi('system:user:remove')")
-    /**
+    @Log(title = "用户管理", businessType = BusinessType.DELETE)
-     * 删除用户
+    @DeleteMapping("/{userIds}")
-     */
+    public AjaxResult<Void> remove(@ApiParam("角色ID串") @PathVariable Long[] userIds) {
-    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+        if (ArrayUtil.contains(userIds, getUserId())) {
-    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+            return error("当前用户不能删除");
-    @DeleteMapping("/{userIds}")
+        }
-    public AjaxResult remove(@PathVariable Long[] userIds)
+        return toAjax(userService.deleteUserByIds(userIds));
-    {
+    }
-        return toAjax(userService.deleteUserByIds(userIds));
+
-    }
+    /**
-
+     * 重置密码
-    /**
+     */
-     * 重置密码
+    @ApiOperation("重置密码")
-     */
+    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
-    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/resetPwd")
-    @PutMapping("/resetPwd")
+    public AjaxResult<Void> resetPwd(@RequestBody SysUser user) {
-    public AjaxResult resetPwd(@RequestBody SysUser user)
+        userService.checkUserAllowed(user);
-    {
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        userService.checkUserAllowed(user);
+        return toAjax(userService.resetPwd(user));
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+    }
-        user.setUpdateBy(SecurityUtils.getUsername());
+
-        return toAjax(userService.resetPwd(user));
+    /**
-    }
+     * 状态修改
-
+     */
-    /**
+    @ApiOperation("状态修改")
-     * 状态修改
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
-     */
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @PutMapping("/changeStatus")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    public AjaxResult<Void> changeStatus(@RequestBody SysUser user) {
-    @PutMapping("/changeStatus")
+        userService.checkUserAllowed(user);
-    public AjaxResult changeStatus(@RequestBody SysUser user)
+        return toAjax(userService.updateUserStatus(user));
-    {
+    }
-        userService.checkUserAllowed(user);
+
-        user.setUpdateBy(SecurityUtils.getUsername());
+    /**
-        return toAjax(userService.updateUserStatus(user));
+     * 根据用户编号获取授权角色
-    }
+     */
-}
+    @ApiOperation("根据用户编号获取授权角色")
    @PreAuthorize("@ss.hasPermi('system:user:query')")
    @GetMapping("/authRole/{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", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
        return AjaxResult.success(ajax);
    }
    /**
     * 用户授权角色
     */
    @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 AjaxResult<Void> insertAuthRole(Long userId, Long[] roleIds) {
        userService.insertUserAuth(userId, roleIds);
        return success();
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java
@ -1,24 +0,0 @@
 package com.ruoyi.web.controller.tool;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.ruoyi.common.core.controller.BaseController;
 /**
 * swagger 接口
 * 
 * @author ruoyi
 */
@Controller
@RequestMapping("/tool/swagger")
 public class SwaggerController extends BaseController
 {
    @PreAuthorize("@ss.hasPermi('tool:swagger:view')")
    @GetMapping()
    public String index()
    {
        return redirect("/swagger-ui.html");
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
@ -1,175 +0,0 @@
 package com.ruoyi.web.controller.tool;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 /**
 * swagger 用户测试方法
 * 
 * @author ruoyi
 */
@Api("用户信息管理")
@RestController
@RequestMapping("/test/user")
 public class TestController extends BaseController
 {
    private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
    {
        users.put(1, new UserEntity(1, "admin", "admin123", "15888888888"));
        users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
    }
    @ApiOperation("获取用户列表")
    @GetMapping("/list")
    public AjaxResult userList()
    {
        List<UserEntity> userList = new ArrayList<UserEntity>(users.values());
        return AjaxResult.success(userList);
    }
    @ApiOperation("获取用户详细")
    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
    @GetMapping("/{userId}")
    public AjaxResult getUser(@PathVariable Integer userId)
    {
        if (!users.isEmpty() && users.containsKey(userId))
        {
            return AjaxResult.success(users.get(userId));
        }
        else
        {
            return AjaxResult.error("用户不存在");
        }
    }
    @ApiOperation("新增用户")
    @ApiImplicitParam(name = "userEntity", value = "新增用户信息", dataType = "UserEntity")
    @PostMapping("/save")
    public AjaxResult save(UserEntity user)
    {
        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
        {
            return AjaxResult.error("用户ID不能为空");
        }
        return AjaxResult.success(users.put(user.getUserId(), user));
    }
    @ApiOperation("更新用户")
    @ApiImplicitParam(name = "userEntity", value = "新增用户信息", dataType = "UserEntity")
    @PutMapping("/update")
    public AjaxResult update(UserEntity user)
    {
        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
        {
            return AjaxResult.error("用户ID不能为空");
        }
        if (users.isEmpty() || !users.containsKey(user.getUserId()))
        {
            return AjaxResult.error("用户不存在");
        }
        users.remove(user.getUserId());
        return AjaxResult.success(users.put(user.getUserId(), user));
    }
    @ApiOperation("删除用户信息")
    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
    @DeleteMapping("/{userId}")
    public AjaxResult delete(@PathVariable Integer userId)
    {
        if (!users.isEmpty() && users.containsKey(userId))
        {
            users.remove(userId);
            return AjaxResult.success();
        }
        else
        {
            return AjaxResult.error("用户不存在");
        }
    }
 }
@ApiModel("用户实体")
 class UserEntity
 {
    @ApiModelProperty("用户ID")
    private Integer userId;
    @ApiModelProperty("用户名称")
    private String username;
    @ApiModelProperty("用户密码")
    private String password;
    @ApiModelProperty("用户手机")
    private String mobile;
    public UserEntity()
    {
    }
    public UserEntity(Integer userId, String username, String password, String mobile)
    {
        this.userId = userId;
        this.username = username;
        this.password = password;
        this.mobile = mobile;
    }
    public Integer getUserId()
    {
        return userId;
    }
    public void setUserId(Integer userId)
    {
        this.userId = userId;
    }
    public String getUsername()
    {
        return username;
    }
    public void setUsername(String username)
    {
        this.username = username;
    }
    public String getPassword()
    {
        return password;
    }
    public void setPassword(String password)
    {
        this.password = password;
    }
    public String getMobile()
    {
        return mobile;
    }
    public void setMobile(String mobile)
    {
        this.mobile = mobile;
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@ -1,125 +0,0 @@
 package com.ruoyi.web.core.config;
 import java.util.ArrayList;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import com.ruoyi.common.config.RuoYiConfig;
 import io.swagger.annotations.ApiOperation;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.service.ApiInfo;
 import springfox.documentation.service.ApiKey;
 import springfox.documentation.service.AuthorizationScope;
 import springfox.documentation.service.Contact;
 import springfox.documentation.service.SecurityReference;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 /**
 * Swagger2的接口配置
 * 
 * @author ruoyi
 */
@Configuration
@EnableSwagger2
 public class SwaggerConfig
 {
    /** 系统基础配置 */
    @Autowired
    private RuoYiConfig ruoyiConfig;
    /** 是否开启swagger */
    @Value("${swagger.enabled}")
    private boolean enabled;
    /** 设置请求的统一前缀 */
    @Value("${swagger.pathMapping}")
    private String pathMapping;
    /**
     * 创建API
     */
    @Bean
    public Docket createRestApi()
    {
        return new Docket(DocumentationType.SWAGGER_2)
                // 是否启用Swagger
                .enable(enabled)
                // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
                .apiInfo(apiInfo())
                // 设置哪些接口暴露给Swagger展示
                .select()
                // 扫描所有有注解的api，用这种方式更灵活
                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
                // 扫描指定包中的swagger注解
                // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
                // 扫描所有 .apis(RequestHandlerSelectors.any())
                .paths(PathSelectors.any())
                .build()
                /* 设置安全模式，swagger可以设置访问token */
                .securitySchemes(securitySchemes())
                .securityContexts(securityContexts())
                .pathMapping(pathMapping);
    }
    /**
     * 安全模式，这里指定token通过Authorization头请求头传递
     */
    private List<ApiKey> securitySchemes()
    {
        List<ApiKey> apiKeyList = new ArrayList<ApiKey>();
        apiKeyList.add(new ApiKey("Authorization", "Authorization", "header"));
        return apiKeyList;
    }
    /**
     * 安全上下文
     */
    private List<SecurityContext> securityContexts()
    {
        List<SecurityContext> securityContexts = new ArrayList<>();
        securityContexts.add(
                SecurityContext.builder()
                        .securityReferences(defaultAuth())
                        .forPaths(PathSelectors.regex("^(?!auth).*$"))
                        .build());
        return securityContexts;
    }
    /**
     * 默认的安全上引用
     */
    private List<SecurityReference> defaultAuth()
    {
        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
        authorizationScopes[0] = authorizationScope;
        List<SecurityReference> securityReferences = new ArrayList<>();
        securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
        return securityReferences;
    }
    /**
     * 添加摘要信息
     */
    private ApiInfo apiInfo()
    {
        // 用ApiInfoBuilder进行定制
        return new ApiInfoBuilder()
                // 设置标题
                .title("标题：若依管理系统_接口文档")
                // 描述
                .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
                // 作者信息
                .contact(new Contact(ruoyiConfig.getName(), null, null))
                // 版本
                .version("版本号:" + ruoyiConfig.getVersion())
                .build();
    }
 }
--- a/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties
+++ b/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties
@ -1 +0,0 @@
 restart.include.json=/com.alibaba.fastjson.*.jar
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@ -0,0 +1,160 @@
 --- # 监控配置
 spring:
  boot:
    admin:
      # Spring Boot Admin Client 客户端的相关配置
      client:
        # 增加客户端开关
        enabled: true
        # 设置 Spring Boot Admin Server 地址
        url: http://localhost:9090/admin
        instance:
          prefer-ip: true # 注册实例时，优先使用 IP
        username: ruoyi
        password: 123456
 --- # 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
      # 执行器端口号 执行器从9101开始往后写
      port: 9101
      # 执行器注册：默认IP:PORT
      address:
      # 执行器IP：默认自动获取IP
      ip:
      # 执行器运行日志文件存储磁盘路径
      logpath: ./logs/xxl-job
      # 执行器日志文件保存天数：大于3生效
      logretentiondays: 30
 --- # 数据源配置
 spring:
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
    dynamic:
      # 性能分析插件(有性能损耗 不建议生产环境使用)
      p6spy: true
      # 设置默认的数据源或者数据源组,默认值即为 master
      primary: master
      datasource:
        # 主库数据源
        master:
          driverClassName: com.mysql.cj.jdbc.Driver
          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
          # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
          username: root
          password: root
        # 从库数据源
        slave:
          lazy: true
          driverClassName: com.mysql.cj.jdbc.Driver
          url:
          username:
          password:
      druid:
        # 初始连接数
        initialSize: 5
        # 最小连接池数量
        minIdle: 10
        # 最大连接池数量
        maxActive: 20
        # 配置获取连接等待超时的时间
        maxWait: 60000
        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
        timeBetweenEvictionRunsMillis: 60000
        # 配置一个连接在池中最小生存的时间，单位是毫秒
        minEvictableIdleTimeMillis: 300000
        # 配置一个连接在池中最大生存的时间，单位是毫秒
        maxEvictableIdleTimeMillis: 900000
        # 配置检测连接是否有效
        validationQuery: SELECT 1 FROM DUAL
        testWhileIdle: true
        testOnBorrow: false
        testOnReturn: false
        # 注意这个值和druid原生不一致，默认启动了stat
        filters: stat
 --- # druid 配置
 spring:
  datasource:
    druid:
      webStatFilter:
        enabled: true
      statViewServlet:
        enabled: true
        # 设置白名单，不填则允许所有访问
        allow:
        url-pattern: /druid/*
        # 控制台管理用户名和密码
        login-username: ruoyi
        login-password: 123456
      filter:
        stat:
          enabled: true
          # 慢SQL记录
          log-slow-sql: true
          slow-sql-millis: 1000
          merge-sql: true
        wall:
          config:
            multi-statement-allow: true
 --- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
 spring:
  redis:
    # 地址
    host: localhost
    # 端口，默认为6379
    port: 6379
    # 数据库索引
    database: 0
    # 密码
    password:
    # 连接超时时间
    timeout: 10s
    # 是否开启ssl
    ssl: false
 redisson:
  # 线程池数量
  threads: 16
  # Netty线程池数量
  nettyThreads: 32
  # 传输模式
  transportMode: "NIO"
  # 单节点配置
  singleServerConfig:
    # 客户端名称
    clientName: ${ruoyi.name}
    # 最小空闲连接数
    connectionMinimumIdleSize: 32
    # 连接池大小
    connectionPoolSize: 64
    # 连接空闲超时，单位：毫秒
    idleConnectionTimeout: 10000
    # 命令等待超时，单位：毫秒
    timeout: 3000
    # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
    retryAttempts: 3
    # 命令重试发送时间间隔，单位：毫秒
    retryInterval: 1500
    # 发布和订阅连接的最小空闲连接数
    subscriptionConnectionMinimumIdleSize: 1
    # 发布和订阅连接池大小
    subscriptionConnectionPoolSize: 50
    # 单个连接最大订阅数量
    subscriptionsPerConnection: 5
    # DNS监测时间间隔，单位：毫秒
    dnsMonitoringInterval: 5000
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@ -1,57 +0,0 @@
 # 数据源配置
 spring:
    datasource:
        type: com.alibaba.druid.pool.DruidDataSource
        driverClassName: com.mysql.cj.jdbc.Driver
        druid:
            # 主库数据源
            master:
                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                username: root
                password: password
            # 从库数据源
            slave:
                # 从数据源开关/默认关闭
                enabled: false
                url: 
                username: 
                password: 
            # 初始连接数
            initialSize: 5
            # 最小连接池数量
            minIdle: 10
            # 最大连接池数量
            maxActive: 20
            # 配置获取连接等待超时的时间
            maxWait: 60000
            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
            timeBetweenEvictionRunsMillis: 60000
            # 配置一个连接在池中最小生存的时间，单位是毫秒
            minEvictableIdleTimeMillis: 300000
            # 配置一个连接在池中最大生存的时间，单位是毫秒
            maxEvictableIdleTimeMillis: 900000
            # 配置检测连接是否有效
            validationQuery: SELECT 1 FROM DUAL
            testWhileIdle: true
            testOnBorrow: false
            testOnReturn: false
            webStatFilter: 
                enabled: true
            statViewServlet:
                enabled: true
                # 设置白名单，不填则允许所有访问
                allow:
                url-pattern: /druid/*
                # 控制台管理用户名和密码
                login-username: ruoyi
                login-password: 123456
            filter:
                stat:
                    enabled: true
                    # 慢SQL记录
                    log-slow-sql: true
                    slow-sql-millis: 1000
                    merge-sql: true
                wall:
                    config:
                        multi-statement-allow: true
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@ -0,0 +1,167 @@
 --- # 配置临时路径存储
 spring:
  servlet:
    multipart:
      # 临时文件存储位置 避免临时文件被系统清理报错
      location: /ruoyi/server/temp
 --- # 监控配置
 spring:
  boot:
    admin:
      # Spring Boot Admin Client 客户端的相关配置
      client:
        # 增加客户端开关
        enabled: true
        # 设置 Spring Boot Admin Server 地址
        url: http://172.30.0.90:9090/admin
        instance:
          prefer-ip: true # 注册实例时，优先使用 IP
        username: ruoyi
        password: 123456
 --- # xxl-job 配置
 xxl:
  job:
    # 执行器开关
    enabled: true
    # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
    admin-addresses: http://172.30.0.92:9100/xxl-job-admin
    # 执行器通讯TOKEN：非空时启用
    access-token: xxl-job
    # 执行器配置
    executor:
      # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
      appname: xxl-job-executor
      # 执行器端口号 执行器从9101开始往后写
      port: 9101
      # 执行器注册：默认IP:PORT
      address:
      # 执行器IP：默认自动获取IP
      ip:
      # 执行器运行日志文件存储磁盘路径
      logpath: ./logs/xxl-job
      # 执行器日志文件保存天数：大于3生效
      logretentiondays: 30
 --- # 数据源配置
 spring:
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
    dynamic:
      # 性能分析插件(有性能损耗 不建议生产环境使用)
      p6spy: false
      # 设置默认的数据源或者数据源组,默认值即为 master
      primary: master
      datasource:
        # 主库数据源
        master:
          driverClassName: com.mysql.cj.jdbc.Driver
          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
          # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
          url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
          username: root
          password: root
        # 从库数据源
        slave:
          lazy: true
          driverClassName: com.mysql.cj.jdbc.Driver
          url:
          username:
          password:
      druid:
        # 初始连接数
        initialSize: 5
        # 最小连接池数量
        minIdle: 10
        # 最大连接池数量
        maxActive: 20
        # 配置获取连接等待超时的时间
        maxWait: 60000
        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
        timeBetweenEvictionRunsMillis: 60000
        # 配置一个连接在池中最小生存的时间，单位是毫秒
        minEvictableIdleTimeMillis: 300000
        # 配置一个连接在池中最大生存的时间，单位是毫秒
        maxEvictableIdleTimeMillis: 900000
        # 配置检测连接是否有效
        validationQuery: SELECT 1 FROM DUAL
        testWhileIdle: true
        testOnBorrow: false
        testOnReturn: false
        # 注意这个值和druid原生不一致，默认启动了stat
        filters: stat
 --- # druid 配置
 spring:
  datasource:
    druid:
      webStatFilter:
        enabled: true
      statViewServlet:
        enabled: true
        # 设置白名单，不填则允许所有访问
        allow:
        url-pattern: /druid/*
        # 控制台管理用户名和密码
        login-username: ruoyi
        login-password: 123456
      filter:
        stat:
          enabled: true
          # 慢SQL记录
          log-slow-sql: true
          slow-sql-millis: 1000
          merge-sql: true
        wall:
          config:
            multi-statement-allow: true
 --- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
 spring:
  redis:
    # 地址
    host: 172.30.0.48
    # 端口，默认为6379
    port: 6379
    # 数据库索引
    database: 0
    # 密码
    password:
    # 连接超时时间
    timeout: 10s
    # 是否开启ssl
    ssl: false
 redisson:
  # 线程池数量
  threads: 16
  # Netty线程池数量
  nettyThreads: 32
  # 传输模式
  transportMode: "NIO"
  # 单节点配置
  singleServerConfig:
    # 客户端名称
    clientName: ${ruoyi.name}
    # 最小空闲连接数
    connectionMinimumIdleSize: 32
    # 连接池大小
    connectionPoolSize: 64
    # 连接空闲超时，单位：毫秒
    idleConnectionTimeout: 10000
    # 命令等待超时，单位：毫秒
    timeout: 3000
    # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
    retryAttempts: 3
    # 命令重试发送时间间隔，单位：毫秒
    retryInterval: 1500
    # 发布和订阅连接的最小空闲连接数
    subscriptionConnectionMinimumIdleSize: 1
    # 发布和订阅连接池大小
    subscriptionConnectionPoolSize: 50
    # 单个连接最大订阅数量
    subscriptionsPerConnection: 5
    # DNS监测时间间隔，单位：毫秒
    dnsMonitoringInterval: 5000
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@ -1,121 +1,293 @@
-# 项目相关配置
+# 项目相关配置
-ruoyi:
+ruoyi:
-  # 名称
+  # 名称
-  name: RuoYi
+  name: RuoYi-Vue-Plus
-  # 版本
+  # 版本
-  version: 3.4.0
+  version: ${ruoyi-vue-plus.version}
-  # 版权年份
+  # 版权年份
-  copyrightYear: 2021
+  copyrightYear: 2021
-  # 实例演示开关
+  # 实例演示开关
-  demoEnabled: true
+  demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+  # 获取ip地址开关
-  profile: D:/ruoyi/uploadPath
+  addressEnabled: true
-  # 获取ip地址开关
+  # 缓存懒加载
-  addressEnabled: false
+  cacheLazy: false
-  # 验证码类型 math 数组计算 char 字符验证
+
-  captchaType: math
+captcha:
-
+  # 页面 <参数设置> 可开启关闭 验证码校验
-# 开发环境配置
+  # 验证码类型 math 数组计算 char 字符验证
-server:
+  type: MATH
-  # 服务器的HTTP端口，默认为8080
+  # line 线段干扰 circle 圆圈干扰 shear 扭曲干扰
-  port: 8080
+  category: CIRCLE
-  servlet:
+  # 数字验证码位数
-    # 应用的访问路径
+  numberLength: 1
-    context-path: /
+  # 字符验证码长度
-  tomcat:
+  charLength: 4
-    # tomcat的URI编码
+
-    uri-encoding: UTF-8
+# 开发环境配置
-    # tomcat最大线程数，默认为200
+server:
-    max-threads: 800
+  # 服务器的HTTP端口，默认为8080
-    # Tomcat启动初始化的线程数，默认值25
+  port: 8080
-    min-spare-threads: 30
+  servlet:
-
+    # 应用的访问路径
-# 日志配置
+    context-path: /
-logging:
+  # undertow 配置
-  level:
+  undertow:
-    com.ruoyi: debug
+    # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的
-    org.springframework: warn
+    max-http-post-size: -1
-
+    # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理
-# Spring配置
+    # 每块buffer的空间大小,越小的空间被利用越充分
-spring:
+    buffer-size: 512
-  # 资源信息
+    # 是否分配的直接内存
-  messages:
+    direct-buffers: true
-    # 国际化资源文件路径
+    threads:
-    basename: i18n/messages
+      # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程
-  profiles: 
+      io: 8
-    active: druid
+      # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
-  # 文件上传
+      worker: 256
-  servlet:
+
-     multipart:
+# 日志配置
-       # 单个文件大小
+logging:
-       max-file-size:  10MB
+  level:
-       # 设置总上传的文件大小
+    com.ruoyi: @logging.level@
-       max-request-size:  20MB
+    org.springframework: warn
-  # 服务模块
+  config: classpath:logback.xml
-  devtools:
+
-    restart:
+# Spring配置
-      # 热部署开关
+spring:
-      enabled: true
+  application:
-  # redis 配置
+    name: ${ruoyi.name}
-  redis:
+  # 资源信息
-    # 地址
+  messages:
-    host: localhost
+    # 国际化资源文件路径
-    # 端口，默认为6379
+    basename: i18n/messages
-    port: 6379
+  profiles:
-    # 数据库索引
+    active: @profiles.active@
-    database: 0
+  # 文件上传
-    # 密码
+  servlet:
-    password: 
+    multipart:
-    # 连接超时时间
+      # 单个文件大小
-    timeout: 10s
+      max-file-size: 10MB
-    lettuce:
+      # 设置总上传的文件大小
-      pool:
+      max-request-size: 20MB
-        # 连接池中的最小空闲连接
+  # 服务模块
-        min-idle: 0
+  devtools:
-        # 连接池中的最大空闲连接
+    restart:
-        max-idle: 8
+      # 热部署开关
-        # 连接池的最大数据库连接数
+      enabled: true
-        max-active: 8
+  # 与vue整合部署使用
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+  thymeleaf:
-        max-wait: -1ms
+    # 将系统模板放置到最前面 否则会与 springboot-admin 页面冲突
-
+    template-resolver-order: 1
-# token配置
+  jackson:
-token:
+    # 日期格式化
-    # 令牌自定义标识
+    date-format: yyyy-MM-dd HH:mm:ss
-    header: Authorization
+    serialization:
-    # 令牌密钥
+      # 格式化输出
-    secret: abcdefghijklmnopqrstuvwxyz
+      indent_output: false
-    # 令牌有效期（默认30分钟）
+      # 忽略无法转换的对象
-    expireTime: 30
+      fail_on_empty_beans: false
-  
+    deserialization:
-# MyBatis配置
+      # 允许对象忽略json中不存在的属性
-mybatis:
+      fail_on_unknown_properties: false
-    # 搜索指定包别名
+
-    typeAliasesPackage: com.ruoyi.**.domain
+# token配置
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+token:
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 令牌自定义标识
-    # 加载全局的配置文件
+  header: Authorization
-    configLocation: classpath:mybatis/mybatis-config.xml
+  # 令牌密钥
-
+  secret: abcdefghijklmnopqrstuvwxyz
-# PageHelper分页插件
+  # 令牌有效期（默认30分钟）
-pagehelper: 
+  expireTime: 30
-  helperDialect: mysql
+
-  reasonable: true
+# security配置
-  supportMethodsArguments: true
+security:
-  params: count=countSql 
+  # 登出路径
-
+  logout-url: /logout
-# Swagger配置
+  # 匿名路径
-swagger:
+  anonymous:
-  # 是否开启swagger
+    - /login
-  enabled: true
+    - /register
-  # 请求前缀
+    - /captchaImage
-  pathMapping: /dev-api
+    # swagger 文档配置
-
+    - /doc.html
-# 防止XSS攻击
+    - /swagger-resources/**
-xss: 
+    - /webjars/**
-  # 过滤开关
+    - /*/api-docs
-  enabled: true
+    # druid 监控配置
-  # 排除链接（多个用逗号分隔）
+    - /druid/**
-  excludes: /system/notice/*
+  # 用户放行
-  # 匹配链接
+  permit-all:
-  urlPatterns: /system/*,/monitor/*,/tool/*
+    # actuator 监控配置
    - /actuator
    - /actuator/**
 # 重复提交
 repeat-submit:
  # 全局间隔时间(毫秒)
  interval: 5000
 # MyBatisPlus配置
 # https://baomidou.com/config/
 mybatis-plus:
  # 不支持多包, 如有需要可在注解配置 或 提升扫包等级
  # 例如 com.**.**.mapper
  mapperPackage: com.ruoyi.**.mapper
  # 对应的 XML 文件位置
  mapperLocations: classpath*:mapper/**/*Mapper.xml
  # 实体扫描，多个package用逗号或者分号分隔
  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
    logImpl: org.apache.ibatis.logging.nologging.NoLoggingImpl
  global-config:
    # 是否打印 Logo banner
    banner: true
    # 是否初始化 SqlRunner
    enableSqlRunner: false
    dbConfig:
      # 主键类型
      # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
      idType: AUTO
      # 表名是否使用驼峰转下划线命名,只对表名生效
      tableUnderline: true
      # 大写命名,对表名和字段名均生效
      capitalMode: false
      # 逻辑已删除值
      logicDeleteValue: 2
      # 逻辑未删除值
      logicNotDeleteValue: 0
      # 字段验证策略之 insert,在 insert 的时候的字段验证策略
      # IGNORED 忽略 NOT_NULL 非NULL NOT_EMPTY 非空 DEFAULT 默认 NEVER 不加入 SQL
      insertStrategy: NOT_NULL
      # 字段验证策略之 update,在 update 的时候的字段验证策略
      updateStrategy: NOT_NULL
      # 字段验证策略之 select,在 select 的时候的字段验证策略既 wrapper 根据内部 entity 生成的 where 条件
      where-strategy: NOT_NULL
 # Swagger配置
 swagger:
  # 是否开启swagger
  enabled: true
  # 请求前缀
  pathMapping: /dev-api
  # 标题
  title: '标题：${ruoyi.name}后台管理系统_接口文档'
  # 描述
  description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...'
  # 版本
  version: '版本号: ${ruoyi-vue-plus.version}'
  # 作者信息
  contact:
    name: Lion Li
    email: crazylionli@163.com
    url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
  groups:
    - name: 1.演示案例
      basePackage: com.ruoyi.demo
    - name: 2.系统模块
      basePackage: com.ruoyi.web
    - name: 3.代码生成模块
      basePackage: com.ruoyi.generator
 knife4j:
  # 是否开启Knife4j增强模式
  enable: true
  # 是否开启生产环境保护策略
  production: @knife4j.production@
  # 前端Ui的个性化配置属性
  setting:
    # 默认语言
    language: zh-CN
    # 是否显示Footer
    enableFooter: false
    # 是否开启动态参数调试功能
    enableDynamicParameter: true
    # 是否在每个Debug调试栏后显示刷新变量按钮
    enableReloadCacheParameter: true
 # 防止XSS攻击
 xss:
  # 过滤开关
  enabled: true
  # 排除链接（多个用逗号分隔）
  excludes: /system/notice
  # 匹配链接
  urlPatterns: /system/*,/monitor/*,/tool/*
 # 全局线程池相关配置
 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 毫秒
  expire: 30000
 --- # Actuator 监控端点的配置项
 management:
  endpoints:
    web:
      # Actuator 提供的 API 接口的根目录。默认为 /actuator
      base-path: /actuator
      exposure:
        # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。
        # 生产环境不建议放开所有 根据项目需求放开即可
        include: @endpoints.include@
  endpoint:
    logfile:
      external-file: ./logs/sys-console.log
--- a/ruoyi-admin/src/main/resources/banner.txt
+++ b/ruoyi-admin/src/main/resources/banner.txt
@ -1,24 +1,8 @@
-Application Version: ${ruoyi.version}
+Application Version: ${ruoyi-vue-plus.version}
-Spring Boot Version: ${spring-boot.version}
+Spring Boot Version: ${spring-boot.version}
-////////////////////////////////////////////////////////////////////
+__________            _____.___.__         ____   ____                     __________.__
-//                          _ooOoo_                               //
+\______   \__ __  ____\__  |   |__|        \   \ /   /_ __   ____          \______   \  |  __ __  ______
-//                         o8888888o                              //
+ |       _/  |  \/  _ \/   |   |  |  ______ \   Y   /  |  \_/ __ \   ______ |     ___/  | |  |  \/  ___/
-//                         88" . "88                              //
+ |    |   \  |  (  <_> )____   |  | /_____/  \     /|  |  /\  ___/  /_____/ |    |   |  |_|  |  /\___ \
-//                         (| ^_^ |)                              //
+ |____|_  /____/ \____// ______|__|           \___/ |____/  \___  >         |____|   |____/____//____  >
-//                         O\  =  /O                              //
+        \/             \/                                       \/                                   \/
 //                      ____/`---'\____                           //
 //                    .'  \\|     |//  `.                         //
 //                   /  \\|||  :  |||//  \                        //
 //                  /  _||||| -:- |||||-  \                       //
 //                  |   | \\\  -  /// |   |                       //
 //                  | \_|  ''\---/''  |   |                       //
 //                  \  .-\__  `-`  ___/-. /                       //
 //                ___`. .'  /--.--\  `. . ___                     //
 //              ."" '<  `.___\_<|>_/___.'  >'"".                  //
 //            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
 //            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
 //      ========`-.____`-.___\_____/___.-`____.-'========         //
 //                           `=---='                              //
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
 //             佛祖保佑       永不宕机      永无BUG               //
 ////////////////////////////////////////////////////////////////////
--- a/ruoyi-admin/src/main/resources/i18n/messages.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages.properties
@ -1,36 +1,32 @@
-#错误消息
+#错误消息
-not.null=* 必须填写
+not.null=* 必须填写
-user.jcaptcha.error=验证码错误
+user.jcaptcha.error=验证码错误
-user.jcaptcha.expire=验证码已失效
+user.jcaptcha.expire=验证码已失效
-user.not.exists=用户不存在/密码错误
+user.not.exists=对不起, 您的账号：{0} 不存在.
-user.password.not.match=用户不存在/密码错误
+user.password.not.match=用户不存在/密码错误
-user.password.retry.limit.count=密码输入错误{0}次
+user.password.retry.limit.count=密码输入错误{0}次
-user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
+user.password.retry.limit.exceed=密码错误次数过多，帐户锁定{0}分钟
-user.password.delete=对不起，您的账号已被删除
+user.password.delete=对不起，您的账号：{0} 已被删除
-user.blocked=用户已封禁，请联系管理员
+user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员
-role.blocked=角色已封禁，请联系管理员
+role.blocked=角色已封禁，请联系管理员
-user.logout.success=退出成功
+user.logout.success=退出成功
-
+length.not.valid=长度必须在{min}到{max}个字符之间
-length.not.valid=长度必须在{min}到{max}个字符之间
+user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
-
+user.password.not.valid=* 5-50个字符
-user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
+user.email.not.valid=邮箱格式错误
-user.password.not.valid=* 5-50个字符
+user.mobile.phone.number.not.valid=手机号格式错误
- 
+user.login.success=登录成功
-user.email.not.valid=邮箱格式错误
+user.register.success=注册成功
-user.mobile.phone.number.not.valid=手机号格式错误
+user.notfound=请重新登录
-user.login.success=登录成功
+user.forcelogout=管理员强制退出，请重新登录
-user.notfound=请重新登录
+user.unknown.error=未知错误，请重新登录
-user.forcelogout=管理员强制退出，请重新登录
+##文件上传消息
-user.unknown.error=未知错误，请重新登录
+upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
-
+upload.filename.exceed.length=上传的文件名最长{0}个字符
-##文件上传消息
+##权限
-upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
+no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
-upload.filename.exceed.length=上传的文件名最长{0}个字符
+no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
-
+no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
-##权限
+no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
-no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
+no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
-no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
+no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
 no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
 no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
 no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
 no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
--- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
@ -0,0 +1,32 @@
 #错误消息
 not.null=* Required fill in
 user.jcaptcha.error=Captcha error
 user.jcaptcha.expire=Captcha invalid
 user.not.exists=Sorry, your account: {0} does not exist
 user.password.not.match=User does not exist/Password error
 user.password.retry.limit.count=Password input error {0} times
 user.password.retry.limit.exceed=Too many password errors, account locked for {0} minutes
 user.password.delete=Sorry, your account：{0} has been deleted
 user.blocked=Sorry, your account: {0} has been disabled. Please contact the administrator
 role.blocked=Role disabled，please contact administrators
 user.logout.success=Exit successful
 length.not.valid=The length must be between {min} and {max} characters
 user.username.not.valid=* 2 to 20 chinese characters, letters, numbers or underscores, and must start with a non number
 user.password.not.valid=* 5-50 characters
 user.email.not.valid=Mailbox format error
 user.mobile.phone.number.not.valid=Phone number format error
 user.login.success=Login successful
 user.register.success=Register successful
 user.notfound=Please login again
 user.forcelogout=The administrator is forced to exit，please login again
 user.unknown.error=Unknown error, please login again
 ##文件上传消息
 upload.exceed.maxSize=The uploaded file size exceeds the limit file size！<br/>the maximum allowed file size is：{0}MB！
 upload.filename.exceed.length=The maximum length of uploaded file name is {0} characters
 ##权限
 no.permission=You do not have permission to the data，please contact your administrator to add permissions [{0}]
 no.create.permission=You do not have permission to create data，please contact your administrator to add permissions [{0}]
 no.update.permission=You do not have permission to modify data，please contact your administrator to add permissions [{0}]
 no.delete.permission=You do not have permission to delete data，please contact your administrator to add permissions [{0}]
 no.export.permission=You do not have permission to export data，please contact your administrator to add permissions [{0}]
 no.view.permission=You do not have permission to view data，please contact your administrator to add permissions [{0}]
--- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
@ -0,0 +1,32 @@
 #错误消息
 not.null=* 必须填写
 user.jcaptcha.error=验证码错误
 user.jcaptcha.expire=验证码已失效
 user.not.exists=对不起, 您的账号：{0} 不存在.
 user.password.not.match=用户不存在/密码错误
 user.password.retry.limit.count=密码输入错误{0}次
 user.password.retry.limit.exceed=密码错误次数过多，帐户锁定{0}分钟
 user.password.delete=对不起，您的账号：{0} 已被删除
 user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员
 role.blocked=角色已封禁，请联系管理员
 user.logout.success=退出成功
 length.not.valid=长度必须在{min}到{max}个字符之间
 user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
 user.password.not.valid=* 5-50个字符
 user.email.not.valid=邮箱格式错误
 user.mobile.phone.number.not.valid=手机号格式错误
 user.login.success=登录成功
 user.register.success=注册成功
 user.notfound=请重新登录
 user.forcelogout=管理员强制退出，请重新登录
 user.unknown.error=未知错误，请重新登录
 ##文件上传消息
 upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
 upload.filename.exceed.length=上传的文件名最长{0}个字符
 ##权限
 no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
 no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
 no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
 no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
 no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
 no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@ -1,93 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
+<configuration>
-    <!-- 日志存放路径 -->
+    <property name="log.path" value="./logs"/>
-	<property name="log.path" value="/home/ruoyi/logs" />
+    <property name="console.log.pattern"
-    <!-- 日志输出格式 -->
+              value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
-
+
-	<!-- 控制台输出 -->
+	<!-- 控制台输出 -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
-			<pattern>${log.pattern}</pattern>
+			<pattern>${console.log.pattern}</pattern>
-		</encoder>
+            <charset>utf-8</charset>
-	</appender>
+		</encoder>
-	
+	</appender>
-	<!-- 系统日志输出 -->
+
-	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!-- 控制台输出 -->
-	    <file>${log.path}/sys-info.log</file>
+    <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 循环政策：基于时间创建日志文件 -->
+        <file>${log.path}/sys-console.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
+            <!-- 日志文件名格式 -->
-			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${log.path}/sys-console.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
+            <!-- 日志最大 1天 -->
-			<maxHistory>60</maxHistory>
+            <maxHistory>1</maxHistory>
-		</rollingPolicy>
+        </rollingPolicy>
-		<encoder>
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
-			<pattern>${log.pattern}</pattern>
+            <pattern>${log.pattern}</pattern>
-		</encoder>
+            <charset>utf-8</charset>
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+        </encoder>
-            <!-- 过滤的级别 -->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>INFO</level>
+            <!-- 过滤的级别 -->
-            <!-- 匹配时的操作：接收（记录） -->
+            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
+        </filter>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
+    </appender>
-            <onMismatch>DENY</onMismatch>
+
-        </filter>
+	<!-- 系统日志输出 -->
-	</appender>
+	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	
+	    <file>${log.path}/sys-info.log</file>
-	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 循环政策：基于时间创建日志文件 -->
-	    <file>${log.path}/sys-error.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-        <!-- 循环政策：基于时间创建日志文件 -->
+            <!-- 日志文件名格式 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志文件名格式 -->
+			<!-- 日志最大的历史 60天 -->
-            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<maxHistory>60</maxHistory>
-			<!-- 日志最大的历史 60天 -->
+		</rollingPolicy>
-			<maxHistory>60</maxHistory>
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
-        </rollingPolicy>
+			<pattern>${log.pattern}</pattern>
-        <encoder>
+		</encoder>
-            <pattern>${log.pattern}</pattern>
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-        </encoder>
+            <!-- 过滤的级别 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
-            <!-- 过滤的级别 -->
+            <!-- 匹配时的操作：接收（记录） -->
-            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
-			<!-- 匹配时的操作：接收（记录） -->
+            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
-			<!-- 不匹配时的操作：拒绝（不记录） -->
+        </filter>
-            <onMismatch>DENY</onMismatch>
+	</appender>
-        </filter>
+
-    </appender>
+	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	
+	    <file>${log.path}/sys-error.log</file>
-	<!-- 用户访问日志输出  -->
+        <!-- 循环政策：基于时间创建日志文件 -->
-    <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-		<file>${log.path}/sys-user.log</file>
+            <!-- 日志文件名格式 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 按天回滚 daily -->
+			<!-- 日志最大的历史 60天 -->
-            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<maxHistory>60</maxHistory>
-            <!-- 日志最大的历史 60天 -->
+        </rollingPolicy>
-            <maxHistory>60</maxHistory>
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
-        </rollingPolicy>
+            <pattern>${log.pattern}</pattern>
-        <encoder>
+        </encoder>
-            <pattern>${log.pattern}</pattern>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-        </encoder>
+            <!-- 过滤的级别 -->
-    </appender>
+            <level>ERROR</level>
-	
+			<!-- 匹配时的操作：接收（记录） -->
-	<!-- 系统模块日志级别控制  -->
+            <onMatch>ACCEPT</onMatch>
-	<logger name="com.ruoyi" level="info" />
+			<!-- 不匹配时的操作：拒绝（不记录） -->
-	<!-- Spring日志级别控制  -->
+            <onMismatch>DENY</onMismatch>
-	<logger name="org.springframework" level="warn" />
+        </filter>
-
+    </appender>
-	<root level="info">
+
-		<appender-ref ref="console" />
+	<!-- 系统模块日志级别控制  -->
-	</root>
+	<logger name="com.ruoyi" level="info" />
-	
+	<!-- Spring日志级别控制  -->
-	<!--系统操作日志-->
+	<logger name="org.springframework" level="warn" />
-    <root level="info">
+
-        <appender-ref ref="file_info" />
+	<root level="info">
-        <appender-ref ref="file_error" />
+		<appender-ref ref="console" />
-    </root>
+	</root>
-	
+
-	<!--系统用户操作日志-->
+	<!--系统操作日志-->
-    <logger name="sys-user" level="info">
+    <root level="info">
-        <appender-ref ref="sys-user"/>
+        <appender-ref ref="file_info" />
-    </logger>
+        <appender-ref ref="file_error" />
-</configuration> 
+        <appender-ref ref="file_console" />
    </root>
 </configuration>
--- a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
+++ b/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
@ -1,15 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE configuration
 PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-config.dtd">
 <configuration>
 	<settings>
 		<setting name="cacheEnabled"             value="true" />  <!-- 全局映射器启用缓存 -->
 		<setting name="useGeneratedKeys"         value="true" />  <!-- 允许 JDBC 支持自动生成主键 -->
 		<setting name="defaultExecutorType"      value="REUSE" /> <!-- 配置默认的执行器 -->
 		<setting name="logImpl"                  value="SLF4J" /> <!-- 指定 MyBatis 所用日志的具体实现 -->
 		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/>  驼峰式命名 -->
 	</settings>
 </configuration>
--- a/ruoyi-admin/src/main/resources/spy.properties
+++ b/ruoyi-admin/src/main/resources/spy.properties
@ -0,0 +1,24 @@
 # p6spy 性能分析插件配置文件
 modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
 # 自定义日志打印
 logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
 #日志输出到控制台
 appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
 # 使用日志系统记录 sql
 #appender=com.p6spy.engine.spy.appender.Slf4JLogger
 # 设置 p6spy driver 代理
 #deregisterdrivers=true
 # 取消JDBC URL前缀
 useprefix=true
 # 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset.
 excludecategories=info,debug,result,commit,resultset
 # 日期格式
 dateformat=yyyy-MM-dd HH:mm:ss
 # 实际驱动可多个
 #driverlist=org.h2.Driver
 # 是否开启慢SQL记录
 outagedetection=true
 # 慢SQL记录标准 2 秒
 outagedetectioninterval=2
 # 是否过滤 Log
 filter=true
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@ -1,124 +1,164 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
+    <parent>
-        <artifactId>ruoyi</artifactId>
+        <artifactId>ruoyi-vue-plus</artifactId>
-        <groupId>com.ruoyi</groupId>
+        <groupId>com.ruoyi</groupId>
-        <version>3.4.0</version>
+        <version>3.5.0</version>
-    </parent>
+    </parent>
-    <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
-
+
-    <artifactId>ruoyi-common</artifactId>
+    <artifactId>ruoyi-common</artifactId>
-
+
-    <description>
+    <description>
-        common通用工具
+        common通用工具
-    </description>
+    </description>
-
+
-    <dependencies>
+    <dependencies>
-
+
-        <!-- Spring框架基本的核心工具 -->
+        <!-- Spring框架基本的核心工具 -->
-        <dependency>
+        <dependency>
-            <groupId>org.springframework</groupId>
+            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
+            <artifactId>spring-context-support</artifactId>
-        </dependency>
+        </dependency>
-
+
-        <!-- SpringWeb模块 -->
+        <!-- SpringWeb模块 -->
-        <dependency>
+        <dependency>
-            <groupId>org.springframework</groupId>
+            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <artifactId>spring-web</artifactId>
-        </dependency>
+        </dependency>
-
+
-        <!-- spring security 安全认证 -->
+        <!-- spring security 安全认证 -->
-        <dependency>
+        <dependency>
-            <groupId>org.springframework.boot</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
+            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
+        </dependency>
-
+
-        <!-- pagehelper 分页插件 -->
+        <!-- 自定义验证注解 -->
-        <dependency>
+        <dependency>
-            <groupId>com.github.pagehelper</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
+        </dependency>
-
+
-        <!-- 自定义验证注解 -->
+        <!--常用工具类 -->
-        <dependency>
+        <dependency>
-            <groupId>javax.validation</groupId>
+            <groupId>org.apache.commons</groupId>
-            <artifactId>validation-api</artifactId>
+            <artifactId>commons-lang3</artifactId>
-        </dependency>
+        </dependency>
-
+
-        <!--常用工具类 -->
+        <!-- JSON工具类 -->
-        <dependency>
+        <dependency>
-            <groupId>org.apache.commons</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>commons-lang3</artifactId>
+            <artifactId>jackson-databind</artifactId>
-        </dependency>
+        </dependency>
-  
+
-        <!-- JSON工具类 -->
+        <!-- excel工具 -->
-        <dependency>
+        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
+            <groupId>org.apache.poi</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <artifactId>poi-ooxml</artifactId>
-        </dependency>
+        </dependency>
-
+
-        <!-- 阿里JSON解析器 -->
+        <dependency>
-        <dependency>
+            <groupId>com.alibaba</groupId>
-            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
-            <artifactId>fastjson</artifactId>
+        </dependency>
-        </dependency>
+
-
+        <dependency>
-        <!-- io常用工具类 -->
+            <groupId>cglib</groupId>
-        <dependency>
+            <artifactId>cglib</artifactId>
-            <groupId>commons-io</groupId>
+        </dependency>
-            <artifactId>commons-io</artifactId>
+
-        </dependency>
+        <!-- yml解析器 -->
-
+        <dependency>
-        <!-- 文件上传工具类 -->
+            <groupId>org.yaml</groupId>
-        <dependency>
+            <artifactId>snakeyaml</artifactId>
-            <groupId>commons-fileupload</groupId>
+        </dependency>
-            <artifactId>commons-fileupload</artifactId>
+
-        </dependency>
+        <!-- jdk11 缺失依赖 jaxb-->
-
+        <dependency>
-        <!-- excel工具 -->
+            <groupId>com.sun.xml.bind</groupId>
-        <dependency>
+            <artifactId>jaxb-impl</artifactId>
-            <groupId>org.apache.poi</groupId>
+        </dependency>
-            <artifactId>poi-ooxml</artifactId>
+
-        </dependency>
+        <!-- servlet包 -->
-
+        <dependency>
-        <!-- yml解析器 -->
+            <groupId>javax.servlet</groupId>
-        <dependency>
+            <artifactId>javax.servlet-api</artifactId>
-            <groupId>org.yaml</groupId>
+        </dependency>
-            <artifactId>snakeyaml</artifactId>
+
-        </dependency>
+        <dependency>
-
+            <groupId>com.baomidou</groupId>
-        <!--Token生成与解析-->
+            <artifactId>mybatis-plus-boot-starter</artifactId>
-        <dependency>
+        </dependency>
-            <groupId>io.jsonwebtoken</groupId>
+        <dependency>
-            <artifactId>jjwt</artifactId>
+            <groupId>com.baomidou</groupId>
-        </dependency>
+            <artifactId>mybatis-plus-extension</artifactId>
-
+        </dependency>
-        <!-- redis 缓存操作 -->
+
-        <dependency>
+        <!-- dynamic-datasource 多数据源-->
-            <groupId>org.springframework.boot</groupId>
+        <dependency>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <groupId>com.baomidou</groupId>
-        </dependency>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-
+        </dependency>
-        <!-- pool 对象池 -->
+
-        <dependency>
+        <dependency>
-            <groupId>org.apache.commons</groupId>
+            <groupId>cn.hutool</groupId>
-            <artifactId>commons-pool2</artifactId>
+            <artifactId>hutool-core</artifactId>
-        </dependency>
+        </dependency>
-
+
-        <!-- 解析客户端操作系统、浏览器等 -->
+        <dependency>
-        <dependency>
+            <groupId>cn.hutool</groupId>
-            <groupId>eu.bitwalker</groupId>
+            <artifactId>hutool-http</artifactId>
-            <artifactId>UserAgentUtils</artifactId>
+        </dependency>
-        </dependency>
+
-
+        <dependency>
-        <!-- servlet包 -->
+            <groupId>cn.hutool</groupId>
-        <dependency>
+            <artifactId>hutool-captcha</artifactId>
-            <groupId>javax.servlet</groupId>
+        </dependency>
-            <artifactId>javax.servlet-api</artifactId>
+
-        </dependency>
+        <dependency>
-
+            <groupId>cn.hutool</groupId>
-    </dependencies>
+            <artifactId>hutool-jwt</artifactId>
-
+        </dependency>
-</project>
+
        <dependency>
            <groupId>cn.hutool</groupId>
            <artifactId>hutool-extra</artifactId>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
        </dependency>
        <dependency>
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>knife4j-spring-boot-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>io.swagger</groupId>
            <artifactId>swagger-annotations</artifactId>
        </dependency>
        <!--  自动生成YML配置关联JSON文件  -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-configuration-processor</artifactId>
        </dependency>
        <!--redisson-->
        <dependency>
            <groupId>org.redisson</groupId>
            <artifactId>redisson-spring-boot-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
        </dependency>
    </dependencies>
 </project>
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java
@ -0,0 +1,26 @@
 package com.ruoyi.common.annotation;
 import java.lang.annotation.*;
 /**
 * 数据权限
 *
 * @author Lion Li
 * @version 3.5.0
 */
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
 public @interface DataColumn {
    /**
     * 占位符关键字
     */
    String key() default "deptName";
    /**
     * 占位符替换值
     */
    String value() default "dept_id";
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataPermission.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataPermission.java
@ -0,0 +1,18 @@
 package com.ruoyi.common.annotation;
 import java.lang.annotation.*;
 /**
 * 数据权限组
 *
 * @author Lion Li
 * @version 3.5.0
 */
@Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
 public @interface DataPermission {
    DataColumn[] value();
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
@ -1,28 +1,32 @@
-package com.ruoyi.common.annotation;
+package com.ruoyi.common.annotation;
-
+
-import java.lang.annotation.Documented;
+import java.lang.annotation.*;
-import java.lang.annotation.ElementType;
+
-import java.lang.annotation.Retention;
+/**
-import java.lang.annotation.RetentionPolicy;
+ * 数据权限过滤注解
-import java.lang.annotation.Target;
+ *
-
+ * @author ruoyi
-/**
+ * @deprecated 3.6.0 移除 {@link com.ruoyi.common.annotation.DataPermission}
- * 数据权限过滤注解
+ */
- * 
+@Target(ElementType.METHOD)
- * @author ruoyi
+@Retention(RetentionPolicy.RUNTIME)
- */
+@Documented
-@Target(ElementType.METHOD)
+@Deprecated
-@Retention(RetentionPolicy.RUNTIME)
+public @interface DataScope {
-@Documented
+
-public @interface DataScope
+    /**
-{
+     * 部门表的别名
-    /**
+     */
-     * 部门表的别名
+    String deptAlias() default "";
-     */
+
-    public String deptAlias() default "";
+    /**
-
+     * 用户表的别名
-    /**
+     */
-     * 用户表的别名
+    String userAlias() default "";
-     */
+
-    public String userAlias() default "";
+    /**
-}
+     * 是否过滤用户权限
     */
    boolean isUser() default false;
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
@ -1,28 +1,25 @@
-package com.ruoyi.common.annotation;
+package com.ruoyi.common.annotation;
-
+
-import java.lang.annotation.Documented;
+import com.ruoyi.common.enums.DataSourceType;
-import java.lang.annotation.ElementType;
+
-import java.lang.annotation.Inherited;
+import java.lang.annotation.*;
-import java.lang.annotation.Retention;
+
-import java.lang.annotation.RetentionPolicy;
+/**
-import java.lang.annotation.Target;
+ * 自定义多数据源切换注解
-import com.ruoyi.common.enums.DataSourceType;
+ * <p>
-
+ * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
-/**
+ *
- * 自定义多数据源切换注解
+ * @author ruoyi
- *
+ * @deprecated 3.6.0 移除 使用原生注解处理 方法更全 {@link com.baomidou.dynamic.datasource.annotation.DS}
- * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
+ */
- *
+@Target({ElementType.METHOD, ElementType.TYPE})
- * @author ruoyi
+@Retention(RetentionPolicy.RUNTIME)
- */
+@Documented
-@Target({ ElementType.METHOD, ElementType.TYPE })
+@Inherited
-@Retention(RetentionPolicy.RUNTIME)
+@Deprecated
-@Documented
+public @interface DataSource {
-@Inherited
+    /**
-public @interface DataSource
+     * 切换数据源名称
-{
+     */
-    /**
+    DataSourceType value() default DataSourceType.MASTER;
-     * 切换数据源名称
+}
     */
    public DataSourceType value() default DataSourceType.MASTER;
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
@ -1,165 +0,0 @@
 package com.ruoyi.common.annotation;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.math.BigDecimal;
 /**
 * 自定义导出Excel数据注解
 * 
 * @author ruoyi
 */
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
 public @interface Excel
 {
    /**
     * 导出时在excel中排序
     */
    public int sort() default Integer.MAX_VALUE;
    /**
     * 导出到Excel中的名字.
     */
    public String name() default "";
    /**
     * 日期格式, 如: yyyy-MM-dd
     */
    public String dateFormat() default "";
    /**
     * 如果是字典类型，请设置字典的type值 (如: sys_user_sex)
     */
    public String dictType() default "";
    /**
     * 读取内容转表达式 (如: 0=男,1=女,2=未知)
     */
    public String readConverterExp() default "";
    /**
     * 分隔符，读取字符串组内容
     */
    public String separator() default ",";
    /**
     * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
     */
    public int scale() default -1;
    /**
     * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
     */
    public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
    /**
     * 导出类型（0数字 1字符串）
     */
    public ColumnType cellType() default ColumnType.STRING;
    /**
     * 导出时在excel中每个列的高度 单位为字符
     */
    public double height() default 14;
    /**
     * 导出时在excel中每个列的宽 单位为字符
     */
    public double width() default 16;
    /**
     * 文字后缀,如% 90 变成90%
     */
    public String suffix() default "";
    /**
     * 当值为空时,字段的默认值
     */
    public String defaultValue() default "";
    /**
     * 提示信息
     */
    public String prompt() default "";
    /**
     * 设置只能选择不能输入的列内容.
     */
    public String[] combo() default {};
    /**
     * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
     */
    public boolean isExport() default true;
    /**
     * 另一个类中的属性名称,支持多级获取,以小数点隔开
     */
    public String targetAttr() default "";
    /**
     * 是否自动统计数据,在最后追加一行统计数据总和
     */
    public boolean isStatistics() default false;
    /**
     * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
     */
    Align align() default Align.AUTO;
    public enum Align
    {
        AUTO(0), LEFT(1), CENTER(2), RIGHT(3);
        private final int value;
        Align(int value)
        {
            this.value = value;
        }
        public int value()
        {
            return this.value;
        }
    }
    /**
     * 字段类型（0：导出导入；1：仅导出；2：仅导入）
     */
    Type type() default Type.ALL;
    public enum Type
    {
        ALL(0), EXPORT(1), IMPORT(2);
        private final int value;
        Type(int value)
        {
            this.value = value;
        }
        public int value()
        {
            return this.value;
        }
    }
    public enum ColumnType
    {
        NUMERIC(0), STRING(1), IMAGE(2);
        private final int value;
        ColumnType(int value)
        {
            this.value = value;
        }
        public int value()
        {
            return this.value;
        }
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelDictFormat.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelDictFormat.java
@ -0,0 +1,30 @@
 package com.ruoyi.common.annotation;
 import java.lang.annotation.*;
 /**
 * 字典格式化
 *
 * @author Lion Li
 */
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@Inherited
 public @interface ExcelDictFormat {
    /**
     * 如果是字典类型，请设置字典的type值 (如: sys_user_sex)
     */
    String dictType() default "";
    /**
     * 读取内容转表达式 (如: 0=男,1=女,2=未知)
     */
    String readConverterExp() default "";
    /**
     * 分隔符，读取字符串组内容
     */
    String separator() default ",";
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java
@ -1,18 +0,0 @@
 package com.ruoyi.common.annotation;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 /**
 * Excel注解集
 * 
 * @author ruoyi
 */
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
 public @interface Excels
 {
    Excel[] value();
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java
@ -1,41 +1,41 @@
-package com.ruoyi.common.annotation;
+package com.ruoyi.common.annotation;
-
+
-import java.lang.annotation.Documented;
+import com.ruoyi.common.enums.BusinessType;
-import java.lang.annotation.ElementType;
+import com.ruoyi.common.enums.OperatorType;
-import java.lang.annotation.Retention;
+
-import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.*;
-import java.lang.annotation.Target;
+
-import com.ruoyi.common.enums.BusinessType;
+/**
-import com.ruoyi.common.enums.OperatorType;
+ * 自定义操作日志记录注解
-
+ *
-/**
+ * @author ruoyi
- * 自定义操作日志记录注解
+ */
- * 
+@Target({ElementType.PARAMETER, ElementType.METHOD})
- * @author ruoyi
+@Retention(RetentionPolicy.RUNTIME)
- *
+@Documented
- */
+public @interface Log {
-@Target({ ElementType.PARAMETER, ElementType.METHOD })
+    /**
-@Retention(RetentionPolicy.RUNTIME)
+     * 模块
-@Documented
+     */
-public @interface Log
+    String title() default "";
-{
+
-    /**
+    /**
-     * 模块 
+     * 功能
-     */
+     */
-    public String title() default "";
+    BusinessType businessType() default BusinessType.OTHER;
-
+
-    /**
+    /**
-     * 功能
+     * 操作人类别
-     */
+     */
-    public BusinessType businessType() default BusinessType.OTHER;
+    OperatorType operatorType() default OperatorType.MANAGE;
-
+
-    /**
+    /**
-     * 操作人类别
+     * 是否保存请求的参数
-     */
+     */
-    public OperatorType operatorType() default OperatorType.MANAGE;
+    boolean isSaveRequestData() default true;
-
+
-    /**
+    /**
-     * 是否保存请求的参数
+     * 是否保存响应的参数
-     */
+     */
-    public boolean isSaveRequestData() default true;
+    boolean isSaveResponseData() default true;
-}
+}
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java
@ -0,0 +1,36 @@
 package com.ruoyi.common.annotation;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.enums.LimitType;
 import java.lang.annotation.*;
 /**
 * 限流注解
 *
 * @author Lion Li
 */
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
 public @interface RateLimiter {
    /**
     * 限流key
     */
    String key() default Constants.RATE_LIMIT_KEY;
    /**
     * 限流时间,单位秒
     */
    int time() default 60;
    /**
     * 限流次数
     */
    int count() default 100;
    /**
     * 限流类型
     */
    LimitType limitType() default LimitType.DEFAULT;
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
@ -1,23 +1,29 @@
-package com.ruoyi.common.annotation;
+package com.ruoyi.common.annotation;
-
+
-import java.lang.annotation.Documented;
+import java.lang.annotation.*;
-import java.lang.annotation.ElementType;
+import java.util.concurrent.TimeUnit;
-import java.lang.annotation.Inherited;
+
-import java.lang.annotation.Retention;
+/**
-import java.lang.annotation.RetentionPolicy;
+ * 自定义注解防止表单重复提交
-import java.lang.annotation.Target;
+ *
-
+ * @author Lion Li
-/**
+ */
- * 自定义注解防止表单重复提交
+@Inherited
- * 
+@Target(ElementType.METHOD)
- * @author ruoyi
+@Retention(RetentionPolicy.RUNTIME)
- *
+@Documented
- */
+public @interface RepeatSubmit {
-@Inherited
+
-@Target(ElementType.METHOD)
+    /**
-@Retention(RetentionPolicy.RUNTIME)
+     * 间隔时间(ms)，小于此时间视为重复提交
-@Documented
+     */
-public @interface RepeatSubmit
+    int interval() default 5000;
-{
+
-
+    TimeUnit timeUnit() default TimeUnit.MILLISECONDS;
-}
+
    /**
     * 提示消息
     */
    String message() default "不允许重复提交，请稍候再试";
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java
@ -0,0 +1,85 @@
 package com.ruoyi.common.captcha;
 import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.math.Calculator;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.ruoyi.common.utils.StringUtils;
 /**
 * 无符号计算生成器
 *
 * @author Lion Li
 */
 public class UnsignedMathGenerator implements CodeGenerator {
 	private static final long serialVersionUID = -5514819971774091076L;
 	private static final String operators = "+-*";
 	/**
 	 * 参与计算数字最大长度
 	 */
 	private final int numberLength;
 	/**
 	 * 构造
 	 */
 	public UnsignedMathGenerator() {
 		this(2);
 	}
 	/**
 	 * 构造
 	 *
 	 * @param numberLength 参与计算最大数字位数
 	 */
 	public UnsignedMathGenerator(int numberLength) {
 		this.numberLength = numberLength;
 	}
 	@Override
 	public String generate() {
 		final int limit = getLimit();
 		int min = RandomUtil.randomInt(limit);
 		int max = RandomUtil.randomInt(min, limit);
 		String number1 = Integer.toString(max);
 		String number2 = Integer.toString(min);
 		number1 = StringUtils.rightPad(number1, this.numberLength, CharUtil.SPACE);
 		number2 = StringUtils.rightPad(number2, this.numberLength, CharUtil.SPACE);
 		return number1 + RandomUtil.randomChar(operators) + number2 + '=';
 	}
 	@Override
 	public boolean verify(String code, String userInputCode) {
 		int result;
 		try {
 			result = Integer.parseInt(userInputCode);
 		} catch (NumberFormatException e) {
 			// 用户输入非数字
 			return false;
 		}
 		final int calculateResult = (int) Calculator.conversion(code);
 		return result == calculateResult;
 	}
 	/**
 	 * 获取验证码长度
 	 *
 	 * @return 验证码长度
 	 */
 	public int getLength() {
 		return this.numberLength * 2 + 2;
 	}
 	/**
 	 * 根据长度获取参与计算数字最大值
 	 *
 	 * @return 最大值
 	 */
 	private int getLimit() {
 		return Integer.parseInt("1" + StringUtils.repeat('0', this.numberLength));
 	}
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
@ -1,116 +1,56 @@
-package com.ruoyi.common.config;
+package com.ruoyi.common.config;
-
+
-import org.springframework.boot.context.properties.ConfigurationProperties;
+import lombok.Data;
-import org.springframework.stereotype.Component;
+import lombok.Getter;
-
+import lombok.experimental.Accessors;
-/**
+import org.springframework.boot.context.properties.ConfigurationProperties;
- * 读取项目相关配置
+import org.springframework.stereotype.Component;
- * 
+
- * @author ruoyi
+/**
- */
+ * 读取项目相关配置
-@Component
+ *
-@ConfigurationProperties(prefix = "ruoyi")
+ * @author Lion Li
-public class RuoYiConfig
+ */
-{
+
-    /** 项目名称 */
+@Data
-    private String name;
+@Accessors(chain = true)
-
+@Component
-    /** 版本 */
+@ConfigurationProperties(prefix = "ruoyi")
-    private String version;
+public class RuoYiConfig {
-
+
-    /** 版权年份 */
+    /**
-    private String copyrightYear;
+     * 项目名称
-
+     */
-    /** 实例演示开关 */
+    private String name;
-    private boolean demoEnabled;
+
-
+    /**
-    /** 上传路径 */
+     * 版本
-    private static String profile;
+     */
-
+    private String version;
-    /** 获取地址开关 */
+
-    private static boolean addressEnabled;
+    /**
-
+     * 版权年份
-    public String getName()
+     */
-    {
+    private String copyrightYear;
-        return name;
+
-    }
+    /**
-
+     * 实例演示开关
-    public void setName(String name)
+     */
-    {
+    private boolean demoEnabled;
-        this.name = name;
+
-    }
+    /**
-
+     * 缓存懒加载
-    public String getVersion()
+     */
-    {
+    private boolean cacheLazy;
-        return version;
+
-    }
+    /**
-
+     * 获取地址开关
-    public void setVersion(String version)
+     */
-    {
+    @Getter
-        this.version = version;
+    private static boolean addressEnabled;
-    }
+
-
+    public void setAddressEnabled(boolean addressEnabled) {
-    public String getCopyrightYear()
+        RuoYiConfig.addressEnabled = addressEnabled;
-    {
+    }
-        return copyrightYear;
+
-    }
+}
    public void setCopyrightYear(String copyrightYear)
    {
        this.copyrightYear = copyrightYear;
    }
    public boolean isDemoEnabled()
    {
        return demoEnabled;
    }
    public void setDemoEnabled(boolean demoEnabled)
    {
        this.demoEnabled = demoEnabled;
    }
    public static String getProfile()
    {
        return profile;
    }
    public void setProfile(String profile)
    {
        RuoYiConfig.profile = profile;
    }
    public static boolean isAddressEnabled()
    {
        return addressEnabled;
    }
    public void setAddressEnabled(boolean addressEnabled)
    {
        RuoYiConfig.addressEnabled = addressEnabled;
    }
    /**
     * 获取头像上传路径
     */
    public static String getAvatarPath()
    {
        return getProfile() + "/avatar";
    }
    /**
     * 获取下载路径
     */
    public static String getDownloadPath()
    {
        return getProfile() + "/download/";
    }
    /**
     * 获取上传路径
     */
    public static String getUploadPath()
    {
        return getProfile() + "/upload";
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@ -1,129 +1,151 @@
-package com.ruoyi.common.constant;
+package com.ruoyi.common.constant;
-
+
-/**
+
- * 通用常量信息
+/**
- * 
+ * 通用常量信息
- * @author ruoyi
+ *
- */
+ * @author ruoyi
-public class Constants
+ */
-{
+public interface Constants {
-    /**
+
-     * UTF-8 字符集
+    /**
-     */
+     * UTF-8 字符集
-    public static final String UTF8 = "UTF-8";
+     */
-
+    String UTF8 = "UTF-8";
-    /**
+
-     * GBK 字符集
+    /**
-     */
+     * GBK 字符集
-    public static final String GBK = "GBK";
+     */
-
+    String GBK = "GBK";
-    /**
+
-     * http请求
+    /**
-     */
+     * http请求
-    public static final String HTTP = "http://";
+     */
-
+    String HTTP = "http://";
-    /**
+
-     * https请求
+    /**
-     */
+     * https请求
-    public static final String HTTPS = "https://";
+     */
-
+    String HTTPS = "https://";
-    /**
+
-     * 通用成功标识
+    /**
-     */
+     * 通用成功标识
-    public static final String SUCCESS = "0";
+     */
-
+    String SUCCESS = "0";
-    /**
+
-     * 通用失败标识
+    /**
-     */
+     * 通用失败标识
-    public static final String FAIL = "1";
+     */
-
+    String FAIL = "1";
-    /**
+
-     * 登录成功
+    /**
-     */
+     * 登录成功
-    public static final String LOGIN_SUCCESS = "Success";
+     */
-
+    String LOGIN_SUCCESS = "Success";
-    /**
+
-     * 注销
+    /**
-     */
+     * 注销
-    public static final String LOGOUT = "Logout";
+     */
-
+    String LOGOUT = "Logout";
-    /**
+
-     * 登录失败
+    /**
-     */
+     * 注册
-    public static final String LOGIN_FAIL = "Error";
+     */
-
+    String REGISTER = "Register";
-    /**
+
-     * 验证码 redis key
+    /**
-     */
+     * 登录失败
-    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
+     */
-
+    String LOGIN_FAIL = "Error";
-    /**
+
-     * 登录用户 redis key
+    /**
-     */
+     * 验证码 redis key
-    public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+     */
-    
+    String CAPTCHA_CODE_KEY = "captcha_codes:";
-    /**
+
-     * 防重提交 redis key
+    /**
-     */
+     * 登录用户 redis key
-    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
+     */
-
+    String LOGIN_TOKEN_KEY = "login_tokens:";
-    /**
+
-     * 验证码有效期（分钟）
+    /**
-     */
+     * 防重提交 redis key
-    public static final Integer CAPTCHA_EXPIRATION = 2;
+     */
-
+    String REPEAT_SUBMIT_KEY = "repeat_submit:";
-    /**
+
-     * 令牌
+    /**
-     */
+     * 限流 redis key
-    public static final String TOKEN = "token";
+     */
-
+    String RATE_LIMIT_KEY = "rate_limit:";
-    /**
+
-     * 令牌前缀
+    /**
-     */
+     * 验证码有效期（分钟）
-    public static final String TOKEN_PREFIX = "Bearer ";
+     */
-
+    Integer CAPTCHA_EXPIRATION = 2;
-    /**
+
-     * 令牌前缀
+    /**
-     */
+     * 登陆错误 redis key
-    public static final String LOGIN_USER_KEY = "login_user_key";
+     */
-
+    String LOGIN_ERROR = "login_error:";
-    /**
+
-     * 用户ID
+    /**
-     */
+     * 登录错误次数
-    public static final String JWT_USERID = "userid";
+     */
-
+    Integer LOGIN_ERROR_NUMBER = 5;
-    /**
+
-     * 用户名称
+    /**
-     */
+     * 登录错误限制时间(分钟)
-    public static final String JWT_USERNAME = "sub";
+     */
-
+    Integer LOGIN_ERROR_LIMIT_TIME = 10;
-    /**
+
-     * 用户头像
+    /**
-     */
+     * 令牌
-    public static final String JWT_AVATAR = "avatar";
+     */
-
+    String TOKEN = "token";
-    /**
+
-     * 创建时间
+    /**
-     */
+     * 令牌前缀
-    public static final String JWT_CREATED = "created";
+     */
-
+    String TOKEN_PREFIX = "Bearer ";
-    /**
+
-     * 用户权限
+    /**
-     */
+     * 令牌前缀
-    public static final String JWT_AUTHORITIES = "authorities";
+     */
-
+    String LOGIN_USER_KEY = "login_user_key";
-    /**
+
-     * 参数管理 cache key
+    /**
-     */
+     * 用户ID
-    public static final String SYS_CONFIG_KEY = "sys_config:";
+     */
-
+    String JWT_USERID = "userid";
-    /**
+
-     * 字典管理 cache key
+    /**
-     */
+     * 用户名称
-    public static final String SYS_DICT_KEY = "sys_dict:";
+     */
-
+    String JWT_USERNAME = "sub";
-    /**
+
-     * 资源映射路径 前缀
+    /**
-     */
+     * 用户头像
-    public static final String RESOURCE_PREFIX = "/profile";
+     */
-}
+    String JWT_AVATAR = "avatar";
    /**
     * 创建时间
     */
    String JWT_CREATED = "created";
    /**
     * 用户权限
     */
    String JWT_AUTHORITIES = "authorities";
    /**
     * 参数管理 cache key
     */
    String SYS_CONFIG_KEY = "sys_config:";
    /**
     * 字典管理 cache key
     */
    String SYS_DICT_KEY = "sys_dict:";
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
@ -1,114 +1,188 @@
-package com.ruoyi.common.constant;
+package com.ruoyi.common.constant;
-
+
-/**
+/**
- * 代码生成通用常量
+ * 代码生成通用常量
- * 
+ *
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-public class GenConstants
+public interface GenConstants {
-{
+    /**
-    /** 单表（增删改查） */
+     * 单表（增删改查）
-    public static final String TPL_CRUD = "crud";
+     */
-
+    String TPL_CRUD = "crud";
-    /** 树表（增删改查） */
+
-    public static final String TPL_TREE = "tree";
+    /**
-
+     * 树表（增删改查）
-    /** 主子表（增删改查） */
+     */
-    public static final String TPL_SUB = "sub";
+    String TPL_TREE = "tree";
-
+
-    /** 树编码字段 */
+    /**
-    public static final String TREE_CODE = "treeCode";
+     * 主子表（增删改查）
-
+     */
-    /** 树父编码字段 */
+    String TPL_SUB = "sub";
-    public static final String TREE_PARENT_CODE = "treeParentCode";
+
-
+    /**
-    /** 树名称字段 */
+     * 树编码字段
-    public static final String TREE_NAME = "treeName";
+     */
-
+    String TREE_CODE = "treeCode";
-    /** 上级菜单ID字段 */
+
-    public static final String PARENT_MENU_ID = "parentMenuId";
+    /**
-
+     * 树父编码字段
-    /** 上级菜单名称字段 */
+     */
-    public static final String PARENT_MENU_NAME = "parentMenuName";
+    String TREE_PARENT_CODE = "treeParentCode";
-
+
-    /** 数据库字符串类型 */
+    /**
-    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
+     * 树名称字段
-
+     */
-    /** 数据库文本类型 */
+    String TREE_NAME = "treeName";
-    public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" };
+
-
+    /**
-    /** 数据库时间类型 */
+     * 上级菜单ID字段
-    public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
+     */
-
+    String PARENT_MENU_ID = "parentMenuId";
-    /** 数据库数字类型 */
+
-    public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
+    /**
-            "bit", "bigint", "float", "double", "decimal" };
+     * 上级菜单名称字段
-
+     */
-    /** 页面不需要编辑字段 */
+    String PARENT_MENU_NAME = "parentMenuName";
-    public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
+
-
+    /**
-    /** 页面不需要显示的列表字段 */
+     * 数据库字符串类型
-    public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by",
+     */
-            "update_time" };
+    String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
-
+
-    /** 页面不需要查询字段 */
+    /**
-    public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by",
+     * 数据库文本类型
-            "update_time", "remark" };
+     */
-
+    String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
-    /** Entity基类字段 */
+
-    public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
+    /**
-
+     * 数据库时间类型
-    /** Tree基类字段 */
+     */
-    public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors", "children" };
+    String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
-
+
-    /** 文本框 */
+    /**
-    public static final String HTML_INPUT = "input";
+     * 数据库数字类型
-
+     */
-    /** 文本域 */
+    String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
-    public static final String HTML_TEXTAREA = "textarea";
+        "bit", "bigint", "float", "double", "decimal"};
-
+
-    /** 下拉框 */
+    /**
-    public static final String HTML_SELECT = "select";
+     * BO对象 不需要添加字段
-
+     */
-    /** 单选框 */
+    String[] COLUMNNAME_NOT_ADD = {"create_by", "create_time", "del_flag", "update_by",
-    public static final String HTML_RADIO = "radio";
+        "update_time", "version"};
-
+
-    /** 复选框 */
+    /**
-    public static final String HTML_CHECKBOX = "checkbox";
+     * BO对象 不需要编辑字段
-
+     */
-    /** 日期控件 */
+    String[] COLUMNNAME_NOT_EDIT = {"create_by", "create_time", "del_flag", "update_by",
-    public static final String HTML_DATETIME = "datetime";
+        "update_time", "version"};
-
+
-    /** 图片上传控件 */
+    /**
-    public static final String HTML_IMAGE_UPLOAD = "imageUpload";
+     * VO对象 不需要返回字段
-
+     */
-    /** 文件上传控件 */
+    String[] COLUMNNAME_NOT_LIST = {"create_by", "create_time", "del_flag", "update_by",
-    public static final String HTML_FILE_UPLOAD = "fileUpload";
+        "update_time", "version"};
-
+
-    /** 富文本控件 */
+    /**
-    public static final String HTML_EDITOR = "editor";
+     * BO对象 不需要查询字段
-
+     */
-    /** 字符串类型 */
+    String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by",
-    public static final String TYPE_STRING = "String";
+        "update_time", "remark", "version"};
-
+
-    /** 整型 */
+    /**
-    public static final String TYPE_INTEGER = "Integer";
+     * Entity基类字段
-
+     */
-    /** 长整型 */
+    String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime"};
-    public static final String TYPE_LONG = "Long";
+
-
+    /**
-    /** 浮点型 */
+     * Tree基类字段
-    public static final String TYPE_DOUBLE = "Double";
+     */
-
+    String[] TREE_ENTITY = {"parentName", "parentId", "children"};
-    /** 高精度计算类型 */
+
-    public static final String TYPE_BIGDECIMAL = "BigDecimal";
+    /**
-
+     * 文本框
-    /** 时间类型 */
+     */
-    public static final String TYPE_DATE = "Date";
+    String HTML_INPUT = "input";
-
+
-    /** 模糊查询 */
+    /**
-    public static final String QUERY_LIKE = "LIKE";
+     * 文本域
-
+     */
-    /** 需要 */
+    String HTML_TEXTAREA = "textarea";
-    public static final String REQUIRE = "1";
+
-}
+    /**
     * 下拉框
     */
    String HTML_SELECT = "select";
    /**
     * 单选框
     */
    String HTML_RADIO = "radio";
    /**
     * 复选框
     */
    String HTML_CHECKBOX = "checkbox";
    /**
     * 日期控件
     */
    String HTML_DATETIME = "datetime";
    /**
     * 图片上传控件
     */
    String HTML_IMAGE_UPLOAD = "imageUpload";
    /**
     * 文件上传控件
     */
    String HTML_FILE_UPLOAD = "fileUpload";
    /**
     * 富文本控件
     */
    String HTML_EDITOR = "editor";
    /**
     * 字符串类型
     */
    String TYPE_STRING = "String";
    /**
     * 整型
     */
    String TYPE_INTEGER = "Integer";
    /**
     * 长整型
     */
    String TYPE_LONG = "Long";
    /**
     * 浮点型
     */
    String TYPE_DOUBLE = "Double";
    /**
     * 高精度计算类型
     */
    String TYPE_BIGDECIMAL = "BigDecimal";
    /**
     * 时间类型
     */
    String TYPE_DATE = "Date";
    /**
     * 模糊查询
     */
    String QUERY_LIKE = "LIKE";
    /**
     * 需要
     */
    String REQUIRE = "1";
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java
@ -1,89 +0,0 @@
 package com.ruoyi.common.constant;
 /**
 * 返回状态码
 * 
 * @author ruoyi
 */
 public class HttpStatus
 {
    /**
     * 操作成功
     */
    public static final int SUCCESS = 200;
    /**
     * 对象创建成功
     */
    public static final int CREATED = 201;
    /**
     * 请求已经被接受
     */
    public static final int ACCEPTED = 202;
    /**
     * 操作已经执行成功，但是没有返回数据
     */
    public static final int NO_CONTENT = 204;
    /**
     * 资源已被移除
     */
    public static final int MOVED_PERM = 301;
    /**
     * 重定向
     */
    public static final int SEE_OTHER = 303;
    /**
     * 资源没有被修改
     */
    public static final int NOT_MODIFIED = 304;
    /**
     * 参数列表错误（缺少，格式不匹配）
     */
    public static final int BAD_REQUEST = 400;
    /**
     * 未授权
     */
    public static final int UNAUTHORIZED = 401;
    /**
     * 访问受限，授权过期
     */
    public static final int FORBIDDEN = 403;
    /**
     * 资源，服务未找到
     */
    public static final int NOT_FOUND = 404;
    /**
     * 不允许的http方法
     */
    public static final int BAD_METHOD = 405;
    /**
     * 资源冲突，或者资源被锁
     */
    public static final int CONFLICT = 409;
    /**
     * 不支持的数据，媒体类型
     */
    public static final int UNSUPPORTED_TYPE = 415;
    /**
     * 系统内部错误
     */
    public static final int ERROR = 500;
    /**
     * 接口未实现
     */
    public static final int NOT_IMPLEMENTED = 501;
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
@ -1,50 +0,0 @@
 package com.ruoyi.common.constant;
 /**
 * 任务调度通用常量
 * 
 * @author ruoyi
 */
 public class ScheduleConstants
 {
    public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
    /** 执行目标key */
    public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
    /** 默认 */
    public static final String MISFIRE_DEFAULT = "0";
    /** 立即触发执行 */
    public static final String MISFIRE_IGNORE_MISFIRES = "1";
    /** 触发一次执行 */
    public static final String MISFIRE_FIRE_AND_PROCEED = "2";
    /** 不触发立即执行 */
    public static final String MISFIRE_DO_NOTHING = "3";
    public enum Status
    {
        /**
         * 正常
         */
        NORMAL("0"),
        /**
         * 暂停
         */
        PAUSE("1");
        private String value;
        private Status(String value)
        {
            this.value = value;
        }
        public String getValue()
        {
            return value;
        }
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@ -1,63 +1,112 @@
-package com.ruoyi.common.constant;
+package com.ruoyi.common.constant;
-
+
-/**
+/**
- * 用户常量信息
+ * 用户常量信息
- * 
+ *
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-public class UserConstants
+public interface UserConstants {
-{
+
-    /**
+    /**
-     * 平台内系统用户的唯一标志
+     * 平台内系统用户的唯一标志
-     */
+     */
-    public static final String SYS_USER = "SYS_USER";
+    String SYS_USER = "SYS_USER";
-
+
-    /** 正常状态 */
+    /**
-    public static final String NORMAL = "0";
+     * 正常状态
-
+     */
-    /** 异常状态 */
+    String NORMAL = "0";
-    public static final String EXCEPTION = "1";
+
-
+    /**
-    /** 用户封禁状态 */
+     * 异常状态
-    public static final String USER_DISABLE = "1";
+     */
-
+    String EXCEPTION = "1";
-    /** 角色封禁状态 */
+
-    public static final String ROLE_DISABLE = "1";
+    /**
-
+     * 用户封禁状态
-    /** 部门正常状态 */
+     */
-    public static final String DEPT_NORMAL = "0";
+    String USER_DISABLE = "1";
-
+
-    /** 部门停用状态 */
+    /**
-    public static final String DEPT_DISABLE = "1";
+     * 角色封禁状态
-
+     */
-    /** 字典正常状态 */
+    String ROLE_DISABLE = "1";
-    public static final String DICT_NORMAL = "0";
+
-
+    /**
-    /** 是否为系统默认（是） */
+     * 部门正常状态
-    public static final String YES = "Y";
+     */
-
+    String DEPT_NORMAL = "0";
-    /** 是否菜单外链（是） */
+
-    public static final String YES_FRAME = "0";
+    /**
-
+     * 部门停用状态
-    /** 是否菜单外链（否） */
+     */
-    public static final String NO_FRAME = "1";
+    String DEPT_DISABLE = "1";
-
+
-    /** 菜单类型（目录） */
+    /**
-    public static final String TYPE_DIR = "M";
+     * 字典正常状态
-
+     */
-    /** 菜单类型（菜单） */
+    String DICT_NORMAL = "0";
-    public static final String TYPE_MENU = "C";
+
-
+    /**
-    /** 菜单类型（按钮） */
+     * 是否为系统默认（是）
-    public static final String TYPE_BUTTON = "F";
+     */
-
+    String YES = "Y";
-    /** Layout组件标识 */
+
-    public final static String LAYOUT = "Layout";
+    /**
-
+     * 是否菜单外链（是）
-    /** ParentView组件标识 */
+     */
-    public final static String PARENT_VIEW = "ParentView";
+    String YES_FRAME = "0";
-
+
-    /** 校验返回结果码 */
+    /**
-    public final static String UNIQUE = "0";
+     * 是否菜单外链（否）
-    public final static String NOT_UNIQUE = "1";
+     */
-}
+    String NO_FRAME = "1";
    /**
     * 菜单类型（目录）
     */
    String TYPE_DIR = "M";
    /**
     * 菜单类型（菜单）
     */
    String TYPE_MENU = "C";
    /**
     * 菜单类型（按钮）
     */
    String TYPE_BUTTON = "F";
    /**
     * Layout组件标识
     */
    String LAYOUT = "Layout";
    /**
     * ParentView组件标识
     */
    String PARENT_VIEW = "ParentView";
    /**
     * InnerLink组件标识
     */
    String INNER_LINK = "InnerLink";
    /**
     * 校验返回结果码
     */
    String UNIQUE = "0";
    String NOT_UNIQUE = "1";
    /**
     * 用户名长度限制
     */
    int USERNAME_MIN_LENGTH = 2;
    int USERNAME_MAX_LENGTH = 20;
    /**
     * 密码长度限制
     */
    int PASSWORD_MIN_LENGTH = 5;
    int PASSWORD_MAX_LENGTH = 20;
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java
@ -0,0 +1,51 @@
 package com.ruoyi.common.convert;
 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.property.ExcelContentProperty;
 import lombok.extern.slf4j.Slf4j;
 import java.math.BigDecimal;
 /**
 * 大数值转换
 * Excel 数值长度位15位 大于15位的数值转换位字符串
 *
 * @author Lion Li
 */
@Slf4j
 public class ExcelBigNumberConvert implements Converter<Long> {
 	@Override
 	public Class<Long> supportJavaTypeKey() {
 		return Long.class;
 	}
 	@Override
 	public CellDataTypeEnum supportExcelTypeKey() {
 		return CellDataTypeEnum.STRING;
 	}
 	@Override
 	public Long convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
 		return Convert.toLong(cellData.getData());
 	}
 	@Override
 	public CellData<Object> convertToExcelData(Long object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
 		if (ObjectUtil.isNotNull(object)) {
 			String str = Convert.toStr(object);
 			if (str.length() > 15) {
 				return new CellData<>(str);
 			}
 		}
 		CellData<Object> cellData = new CellData<>(new BigDecimal(object));
 		cellData.setType(CellDataTypeEnum.NUMBER);
 		return cellData;
 	}
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
@ -0,0 +1,71 @@
 package com.ruoyi.common.convert;
 import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.core.convert.Convert;
 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.property.ExcelContentProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.core.service.DictService;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
 import java.lang.reflect.Field;
 /**
 * 字典格式化转换处理
 *
 * @author Lion Li
 */
@Slf4j
 public class ExcelDictConvert implements Converter<Object> {
 	@Override
 	public Class<Object> supportJavaTypeKey() {
 		return Object.class;
 	}
 	@Override
 	public CellDataTypeEnum supportExcelTypeKey() {
 		return null;
 	}
 	@Override
 	public Object convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
 		ExcelDictFormat anno = getAnnotation(contentProperty.getField());
 		String type = anno.dictType();
 		String label = cellData.getStringValue();
 		String value;
 		if (StringUtils.isBlank(type)) {
 			value = ExcelUtil.reverseByExp(label, anno.readConverterExp(), anno.separator());
 		} else {
 			value = SpringUtils.getBean(DictService.class).getDictValue(type, label, anno.separator());
 		}
 		return Convert.convert(contentProperty.getField().getType(), value);
 	}
 	@Override
 	public CellData<String> convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
 		if (StringUtils.isNull(object)) {
 			return new CellData<>("");
 		}
 		ExcelDictFormat anno = getAnnotation(contentProperty.getField());
 		String type = anno.dictType();
 		String value = Convert.toStr(object);
 		String label;
 		if (StringUtils.isBlank(type)) {
 			label = ExcelUtil.convertByExp(value, anno.readConverterExp(), anno.separator());
 		} else {
 			label = SpringUtils.getBean(DictService.class).getDictLabel(type, value, anno.separator());
 		}
 		return new CellData<>(label);
 	}
 	private ExcelDictFormat getAnnotation(Field field) {
 		return AnnotationUtil.getAnnotation(field, ExcelDictFormat.class);
 	}
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@ -1,137 +1,97 @@
-package com.ruoyi.common.core.controller;
+package com.ruoyi.common.core.controller;
-
+
-import java.beans.PropertyEditorSupport;
+import com.ruoyi.common.core.domain.AjaxResult;
-import java.util.Date;
+import com.ruoyi.common.core.domain.model.LoginUser;
-import java.util.List;
+import com.ruoyi.common.utils.SecurityUtils;
-import org.slf4j.Logger;
+import com.ruoyi.common.utils.StringUtils;
-import org.slf4j.LoggerFactory;
+
-import org.springframework.web.bind.WebDataBinder;
+/**
-import org.springframework.web.bind.annotation.InitBinder;
+ * web层通用数据处理
-import com.github.pagehelper.PageHelper;
+ *
-import com.github.pagehelper.PageInfo;
+ * @author ruoyi
-import com.ruoyi.common.constant.HttpStatus;
+ */
-import com.ruoyi.common.core.domain.AjaxResult;
+public class BaseController {
-import com.ruoyi.common.core.page.PageDomain;
+
-import com.ruoyi.common.core.page.TableDataInfo;
+    /**
-import com.ruoyi.common.core.page.TableSupport;
+     * 返回成功
-import com.ruoyi.common.utils.DateUtils;
+     */
-import com.ruoyi.common.utils.StringUtils;
+    public AjaxResult<Void> success() {
-import com.ruoyi.common.utils.sql.SqlUtil;
+        return AjaxResult.success();
-
+    }
-/**
+
- * web层通用数据处理
+    /**
- * 
+     * 返回失败消息
- * @author ruoyi
+     */
- */
+    public AjaxResult<Void> error() {
-public class BaseController
+        return AjaxResult.error();
-{
+    }
-    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+
-
+    /**
-    /**
+     * 返回成功消息
-     * 将前台传递过来的日期格式的字符串，自动转化为Date类型
+     */
-     */
+    public AjaxResult<Void> success(String message) {
-    @InitBinder
+        return AjaxResult.success(message);
-    public void initBinder(WebDataBinder binder)
+    }
-    {
+
-        // Date 类型转换
+    /**
-        binder.registerCustomEditor(Date.class, new PropertyEditorSupport()
+     * 返回失败消息
-        {
+     */
-            @Override
+    public AjaxResult<Void> error(String message) {
-            public void setAsText(String text)
+        return AjaxResult.error(message);
-            {
+    }
-                setValue(DateUtils.parseDate(text));
+
-            }
+    /**
-        });
+     * 响应返回结果
-    }
+     *
-
+     * @param rows 影响行数
-    /**
+     * @return 操作结果
-     * 设置请求分页数据
+     */
-     */
+    protected AjaxResult<Void> toAjax(int rows) {
-    protected void startPage()
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
-    {
+    }
-        PageDomain pageDomain = TableSupport.buildPageRequest();
+
-        Integer pageNum = pageDomain.getPageNum();
+    /**
-        Integer pageSize = pageDomain.getPageSize();
+     * 响应返回结果
-        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
+     *
-        {
+     * @param result 结果
-            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+     * @return 操作结果
-            PageHelper.startPage(pageNum, pageSize, orderBy);
+     */
-        }
+    protected AjaxResult<Void> toAjax(boolean result) {
-    }
+        return result ? success() : error();
-
+    }
-    /**
+
-     * 响应请求分页数据
+    /**
-     */
+     * 页面跳转
-    @SuppressWarnings({ "rawtypes", "unchecked" })
+     */
-    protected TableDataInfo getDataTable(List<?> list)
+    public String redirect(String url) {
-    {
+        return StringUtils.format("redirect:{}", url);
-        TableDataInfo rspData = new TableDataInfo();
+    }
-        rspData.setCode(HttpStatus.SUCCESS);
+
-        rspData.setMsg("查询成功");
+    /**
-        rspData.setRows(list);
+     * 获取用户缓存信息
-        rspData.setTotal(new PageInfo(list).getTotal());
+     */
-        return rspData;
+    public LoginUser getLoginUser() {
-    }
+        return SecurityUtils.getLoginUser();
-
+    }
-    /**
+
-     * 响应返回结果
+    /**
-     * 
+     * 获取登录用户id
-     * @param rows 影响行数
+     */
-     * @return 操作结果
+    public Long getUserId() {
-     */
+        return getLoginUser().getUserId();
-    protected AjaxResult toAjax(int rows)
+    }
-    {
+
-        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    /**
-    }
+     * 获取登录部门id
-
+     */
-    /**
+    public Long getDeptId() {
-     * 响应返回结果
+        return getLoginUser().getDeptId();
-     * 
+    }
-     * @param result 结果
+
-     * @return 操作结果
+    /**
-     */
+     * 获取登录用户名
-    protected AjaxResult toAjax(boolean result)
+     */
-    {
+    public String getUsername() {
-        return result ? success() : error();
+        return getLoginUser().getUsername();
-    }
+    }
-
+}
    /**
     * 返回成功
     */
    public AjaxResult success()
    {
        return AjaxResult.success();
    }
    /**
     * 返回失败消息
     */
    public AjaxResult error()
    {
        return AjaxResult.error();
    }
    /**
     * 返回成功消息
     */
    public AjaxResult success(String message)
    {
        return AjaxResult.success(message);
    }
    /**
     * 返回失败消息
     */
    public AjaxResult error(String message)
    {
        return AjaxResult.error(message);
    }
    /**
     * 页面跳转
     */
    public String redirect(String url)
    {
        return StringUtils.format("redirect:{}", url);
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
@ -1,148 +1,134 @@
-package com.ruoyi.common.core.domain;
+package com.ruoyi.common.core.domain;
-
+
-import java.util.HashMap;
+import cn.hutool.http.HttpStatus;
-import com.ruoyi.common.constant.HttpStatus;
+import io.swagger.annotations.ApiModel;
-import com.ruoyi.common.utils.StringUtils;
+import io.swagger.annotations.ApiModelProperty;
-
+import lombok.AllArgsConstructor;
-/**
+import lombok.Data;
- * 操作消息提醒
+import lombok.NoArgsConstructor;
- * 
+import lombok.experimental.Accessors;
- * @author ruoyi
+
- */
+/**
-public class AjaxResult extends HashMap<String, Object>
+ * 操作消息提醒
-{
+ *
-    private static final long serialVersionUID = 1L;
+ * @author Lion Li
-
+ */
-    /** 状态码 */
+@Data
-    public static final String CODE_TAG = "code";
+@NoArgsConstructor
-
+@AllArgsConstructor
-    /** 返回内容 */
+@Accessors(chain = true)
-    public static final String MSG_TAG = "msg";
+@ApiModel("请求响应对象")
-
+public class AjaxResult<T> {
-    /** 数据对象 */
+
-    public static final String DATA_TAG = "data";
+	private static final long serialVersionUID = 1L;
-
+
-    /**
+	/**
-     * 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。
+	 * 状态码
-     */
+	 */
-    public AjaxResult()
+	@ApiModelProperty("消息状态码")
-    {
+	private int code;
-    }
+
-
+	/**
-    /**
+	 * 返回内容
-     * 初始化一个新创建的 AjaxResult 对象
+	 */
-     * 
+	@ApiModelProperty("消息内容")
-     * @param code 状态码
+	private String msg;
-     * @param msg 返回内容
+
-     */
+	/**
-    public AjaxResult(int code, String msg)
+	 * 数据对象
-    {
+	 */
-        super.put(CODE_TAG, code);
+	@ApiModelProperty("数据对象")
-        super.put(MSG_TAG, msg);
+	private T data;
-    }
+
-
+	/**
-    /**
+	 * 初始化一个新创建的 AjaxResult 对象
-     * 初始化一个新创建的 AjaxResult 对象
+	 *
-     * 
+	 * @param code 状态码
-     * @param code 状态码
+	 * @param msg  返回内容
-     * @param msg 返回内容
+	 */
-     * @param data 数据对象
+	public AjaxResult(int code, String msg) {
-     */
+		this.code = code;
-    public AjaxResult(int code, String msg, Object data)
+		this.msg = msg;
-    {
+	}
-        super.put(CODE_TAG, code);
+
-        super.put(MSG_TAG, msg);
+	/**
-        if (StringUtils.isNotNull(data))
+	 * 返回成功消息
-        {
+	 *
-            super.put(DATA_TAG, data);
+	 * @return 成功消息
-        }
+	 */
-    }
+	public static AjaxResult<Void> success() {
-
+		return AjaxResult.success("操作成功");
-    /**
+	}
-     * 返回成功消息
+
-     * 
+	/**
-     * @return 成功消息
+	 * 返回成功数据
-     */
+	 *
-    public static AjaxResult success()
+	 * @return 成功消息
-    {
+	 */
-        return AjaxResult.success("操作成功");
+	public static <T> AjaxResult<T> success(T data) {
-    }
+		return AjaxResult.success("操作成功", data);
-
+	}
-    /**
+
-     * 返回成功数据
+	/**
-     * 
+	 * 返回成功消息
-     * @return 成功消息
+	 *
-     */
+	 * @param msg 返回内容
-    public static AjaxResult success(Object data)
+	 * @return 成功消息
-    {
+	 */
-        return AjaxResult.success("操作成功", data);
+	public static AjaxResult<Void> success(String msg) {
-    }
+		return AjaxResult.success(msg, null);
-
+	}
-    /**
+
-     * 返回成功消息
+	/**
-     * 
+	 * 返回成功消息
-     * @param msg 返回内容
+	 *
-     * @return 成功消息
+	 * @param msg  返回内容
-     */
+	 * @param data 数据对象
-    public static AjaxResult success(String msg)
+	 * @return 成功消息
-    {
+	 */
-        return AjaxResult.success(msg, null);
+	public static <T> AjaxResult<T> success(String msg, T data) {
-    }
+		return new AjaxResult<>(HttpStatus.HTTP_OK, msg, data);
-
+	}
-    /**
+
-     * 返回成功消息
+	/**
-     * 
+	 * 返回错误消息
-     * @param msg 返回内容
+	 *
-     * @param data 数据对象
+	 * @return
-     * @return 成功消息
+	 */
-     */
+	public static AjaxResult<Void> error() {
-    public static AjaxResult success(String msg, Object data)
+		return AjaxResult.error("操作失败");
-    {
+	}
-        return new AjaxResult(HttpStatus.SUCCESS, msg, data);
+
-    }
+	/**
-
+	 * 返回错误消息
-    /**
+	 *
-     * 返回错误消息
+	 * @param msg 返回内容
-     * 
+	 * @return 警告消息
-     * @return
+	 */
-     */
+	public static AjaxResult<Void> error(String msg) {
-    public static AjaxResult error()
+		return AjaxResult.error(msg, null);
-    {
+	}
-        return AjaxResult.error("操作失败");
+
-    }
+	/**
-
+	 * 返回错误消息
-    /**
+	 *
-     * 返回错误消息
+	 * @param msg  返回内容
-     * 
+	 * @param data 数据对象
-     * @param msg 返回内容
+	 * @return 警告消息
-     * @return 警告消息
+	 */
-     */
+	public static <T> AjaxResult<T> error(String msg, T data) {
-    public static AjaxResult error(String msg)
+		return new AjaxResult<>(HttpStatus.HTTP_INTERNAL_ERROR, msg, data);
-    {
+	}
-        return AjaxResult.error(msg, null);
+
-    }
+	/**
-
+	 * 返回错误消息
-    /**
+	 *
-     * 返回错误消息
+	 * @param code 状态码
-     * 
+	 * @param msg  返回内容
-     * @param msg 返回内容
+	 * @return 警告消息
-     * @param data 数据对象
+	 */
-     * @return 警告消息
+	public static AjaxResult<Void> error(int code, String msg) {
-     */
+		return new AjaxResult<>(code, msg, null);
-    public static AjaxResult error(String msg, Object data)
+	}
-    {
+
-        return new AjaxResult(HttpStatus.ERROR, msg, data);
+}
    }
    /**
     * 返回错误消息
     * 
     * @param code 状态码
     * @param msg 返回内容
     * @return 警告消息
     */
    public static AjaxResult error(int code, String msg)
    {
        return new AjaxResult(code, msg, null);
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@ -1,114 +1,68 @@
-package com.ruoyi.common.core.domain;
+package com.ruoyi.common.core.domain;
-
+
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.FieldFill;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
-import java.util.HashMap;
+import io.swagger.annotations.ApiModelProperty;
-import java.util.Map;
+import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.experimental.Accessors;
-
+
-/**
+import java.io.Serializable;
- * Entity基类
+import java.util.Date;
- * 
+import java.util.HashMap;
- * @author ruoyi
+import java.util.Map;
- */
+
-public class BaseEntity implements Serializable
+/**
-{
+ * Entity基类
-    private static final long serialVersionUID = 1L;
+ *
-
+ * @author Lion Li
-    /** 搜索值 */
+ */
-    private String searchValue;
+
-
+@Data
-    /** 创建者 */
+@Accessors(chain = true)
-    private String createBy;
+public class BaseEntity implements Serializable {
-
+
-    /** 创建时间 */
+	private static final long serialVersionUID = 1L;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
-    private Date createTime;
+	/**
-
+	 * 搜索值
-    /** 更新者 */
+	 */
-    private String updateBy;
+	@ApiModelProperty(value = "搜索值")
-
+	@TableField(exist = false)
-    /** 更新时间 */
+	private String searchValue;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
-    private Date updateTime;
+	/**
-
+	 * 创建者
-    /** 备注 */
+	 */
-    private String remark;
+	@ApiModelProperty(value = "创建者")
-
+	@TableField(fill = FieldFill.INSERT)
-    /** 请求参数 */
+	private String createBy;
-    private Map<String, Object> params;
+
-
+	/**
-    public String getSearchValue()
+	 * 创建时间
-    {
+	 */
-        return searchValue;
+	@ApiModelProperty(value = "创建时间")
-    }
+	@TableField(fill = FieldFill.INSERT)
-
+	private Date createTime;
-    public void setSearchValue(String searchValue)
+
-    {
+	/**
-        this.searchValue = searchValue;
+	 * 更新者
-    }
+	 */
-
+	@ApiModelProperty(value = "更新者")
-    public String getCreateBy()
+	@TableField(fill = FieldFill.INSERT_UPDATE)
-    {
+	private String updateBy;
-        return createBy;
+
-    }
+	/**
-
+	 * 更新时间
-    public void setCreateBy(String createBy)
+	 */
-    {
+	@ApiModelProperty(value = "更新时间")
-        this.createBy = createBy;
+	@TableField(fill = FieldFill.INSERT_UPDATE)
-    }
+	private Date updateTime;
-
+
-    public Date getCreateTime()
+	/**
-    {
+	 * 请求参数
-        return createTime;
+	 */
-    }
+	@ApiModelProperty(value = "请求参数")
-
+	@TableField(exist = false)
-    public void setCreateTime(Date createTime)
+	private Map<String, Object> params = new HashMap<>();
-    {
+
-        this.createTime = createTime;
+}
    }
    public String getUpdateBy()
    {
        return updateBy;
    }
    public void setUpdateBy(String updateBy)
    {
        this.updateBy = updateBy;
    }
    public Date getUpdateTime()
    {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime)
    {
        this.updateTime = updateTime;
    }
    public String getRemark()
    {
        return remark;
    }
    public void setRemark(String remark)
    {
        this.remark = remark;
    }
    public Map<String, Object> getParams()
    {
        if (params == null)
        {
            params = new HashMap<>();
        }
        return params;
    }
    public void setParams(Map<String, Object> params)
    {
        this.params = params;
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
@ -0,0 +1,93 @@
 package com.ruoyi.common.core.domain;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.sql.SqlUtil;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import java.io.Serializable;
 /**
 * 分页查询实体类
 *
 * @author Lion Li
 */
@Data
@Accessors(chain = true)
 public class PageQuery implements Serializable {
 	private static final long serialVersionUID = 1L;
    /**
     * 分页大小
     */
    @ApiModelProperty("分页大小")
    private Integer pageSize;
    /**
     * 当前页数
     */
    @ApiModelProperty("当前页数")
    private Integer pageNum;
    /**
     * 排序列
     */
    @ApiModelProperty("排序列")
    private String orderByColumn;
    /**
     * 排序的方向desc或者asc
     */
    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
    private String isAsc;
    /**
     * 当前记录起始索引 默认值
     */
    public static final int DEFAULT_PAGE_NUM = 1;
    /**
     * 每页显示记录数 默认值 默认查全部
     */
    public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
    public <T> Page<T> build() {
        Integer pageNum = ObjectUtil.defaultIfNull(getPageNum(), DEFAULT_PAGE_NUM);
        Integer pageSize = ObjectUtil.defaultIfNull(getPageSize(), DEFAULT_PAGE_SIZE);
        if (pageNum <= 0) {
            pageNum = DEFAULT_PAGE_NUM;
        }
        Page<T> page = new Page<>(pageNum, pageSize);
        OrderItem orderItem = buildOrderItem();
        if (ObjectUtil.isNotNull(orderItem)) {
            page.addOrder(orderItem);
        }
        return page;
    }
    private OrderItem buildOrderItem() {
        // 兼容前端排序类型
        if ("ascending".equals(isAsc)) {
            isAsc = "asc";
        } else if ("descending".equals(isAsc)) {
            isAsc = "desc";
        }
        if (StringUtils.isNotBlank(orderByColumn)) {
            String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
            orderBy = StringUtils.toUnderScoreCase(orderBy);
            if ("asc".equals(isAsc)) {
                return OrderItem.asc(orderBy);
            } else if ("desc".equals(isAsc)) {
                return OrderItem.desc(orderBy);
            }
        }
        return null;
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
@ -1,79 +1,45 @@
-package com.ruoyi.common.core.domain;
+package com.ruoyi.common.core.domain;
-
+
-import java.util.ArrayList;
+import com.baomidou.mybatisplus.annotation.TableField;
-import java.util.List;
+import io.swagger.annotations.ApiModelProperty;
-
+import lombok.Data;
-/**
+import lombok.EqualsAndHashCode;
- * Tree基类
+import lombok.experimental.Accessors;
- * 
+
- * @author ruoyi
+import java.util.ArrayList;
- */
+import java.util.List;
-public class TreeEntity extends BaseEntity
+
-{
+/**
-    private static final long serialVersionUID = 1L;
+ * Tree基类
-
+ *
-    /** 父菜单名称 */
+ * @author Lion Li
-    private String parentName;
+ */
-
+
-    /** 父菜单ID */
+@Data
-    private Long parentId;
+@EqualsAndHashCode(callSuper = true)
-
+@Accessors(chain = true)
-    /** 显示顺序 */
+public class TreeEntity extends BaseEntity {
-    private Integer orderNum;
+
-
+	private static final long serialVersionUID = 1L;
-    /** 祖级列表 */
+
-    private String ancestors;
+	/**
-
+	 * 父菜单名称
-    /** 子部门 */
+	 */
-    private List<?> children = new ArrayList<>();
+	@TableField(exist = false)
-
+	@ApiModelProperty(value = "父菜单名称")
-    public String getParentName()
+	private String parentName;
-    {
+
-        return parentName;
+	/**
-    }
+	 * 父菜单ID
-
+	 */
-    public void setParentName(String parentName)
+	@ApiModelProperty(value = "父菜单ID")
-    {
+	private Long parentId;
-        this.parentName = parentName;
+
-    }
+	/**
-
+	 * 子部门
-    public Long getParentId()
+	 */
-    {
+	@TableField(exist = false)
-        return parentId;
+	@ApiModelProperty(value = "子部门")
-    }
+	private List<?> children = new ArrayList<>();
-
+
-    public void setParentId(Long parentId)
+}
    {
        this.parentId = parentId;
    }
    public Integer getOrderNum()
    {
        return orderNum;
    }
    public void setOrderNum(Integer orderNum)
    {
        this.orderNum = orderNum;
    }
    public String getAncestors()
    {
        return ancestors;
    }
    public void setAncestors(String ancestors)
    {
        this.ancestors = ancestors;
    }
    public List<?> getChildren()
    {
        return children;
    }
    public void setChildren(List<?> children)
    {
        this.children = children;
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
@ -1,77 +0,0 @@
 package com.ruoyi.common.core.domain;
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 /**
 * Treeselect树结构实体类
 * 
 * @author ruoyi
 */
 public class TreeSelect implements Serializable
 {
    private static final long serialVersionUID = 1L;
    /** 节点ID */
    private Long id;
    /** 节点名称 */
    private String label;
    /** 子节点 */
    @JsonInclude(JsonInclude.Include.NON_EMPTY)
    private List<TreeSelect> children;
    public TreeSelect()
    {
    }
    public TreeSelect(SysDept dept)
    {
        this.id = dept.getDeptId();
        this.label = dept.getDeptName();
        this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
    }
    public TreeSelect(SysMenu menu)
    {
        this.id = menu.getMenuId();
        this.label = menu.getMenuName();
        this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
    }
    public Long getId()
    {
        return id;
    }
    public void setId(Long id)
    {
        this.id = id;
    }
    public String getLabel()
    {
        return label;
    }
    public void setLabel(String label)
    {
        this.label = label;
    }
    public List<TreeSelect> getChildren()
    {
        return children;
    }
    public void setChildren(List<TreeSelect> children)
    {
        this.children = children;
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java
@ -0,0 +1,108 @@
 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;
 /**
 * 通用操作日志实体
 *
 * @author Lion Li
 */
@Data
@NoArgsConstructor
@Accessors(chain = true)
 public class OperLogDTO implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 日志主键
     */
    private Long operId;
    /**
     * 操作模块
     */
    private String title;
    /**
     * 业务类型（0其它 1新增 2修改 3删除）
     */
    private Integer businessType;
    /**
     * 业务类型数组
     */
    private Integer[] businessTypes;
    /**
     * 请求方法
     */
    private String method;
    /**
     * 请求方式
     */
    private String requestMethod;
    /**
     * 操作类别（0其它 1后台用户 2手机端用户）
     */
    private Integer operatorType;
    /**
     * 操作人员
     */
    private String operName;
    /**
     * 部门名称
     */
    private String deptName;
    /**
     * 请求url
     */
    private String operUrl;
    /**
     * 操作地址
     */
    private String operIp;
    /**
     * 操作地点
     */
    private String operLocation;
    /**
     * 请求参数
     */
    private String operParam;
    /**
     * 返回参数
     */
    private String jsonResult;
    /**
     * 操作状态（0正常 1异常）
     */
    private Integer status;
    /**
     * 错误消息
     */
    private String errorMsg;
    /**
     * 操作时间
     */
    private Date operTime;
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@ -1,202 +1,93 @@
-package com.ruoyi.common.core.domain.entity;
+package com.ruoyi.common.core.domain.entity;
-
+
-import java.util.ArrayList;
+import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.List;
+import com.baomidou.mybatisplus.annotation.TableLogic;
-import javax.validation.constraints.Email;
+import com.baomidou.mybatisplus.annotation.TableName;
-import javax.validation.constraints.NotBlank;
+import com.ruoyi.common.core.domain.TreeEntity;
-import javax.validation.constraints.Size;
+import io.swagger.annotations.ApiModel;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
-import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
-
+import lombok.experimental.Accessors;
-/**
+
- * 部门表 sys_dept
+import javax.validation.constraints.Email;
- * 
+import javax.validation.constraints.NotBlank;
- * @author ruoyi
+import javax.validation.constraints.Size;
- */
+
-public class SysDept extends BaseEntity
+/**
-{
+ * 部门表 sys_dept
-    private static final long serialVersionUID = 1L;
+ *
-
+ * @author Lion Li
-    /** 部门ID */
+ */
-    private Long deptId;
+
-
+@Data
-    /** 父部门ID */
+@EqualsAndHashCode(callSuper = true)
-    private Long parentId;
+@Accessors(chain = true)
-
+@TableName("sys_dept")
-    /** 祖级列表 */
+@ApiModel("部门业务对象")
-    private String ancestors;
+public class SysDept extends TreeEntity {
-
+	private static final long serialVersionUID = 1L;
-    /** 部门名称 */
+
-    private String deptName;
+	/**
-
+	 * 部门ID
-    /** 显示顺序 */
+	 */
-    private String orderNum;
+	@ApiModelProperty(value = "部门id")
-
+	@TableId(value = "dept_id")
-    /** 负责人 */
+	private Long deptId;
-    private String leader;
+
-
+	/**
-    /** 联系电话 */
+	 * 部门名称
-    private String phone;
+	 */
-
+	@ApiModelProperty(value = "部门名称")
-    /** 邮箱 */
+	@NotBlank(message = "部门名称不能为空")
-    private String email;
+	@Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
-
+	private String deptName;
-    /** 部门状态:0正常,1停用 */
+
-    private String status;
+	/**
-
+	 * 显示顺序
-    /** 删除标志（0代表存在 2代表删除） */
+	 */
-    private String delFlag;
+	@ApiModelProperty(value = "显示顺序")
-
+	@NotBlank(message = "显示顺序不能为空")
-    /** 父部门名称 */
+	private String orderNum;
-    private String parentName;
+
-    
+	/**
-    /** 子部门 */
+	 * 负责人
-    private List<SysDept> children = new ArrayList<SysDept>();
+	 */
-
+	@ApiModelProperty(value = "负责人")
-    public Long getDeptId()
+	private String leader;
-    {
+
-        return deptId;
+	/**
-    }
+	 * 联系电话
-
+	 */
-    public void setDeptId(Long deptId)
+	@ApiModelProperty(value = "联系电话")
-    {
+	@Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
-        this.deptId = deptId;
+	private String phone;
-    }
+
-
+	/**
-    public Long getParentId()
+	 * 邮箱
-    {
+	 */
-        return parentId;
+	@ApiModelProperty(value = "邮箱")
-    }
+	@Email(message = "邮箱格式不正确")
-
+	@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public void setParentId(Long parentId)
+	private String email;
-    {
+
-        this.parentId = parentId;
+	/**
-    }
+	 * 部门状态:0正常,1停用
-
+	 */
-    public String getAncestors()
+	@ApiModelProperty(value = "部门状态:0正常,1停用")
-    {
+	private String status;
-        return ancestors;
+
-    }
+	/**
-
+	 * 删除标志（0代表存在 2代表删除）
-    public void setAncestors(String ancestors)
+	 */
-    {
+	@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
-        this.ancestors = ancestors;
+	@TableLogic
-    }
+	private String delFlag;
-
+
-    @NotBlank(message = "部门名称不能为空")
+	/**
-    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
+	 * 祖级列表
-    public String getDeptName()
+	 */
-    {
+	@ApiModelProperty(value = "祖级列表")
-        return deptName;
+	private String ancestors;
-    }
+
-
+}
    public void setDeptName(String deptName)
    {
        this.deptName = deptName;
    }
    @NotBlank(message = "显示顺序不能为空")
    public String getOrderNum()
    {
        return orderNum;
    }
    public void setOrderNum(String orderNum)
    {
        this.orderNum = orderNum;
    }
    public String getLeader()
    {
        return leader;
    }
    public void setLeader(String leader)
    {
        this.leader = leader;
    }
    @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
    public String getPhone()
    {
        return phone;
    }
    public void setPhone(String phone)
    {
        this.phone = phone;
    }
    @Email(message = "邮箱格式不正确")
    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
    public String getEmail()
    {
        return email;
    }
    public void setEmail(String email)
    {
        this.email = email;
    }
    public String getStatus()
    {
        return status;
    }
    public void setStatus(String status)
    {
        this.status = status;
    }
    public String getDelFlag()
    {
        return delFlag;
    }
    public void setDelFlag(String delFlag)
    {
        this.delFlag = delFlag;
    }
    public String getParentName()
    {
        return parentName;
    }
    public void setParentName(String parentName)
    {
        this.parentName = parentName;
    }
    public List<SysDept> getChildren()
    {
        return children;
    }
    public void setChildren(List<SysDept> children)
    {
        this.children = children;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("deptId", getDeptId())
            .append("parentId", getParentId())
            .append("ancestors", getAncestors())
            .append("deptName", getDeptName())
            .append("orderNum", getOrderNum())
            .append("leader", getLeader())
            .append("phone", getPhone())
            .append("email", getEmail())
            .append("status", getStatus())
            .append("delFlag", getDelFlag())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .toString();
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
@ -1,176 +1,115 @@
-package com.ruoyi.common.core.domain.entity;
+package com.ruoyi.common.core.domain.entity;
-
+
-import javax.validation.constraints.NotBlank;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import javax.validation.constraints.Size;
+import com.alibaba.excel.annotation.ExcelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.TableId;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.convert.ExcelDictConvert;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.domain.BaseEntity;
-
+import io.swagger.annotations.ApiModel;
-/**
+import io.swagger.annotations.ApiModelProperty;
- * 字典数据表 sys_dict_data
+import lombok.Data;
- * 
+import lombok.EqualsAndHashCode;
- * @author ruoyi
+import lombok.experimental.Accessors;
- */
+
-public class SysDictData extends BaseEntity
+import javax.validation.constraints.NotBlank;
-{
+import javax.validation.constraints.Size;
-    private static final long serialVersionUID = 1L;
+
-
+/**
-    /** 字典编码 */
+ * 字典数据表 sys_dict_data
-    @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
+ *
-    private Long dictCode;
+ * @author Lion Li
-
+ */
-    /** 字典排序 */
+
-    @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
+@Data
-    private Long dictSort;
+@EqualsAndHashCode(callSuper = true)
-
+@Accessors(chain = true)
-    /** 字典标签 */
+@TableName("sys_dict_data")
-    @Excel(name = "字典标签")
+@ExcelIgnoreUnannotated
-    private String dictLabel;
+@ApiModel("字典数据业务对象")
-
+public class SysDictData extends BaseEntity {
-    /** 字典键值 */
+
-    @Excel(name = "字典键值")
+	/**
-    private String dictValue;
+	 * 字典编码
-
+	 */
-    /** 字典类型 */
+	@ApiModelProperty(value = "字典编码")
-    @Excel(name = "字典类型")
+	@ExcelProperty(value = "字典编码")
-    private String dictType;
+	@TableId(value = "dict_code")
-
+	private Long dictCode;
-    /** 样式属性（其他样式扩展） */
+
-    private String cssClass;
+	/**
-
+	 * 字典排序
-    /** 表格字典样式 */
+	 */
-    private String listClass;
+	@ApiModelProperty(value = "字典排序")
-
+	@ExcelProperty(value = "字典排序")
-    /** 是否默认（Y是 N否） */
+	private Long dictSort;
-    @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
+
-    private String isDefault;
+	/**
-
+	 * 字典标签
-    /** 状态（0正常 1停用） */
+	 */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+	@ApiModelProperty(value = "字典标签")
-    private String status;
+	@ExcelProperty(value = "字典标签")
-
+	@NotBlank(message = "字典标签不能为空")
-    public Long getDictCode()
+	@Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
-    {
+	private String dictLabel;
-        return dictCode;
+
-    }
+	/**
-
+	 * 字典键值
-    public void setDictCode(Long dictCode)
+	 */
-    {
+	@ApiModelProperty(value = "字典键值")
-        this.dictCode = dictCode;
+	@ExcelProperty(value = "字典键值")
-    }
+	@NotBlank(message = "字典键值不能为空")
-
+	@Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
-    public Long getDictSort()
+	private String dictValue;
-    {
+
-        return dictSort;
+	/**
-    }
+	 * 字典类型
-
+	 */
-    public void setDictSort(Long dictSort)
+	@ApiModelProperty(value = "字典类型")
-    {
+	@ExcelProperty(value = "字典类型")
-        this.dictSort = dictSort;
+	@NotBlank(message = "字典类型不能为空")
-    }
+	@Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
-
+	private String dictType;
-    @NotBlank(message = "字典标签不能为空")
+
-    @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
+	/**
-    public String getDictLabel()
+	 * 样式属性（其他样式扩展）
-    {
+	 */
-        return dictLabel;
+	@ApiModelProperty(value = "样式属性（其他样式扩展）")
-    }
+	@Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
-
+	private String cssClass;
-    public void setDictLabel(String dictLabel)
+
-    {
+	/**
-        this.dictLabel = dictLabel;
+	 * 表格字典样式
-    }
+	 */
-
+	@ApiModelProperty(value = "表格字典样式")
-    @NotBlank(message = "字典键值不能为空")
+	private String listClass;
-    @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
+
-    public String getDictValue()
+	/**
-    {
+	 * 是否默认（Y是 N否）
-        return dictValue;
+	 */
-    }
+	@ApiModelProperty(value = "是否默认（Y是 N否）")
-
+	@ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class)
-    public void setDictValue(String dictValue)
+	@ExcelDictFormat(dictType = "sys_yes_no")
-    {
+	private String isDefault;
-        this.dictValue = dictValue;
+
-    }
+	/**
-
+	 * 状态（0正常 1停用）
-    @NotBlank(message = "字典类型不能为空")
+	 */
-    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
+	@ApiModelProperty(value = "状态（0正常 1停用）")
-    public String getDictType()
+	@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    {
+	@ExcelDictFormat(dictType = "sys_normal_disable")
-        return dictType;
+	private String status;
-    }
+
-
+	/**
-    public void setDictType(String dictType)
+	 * 备注
-    {
+	 */
-        this.dictType = dictType;
+	@ApiModelProperty(value = "备注")
-    }
+	private String remark;
-
+
-    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
+	public boolean getDefault() {
-    public String getCssClass()
+		return UserConstants.YES.equals(this.isDefault);
-    {
+	}
-        return cssClass;
+
-    }
+}
    public void setCssClass(String cssClass)
    {
        this.cssClass = cssClass;
    }
    public String getListClass()
    {
        return listClass;
    }
    public void setListClass(String listClass)
    {
        this.listClass = listClass;
    }
    public boolean getDefault()
    {
        return UserConstants.YES.equals(this.isDefault) ? true : false;
    }
    public String getIsDefault()
    {
        return isDefault;
    }
    public void setIsDefault(String isDefault)
    {
        this.isDefault = isDefault;
    }
    public String getStatus()
    {
        return status;
    }
    public void setStatus(String status)
    {
        this.status = status;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("dictCode", getDictCode())
            .append("dictSort", getDictSort())
            .append("dictLabel", getDictLabel())
            .append("dictValue", getDictValue())
            .append("dictType", getDictType())
            .append("cssClass", getCssClass())
            .append("listClass", getListClass())
            .append("isDefault", getIsDefault())
            .append("status", getStatus())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("remark", getRemark())
            .toString();
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
@ -1,94 +1,73 @@
-package com.ruoyi.common.core.domain.entity;
+package com.ruoyi.common.core.domain.entity;
-
+
-import javax.validation.constraints.NotBlank;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import javax.validation.constraints.Size;
+import com.alibaba.excel.annotation.ExcelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.TableId;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.convert.ExcelDictConvert;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.domain.BaseEntity;
-
+import io.swagger.annotations.ApiModel;
-/**
+import io.swagger.annotations.ApiModelProperty;
- * 字典类型表 sys_dict_type
+import lombok.Data;
- * 
+import lombok.EqualsAndHashCode;
- * @author ruoyi
+import lombok.experimental.Accessors;
- */
+
-public class SysDictType extends BaseEntity
+import javax.validation.constraints.NotBlank;
-{
+import javax.validation.constraints.Size;
-    private static final long serialVersionUID = 1L;
+
-
+/**
-    /** 字典主键 */
+ * 字典类型表 sys_dict_type
-    @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
+ *
-    private Long dictId;
+ * @author Lion Li
-
+ */
-    /** 字典名称 */
+
-    @Excel(name = "字典名称")
+@Data
-    private String dictName;
+@EqualsAndHashCode(callSuper = true)
-
+@Accessors(chain = true)
-    /** 字典类型 */
+@TableName("sys_dict_type")
-    @Excel(name = "字典类型")
+@ExcelIgnoreUnannotated
-    private String dictType;
+@ApiModel("字典类型业务对象")
-
+public class SysDictType extends BaseEntity {
-    /** 状态（0正常 1停用） */
+
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+	/**
-    private String status;
+	 * 字典主键
-
+	 */
-    public Long getDictId()
+	@ApiModelProperty(value = "字典主键")
-    {
+	@ExcelProperty(value = "字典主键")
-        return dictId;
+	@TableId(value = "dict_id")
-    }
+	private Long dictId;
-
+
-    public void setDictId(Long dictId)
+	/**
-    {
+	 * 字典名称
-        this.dictId = dictId;
+	 */
-    }
+	@ApiModelProperty(value = "字典名称")
-
+	@ExcelProperty(value = "字典名称")
-    @NotBlank(message = "字典名称不能为空")
+	@NotBlank(message = "字典名称不能为空")
-    @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
+	@Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
-    public String getDictName()
+	private String dictName;
-    {
+
-        return dictName;
+	/**
-    }
+	 * 字典类型
-
+	 */
-    public void setDictName(String dictName)
+	@ApiModelProperty(value = "字典类型")
-    {
+	@ExcelProperty(value = "字典类型")
-        this.dictName = dictName;
+	@NotBlank(message = "字典类型不能为空")
-    }
+	@Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
-
+	private String dictType;
-    @NotBlank(message = "字典类型不能为空")
+
-    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
+	/**
-    public String getDictType()
+	 * 状态（0正常 1停用）
-    {
+	 */
-        return dictType;
+	@ApiModelProperty(value = "状态（0正常 1停用）")
-    }
+	@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-
+	@ExcelDictFormat(dictType = "sys_normal_disable")
-    public void setDictType(String dictType)
+	private String status;
-    {
+
-        this.dictType = dictType;
+	/**
-    }
+	 * 备注
-
+	 */
-    public String getStatus()
+	@ApiModelProperty(value = "备注")
-    {
+	private String remark;
-        return status;
+
-    }
+}
    public void setStatus(String status)
    {
        this.status = status;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("dictId", getDictId())
            .append("dictName", getDictName())
            .append("dictType", getDictType())
            .append("status", getStatus())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("remark", getRemark())
            .toString();
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@ -1,245 +1,122 @@
-package com.ruoyi.common.core.domain.entity;
+package com.ruoyi.common.core.domain.entity;
-
+
-import java.util.ArrayList;
+import com.baomidou.mybatisplus.annotation.TableField;
-import java.util.List;
+import com.baomidou.mybatisplus.annotation.TableId;
-import javax.validation.constraints.NotBlank;
+import com.baomidou.mybatisplus.annotation.TableName;
-import javax.validation.constraints.Size;
+import com.ruoyi.common.core.domain.TreeEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModel;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModelProperty;
-import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
-
+import lombok.EqualsAndHashCode;
-/**
+import lombok.experimental.Accessors;
- * 菜单权限表 sys_menu
+
- * 
+import javax.validation.constraints.NotBlank;
- * @author ruoyi
+import javax.validation.constraints.Size;
- */
+
-public class SysMenu extends BaseEntity
+/**
-{
+ * 菜单权限表 sys_menu
-    private static final long serialVersionUID = 1L;
+ *
-
+ * @author Lion Li
-    /** 菜单ID */
+ */
-    private Long menuId;
+
-
+@Data
-    /** 菜单名称 */
+@EqualsAndHashCode(callSuper = true)
-    private String menuName;
+@Accessors(chain = true)
-
+@TableName("sys_menu")
-    /** 父菜单名称 */
+@ApiModel("菜单权限业务对象")
-    private String parentName;
+public class SysMenu extends TreeEntity {
-
+
-    /** 父菜单ID */
+	/**
-    private Long parentId;
+	 * 菜单ID
-
+	 */
-    /** 显示顺序 */
+	@ApiModelProperty(value = "菜单ID")
-    private String orderNum;
+	@TableId(value = "menu_id")
-
+	private Long menuId;
-    /** 路由地址 */
+
-    private String path;
+	/**
-
+	 * 菜单名称
-    /** 组件路径 */
+	 */
-    private String component;
+	@ApiModelProperty(value = "菜单名称")
-
+	@NotBlank(message = "菜单名称不能为空")
-    /** 是否为外链（0是 1否） */
+	@Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
-    private String isFrame;
+	private String menuName;
-
+
-    /** 是否缓存（0缓存 1不缓存） */
+	/**
-    private String isCache;
+	 * 显示顺序
-
+	 */
-    /** 类型（M目录 C菜单 F按钮） */
+	@ApiModelProperty(value = "显示顺序")
-    private String menuType;
+	@NotBlank(message = "显示顺序不能为空")
-
+	private String orderNum;
-    /** 显示状态（0显示 1隐藏） */
+
-    private String visible;
+	/**
-    
+	 * 路由地址
-    /** 菜单状态（0显示 1隐藏） */
+	 */
-    private String status;
+	@ApiModelProperty(value = "路由地址")
-
+	@Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
-    /** 权限字符串 */
+	private String path;
-    private String perms;
+
-
+	/**
-    /** 菜单图标 */
+	 * 组件路径
-    private String icon;
+	 */
-
+	@ApiModelProperty(value = "组件路径")
-    /** 子菜单 */
+	@Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
-    private List<SysMenu> children = new ArrayList<SysMenu>();
+	private String component;
-
+
-    public Long getMenuId()
+    /**
-    {
+     * 路由参数
-        return menuId;
+     */
-    }
+	@ApiModelProperty(value = "路由参数")
-
+    @TableField("`query`")
-    public void setMenuId(Long menuId)
+    private String query;
-    {
+
-        this.menuId = menuId;
+	/**
-    }
+	 * 是否为外链（0是 1否）
-
+	 */
-    @NotBlank(message = "菜单名称不能为空")
+	@ApiModelProperty(value = "是否为外链（0是 1否）")
-    @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
+	private String isFrame;
-    public String getMenuName()
+
-    {
+	/**
-        return menuName;
+	 * 是否缓存（0缓存 1不缓存）
-    }
+	 */
-
+	@ApiModelProperty(value = "是否缓存（0缓存 1不缓存）")
-    public void setMenuName(String menuName)
+	private String isCache;
-    {
+
-        this.menuName = menuName;
+	/**
-    }
+	 * 类型（M目录 C菜单 F按钮）
-
+	 */
-    public String getParentName()
+	@ApiModelProperty(value = "类型（M目录 C菜单 F按钮）")
-    {
+	@NotBlank(message = "菜单类型不能为空")
-        return parentName;
+	private String menuType;
-    }
+
-
+	/**
-    public void setParentName(String parentName)
+	 * 显示状态（0显示 1隐藏）
-    {
+	 */
-        this.parentName = parentName;
+	@ApiModelProperty(value = "显示状态（0显示 1隐藏）")
-    }
+	private String visible;
-
+
-    public Long getParentId()
+	/**
-    {
+	 * 菜单状态（0显示 1隐藏）
-        return parentId;
+	 */
-    }
+	@ApiModelProperty(value = "菜单状态（0显示 1隐藏）")
-
+	private String status;
-    public void setParentId(Long parentId)
+
-    {
+	/**
-        this.parentId = parentId;
+	 * 权限字符串
-    }
+	 */
-
+	@ApiModelProperty(value = "权限字符串")
-    @NotBlank(message = "显示顺序不能为空")
+	@Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
-    public String getOrderNum()
+	private String perms;
-    {
+
-        return orderNum;
+	/**
-    }
+	 * 菜单图标
-
+	 */
-    public void setOrderNum(String orderNum)
+	@ApiModelProperty(value = "菜单图标")
-    {
+	private String icon;
-        this.orderNum = orderNum;
+
-    }
+	/**
-
+	 * 备注
-    @Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
+	 */
-    public String getPath()
+	@ApiModelProperty(value = "备注")
-    {
+	private String remark;
-        return path;
+
-    }
+}
    public void setPath(String path)
    {
        this.path = path;
    }
    @Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
    public String getComponent()
    {
        return component;
    }
    public void setComponent(String component)
    {
        this.component = component;
    }
    public String getIsFrame()
    {
        return isFrame;
    }
    public void setIsFrame(String isFrame)
    {
        this.isFrame = isFrame;
    }
    public String getIsCache()
    {
        return isCache;
    }
    public void setIsCache(String isCache)
    {
        this.isCache = isCache;
    }
    @NotBlank(message = "菜单类型不能为空")
    public String getMenuType()
    {
        return menuType;
    }
    public void setMenuType(String menuType)
    {
        this.menuType = menuType;
    }
    public String getVisible()
    {
        return visible;
    }
    public void setVisible(String visible)
    {
        this.visible = visible;
    }
    public String getStatus()
    {
        return status;
    }
    public void setStatus(String status)
    {
        this.status = status;
    }
    @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
    public String getPerms()
    {
        return perms;
    }
    public void setPerms(String perms)
    {
        this.perms = perms;
    }
    public String getIcon()
    {
        return icon;
    }
    public void setIcon(String icon)
    {
        this.icon = icon;
    }
    public List<SysMenu> getChildren()
    {
        return children;
    }
    public void setChildren(List<SysMenu> children)
    {
        this.children = children;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("menuId", getMenuId())
            .append("menuName", getMenuName())
            .append("parentId", getParentId())
            .append("orderNum", getOrderNum())
            .append("path", getPath())
            .append("component", getComponent())
            .append("isFrame", getIsFrame())
            .append("IsCache", getIsCache())
            .append("menuType", getMenuType())
            .append("visible", getVisible())
            .append("status ", getStatus())
            .append("perms", getPerms())
            .append("icon", getIcon())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("remark", getRemark())
            .toString();
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@ -1,226 +1,144 @@
-package com.ruoyi.common.core.domain.entity;
+package com.ruoyi.common.core.domain.entity;
-
+
-import javax.validation.constraints.NotBlank;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import javax.validation.constraints.Size;
+import com.alibaba.excel.annotation.ExcelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.TableField;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.annotation.ExcelDictFormat;
-
+import com.ruoyi.common.convert.ExcelDictConvert;
-/**
+import com.ruoyi.common.core.domain.BaseEntity;
- * 角色表 sys_role
+import io.swagger.annotations.ApiModelProperty;
- * 
+import lombok.Data;
- * @author ruoyi
+import lombok.EqualsAndHashCode;
- */
+import lombok.NoArgsConstructor;
-public class SysRole extends BaseEntity
+import lombok.experimental.Accessors;
-{
+
-    private static final long serialVersionUID = 1L;
+import javax.validation.constraints.NotBlank;
-
+import javax.validation.constraints.Size;
-    /** 角色ID */
+
-    @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
+/**
-    private Long roleId;
+ * 角色表 sys_role
-
+ *
-    /** 角色名称 */
+ * @author Lion Li
-    @Excel(name = "角色名称")
+ */
-    private String roleName;
+
-
+@Data
-    /** 角色权限 */
+@NoArgsConstructor
-    @Excel(name = "角色权限")
+@EqualsAndHashCode(callSuper = true)
-    private String roleKey;
+@Accessors(chain = true)
-
+@TableName("sys_role")
-    /** 角色排序 */
+@ExcelIgnoreUnannotated
-    @Excel(name = "角色排序")
+public class SysRole extends BaseEntity {
-    private String roleSort;
+
-
+	/**
-    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */
+	 * 角色ID
-    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限")
+	 */
-    private String dataScope;
+	@ApiModelProperty(value = "角色ID")
-
+	@ExcelProperty(value = "角色序号")
-    /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
+	@TableId(value = "role_id")
-    private boolean menuCheckStrictly;
+	private Long roleId;
-
+
-    /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
+	/**
-    private boolean deptCheckStrictly;
+	 * 角色名称
-
+	 */
-    /** 角色状态（0正常 1停用） */
+	@ApiModelProperty(value = "角色名称")
-    @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
+	@ExcelProperty(value = "角色名称")
-    private String status;
+	@NotBlank(message = "角色名称不能为空")
-
+	@Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
-    /** 删除标志（0代表存在 2代表删除） */
+	private String roleName;
-    private String delFlag;
+
-
+	/**
-    /** 用户是否存在此角色标识 默认不存在 */
+	 * 角色权限
-    private boolean flag = false;
+	 */
-
+	@ApiModelProperty(value = "角色权限")
-    /** 菜单组 */
+	@ExcelProperty(value = "角色权限")
-    private Long[] menuIds;
+	@NotBlank(message = "权限字符不能为空")
-
+	@Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
-    /** 部门组（数据权限） */
+	private String roleKey;
-    private Long[] deptIds;
+
-
+	/**
-    public SysRole()
+	 * 角色排序
-    {
+	 */
-
+	@ApiModelProperty(value = "角色排序")
-    }
+	@ExcelProperty(value = "角色排序")
-
+	@NotBlank(message = "显示顺序不能为空")
-    public SysRole(Long roleId)
+	private String roleSort;
-    {
+
-        this.roleId = roleId;
+	/**
-    }
+	 * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
-
+	 */
-    public Long getRoleId()
+	@ApiModelProperty(value = "数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）")
-    {
+	@ExcelProperty(value = "数据范围", converter = ExcelDictConvert.class)
-        return roleId;
+	@ExcelDictFormat(readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
-    }
+	private String dataScope;
-
+
-    public void setRoleId(Long roleId)
+	/**
-    {
+	 * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
-        this.roleId = roleId;
+	 */
-    }
+	@ApiModelProperty(value = "菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）")
-
+	private boolean menuCheckStrictly;
-    public boolean isAdmin()
+
-    {
+	/**
-        return isAdmin(this.roleId);
+	 * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
-    }
+	 */
-
+	@ApiModelProperty(value = "部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）")
-    public static boolean isAdmin(Long roleId)
+	private boolean deptCheckStrictly;
-    {
+
-        return roleId != null && 1L == roleId;
+	/**
-    }
+	 * 角色状态（0正常 1停用）
-
+	 */
-    @NotBlank(message = "角色名称不能为空")
+	@ApiModelProperty(value = "角色状态（0正常 1停用）")
-    @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
+	@ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class)
-    public String getRoleName()
+	@ExcelDictFormat(dictType = "sys_common_status")
-    {
+	private String status;
-        return roleName;
+
-    }
+	/**
-
+	 * 删除标志（0代表存在 2代表删除）
-    public void setRoleName(String roleName)
+	 */
-    {
+	@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
-        this.roleName = roleName;
+	@TableLogic
-    }
+	private String delFlag;
-
+
-    @NotBlank(message = "权限字符不能为空")
+	/**
-    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
+	 * 备注
-    public String getRoleKey()
+	 */
-    {
+	@ApiModelProperty(value = "备注")
-        return roleKey;
+	private String remark;
-    }
+
-
+	/**
-    public void setRoleKey(String roleKey)
+	 * 用户是否存在此角色标识 默认不存在
-    {
+	 */
-        this.roleKey = roleKey;
+	@ApiModelProperty(value = "用户是否存在此角色标识 默认不存在")
-    }
+	@TableField(exist = false)
-
+	private boolean flag = false;
-    @NotBlank(message = "显示顺序不能为空")
+
-    public String getRoleSort()
+	/**
-    {
+	 * 菜单组
-        return roleSort;
+	 */
-    }
+	@ApiModelProperty(value = "菜单组")
-
+	@TableField(exist = false)
-    public void setRoleSort(String roleSort)
+	private Long[] menuIds;
-    {
+
-        this.roleSort = roleSort;
+	/**
-    }
+	 * 部门组（数据权限）
-
+	 */
-    public String getDataScope()
+	@ApiModelProperty(value = "部门组（数据权限）")
-    {
+	@TableField(exist = false)
-        return dataScope;
+	private Long[] deptIds;
-    }
+
-
+	public SysRole(Long roleId) {
-    public void setDataScope(String dataScope)
+		this.roleId = roleId;
-    {
+	}
-        this.dataScope = dataScope;
+
-    }
+	@ApiModelProperty(value = "是否管理员")
-
+	public boolean isAdmin() {
-    public boolean isMenuCheckStrictly()
+		return isAdmin(this.roleId);
-    {
+	}
-        return menuCheckStrictly;
+
-    }
+	public static boolean isAdmin(Long roleId) {
-
+		return roleId != null && 1L == roleId;
-    public void setMenuCheckStrictly(boolean menuCheckStrictly)
+	}
-    {
+
-        this.menuCheckStrictly = menuCheckStrictly;
+}
    }
    public boolean isDeptCheckStrictly()
    {
        return deptCheckStrictly;
    }
    public void setDeptCheckStrictly(boolean deptCheckStrictly)
    {
        this.deptCheckStrictly = deptCheckStrictly;
    }
    public String getStatus()
    {
        return status;
    }
    public void setStatus(String status)
    {
        this.status = status;
    }
    public String getDelFlag()
    {
        return delFlag;
    }
    public void setDelFlag(String delFlag)
    {
        this.delFlag = delFlag;
    }
    public boolean isFlag()
    {
        return flag;
    }
    public void setFlag(boolean flag)
    {
        this.flag = flag;
    }
    public Long[] getMenuIds()
    {
        return menuIds;
    }
    public void setMenuIds(Long[] menuIds)
    {
        this.menuIds = menuIds;
    }
    public Long[] getDeptIds()
    {
        return deptIds;
    }
    public void setDeptIds(Long[] deptIds)
    {
        this.deptIds = deptIds;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("roleId", getRoleId())
            .append("roleName", getRoleName())
            .append("roleKey", getRoleKey())
            .append("roleSort", getRoleSort())
            .append("dataScope", getDataScope())
            .append("menuCheckStrictly", isMenuCheckStrictly())
            .append("deptCheckStrictly", isDeptCheckStrictly())
            .append("status", getStatus())
            .append("delFlag", getDelFlag())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("remark", getRemark())
            .toString();
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@ -1,328 +1,187 @@
-package com.ruoyi.common.core.domain.entity;
+package com.ruoyi.common.core.domain.entity;
-
+
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonIgnore;
-import javax.validation.constraints.Email;
+import com.fasterxml.jackson.annotation.JsonProperty;
-import javax.validation.constraints.NotBlank;
+import com.ruoyi.common.core.domain.BaseEntity;
-import javax.validation.constraints.Size;
+import com.ruoyi.common.xss.Xss;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModel;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
-import com.ruoyi.common.annotation.Excel;
+import lombok.NoArgsConstructor;
-import com.ruoyi.common.annotation.Excel.ColumnType;
+import lombok.experimental.Accessors;
-import com.ruoyi.common.annotation.Excel.Type;
+
-import com.ruoyi.common.annotation.Excels;
+import javax.validation.constraints.Email;
-import com.ruoyi.common.core.domain.BaseEntity;
+import javax.validation.constraints.NotBlank;
-
+import javax.validation.constraints.Size;
-/**
+import java.util.Date;
- * 用户对象 sys_user
+import java.util.List;
- * 
+
- * @author ruoyi
+/**
- */
+ * 用户对象 sys_user
-public class SysUser extends BaseEntity
+ *
-{
+ * @author Lion Li
-    private static final long serialVersionUID = 1L;
+ */
-
+
-    /** 用户ID */
+@Data
-    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+@NoArgsConstructor
-    private Long userId;
+@EqualsAndHashCode(callSuper = true)
-
+@Accessors(chain = true)
-    /** 部门ID */
+@TableName("sys_user")
-    @Excel(name = "部门编号", type = Type.IMPORT)
+@ApiModel("用户信息业务对象")
-    private Long deptId;
+public class SysUser extends BaseEntity {
-
+
-    /** 用户账号 */
+	/**
-    @Excel(name = "登录名称")
+	 * 用户ID
-    private String userName;
+	 */
-
+	@ApiModelProperty(value = "用户ID")
-    /** 用户昵称 */
+	@TableId(value = "user_id")
-    @Excel(name = "用户名称")
+	private Long userId;
-    private String nickName;
+
-
+	/**
-    /** 用户邮箱 */
+	 * 部门ID
-    @Excel(name = "用户邮箱")
+	 */
-    private String email;
+	@ApiModelProperty(value = "部门ID")
-
+	private Long deptId;
-    /** 手机号码 */
+
-    @Excel(name = "手机号码")
+	/**
-    private String phonenumber;
+	 * 用户账号
-
+	 */
-    /** 用户性别 */
+	@ApiModelProperty(value = "用户账号")
-    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+    @Xss(message = "用户账号不能包含脚本字符")
-    private String sex;
+    @NotBlank(message = "用户账号不能为空")
-
+	@Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
-    /** 用户头像 */
+	private String userName;
-    private String avatar;
+
-
+	/**
-    /** 密码 */
+	 * 用户昵称
-    private String password;
+	 */
-
+    @ApiModelProperty(value = "用户昵称")
-    /** 盐加密 */
+    @Xss(message = "用户昵称不能包含脚本字符")
-    private String salt;
+    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-
+	private String nickName;
-    /** 帐号状态（0正常 1停用） */
+
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+	/**
-    private String status;
+	 * 用户邮箱
-
+	 */
-    /** 删除标志（0代表存在 2代表删除） */
+	@ApiModelProperty(value = "用户邮箱")
-    private String delFlag;
+	@Email(message = "邮箱格式不正确")
-
+	@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    /** 最后登录IP */
+	private String email;
-    @Excel(name = "最后登录IP", type = Type.EXPORT)
+
-    private String loginIp;
+	/**
-
+	 * 手机号码
-    /** 最后登录时间 */
+	 */
-    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+	@ApiModelProperty(value = "手机号码")
-    private Date loginDate;
+	private String phonenumber;
-
+
-    /** 部门对象 */
+	/**
-    @Excels({
+	 * 用户性别
-        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
+	 */
-        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+	@ApiModelProperty(value = "用户性别")
-    })
+	private String sex;
-    private SysDept dept;
+
-
+	/**
-    /** 角色对象 */
+	 * 用户头像
-    private List<SysRole> roles;
+	 */
-
+	@ApiModelProperty(value = "用户头像")
-    /** 角色组 */
+	private String avatar;
-    private Long[] roleIds;
+
-
+	/**
-    /** 岗位组 */
+	 * 密码
-    private Long[] postIds;
+	 */
-
+	@ApiModelProperty(value = "密码")
-    public SysUser()
+	@TableField(
-    {
+			insertStrategy = FieldStrategy.NOT_EMPTY,
-
+			updateStrategy = FieldStrategy.NOT_EMPTY,
-    }
+			whereStrategy = FieldStrategy.NOT_EMPTY
-
+	)
-    public SysUser(Long userId)
+	private String password;
-    {
+
-        this.userId = userId;
+	@JsonIgnore
-    }
+	@JsonProperty
-
+	public String getPassword() {
-    public Long getUserId()
+		return password;
-    {
+	}
-        return userId;
+
-    }
+	/**
-
+	 * 帐号状态（0正常 1停用）
-    public void setUserId(Long userId)
+	 */
-    {
+	@ApiModelProperty(value = "帐号状态（0正常 1停用）")
-        this.userId = userId;
+	private String status;
-    }
+
-
+	/**
-    public boolean isAdmin()
+	 * 删除标志（0代表存在 2代表删除）
-    {
+	 */
-        return isAdmin(this.userId);
+	@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
-    }
+	@TableLogic
-
+	private String delFlag;
-    public static boolean isAdmin(Long userId)
+
-    {
+	/**
-        return userId != null && 1L == userId;
+	 * 最后登录IP
-    }
+	 */
-
+	@ApiModelProperty(value = "最后登录IP")
-    public Long getDeptId()
+	private String loginIp;
-    {
+
-        return deptId;
+	/**
-    }
+	 * 最后登录时间
-
+	 */
-    public void setDeptId(Long deptId)
+	@ApiModelProperty(value = "最后登录时间")
-    {
+	private Date loginDate;
-        this.deptId = deptId;
+
-    }
+	/**
-
+	 * 备注
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+	 */
-    public String getNickName()
+	@ApiModelProperty(value = "备注")
-    {
+	private String remark;
-        return nickName;
+
-    }
+	/**
-
+	 * 部门对象
-    public void setNickName(String nickName)
+	 */
-    {
+	@ApiModelProperty(value = "部门对象")
-        this.nickName = nickName;
+	@TableField(exist = false)
-    }
+	private SysDept dept;
-
+
-    @NotBlank(message = "用户账号不能为空")
+	/**
-    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
+	 * 角色对象
-    public String getUserName()
+	 */
-    {
+	@ApiModelProperty(value = "角色对象")
-        return userName;
+	@TableField(exist = false)
-    }
+	private List<SysRole> roles;
-
+
-    public void setUserName(String userName)
+	/**
-    {
+	 * 角色组
-        this.userName = userName;
+	 */
-    }
+	@ApiModelProperty(value = "角色组")
-
+	@TableField(exist = false)
-    @Email(message = "邮箱格式不正确")
+	private Long[] roleIds;
-    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+
-    public String getEmail()
+	/**
-    {
+	 * 岗位组
-        return email;
+	 */
-    }
+	@ApiModelProperty(value = "岗位组")
-
+	@TableField(exist = false)
-    public void setEmail(String email)
+	private Long[] postIds;
-    {
+
-        this.email = email;
+	/**
-    }
+	 * 数据权限 当前角色ID
-
+	 */
-    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
+	@ApiModelProperty(value = "角色ID")
-    public String getPhonenumber()
+	@TableField(exist = false)
-    {
+	private Long roleId;
-        return phonenumber;
+
-    }
+	public SysUser(Long userId) {
-
+		this.userId = userId;
-    public void setPhonenumber(String phonenumber)
+	}
-    {
+
-        this.phonenumber = phonenumber;
+	@ApiModelProperty(value = "是否管理员")
-    }
+	public boolean isAdmin() {
-
+		return isAdmin(this.userId);
-    public String getSex()
+	}
-    {
+
-        return sex;
+	public static boolean isAdmin(Long userId) {
-    }
+		return userId != null && 1L == userId;
-
+	}
-    public void setSex(String sex)
+
-    {
+}
        this.sex = sex;
    }
    public String getAvatar()
    {
        return avatar;
    }
    public void setAvatar(String avatar)
    {
        this.avatar = avatar;
    }
 	@JsonIgnore
    @JsonProperty
    public String getPassword()
    {
        return password;
    }
    public void setPassword(String password)
    {
        this.password = password;
    }
    public String getSalt()
    {
        return salt;
    }
    public void setSalt(String salt)
    {
        this.salt = salt;
    }
    public String getStatus()
    {
        return status;
    }
    public void setStatus(String status)
    {
        this.status = status;
    }
    public String getDelFlag()
    {
        return delFlag;
    }
    public void setDelFlag(String delFlag)
    {
        this.delFlag = delFlag;
    }
    public String getLoginIp()
    {
        return loginIp;
    }
    public void setLoginIp(String loginIp)
    {
        this.loginIp = loginIp;
    }
    public Date getLoginDate()
    {
        return loginDate;
    }
    public void setLoginDate(Date loginDate)
    {
        this.loginDate = loginDate;
    }
    public SysDept getDept()
    {
        return dept;
    }
    public void setDept(SysDept dept)
    {
        this.dept = dept;
    }
    public List<SysRole> getRoles()
    {
        return roles;
    }
    public void setRoles(List<SysRole> roles)
    {
        this.roles = roles;
    }
    public Long[] getRoleIds()
    {
        return roleIds;
    }
    public void setRoleIds(Long[] roleIds)
    {
        this.roleIds = roleIds;
    }
    public Long[] getPostIds()
    {
        return postIds;
    }
    public void setPostIds(Long[] postIds)
    {
        this.postIds = postIds;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("userId", getUserId())
            .append("deptId", getDeptId())
            .append("userName", getUserName())
            .append("nickName", getNickName())
            .append("email", getEmail())
            .append("phonenumber", getPhonenumber())
            .append("sex", getSex())
            .append("avatar", getAvatar())
            .append("password", getPassword())
            .append("salt", getSalt())
            .append("status", getStatus())
            .append("delFlag", getDelFlag())
            .append("loginIp", getLoginIp())
            .append("loginDate", getLoginDate())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("remark", getRemark())
            .append("dept", getDept())
            .toString();
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
@ -1,69 +1,43 @@
 package com.ruoyi.common.core.domain.model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 /**
 * 用户登录对象
- * 
+ *
- * @author ruoyi
+ * @author Lion Li
 */
-public class LoginBody
+
-{
+@Data
@Accessors(chain = true)
@ApiModel("用户登录对象")
 public class LoginBody {
    /**
     * 用户名
     */
    @ApiModelProperty(value = "用户名")
    private String username;
    /**
     * 用户密码
     */
    @ApiModelProperty(value = "用户密码")
    private String password;
    /**
     * 验证码
     */
    @ApiModelProperty(value = "验证码")
    private String code;
    /**
     * 唯一标识
     */
    @ApiModelProperty(value = "唯一标识")
    private String uuid = "";
    public String getUsername()
    {
        return username;
    }
    public void setUsername(String username)
    {
        this.username = username;
    }
    public String getPassword()
    {
        return password;
    }
    public void setPassword(String password)
    {
        this.password = password;
    }
    public String getCode()
    {
        return code;
    }
    public void setCode(String code)
    {
        this.code = code;
    }
    public String getUuid()
    {
        return uuid;
    }
    public void setUuid(String uuid)
    {
        this.uuid = uuid;
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
@ -1,228 +1,142 @@
-package com.ruoyi.common.core.domain.model;
+package com.ruoyi.common.core.domain.model;
-
+
-import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonIgnore;
-import java.util.Set;
+import lombok.Data;
-import org.springframework.security.core.GrantedAuthority;
+import lombok.NoArgsConstructor;
-import org.springframework.security.core.userdetails.UserDetails;
+import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.security.core.GrantedAuthority;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.security.core.userdetails.UserDetails;
-
+
-/**
+import java.util.Collection;
- * 登录用户身份权限
+import java.util.Set;
- * 
+
- * @author ruoyi
+/**
- */
+ * 登录用户身份权限
-public class LoginUser implements UserDetails
+ *
-{
+ * @author Lion Li
-    private static final long serialVersionUID = 1L;
+ */
-
+
-    /**
+@Data
-     * 用户唯一标识
+@NoArgsConstructor
-     */
+@Accessors(chain = true)
-    private String token;
+public class LoginUser implements UserDetails {
-
+
-    /**
+    private static final long serialVersionUID = 1L;
-     * 登录时间
+
-     */
+    /**
-    private Long loginTime;
+     * 用户ID
-
+     */
-    /**
+    private Long userId;
-     * 过期时间
+
-     */
+    /**
-    private Long expireTime;
+     * 部门ID
-
+     */
-    /**
+    private Long deptId;
-     * 登录IP地址
+
-     */
+    /**
-    private String ipaddr;
+     * 用户唯一标识
-
+     */
-    /**
+    private String token;
-     * 登录地点
+
-     */
+    /**
-    private String loginLocation;
+     * 登录时间
-
+     */
-    /**
+    private Long loginTime;
-     * 浏览器类型
+
-     */
+    /**
-    private String browser;
+     * 过期时间
-
+     */
-    /**
+    private Long expireTime;
-     * 操作系统
+
-     */
+    /**
-    private String os;
+     * 登录IP地址
-
+     */
-    /**
+    private String ipaddr;
-     * 权限列表
+
-     */
+    /**
-    private Set<String> permissions;
+     * 登录地点
-
+     */
-    /**
+    private String loginLocation;
-     * 用户信息
+
-     */
+    /**
-    private SysUser user;
+     * 浏览器类型
-
+     */
-    public String getToken()
+    private String browser;
-    {
+
-        return token;
+    /**
-    }
+     * 操作系统
-
+     */
-    public void setToken(String token)
+    private String os;
-    {
+
-        this.token = token;
+    /**
-    }
+     * 菜单权限
-
+     */
-    public LoginUser()
+    private Set<String> menuPermissions;
-    {
+
-    }
+    /**
-
+     * 角色权限
-    public LoginUser(SysUser user, Set<String> permissions)
+     */
-    {
+    private Set<String> rolePermissions;
-        this.user = user;
+
-        this.permissions = permissions;
+    /**
-    }
+     * 用户名
-
+     */
-    @JsonIgnore
+    private String username;
-    @Override
+
-    public String getPassword()
+    /**
-    {
+     * 密码
-        return user.getPassword();
+     */
-    }
+    private String password;
-
+
-    @Override
+    @JsonIgnore
-    public String getUsername()
+    @Override
-    {
+    public String getPassword() {
-        return user.getUserName();
+        return password;
-    }
+    }
-
+
-    /**
+    @Override
-     * 账户是否未过期,过期无法验证
+    public String getUsername() {
-     */
+        return username;
-    @JsonIgnore
+    }
-    @Override
+
-    public boolean isAccountNonExpired()
+    /**
-    {
+     * 账户是否未过期,过期无法验证
-        return true;
+     */
-    }
+    @JsonIgnore
-
+    @Override
-    /**
+    public boolean isAccountNonExpired() {
-     * 指定用户是否解锁,锁定的用户无法进行身份验证
+        return true;
-     * 
+    }
-     * @return
+
-     */
+    /**
-    @JsonIgnore
+     * 指定用户是否解锁,锁定的用户无法进行身份验证
-    @Override
+     */
-    public boolean isAccountNonLocked()
+    @JsonIgnore
-    {
+    @Override
-        return true;
+    public boolean isAccountNonLocked() {
-    }
+        return true;
-
+    }
-    /**
+
-     * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
+    /**
-     * 
+     * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
-     * @return
+     */
-     */
+    @JsonIgnore
-    @JsonIgnore
+    @Override
-    @Override
+    public boolean isCredentialsNonExpired() {
-    public boolean isCredentialsNonExpired()
+        return true;
-    {
+    }
-        return true;
+
-    }
+    /**
-
+     * 是否可用 ,禁用的用户不能身份验证
-    /**
+     */
-     * 是否可用 ,禁用的用户不能身份验证
+    @JsonIgnore
-     * 
+    @Override
-     * @return
+    public boolean isEnabled() {
-     */
+        return true;
-    @JsonIgnore
+    }
-    @Override
+
-    public boolean isEnabled()
+    @Override
-    {
+    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return true;
+        return null;
-    }
+    }
-
+}
    public Long getLoginTime()
    {
        return loginTime;
    }
    public void setLoginTime(Long loginTime)
    {
        this.loginTime = loginTime;
    }
    public String getIpaddr()
    {
        return ipaddr;
    }
    public void setIpaddr(String ipaddr)
    {
        this.ipaddr = ipaddr;
    }
    public String getLoginLocation()
    {
        return loginLocation;
    }
    public void setLoginLocation(String loginLocation)
    {
        this.loginLocation = loginLocation;
    }
    public String getBrowser()
    {
        return browser;
    }
    public void setBrowser(String browser)
    {
        this.browser = browser;
    }
    public String getOs()
    {
        return os;
    }
    public void setOs(String os)
    {
        this.os = os;
    }
    public Long getExpireTime()
    {
        return expireTime;
    }
    public void setExpireTime(Long expireTime)
    {
        this.expireTime = expireTime;
    }
    public Set<String> getPermissions()
    {
        return permissions;
    }
    public void setPermissions(Set<String> permissions)
    {
        this.permissions = permissions;
    }
    public SysUser getUser()
    {
        return user;
    }
    public void setUser(SysUser user)
    {
        this.user = user;
    }
    @Override
    public Collection<? extends GrantedAuthority> getAuthorities()
    {
        return null;
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
@ -0,0 +1,13 @@
 package com.ruoyi.common.core.domain.model;
 import io.swagger.annotations.ApiModel;
 /**
 * 用户注册对象
 *
 * @author Lion Li
 */
@ApiModel("用户注册对象")
 public class RegisterBody extends LoginBody {
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java
@ -0,0 +1,98 @@
 package com.ruoyi.common.core.mybatisplus.core;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import org.apache.ibatis.annotations.Param;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 /**
 * 自定义 Mapper 接口, 实现 自定义扩展
 *
 * @author Lion Li
 * @since 2021-05-13
 */
 public interface BaseMapperPlus<T> extends BaseMapper<T> {
 	/**
 	 * 单sql批量插入( 全量填充 )
 	 */
 	int insertAll(@Param("list") Collection<T> batchList);
    /**
     * 根据 ID 查询
     */
    default <V> V selectVoById(Serializable id, Class<V> voClass){
        T obj = this.selectById(id);
        if (ObjectUtil.isNull(obj)) {
            return null;
        }
        return BeanCopyUtils.copy(obj, voClass);
    }
    /**
     * 查询（根据ID 批量查询）
     */
    default <V> List<V> selectVoBatchIds(Collection<? extends Serializable> idList, Class<V> voClass){
        List<T> list = this.selectBatchIds(idList);
        if (CollUtil.isEmpty(list)) {
            return CollUtil.newArrayList();
        }
        return BeanCopyUtils.copyList(list, voClass);
    }
    /**
     * 查询（根据 columnMap 条件）
     */
    default <V> List<V> selectVoByMap(Map<String, Object> map, Class<V> voClass){
        List<T> list = this.selectByMap(map);
        if (CollUtil.isEmpty(list)) {
            return CollUtil.newArrayList();
        }
        return BeanCopyUtils.copyList(list, voClass);
    }
    /**
     * 根据 entity 条件，查询一条记录
     */
    default <V> V selectVoOne(Wrapper<T> wrapper, Class<V> voClass) {
        T obj = this.selectOne(wrapper);
        if (ObjectUtil.isNull(obj)) {
            return null;
        }
        return BeanCopyUtils.copy(obj, voClass);
    }
    /**
     * 根据 entity 条件，查询全部记录
     */
    default <V> List<V> selectVoList(Wrapper<T> wrapper, Class<V> voClass) {
        List<T> list = this.selectList(wrapper);
        if (CollUtil.isEmpty(list)) {
            return CollUtil.newArrayList();
        }
        return BeanCopyUtils.copyList(list, voClass);
    }
    /**
     * 分页查询VO
     */
    default <V, P extends IPage<V>> P selectVoPage(IPage<T> page, Wrapper<T> wrapper, Class<V> voClass) {
        IPage<T> pageData = this.selectPage(page, wrapper);
        IPage<V> voPage = new Page<>(pageData.getCurrent(), pageData.getSize(), pageData.getTotal());
        if (CollUtil.isEmpty(pageData.getRecords())) {
            return (P) voPage;
        }
        voPage.setRecords(BeanCopyUtils.copyList(pageData.getRecords(), voClass));
        return (P) voPage;
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
@ -0,0 +1,155 @@
 package com.ruoyi.common.core.mybatisplus.core;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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
 	 * @return V对象
 	 */
 	V getVoById(Serializable id);
 	/**
 	 * @param convertor 自定义转换器
 	 */
 	default V getVoById(Serializable id, Function<T, V> convertor) {
 		return convertor.apply(getById(id));
 	}
 	/**
 	 * @param idList      id列表
 	 * @return V对象
 	 */
 	List<V> listVoByIds(Collection<? extends Serializable> idList);
 	/**
 	 * @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 对象
 	 * @return V对象
 	 */
 	List<V> listVoByMap(Map<String, Object> columnMap);
 	/**
 	 * @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 查询条件
 	 * @return V对象
 	 */
 	V getVoOne(Wrapper<T> queryWrapper);
 	/**
 	 * @param convertor 自定义转换器
 	 */
 	default V getVoOne(Wrapper<T> queryWrapper, Function<T, V> convertor) {
 		return convertor.apply(getOne(queryWrapper, true));
 	}
 	/**
 	 * @param queryWrapper 查询条件
 	 * @return V对象
 	 */
 	List<V> listVo(Wrapper<T> queryWrapper);
 	/**
 	 * @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 查询条件
 	 * @return V对象
     * @deprecated 3.6.0 移除 请使用 {@link ServicePlusImpl#pageVo(IPage, Wrapper)}
 	 */
    @Deprecated
 	PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper);
    /**
     * @param convertor 自定义转换器
     * @deprecated 3.6.0 移除 请使用 {@link ServicePlusImpl#pageVo(IPage, Wrapper)}
     */
    @Deprecated
 	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()));
 	}
    /**
     * @deprecated 3.6.0 移除 请使用 {@link ServicePlusImpl#pageVo(IPage, Wrapper)}
     */
    @Deprecated
 	default PagePlus<T, V> pageVo(PagePlus<T, V> page) {
 		return pageVo(page, Wrappers.emptyWrapper());
 	}
 	/**
 	 * @param convertor 自定义转换器
     * @deprecated 3.6.0 移除 请使用 {@link ServicePlusImpl#pageVo(IPage, Wrapper)}
 	 */
    @Deprecated
 	default PagePlus<T, V> pageVo(PagePlus<T, V> page, Function<Collection<T>, List<V>> convertor) {
 		return pageVo(page, Wrappers.emptyWrapper(), convertor);
 	}
 	boolean saveAll(Collection<T> entityList);
 	boolean saveOrUpdateAll(Collection<T> entityList);
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
@ -0,0 +1,226 @@
 package com.ruoyi.common.core.mybatisplus.core;
 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.IPage;
 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 查询
 	 */
 	@Override
 	public V getVoById(Serializable id) {
        return getBaseMapper().selectVoById(id, voClass);
 	}
 	/**
 	 * 查询（根据ID 批量查询）
 	 */
 	@Override
 	public List<V> listVoByIds(Collection<? extends Serializable> idList) {
        return getBaseMapper().selectVoBatchIds(idList, voClass);
 	}
 	/**
 	 * 查询（根据 columnMap 条件）
 	 */
 	@Override
 	public List<V> listVoByMap(Map<String, Object> columnMap) {
        return getBaseMapper().selectVoByMap(columnMap, voClass);
 	}
 	/**
 	 * 根据 Wrapper，查询一条记录 <br/>
 	 * <p>结果集，如果是多个会抛出异常，随机取一条加上限制条件 wrapper.last("LIMIT 1")</p>
 	 */
 	@Override
 	public V getVoOne(Wrapper<T> queryWrapper) {
        return getBaseMapper().selectVoOne(queryWrapper, voClass);
 	}
 	/**
 	 * 查询列表
 	 */
 	@Override
 	public List<V> listVo(Wrapper<T> queryWrapper) {
        return getBaseMapper().selectVoList(queryWrapper, voClass);
 	}
 	/**
 	 * 翻页查询
     * @deprecated 3.6.0 移除 请使用 {@link #pageVo(IPage, Wrapper)}
 	 */
 	@Override
    @Deprecated
 	public PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper) {
 		PagePlus<T, V> result = getBaseMapper().selectPage(page, queryWrapper);
 		List<V> volist = BeanCopyUtils.copyList(result.getRecords(), voClass);
 		result.setRecordsVo(volist);
 		return result;
 	}
    /**
     * 翻页查询
     *
     * @param page         翻页对象
     * @param queryWrapper 实体对象封装操作类
     */
    public <P extends IPage<V>> P pageVo(IPage<T> page, Wrapper<T> queryWrapper) {
        return getBaseMapper().selectVoPage(page, queryWrapper, voClass);
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java
@ -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();
 	}
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
@ -1,72 +0,0 @@
 package com.ruoyi.common.core.page;
 import com.ruoyi.common.utils.StringUtils;
 /**
 * 分页数据
 * 
 * @author ruoyi
 */
 public class PageDomain
 {
    /** 当前记录起始索引 */
    private Integer pageNum;
    /** 每页显示记录数 */
    private Integer pageSize;
    /** 排序列 */
    private String orderByColumn;
    /** 排序的方向desc或者asc */
    private String isAsc = "asc";
    public String getOrderBy()
    {
        if (StringUtils.isEmpty(orderByColumn))
        {
            return "";
        }
        return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
    }
    public Integer getPageNum()
    {
        return pageNum;
    }
    public void setPageNum(Integer pageNum)
    {
        this.pageNum = pageNum;
    }
    public Integer getPageSize()
    {
        return pageSize;
    }
    public void setPageSize(Integer pageSize)
    {
        this.pageSize = pageSize;
    }
    public String getOrderByColumn()
    {
        return orderByColumn;
    }
    public void setOrderByColumn(String orderByColumn)
    {
        this.orderByColumn = orderByColumn;
    }
    public String getIsAsc()
    {
        return isAsc;
    }
    public void setIsAsc(String isAsc)
    {
        this.isAsc = isAsc;
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java
@ -0,0 +1,158 @@
 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
 * @deprecated 3.6.0 删除 请使用 {@link com.ruoyi.common.core.domain.PageQuery#build()}
 */
@Data
@Accessors(chain = true)
@Deprecated
 public class PagePlus<T,K> implements IPage<T> {
    /**
     * domain实体列表
     */
    private List<T> records = Collections.emptyList();
    /**
     * vo实体列表
     */
    private List<K> recordsVo = Collections.emptyList();
    /**
     * 总数
     */
    private long total = 0L;
    /**
     * 页长度
     */
    private long size = 10L;
    /**
     * 当前页
     */
    private long current = 1L;
    /**
     * 排序字段信息
     */
    private List<OrderItem> orders = new ArrayList<>();
    /**
     * 自动优化 COUNT SQL
     */
    private boolean optimizeCountSql = true;
    /**
     * 是否进行 count 查询
     */
    private boolean isSearchCount = true;
    /**
     * 是否命中count缓存
     */
    private boolean hitCount = false;
    /**
     * countId
     */
    private String countId;
    /**
     * 最大limit
     */
    private Long maxLimit;
    public PagePlus() {
    }
    public PagePlus(long current, long size) {
        this(current, size, 0L);
    }
    public PagePlus(long current, long size, long total) {
        this(current, size, total, true);
    }
    public PagePlus(long current, long size, boolean isSearchCount) {
        this(current, size, 0L, isSearchCount);
    }
    public PagePlus(long current, long size, long total, boolean isSearchCount) {
        if (current > 1L) {
            this.current = current;
        }
        this.size = size;
        this.total = total;
        this.isSearchCount = isSearchCount;
    }
    @Override
    public String countId() {
        return this.getCountId();
    }
    @Override
    public Long maxLimit() {
        return this.getMaxLimit();
    }
    public PagePlus<T, K> addOrder(OrderItem... items) {
        this.orders.addAll(Arrays.asList(items));
        return this;
    }
    public PagePlus<T, K> addOrder(List<OrderItem> items) {
        this.orders.addAll(items);
        return this;
    }
    @Override
    public List<OrderItem> orders() {
        return this.getOrders();
    }
    @Override
    public boolean optimizeCountSql() {
        return this.optimizeCountSql;
    }
 	@Override
 	public long getPages() {
 		// 解决 github issues/3208
 		return IPage.super.getPages();
 	}
 	public static <T,K> PagePlus<T,K> of(long current, long size) {
 		return of(current, size, 0);
 	}
 	public static <T,K> PagePlus<T,K> of(long current, long size, long total) {
 		return of(current, size, total, true);
 	}
 	public static <T,K> PagePlus<T,K> of(long current, long size, boolean searchCount) {
 		return of(current, size, 0, searchCount);
 	}
 	public static <T,K> PagePlus<T,K> of(long current, long size, long total, boolean searchCount) {
 		return new PagePlus<>(current, size, total, searchCount);
 	}
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
@ -1,85 +1,87 @@
-package com.ruoyi.common.core.page;
+package com.ruoyi.common.core.page;
-
+
-import java.io.Serializable;
+import cn.hutool.http.HttpStatus;
-import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-
+import io.swagger.annotations.ApiModel;
-/**
+import io.swagger.annotations.ApiModelProperty;
- * 表格分页数据对象
+import lombok.Data;
- * 
+import lombok.NoArgsConstructor;
- * @author ruoyi
+import lombok.experimental.Accessors;
- */
+
-public class TableDataInfo implements Serializable
+import java.io.Serializable;
-{
+import java.util.List;
-    private static final long serialVersionUID = 1L;
+
-
+/**
-    /** 总记录数 */
+ * 表格分页数据对象
-    private long total;
+ *
-
+ * @author Lion Li
-    /** 列表数据 */
+ */
-    private List<?> rows;
+
-
+@Data
-    /** 消息状态码 */
+@NoArgsConstructor
-    private int code;
+@Accessors(chain = true)
-
+@ApiModel("分页响应对象")
-    /** 消息内容 */
+public class TableDataInfo<T> implements Serializable {
-    private String msg;
+	private static final long serialVersionUID = 1L;
-
+
-    /**
+	/**
-     * 表格数据对象
+	 * 总记录数
-     */
+	 */
-    public TableDataInfo()
+	@ApiModelProperty("总记录数")
-    {
+	private long total;
-    }
+
-
+	/**
-    /**
+	 * 列表数据
-     * 分页
+	 */
-     * 
+	@ApiModelProperty("列表数据")
-     * @param list 列表数据
+	private List<T> rows;
-     * @param total 总记录数
+
-     */
+	/**
-    public TableDataInfo(List<?> list, int total)
+	 * 消息状态码
-    {
+	 */
-        this.rows = list;
+	@ApiModelProperty("消息状态码")
-        this.total = total;
+	private int code;
-    }
+
-
+	/**
-    public long getTotal()
+	 * 消息内容
-    {
+	 */
-        return total;
+	@ApiModelProperty("消息内容")
-    }
+	private String msg;
-
+
-    public void setTotal(long total)
+	/**
-    {
+	 * 分页
-        this.total = total;
+	 *
-    }
+	 * @param list  列表数据
-
+	 * @param total 总记录数
-    public List<?> getRows()
+	 */
-    {
+	public TableDataInfo(List<T> list, long total) {
-        return rows;
+		this.rows = list;
-    }
+		this.total = total;
-
+	}
-    public void setRows(List<?> rows)
+
-    {
+    public static <T> TableDataInfo<T> build(IPage<T> page) {
-        this.rows = rows;
+        TableDataInfo<T> rspData = new TableDataInfo<>();
-    }
+        rspData.setCode(HttpStatus.HTTP_OK);
-
+        rspData.setMsg("查询成功");
-    public int getCode()
+        rspData.setRows(page.getRecords());
-    {
+        rspData.setTotal(page.getTotal());
-        return code;
+        return rspData;
-    }
+    }
-
+
-    public void setCode(int code)
+    public static <T> TableDataInfo<T> build(List<T> list) {
-    {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
-        this.code = code;
+        rspData.setCode(HttpStatus.HTTP_OK);
-    }
+        rspData.setMsg("查询成功");
-
+        rspData.setRows(list);
-    public String getMsg()
+        rspData.setTotal(list.size());
-    {
+        return rspData;
-        return msg;
+    }
-    }
+
-
+    public static <T> TableDataInfo<T> build() {
-    public void setMsg(String msg)
+        TableDataInfo<T> rspData = new TableDataInfo<>();
-    {
+        rspData.setCode(HttpStatus.HTTP_OK);
-        this.msg = msg;
+        rspData.setMsg("查询成功");
-    }
+        return rspData;
-}
+    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
@ -1,49 +0,0 @@
 package com.ruoyi.common.core.page;
 import com.ruoyi.common.utils.ServletUtils;
 /**
 * 表格数据处理
 * 
 * @author ruoyi
 */
 public class TableSupport
 {
    /**
     * 当前记录起始索引
     */
    public static final String PAGE_NUM = "pageNum";
    /**
     * 每页显示记录数
     */
    public static final String PAGE_SIZE = "pageSize";
    /**
     * 排序列
     */
    public static final String ORDER_BY_COLUMN = "orderByColumn";
    /**
     * 排序的方向 "desc" 或者 "asc".
     */
    public static final String IS_ASC = "isAsc";
    /**
     * 封装分页对象
     */
    public static PageDomain getPageDomain()
    {
        PageDomain pageDomain = new PageDomain();
        pageDomain.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM));
        pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
        pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
        pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
        return pageDomain;
    }
    public static PageDomain buildPageRequest()
    {
        return getPageDomain();
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
@ -1,234 +0,0 @@
 package com.ruoyi.common.core.redis;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.BoundSetOperations;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Component;
 /**
 * spring redis 工具类
 *
 * @author ruoyi
 **/
@SuppressWarnings(value = { "unchecked", "rawtypes" })
@Component
 public class RedisCache
 {
    @Autowired
    public RedisTemplate redisTemplate;
    /**
     * 缓存基本的对象，Integer、String、实体类等
     *
     * @param key 缓存的键值
     * @param value 缓存的值
     */
    public <T> void setCacheObject(final String key, final T value)
    {
        redisTemplate.opsForValue().set(key, value);
    }
    /**
     * 缓存基本的对象，Integer、String、实体类等
     *
     * @param key 缓存的键值
     * @param value 缓存的值
     * @param timeout 时间
     * @param timeUnit 时间颗粒度
     */
    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit)
    {
        redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
    }
    /**
     * 设置有效时间
     *
     * @param key Redis键
     * @param timeout 超时时间
     * @return true=设置成功；false=设置失败
     */
    public boolean expire(final String key, final long timeout)
    {
        return expire(key, timeout, TimeUnit.SECONDS);
    }
    /**
     * 设置有效时间
     *
     * @param key Redis键
     * @param timeout 超时时间
     * @param unit 时间单位
     * @return true=设置成功；false=设置失败
     */
    public boolean expire(final String key, final long timeout, final TimeUnit unit)
    {
        return redisTemplate.expire(key, timeout, unit);
    }
    /**
     * 获得缓存的基本对象。
     *
     * @param key 缓存键值
     * @return 缓存键值对应的数据
     */
    public <T> T getCacheObject(final String key)
    {
        ValueOperations<String, T> operation = redisTemplate.opsForValue();
        return operation.get(key);
    }
    /**
     * 删除单个对象
     *
     * @param key
     */
    public boolean deleteObject(final String key)
    {
        return redisTemplate.delete(key);
    }
    /**
     * 删除集合对象
     *
     * @param collection 多个对象
     * @return
     */
    public long deleteObject(final Collection collection)
    {
        return redisTemplate.delete(collection);
    }
    /**
     * 缓存List数据
     *
     * @param key 缓存的键值
     * @param dataList 待缓存的List数据
     * @return 缓存的对象
     */
    public <T> long setCacheList(final String key, final List<T> dataList)
    {
        Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
        return count == null ? 0 : count;
    }
    /**
     * 获得缓存的list对象
     *
     * @param key 缓存的键值
     * @return 缓存键值对应的数据
     */
    public <T> List<T> getCacheList(final String key)
    {
        return redisTemplate.opsForList().range(key, 0, -1);
    }
    /**
     * 缓存Set
     *
     * @param key 缓存键值
     * @param dataSet 缓存的数据
     * @return 缓存数据的对象
     */
    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet)
    {
        BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
        Iterator<T> it = dataSet.iterator();
        while (it.hasNext())
        {
            setOperation.add(it.next());
        }
        return setOperation;
    }
    /**
     * 获得缓存的set
     *
     * @param key
     * @return
     */
    public <T> Set<T> getCacheSet(final String key)
    {
        return redisTemplate.opsForSet().members(key);
    }
    /**
     * 缓存Map
     *
     * @param key
     * @param dataMap
     */
    public <T> void setCacheMap(final String key, final Map<String, T> dataMap)
    {
        if (dataMap != null) {
            redisTemplate.opsForHash().putAll(key, dataMap);
        }
    }
    /**
     * 获得缓存的Map
     *
     * @param key
     * @return
     */
    public <T> Map<String, T> getCacheMap(final String key)
    {
        return redisTemplate.opsForHash().entries(key);
    }
    /**
     * 往Hash中存入数据
     *
     * @param key Redis键
     * @param hKey Hash键
     * @param value 值
     */
    public <T> void setCacheMapValue(final String key, final String hKey, final T value)
    {
        redisTemplate.opsForHash().put(key, hKey, value);
    }
    /**
     * 获取Hash中的数据
     *
     * @param key Redis键
     * @param hKey Hash键
     * @return Hash中的对象
     */
    public <T> T getCacheMapValue(final String key, final String hKey)
    {
        HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
        return opsForHash.get(key, hKey);
    }
    /**
     * 获取多个Hash中的数据
     *
     * @param key Redis键
     * @param hKeys Hash键集合
     * @return Hash对象集合
     */
    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys)
    {
        return redisTemplate.opsForHash().multiGet(key, hKeys);
    }
    /**
     * 获得缓存的基本对象列表
     *
     * @param pattern 字符串前缀
     * @return 对象列表
     */
    public Collection<String> keys(final String pattern)
    {
        return redisTemplate.keys(pattern);
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/ConfigService.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/ConfigService.java
@ -0,0 +1,18 @@
 package com.ruoyi.common.core.service;
 /**
 * 通用 参数配置服务
 *
 * @author Lion Li
 */
 public interface ConfigService {
    /**
     * 根据参数 key 获取参数值
     *
     * @param configKey 参数 key
     * @return 参数值
     */
    String getConfigValue(String configKey);
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/DictService.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/DictService.java
@ -0,0 +1,57 @@
 package com.ruoyi.common.core.service;
 /**
 * 通用 字典服务
 *
 * @author Lion Li
 */
 public interface DictService {
    /**
     * 分隔符
     */
    String SEPARATOR = ",";
    /**
     * 根据字典类型和字典值获取字典标签
     *
     * @param dictType  字典类型
     * @param dictValue 字典值
     * @return 字典标签
     */
    default String getDictLabel(String dictType, String dictValue) {
        return getDictLabel(dictType, dictValue, SEPARATOR);
    }
    /**
     * 根据字典类型和字典标签获取字典值
     *
     * @param dictType  字典类型
     * @param dictLabel 字典标签
     * @return 字典值
     */
    default String getDictValue(String dictType, String dictLabel) {
        return getDictValue(dictType, dictLabel, SEPARATOR);
    }
    /**
     * 根据字典类型和字典值获取字典标签
     *
     * @param dictType  字典类型
     * @param dictValue 字典值
     * @param separator 分隔符
     * @return 字典标签
     */
    String getDictLabel(String dictType, String dictValue, String separator);
    /**
     * 根据字典类型和字典标签获取字典值
     *
     * @param dictType  字典类型
     * @param dictLabel 字典标签
     * @param separator 分隔符
     * @return 字典值
     */
    String getDictValue(String dictType, String dictLabel, String separator);
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/LogininforService.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/LogininforService.java
@ -0,0 +1,14 @@
 package com.ruoyi.common.core.service;
 import javax.servlet.http.HttpServletRequest;
 /**
 * 通用 系统访问日志
 *
 * @author Lion Li
 */
 public interface LogininforService {
    void recordLogininfor(String username, String status, String message,
                          HttpServletRequest request, Object... args);
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/OperLogService.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/OperLogService.java
@ -0,0 +1,15 @@
 package com.ruoyi.common.core.service;
 import com.ruoyi.common.core.domain.dto.OperLogDTO;
 import org.springframework.scheduling.annotation.Async;
 /**
 * 通用 操作日志
 *
 * @author Lion Li
 */
 public interface OperLogService {
    @Async
    void recordOper(OperLogDTO operLogDTO);
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/TokenService.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/service/TokenService.java
@ -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);
 }
--- a/Show More
+++ b/Show More
		`@ -1 +0,0 @@`
			`restart.include.json=/com.alibaba.fastjson.*.jar`