Pre Merge pull request !444 from Barudisshu/master

Merge pull request !397 from 威士忌的纯度/N/A

.editorconfig

@@ -0,0 +1,10 @@
+root = true
+
+[*]
+charset = utf-8
+max_line_length = 120
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+end_of_line = lf
+insert_final_newline = true

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: http://doc.ruoyi.vip/ruoyi-cloud/other/donate.html

.gitignore

@@ -25,6 +25,8 @@ target/
 *.iml
 *.ipr
 
+### JRebel ###
+rebel.xml
 ### NetBeans ###
 nbproject/private/
 build/*
@@ -37,6 +39,7 @@ nbdist/
 # Others
 *.log
 *.xml.versionsBackup
+*.swp
 
 !*/build/*.java
 !*/build/*.html

.java-version

@@ -0,0 +1 @@
+1.8

.mvn/jvm.config

@@ -0,0 +1,12 @@
+--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+-Xmx1024m
+-Xms1024m
+-XX:+TieredCompilation
+-Xshare:on
+-Djava.net.preferIPv4Stack=true
+-Djava.security.egd=file:/dev/./urandom

.mvn/maven.config

@@ -0,0 +1,3 @@
+-Djava.version=1.8
+-Drevision=1.0.0
+-Dchangelist=-SNAPSHOT

README.md

@@ -1,3 +1,14 @@
+<p align="center">
+	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-b99b286755aef70355a7084753f89cdb7c9.png">
+</p>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.6</h1>
+<h4 align="center">基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构</h4>
+<p align="center">
+	<a href="https://gitee.com/y_project/RuoYi-Cloud/stargazers"><img src="https://gitee.com/y_project/RuoYi-Cloud/badge/star.svg?theme=dark"></a>
+	<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.6-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/RuoYi-Cloud/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
+</p>
+
 ## 平台简介
 
 若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
@@ -6,12 +17,9 @@
 * 后端采用Spring Boot、Spring Cloud & Alibaba。
 * 注册中心、配置中心选型Nacos，权限认证使用Redis。
 * 流量控制框架选型Sentinel，分布式事务选型Seata。
-* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Cloud-Vue3](https://github.com/yangzongzhuan/RuoYi-Cloud-Vue3)，保持同步更新。
+* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Cloud-Vue3](https://gitcode.com/yangzongzhuan/RuoYi-Cloud-Vue3)，保持同步更新。
 * 如需不分离应用，请移步 [RuoYi](https://gitee.com/y_project/RuoYi)，如需分离应用，请移步 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue)
-* 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp;
+* 阿里云优惠券：[点我进入](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-Cloud](https://gitee.com/zhangmrit/ruoyi-cloud) Ant Design版本。
 
 ## 系统模块
 
@@ -28,7 +36,9 @@ com.ruoyi
 │       └── ruoyi-common-datasource                   // 多数据源
 │       └── ruoyi-common-log                          // 日志记录
 │       └── ruoyi-common-redis                        // 缓存服务
+│       └── ruoyi-common-seata                        // 分布式事务
 │       └── ruoyi-common-security                     // 安全模块
+│       └── ruoyi-common-sensitive                    // 数据脱敏
 │       └── ruoyi-common-swagger                      // 系统接口
 ├── ruoyi-modules         // 业务模块
 │       └── ruoyi-system                              // 系统模块 [9201]
@@ -116,4 +126,4 @@ com.ruoyi
 
 ## 若依微服务交流群
 
-QQ群： [![加入QQ群](https://img.shields.io/badge/已满-42799195-blue.svg)](https://jq.qq.com/?_wv=1027&k=yqInfq0S) [![加入QQ群](https://img.shields.io/badge/已满-170157040-blue.svg)](https://jq.qq.com/?_wv=1027&k=Oy1mb3p8) [![加入QQ群](https://img.shields.io/badge/已满-130643120-blue.svg)](https://jq.qq.com/?_wv=1027&k=rvxkJtXK) [![加入QQ群](https://img.shields.io/badge/已满-225920371-blue.svg)](https://jq.qq.com/?_wv=1027&k=0Ck3PvTe) [![加入QQ群](https://img.shields.io/badge/已满-201705537-blue.svg)](https://jq.qq.com/?_wv=1027&k=FnHHP4TT) [![加入QQ群](https://img.shields.io/badge/236543183-blue.svg)](https://jq.qq.com/?_wv=1027&k=qdT1Ojpz) 点击按钮入群。
+QQ群： [![加入QQ群](https://img.shields.io/badge/已满-42799195-blue.svg)](https://jq.qq.com/?_wv=1027&k=yqInfq0S) [![加入QQ群](https://img.shields.io/badge/已满-170157040-blue.svg)](https://jq.qq.com/?_wv=1027&k=Oy1mb3p8) [![加入QQ群](https://img.shields.io/badge/已满-130643120-blue.svg)](https://jq.qq.com/?_wv=1027&k=rvxkJtXK) [![加入QQ群](https://img.shields.io/badge/已满-225920371-blue.svg)](https://jq.qq.com/?_wv=1027&k=0Ck3PvTe) [![加入QQ群](https://img.shields.io/badge/已满-201705537-blue.svg)](https://jq.qq.com/?_wv=1027&k=FnHHP4TT) [![加入QQ群](https://img.shields.io/badge/已满-236543183-blue.svg)](https://jq.qq.com/?_wv=1027&k=qdT1Ojpz) [![加入QQ群](https://img.shields.io/badge/已满-213618602-blue.svg)](https://jq.qq.com/?_wv=1027&k=nw3OiyXs) [![加入QQ群](https://img.shields.io/badge/已满-148794840-blue.svg)](https://jq.qq.com/?_wv=1027&k=kiU5WDls) [![加入QQ群](https://img.shields.io/badge/已满-118752664-blue.svg)](https://jq.qq.com/?_wv=1027&k=MtBy6YfT) [![加入QQ群](https://img.shields.io/badge/已满-101038945-blue.svg)](https://jq.qq.com/?_wv=1027&k=FqImHgH2) [![加入QQ群](https://img.shields.io/badge/已满-128355254-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=G4jZ4EtdT50PhnMBudTnEwgonxkXOscJ&authKey=FkGHYfoTKlGE6wHdKdjH9bVoOgQjtLP9WM%2Fj7pqGY1msoqw9uxDiBo39E2mLgzYg&noverify=0&group_code=128355254) [![加入QQ群](https://img.shields.io/badge/已满-179219821-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=irnwcXhbLOQEv1g-TwGifjNTA_f4wZiA&authKey=4bpzEwhcUY%2FvsPDHvzYn6xfoS%2FtOArvZ%2BGXzfr7O0%2FEqLfkKA%2BuCDXlzHIFg8t93&noverify=0&group_code=179219821) [![加入QQ群](https://img.shields.io/badge/已满-158753145-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=lx1uEdEDuxeM7rUvF3qmlFdqKqdJ5Z-R&authKey=rgyPW9yhhh4IIURKVFa6NgP3qiqH04WAzrJ0trsgkr3pjzm6sKIOGyA58oOjoj%2FJ&noverify=0&group_code=158753145) [![加入QQ群](https://img.shields.io/badge/112869560-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Kuaw0Xdlw2Nlgn6s8h9elzuquHGxGObD&authKey=cSrQcWQ%2BzQZAFFrwxaR%2BbzcumX4WRduZnd1O6JO1dlclQMiu%2BKwxAy8t2JfNp67V&noverify=0&group_code=112869560) 点击按钮入群。

bin/clean.bat

@@ -1,6 +1,6 @@
 @echo off
 echo.
-echo [信息] 清理工程target生成路径。
+echo [信息] 清理工程target生成路径。
 echo.
 
 %~d0

bin/package.bat

@@ -1,6 +1,6 @@
 @echo off
 echo.
-echo [信息] 打包Web工程，生成war/jar包文件。
+echo [信息] 打包Web工程，生成war/jar包文件。
 echo.
 
 %~d0

bin/run-auth.bat

@@ -1,6 +1,6 @@
 @echo off
 echo.
-echo [信息] 使用Jar命令运行Auth工程。
+echo [信息] 使用Jar命令运行Auth工程。
 echo.
 
 cd %~dp0

bin/run-gateway.bat

@@ -1,6 +1,6 @@
 @echo off
 echo.
-echo [信息] 使用Jar命令运行Gateway工程。
+echo [信息] 使用Jar命令运行Gateway工程。
 echo.
 
 cd %~dp0

bin/run-modules-file.bat

@@ -1,6 +1,6 @@
 @echo off
 echo.
-echo [信息] 使用Jar命令运行Modules-File工程。
+echo [信息] 使用Jar命令运行Modules-File工程。
 echo.
 
 cd %~dp0

bin/run-modules-gen.bat

@@ -1,6 +1,6 @@
 @echo off
 echo.
-echo [信息] 使用Jar命令运行Modules-Gen工程。
+echo [信息] 使用Jar命令运行Modules-Gen工程。
 echo.
 
 cd %~dp0

bin/run-modules-job.bat

@@ -1,6 +1,6 @@
 @echo off
 echo.
-echo [信息] 使用Jar命令运行Modules-Job工程。
+echo [信息] 使用Jar命令运行Modules-Job工程。
 echo.
 
 cd %~dp0

bin/run-modules-system.bat

@@ -1,6 +1,6 @@
 @echo off
 echo.
-echo [信息] 使用Jar命令运行Modules-System工程。
+echo [信息] 使用Jar命令运行Modules-System工程。
 echo.
 
 cd %~dp0

bin/run-monitor.bat

@@ -1,6 +1,6 @@
 @echo off
 echo.
-echo [信息] 使用Jar命令运行Monitor工程。
+echo [信息] 使用Jar命令运行Monitor工程。
 echo.
 
 cd %~dp0

docker/copy.sh

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# 复制项目的文件到对应docker路径，便于一键生成镜像。
+usage() {
+	echo "Usage: sh copy.sh"
+	exit 1
+}
+
+
+# copy sql
+echo "begin copy sql "
+cp ../sql/ry_20250523.sql ./mysql/db
+cp ../sql/ry_config_20250224.sql ./mysql/db
+
+# copy html
+echo "begin copy html "
+cp -r ../ruoyi-ui/dist/** ./nginx/html/dist
+
+
+# copy jar
+echo "begin copy ruoyi-gateway "
+cp ../ruoyi-gateway/target/ruoyi-gateway.jar ./ruoyi/gateway/jar
+
+echo "begin copy ruoyi-auth "
+cp ../ruoyi-auth/target/ruoyi-auth.jar ./ruoyi/auth/jar
+
+echo "begin copy ruoyi-visual "
+cp ../ruoyi-visual/ruoyi-monitor/target/ruoyi-visual-monitor.jar  ./ruoyi/visual/monitor/jar
+
+echo "begin copy ruoyi-modules-system "
+cp ../ruoyi-modules/ruoyi-system/target/ruoyi-modules-system.jar ./ruoyi/modules/system/jar
+
+echo "begin copy ruoyi-modules-file "
+cp ../ruoyi-modules/ruoyi-file/target/ruoyi-modules-file.jar ./ruoyi/modules/file/jar
+
+echo "begin copy ruoyi-modules-job "
+cp ../ruoyi-modules/ruoyi-job/target/ruoyi-modules-job.jar ./ruoyi/modules/job/jar
+
+echo "begin copy ruoyi-modules-gen "
+cp ../ruoyi-modules/ruoyi-gen/target/ruoyi-modules-gen.jar ./ruoyi/modules/gen/jar
+

docker/deploy.sh

@@ -26,12 +26,12 @@ port(){
 
 # 启动基础环境（必须）
 base(){
-	docker-compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos ruoyi-nginx
+	docker-compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos
 }
 
 # 启动程序模块（必须）
 modules(){
-	docker-compose up -d ruoyi-gateway ruoyi-auth ruoyi-modules-system
+	docker-compose up -d ruoyi-nginx ruoyi-gateway ruoyi-auth ruoyi-modules-system
 }
 
 # 关闭所有环境/模块

docker/docker-compose.yml

@@ -69,7 +69,7 @@ services:
     container_name: ruoyi-gateway
     build:
       context: ./ruoyi/gateway
-      dockerfile: dockerfile
+      dockerfile: ruoyi/gateway/Dockerfile
     ports:
       - "8080:8080"
     depends_on:
@@ -80,7 +80,7 @@ services:
     container_name: ruoyi-auth
     build:
       context: ./ruoyi/auth
-      dockerfile: dockerfile
+      dockerfile: ruoyi/auth/Dockerfile
     ports:
       - "9200:9200"
     depends_on:
@@ -91,7 +91,7 @@ services:
     container_name: ruoyi-modules-system
     build:
       context: ./ruoyi/modules/system
-      dockerfile: dockerfile
+      dockerfile: ruoyi/modules/system/Dockerfile
     ports:
       - "9201:9201"
     depends_on:
@@ -104,7 +104,7 @@ services:
     container_name: ruoyi-modules-gen
     build:
       context: ./ruoyi/modules/gen
-      dockerfile: dockerfile
+      dockerfile: ruoyi/modules/gen/Dockerfile
     ports:
       - "9202:9202"
     depends_on:
@@ -115,7 +115,7 @@ services:
     container_name: ruoyi-modules-job
     build:
       context: ./ruoyi/modules/job
-      dockerfile: dockerfile
+      dockerfile: ruoyi/modules/job/Dockerfile
     ports:
       - "9203:9203"
     depends_on:
@@ -126,7 +126,7 @@ services:
     container_name: ruoyi-modules-file
     build:
       context: ./ruoyi/modules/file
-      dockerfile: dockerfile
+      dockerfile: ruoyi/modules/file/Dockerfile
     ports:
       - "9300:9300"
     volumes:
@@ -135,6 +135,6 @@ services:
     container_name: ruoyi-visual-monitor
     build:
       context: ./ruoyi/visual/monitor
-      dockerfile: dockerfile
+      dockerfile: ruoyi/visual/monitor/Dockerfile
     ports:
       - "9100:9100"

docker/mysql/Dockerfile

@@ -0,0 +1,7 @@
+# 基础镜像
+FROM mysql:5.7
+# author
+LABEL org.opencontainers.image.authors="ruoyi"
+
+# 执行sql脚本
+COPY ./db/*.sql /docker-entrypoint-initdb.d/

docker/mysql/db/readme.txt

@@ -1 +1 @@
-存放sql目录下的所有脚本，用于docker自动执行。
+存放sql目录下的所有脚本，用于docker自动执行。

docker/mysql/dockerfile

@@ -1,7 +0,0 @@
-# 基础镜像
-FROM mysql:5.7
-# author
-MAINTAINER ruoyi
-
-# 执行sql脚本
-ADD ./db/*.sql /docker-entrypoint-initdb.d/

docker/nacos/Dockerfile

@@ -1,7 +1,7 @@
 # 基础镜像
 FROM nacos/nacos-server
 # author
-MAINTAINER ruoyi
+LABEL org.opencontainers.image.authors="ruoyi"
 
 # 复制conf文件到路径
 COPY ./conf/application.properties /home/nacos/conf/application.properties

docker/nacos/conf/application.properties

@@ -16,7 +16,7 @@ management.metrics.export.influx.enabled=false
 server.tomcat.accesslog.enabled=true
 server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i
 
-server.tomcat.basedir=
+server.tomcat.basedir=/home/ruoyi/nacos/tomcat/logs
 
 nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
 

docker/nginx/Dockerfile

@@ -1,7 +1,7 @@
 # 基础镜像
 FROM nginx
 # author
-MAINTAINER ruoyi
+LABEL org.opencontainers.image.authors="ruoyi"
 
 # 挂载目录
 VOLUME /home/ruoyi/projects/ruoyi-ui

docker/nginx/conf/nginx.conf

@@ -28,9 +28,14 @@ http {
             proxy_pass http://ruoyi-gateway:8080/;
         }
 
+        # 避免actuator暴露
+        if ($uri ~ "/actuator") {
+            return 403;
+        }
+
         error_page   500 502 503 504  /50x.html;
         location = /50x.html {
             root   html;
         }
     }
-}# requirepass 123456
+}

docker/nginx/html/dist/readme.txt

@@ -1 +1 @@
-存放前端ruoyi-ui构建好的静态文件，用于nginx请求访问。
+存放前端ruoyi-ui构建好的静态文件，用于nginx请求访问。

docker/redis/Dockerfile

@@ -1,7 +1,7 @@
 # 基础镜像
 FROM redis
 # author
-MAINTAINER ruoyi
+LABEL org.opencontainers.image.authors="ruoyi"
 
 # 挂载目录
 VOLUME /home/ruoyi/redis

docker/ruoyi/auth/Dockerfile

@@ -1,7 +1,7 @@
 # 基础镜像
 FROM  openjdk:8-jre
 # author
-MAINTAINER ruoyi
+LABEL org.opencontainers.image.authors="ruoyi"
 
 # 挂载目录
 VOLUME /home/ruoyi

docker/ruoyi/auth/jar/readme.txt

@@ -1 +1 @@
-存放认证中心打包好的jar文件，用于docker启动应用。
+存放认证中心打包好的jar文件，用于docker启动应用。

docker/ruoyi/gateway/Dockerfile

@@ -1,7 +1,7 @@
 # 基础镜像
 FROM  openjdk:8-jre
 # author
-MAINTAINER ruoyi
+LABEL org.opencontainers.image.authors="ruoyi"
 
 # 挂载目录
 VOLUME /home/ruoyi

docker/ruoyi/gateway/jar/readme.txt

@@ -1 +1 @@
-存放网关模块打包好的jar文件，用于docker启动应用。
+存放网关模块打包好的jar文件，用于docker启动应用。

docker/ruoyi/modules/file/Dockerfile

@@ -1,7 +1,7 @@
 # 基础镜像
 FROM  openjdk:8-jre
 # author
-MAINTAINER ruoyi
+LABEL org.opencontainers.image.authors="ruoyi"
 
 # 挂载目录
 VOLUME /home/ruoyi

docker/ruoyi/modules/file/jar/readme.txt

@@ -1 +1 @@
-存放文件服务打包好的jar文件，用于docker启动应用。
+存放文件服务打包好的jar文件，用于docker启动应用。

docker/ruoyi/modules/gen/Dockerfile

@@ -1,7 +1,7 @@
 # 基础镜像
 FROM  openjdk:8-jre
 # author
-MAINTAINER ruoyi
+LABEL org.opencontainers.image.authors="ruoyi"
 
 # 挂载目录
 VOLUME /home/ruoyi

docker/ruoyi/modules/gen/jar/readme.txt

@@ -1 +1 @@
-存放代码生成打包好的jar文件，用于docker启动应用。
+存放代码生成打包好的jar文件，用于docker启动应用。

docker/ruoyi/modules/job/Dockerfile

@@ -1,7 +1,7 @@
 # 基础镜像
 FROM  openjdk:8-jre
 # author
-MAINTAINER ruoyi
+LABEL org.opencontainers.image.authors="ruoyi"
 
 # 挂载目录
 VOLUME /home/ruoyi

docker/ruoyi/modules/job/jar/readme.txt

@@ -1 +1 @@
-存放定时任务打包好的jar文件，用于docker启动应用。
+存放定时任务打包好的jar文件，用于docker启动应用。

docker/ruoyi/modules/system/Dockerfile

@@ -1,7 +1,7 @@
 # 基础镜像
 FROM  openjdk:8-jre
 # author
-MAINTAINER ruoyi
+LABEL org.opencontainers.image.authors="ruoyi"
 
 # 挂载目录
 VOLUME /home/ruoyi

docker/ruoyi/modules/system/jar/readme.txt

@@ -1 +1 @@
-存放系统模块打包好的jar文件，用于docker启动应用。
+存放系统模块打包好的jar文件，用于docker启动应用。

docker/ruoyi/visual/monitor/Dockerfile

@@ -1,7 +1,7 @@
 # 基础镜像
 FROM  openjdk:8-jre
 # author
-MAINTAINER ruoyi
+LABEL org.opencontainers.image.authors="ruoyi"
 
 # 挂载目录
 VOLUME /home/ruoyi

docker/ruoyi/visual/monitor/jar/readme.txt

@@ -1 +1 @@
-存放监控中心打包好的jar文件，用于docker启动应用。
+存放监控中心打包好的jar文件，用于docker启动应用。

pom.xml

@@ -6,46 +6,55 @@
 
   <groupId>com.ruoyi</groupId>
   <artifactId>ruoyi</artifactId>
-    <version>3.3.0</version>
+  <version>3.6.6</version>
 
   <name>ruoyi</name>
   <url>http://www.ruoyi.vip</url>
   <description>若依微服务系统</description>
 
   <properties>
-        <ruoyi.version>3.3.0</ruoyi.version>
+    <ruoyi.version>3.6.6</ruoyi.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.version>1.8</java.version>
-        <spring-boot.version>2.5.6</spring-boot.version>
+    <spring-boot.version>2.7.18</spring-boot.version>
-        <spring-cloud.version>2020.0.4</spring-cloud.version>
+    <spring-cloud.version>2021.0.9</spring-cloud.version>
-        <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
+    <spring-cloud-alibaba.version>2021.0.6.1</spring-cloud-alibaba.version>
-        <alibaba.nacos.version>2.0.3</alibaba.nacos.version>
+    <spring-boot-admin.version>2.7.16</spring-boot-admin.version>
-        <spring-boot-admin.version>2.5.4</spring-boot-admin.version>
-        <spring-boot.mybatis>2.2.0</spring-boot.mybatis>
-        <swagger.fox.version>3.0.0</swagger.fox.version>
-        <swagger.core.version>1.6.2</swagger.core.version>
     <tobato.version>1.27.2</tobato.version>
-        <kaptcha.version>2.3.2</kaptcha.version>
+    <kaptcha.version>2.3.3</kaptcha.version>
-        <pagehelper.boot.version>1.4.0</pagehelper.boot.version>
+    <pagehelper.boot.version>2.0.0</pagehelper.boot.version>
-        <druid.version>1.2.8</druid.version>
+    <druid.version>1.2.23</druid.version>
-        <dynamic-ds.version>3.5.0</dynamic-ds.version>
+    <dynamic-ds.version>4.3.1</dynamic-ds.version>
-        <commons.io.version>2.11.0</commons.io.version>
+    <commons.io.version>2.19.0</commons.io.version>
-        <commons.fileupload.version>1.4</commons.fileupload.version>
     <velocity.version>2.3</velocity.version>
-        <fastjson.version>1.2.78</fastjson.version>
+    <fastjson.version>2.0.57</fastjson.version>
     <jjwt.version>0.9.1</jjwt.version>
     <minio.version>8.2.2</minio.version>
     <poi.version>4.1.2</poi.version>
-        <common-pool.version>2.10.0</common-pool.version>
+    <springdoc.version>1.6.9</springdoc.version>
-        <commons-collections.version>3.2.2</commons-collections.version>
+    <transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
-        <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
+    <!-- override dependency version -->
+    <tomcat.version>9.0.112</tomcat.version>
+    <logback.version>1.2.13</logback.version>
+    <spring-framework.version>5.3.39</spring-framework.version>
+    <!-- plugin version -->
+    <git-code-format-maven-plugin.version>5.4</git-code-format-maven-plugin.version>
   </properties>
 
   <!-- 依赖声明 -->
   <dependencyManagement>
     <dependencies>
 
+      <!-- 覆盖SpringFramework的依赖配置-->
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-framework-bom</artifactId>
+        <version>${spring-framework.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <!-- SpringCloud 微服务 -->
       <dependency>
         <groupId>org.springframework.cloud</groupId>
@@ -64,13 +73,6 @@
         <scope>import</scope>
       </dependency>
 
-            <!-- Alibaba Nacos 配置 -->
-            <dependency>
-                <groupId>com.alibaba.nacos</groupId>
-                <artifactId>nacos-client</artifactId>
-                <version>${alibaba.nacos.version}</version>
-            </dependency>
-
       <!-- SpringBoot 依赖配置 -->
       <dependency>
         <groupId>org.springframework.boot</groupId>
@@ -80,11 +82,36 @@
         <scope>import</scope>
       </dependency>
 
-            <!--  SpringBoot 监控客户端 -->
+      <!-- 覆盖logback的依赖配置-->
       <dependency>
-                <groupId>de.codecentric</groupId>
+        <groupId>ch.qos.logback</groupId>
-                <artifactId>spring-boot-admin-starter-client</artifactId>
+        <artifactId>logback-core</artifactId>
-                <version>${spring-boot-admin.version}</version>
+        <version>${logback.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>${logback.version}</version>
+      </dependency>
+
+      <!-- 覆盖tomcat的依赖配置-->
+      <dependency>
+        <groupId>org.apache.tomcat.embed</groupId>
+        <artifactId>tomcat-embed-core</artifactId>
+        <version>${tomcat.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.tomcat.embed</groupId>
+        <artifactId>tomcat-embed-el</artifactId>
+        <version>${tomcat.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.tomcat.embed</groupId>
+        <artifactId>tomcat-embed-websocket</artifactId>
+        <version>${tomcat.version}</version>
       </dependency>
 
       <!-- FastDFS 分布式文件系统 -->
@@ -94,28 +121,16 @@
         <version>${tobato.version}</version>
       </dependency>
 
-            <!-- Mybatis 依赖配置 -->
+      <!-- Springdoc webmvc 依赖配置 -->
       <dependency>
-                <groupId>org.mybatis.spring.boot</groupId>
+        <groupId>org.springdoc</groupId>
-                <artifactId>mybatis-spring-boot-starter</artifactId>
+        <artifactId>springdoc-openapi-ui</artifactId>
-                <version>${spring-boot.mybatis}</version>
+        <version>${springdoc.version}</version>
-            </dependency>
-
-            <!-- Swagger 依赖配置 -->
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-models</artifactId>
-                <version>${swagger.core.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${swagger.core.version}</version>
       </dependency>
 
       <!-- 验证码 -->
       <dependency>
-                <groupId>com.github.penggle</groupId>
+        <groupId>pro.fessional</groupId>
         <artifactId>kaptcha</artifactId>
         <version>${kaptcha.version}</version>
       </dependency>
@@ -141,13 +156,6 @@
         <version>${poi.version}</version>
       </dependency>
 
-            <!-- 文件上传工具类 -->
-            <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>${commons.fileupload.version}</version>
-            </dependency>
-
       <!-- 代码生成使用模板 -->
       <dependency>
         <groupId>org.apache.velocity</groupId>
@@ -155,17 +163,10 @@
         <version>${velocity.version}</version>
       </dependency>
 
-            <!-- Collection 增强Java集合框架 -->
-            <dependency> 
-                <groupId>commons-collections</groupId> 
-                <artifactId>commons-collections</artifactId> 
-                <version>${commons-collections.version}</version>
-            </dependency>
-
       <!-- JSON 解析器和生成器 -->
       <dependency>
-                <groupId>com.alibaba</groupId>
+        <groupId>com.alibaba.fastjson2</groupId>
-                <artifactId>fastjson</artifactId>
+        <artifactId>fastjson2</artifactId>
         <version>${fastjson.version}</version>
       </dependency>
 
@@ -183,13 +184,6 @@
         <version>${transmittable-thread-local.version}</version>
       </dependency>
 
-            <!-- 公共资源池 -->
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-pool2</artifactId>
-                <version>${common-pool.version}</version>
-            </dependency>
-
       <!-- 核心模块 -->
       <dependency>
         <groupId>com.ruoyi</groupId>
@@ -211,6 +205,13 @@
         <version>${ruoyi.version}</version>
       </dependency>
 
+      <!-- 数据脱敏 -->
+      <dependency>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common-sensitive</artifactId>
+        <version>${ruoyi.version}</version>
+      </dependency>
+
       <!-- 权限范围 -->
       <dependency>
         <groupId>com.ruoyi</groupId>
@@ -225,6 +226,13 @@
         <version>${ruoyi.version}</version>
       </dependency>
 
+      <!-- 分布式事务 -->
+      <dependency>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common-seata</artifactId>
+        <version>${ruoyi.version}</version>
+      </dependency>
+
       <!-- 日志记录 -->
       <dependency>
         <groupId>com.ruoyi</groupId>
@@ -278,7 +286,89 @@
           <encoding>${project.build.sourceEncoding}</encoding>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>com.cosium.code</groupId>
+        <artifactId>git-code-format-maven-plugin</artifactId>
+      </plugin>
     </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-maven-plugin</artifactId>
+          <version>${spring-boot.version}</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>repackage</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>com.cosium.code</groupId>
+          <artifactId>git-code-format-maven-plugin</artifactId>
+          <version>${git-code-format-maven-plugin.version}</version>
+          <executions>
+            <execution>
+              <id>install-formatter-hook</id>
+              <goals>
+                <goal>install-hooks</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>git-code-format</id>
+              <phase>validate</phase>
+              <goals>
+                <goal>format-code</goal>
+                <goal>validate-code-format</goal>
+              </goals>
+            </execution>
+          </executions>
+          <dependencies>
+            <dependency>
+              <groupId>com.cosium.code</groupId>
+              <artifactId>google-java-format</artifactId>
+              <version>${git-code-format-maven-plugin.version}</version>
+            </dependency>
+          </dependencies>
+          <configuration>
+            <formatterOptions>
+              <googleJavaFormat.aosp>false</googleJavaFormat.aosp>
+              <googleJavaFormat.formatJavadoc>true</googleJavaFormat.formatJavadoc>
+              <googleJavaFormat.fixImportsOnly>false</googleJavaFormat.fixImportsOnly>
+              <googleJavaFormat.skipSortingImports>false</googleJavaFormat.skipSortingImports>
+              <googleJavaFormat.skipRemoveUnusedImports>false</googleJavaFormat.skipRemoveUnusedImports>
+            </formatterOptions>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </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>
+
 </project>

ruoyi-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.3.0</version>
+        <version>3.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-api/ruoyi-api-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-api</artifactId>
-        <version>3.3.0</version>
+        <version>3.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java

@@ -1,23 +1,27 @@
 package com.ruoyi.system.api;
 
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.domain.SysFile;
 import com.ruoyi.system.api.factory.RemoteFileFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 文件服务
  *
  * @author ruoyi
  */
-@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
+@FeignClient(
-public interface RemoteFileService
+    contextId = "remoteFileService",
-{
+    value = ServiceNameConstants.FILE_SERVICE,
+    fallbackFactory = RemoteFileFallbackFactory.class)
+public interface RemoteFileService {
   /**
    * 上传文件
    *
@@ -26,4 +30,13 @@ public interface RemoteFileService
    */
   @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
   public R<SysFile> upload(@RequestPart(value = "file") MultipartFile file);
+
+  /**
+   * 删除文件
+   *
+   * @param fileUrl 文件地址
+   * @return 结果
+   */
+  @DeleteMapping(value = "/delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+  public R<Boolean> delete(@RequestParam("fileUrl") String fileUrl);
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java

@@ -1,24 +1,26 @@
 package com.ruoyi.system.api;
 
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.domain.SysLogininfor;
 import com.ruoyi.system.api.domain.SysOperLog;
 import com.ruoyi.system.api.factory.RemoteLogFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 /**
  * 日志服务
  *
  * @author ruoyi
  */
-@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class)
+@FeignClient(
-public interface RemoteLogService
+    contextId = "remoteLogService",
-{
+    value = ServiceNameConstants.SYSTEM_SERVICE,
+    fallbackFactory = RemoteLogFallbackFactory.class)
+public interface RemoteLogService {
   /**
    * 保存系统日志
    *
@@ -27,7 +29,10 @@ public interface RemoteLogService
    * @return 结果
    */
   @PostMapping("/operlog")
-    public R<Boolean> saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+  public R<Boolean> saveLog(
+      @RequestBody SysOperLog sysOperLog,
+      @RequestHeader(SecurityConstants.FROM_SOURCE) String source)
+      throws Exception;
 
   /**
    * 保存访问记录
@@ -37,5 +42,7 @@ public interface RemoteLogService
    * @return 结果
    */
   @PostMapping("/logininfor")
-    public R<Boolean> saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+  public R<Boolean> saveLogininfor(
+      @RequestBody SysLogininfor sysLogininfor,
+      @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java

@@ -1,26 +1,29 @@
 package com.ruoyi.system.api;
 
-import org.springframework.cloud.openfeign.FeignClient;
-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.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
 import com.ruoyi.system.api.model.LoginUser;
+import org.springframework.cloud.openfeign.FeignClient;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 /**
  * 用户服务
  *
  * @author ruoyi
  */
-@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
+@FeignClient(
-public interface RemoteUserService
+    contextId = "remoteUserService",
-{
+    value = ServiceNameConstants.SYSTEM_SERVICE,
+    fallbackFactory = RemoteUserFallbackFactory.class)
+public interface RemoteUserService {
   /**
    * 通过用户名查询用户信息
    *
@@ -29,7 +32,9 @@ public interface RemoteUserService
    * @return 结果
    */
   @GetMapping("/user/info/{username}")
-    public R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+  public R<LoginUser> getUserInfo(
+      @PathVariable("username") String username,
+      @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
   /**
    * 注册用户信息
@@ -39,5 +44,17 @@ public interface RemoteUserService
    * @return 结果
    */
   @PostMapping("/user/register")
-    public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+  public R<Boolean> registerUserInfo(
+      @RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+  /**
+   * 记录用户登录IP地址和登录时间
+   *
+   * @param sysUser 用户信息
+   * @param source 请求来源
+   * @return 结果
+   */
+  @PutMapping("/user/recordlogin")
+  public R<Boolean> recordUserLogin(
+      @RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java

@@ -1,21 +1,21 @@
 package com.ruoyi.system.api.domain;
 
+import com.ruoyi.common.core.web.domain.BaseEntity;
 import java.util.ArrayList;
 import java.util.List;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.web.domain.BaseEntity;
 
 /**
  * 部门表 sys_dept
  *
  * @author ruoyi
  */
-public class SysDept extends BaseEntity
+public class SysDept extends BaseEntity {
-{
   private static final long serialVersionUID = 1L;
 
   /** 部门ID */
@@ -31,7 +31,7 @@ public class SysDept extends BaseEntity
   private String deptName;
 
   /** 显示顺序 */
-    private String orderNum;
+  private Integer orderNum;
 
   /** 负责人 */
   private String leader;
@@ -54,129 +54,105 @@ public class SysDept extends BaseEntity
   /** 子部门 */
   private List<SysDept> children = new ArrayList<SysDept>();
 
-    public Long getDeptId()
+  public Long getDeptId() {
-    {
     return deptId;
   }
 
-    public void setDeptId(Long deptId)
+  public void setDeptId(Long deptId) {
-    {
     this.deptId = deptId;
   }
 
-    public Long getParentId()
+  public Long getParentId() {
-    {
     return parentId;
   }
 
-    public void setParentId(Long parentId)
+  public void setParentId(Long parentId) {
-    {
     this.parentId = parentId;
   }
 
-    public String getAncestors()
+  public String getAncestors() {
-    {
     return ancestors;
   }
 
-    public void setAncestors(String ancestors)
+  public void setAncestors(String ancestors) {
-    {
     this.ancestors = ancestors;
   }
 
   @NotBlank(message = "部门名称不能为空")
   @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
-    public String getDeptName()
+  public String getDeptName() {
-    {
     return deptName;
   }
 
-    public void setDeptName(String deptName)
+  public void setDeptName(String deptName) {
-    {
     this.deptName = deptName;
   }
 
-    @NotBlank(message = "显示顺序不能为空")
+  @NotNull(message = "显示顺序不能为空")
-    public String getOrderNum()
+  public Integer getOrderNum() {
-    {
     return orderNum;
   }
 
-    public void setOrderNum(String orderNum)
+  public void setOrderNum(Integer orderNum) {
-    {
     this.orderNum = orderNum;
   }
 
-    public String getLeader()
+  public String getLeader() {
-    {
     return leader;
   }
 
-    public void setLeader(String leader)
+  public void setLeader(String leader) {
-    {
     this.leader = leader;
   }
 
   @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
-    public String getPhone()
+  public String getPhone() {
-    {
     return phone;
   }
 
-    public void setPhone(String phone)
+  public void setPhone(String phone) {
-    {
     this.phone = phone;
   }
 
   @Email(message = "邮箱格式不正确")
   @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
+  public String getEmail() {
-    {
     return email;
   }
 
-    public void setEmail(String email)
+  public void setEmail(String email) {
-    {
     this.email = email;
   }
 
-    public String getStatus()
+  public String getStatus() {
-    {
     return status;
   }
 
-    public void setStatus(String status)
+  public void setStatus(String status) {
-    {
     this.status = status;
   }
 
-    public String getDelFlag()
+  public String getDelFlag() {
-    {
     return delFlag;
   }
 
-    public void setDelFlag(String delFlag)
+  public void setDelFlag(String delFlag) {
-    {
     this.delFlag = delFlag;
   }
 
-    public String getParentName()
+  public String getParentName() {
-    {
     return parentName;
   }
 
-    public void setParentName(String parentName)
+  public void setParentName(String parentName) {
-    {
     this.parentName = parentName;
   }
 
-    public List<SysDept> getChildren()
+  public List<SysDept> getChildren() {
-    {
     return children;
   }
 
-    public void setChildren(List<SysDept> children)
+  public void setChildren(List<SysDept> children) {
-    {
     this.children = children;
   }
 

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java

@@ -1,21 +1,20 @@
 package com.ruoyi.system.api.domain;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 字典数据表 sys_dict_data
  *
  * @author ruoyi
  */
-public class SysDictData extends BaseEntity
+public class SysDictData extends BaseEntity {
-{
   private static final long serialVersionUID = 1L;
 
   /** 字典编码 */
@@ -52,105 +51,86 @@ public class SysDictData extends BaseEntity
   @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
   private String status;
 
-    public Long getDictCode()
+  public Long getDictCode() {
-    {
     return dictCode;
   }
 
-    public void setDictCode(Long dictCode)
+  public void setDictCode(Long dictCode) {
-    {
     this.dictCode = dictCode;
   }
 
-    public Long getDictSort()
+  public Long getDictSort() {
-    {
     return dictSort;
   }
 
-    public void setDictSort(Long dictSort)
+  public void setDictSort(Long dictSort) {
-    {
     this.dictSort = dictSort;
   }
 
   @NotBlank(message = "字典标签不能为空")
   @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
-    public String getDictLabel()
+  public String getDictLabel() {
-    {
     return dictLabel;
   }
 
-    public void setDictLabel(String dictLabel)
+  public void setDictLabel(String dictLabel) {
-    {
     this.dictLabel = dictLabel;
   }
 
   @NotBlank(message = "字典键值不能为空")
   @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
-    public String getDictValue()
+  public String getDictValue() {
-    {
     return dictValue;
   }
 
-    public void setDictValue(String dictValue)
+  public void setDictValue(String dictValue) {
-    {
     this.dictValue = dictValue;
   }
 
   @NotBlank(message = "字典类型不能为空")
   @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
-    public String getDictType()
+  public String getDictType() {
-    {
     return dictType;
   }
 
-    public void setDictType(String dictType)
+  public void setDictType(String dictType) {
-    {
     this.dictType = dictType;
   }
 
   @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
-    public String getCssClass()
+  public String getCssClass() {
-    {
     return cssClass;
   }
 
-    public void setCssClass(String cssClass)
+  public void setCssClass(String cssClass) {
-    {
     this.cssClass = cssClass;
   }
 
-    public String getListClass()
+  public String getListClass() {
-    {
     return listClass;
   }
 
-    public void setListClass(String listClass)
+  public void setListClass(String listClass) {
-    {
     this.listClass = listClass;
   }
 
-    public boolean getDefault()
+  public boolean getDefault() {
-    {
+    return UserConstants.YES.equals(this.isDefault);
-        return UserConstants.YES.equals(this.isDefault) ? true : false;
   }
 
-    public String getIsDefault()
+  public String getIsDefault() {
-    {
     return isDefault;
   }
 
-    public void setIsDefault(String isDefault)
+  public void setIsDefault(String isDefault) {
-    {
     this.isDefault = isDefault;
   }
 
-    public String getStatus()
+  public String getStatus() {
-    {
     return status;
   }
 
-    public void setStatus(String status)
+  public void setStatus(String status) {
-    {
     this.status = status;
   }
 

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java

@@ -1,20 +1,20 @@
 package com.ruoyi.system.api.domain;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 字典类型表 sys_dict_type
  *
  * @author ruoyi
  */
-public class SysDictType extends BaseEntity
+public class SysDictType extends BaseEntity {
-{
   private static final long serialVersionUID = 1L;
 
   /** 字典主键 */
@@ -33,47 +33,40 @@ public class SysDictType extends BaseEntity
   @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
   private String status;
 
-    public Long getDictId()
+  public Long getDictId() {
-    {
     return dictId;
   }
 
-    public void setDictId(Long dictId)
+  public void setDictId(Long dictId) {
-    {
     this.dictId = dictId;
   }
 
   @NotBlank(message = "字典名称不能为空")
   @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
-    public String getDictName()
+  public String getDictName() {
-    {
     return dictName;
   }
 
-    public void setDictName(String dictName)
+  public void setDictName(String dictName) {
-    {
     this.dictName = dictName;
   }
 
   @NotBlank(message = "字典类型不能为空")
   @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
-    public String getDictType()
+  @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
-    {
+  public String getDictType() {
     return dictType;
   }
 
-    public void setDictType(String dictType)
+  public void setDictType(String dictType) {
-    {
     this.dictType = dictType;
   }
 
-    public String getStatus()
+  public String getStatus() {
-    {
     return status;
   }
 
-    public void setStatus(String status)
+  public void setStatus(String status) {
-    {
     this.status = status;
   }
 

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java

@@ -8,35 +8,26 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  *
  * @author ruoyi
  */
-public class SysFile
+public class SysFile {
-{
+  /** 文件名称 */
-    /**
-     * 文件名称
-     */
   private String name;
 
-    /**
+  /** 文件地址 */
-     * 文件地址
-     */
   private String url;
 
-    public String getName()
+  public String getName() {
-    {
     return name;
   }
 
-    public void setName(String name)
+  public void setName(String name) {
-    {
     this.name = name;
   }
 
-    public String getUrl()
+  public String getUrl() {
-    {
     return url;
   }
 
-    public void setUrl(String url)
+  public void setUrl(String url) {
-    {
     this.url = url;
   }
 

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java

@@ -1,18 +1,17 @@
 package com.ruoyi.system.api.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import java.util.Date;
 
 /**
  * 系统访问记录表 sys_logininfor
  *
  * @author ruoyi
  */
-public class SysLogininfor extends BaseEntity
+public class SysLogininfor extends BaseEntity {
-{
   private static final long serialVersionUID = 1L;
 
   /** ID */
@@ -40,63 +39,51 @@ public class SysLogininfor extends BaseEntity
   @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
   private Date accessTime;
 
-    public Long getInfoId()
+  public Long getInfoId() {
-    {
     return infoId;
   }
 
-    public void setInfoId(Long infoId)
+  public void setInfoId(Long infoId) {
-    {
     this.infoId = infoId;
   }
 
-    public String getUserName()
+  public String getUserName() {
-    {
     return userName;
   }
 
-    public void setUserName(String userName)
+  public void setUserName(String userName) {
-    {
     this.userName = userName;
   }
 
-    public String getStatus()
+  public String getStatus() {
-    {
     return status;
   }
 
-    public void setStatus(String status)
+  public void setStatus(String status) {
-    {
     this.status = status;
   }
 
-    public String getIpaddr()
+  public String getIpaddr() {
-    {
     return ipaddr;
   }
 
-    public void setIpaddr(String ipaddr)
+  public void setIpaddr(String ipaddr) {
-    {
     this.ipaddr = ipaddr;
   }
 
-    public String getMsg()
+  public String getMsg() {
-    {
     return msg;
   }
 
-    public void setMsg(String msg)
+  public void setMsg(String msg) {
-    {
     this.msg = msg;
   }
 
-    public Date getAccessTime()
+  public Date getAccessTime() {
-    {
     return accessTime;
   }
 
-    public void setAccessTime(Date accessTime)
+  public void setAccessTime(Date accessTime) {
-    {
     this.accessTime = accessTime;
   }
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java

@@ -1,18 +1,17 @@
 package com.ruoyi.system.api.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import java.util.Date;
 
 /**
  * 操作日志记录表 oper_log
  *
  * @author ruoyi
  */
-public class SysOperLog extends BaseEntity
+public class SysOperLog extends BaseEntity {
-{
   private static final long serialVersionUID = 1L;
 
   /** 日志主键 */
@@ -79,163 +78,143 @@ public class SysOperLog extends BaseEntity
   @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
   private Date operTime;
 
-    public Long getOperId()
+  /** 消耗时间 */
-    {
+  @Excel(name = "消耗时间", suffix = "毫秒")
+  private Long costTime;
+
+  public Long getOperId() {
     return operId;
   }
 
-    public void setOperId(Long operId)
+  public void setOperId(Long operId) {
-    {
     this.operId = operId;
   }
 
-    public String getTitle()
+  public String getTitle() {
-    {
     return title;
   }
 
-    public void setTitle(String title)
+  public void setTitle(String title) {
-    {
     this.title = title;
   }
 
-    public Integer getBusinessType()
+  public Integer getBusinessType() {
-    {
     return businessType;
   }
 
-    public void setBusinessType(Integer businessType)
+  public void setBusinessType(Integer businessType) {
-    {
     this.businessType = businessType;
   }
 
-    public Integer[] getBusinessTypes()
+  public Integer[] getBusinessTypes() {
-    {
     return businessTypes;
   }
 
-    public void setBusinessTypes(Integer[] businessTypes)
+  public void setBusinessTypes(Integer[] businessTypes) {
-    {
     this.businessTypes = businessTypes;
   }
 
-    public String getMethod()
+  public String getMethod() {
-    {
     return method;
   }
 
-    public void setMethod(String method)
+  public void setMethod(String method) {
-    {
     this.method = method;
   }
 
-    public String getRequestMethod()
+  public String getRequestMethod() {
-    {
     return requestMethod;
   }
 
-    public void setRequestMethod(String requestMethod)
+  public void setRequestMethod(String requestMethod) {
-    {
     this.requestMethod = requestMethod;
   }
 
-    public Integer getOperatorType()
+  public Integer getOperatorType() {
-    {
     return operatorType;
   }
 
-    public void setOperatorType(Integer operatorType)
+  public void setOperatorType(Integer operatorType) {
-    {
     this.operatorType = operatorType;
   }
 
-    public String getOperName()
+  public String getOperName() {
-    {
     return operName;
   }
 
-    public void setOperName(String operName)
+  public void setOperName(String operName) {
-    {
     this.operName = operName;
   }
 
-    public String getDeptName()
+  public String getDeptName() {
-    {
     return deptName;
   }
 
-    public void setDeptName(String deptName)
+  public void setDeptName(String deptName) {
-    {
     this.deptName = deptName;
   }
 
-    public String getOperUrl()
+  public String getOperUrl() {
-    {
     return operUrl;
   }
 
-    public void setOperUrl(String operUrl)
+  public void setOperUrl(String operUrl) {
-    {
     this.operUrl = operUrl;
   }
 
-    public String getOperIp()
+  public String getOperIp() {
-    {
     return operIp;
   }
 
-    public void setOperIp(String operIp)
+  public void setOperIp(String operIp) {
-    {
     this.operIp = operIp;
   }
 
-    public String getOperParam()
+  public String getOperParam() {
-    {
     return operParam;
   }
 
-    public void setOperParam(String operParam)
+  public void setOperParam(String operParam) {
-    {
     this.operParam = operParam;
   }
 
-    public String getJsonResult()
+  public String getJsonResult() {
-    {
     return jsonResult;
   }
 
-    public void setJsonResult(String jsonResult)
+  public void setJsonResult(String jsonResult) {
-    {
     this.jsonResult = jsonResult;
   }
 
-    public Integer getStatus()
+  public Integer getStatus() {
-    {
     return status;
   }
 
-    public void setStatus(Integer status)
+  public void setStatus(Integer status) {
-    {
     this.status = status;
   }
 
-    public String getErrorMsg()
+  public String getErrorMsg() {
-    {
     return errorMsg;
   }
 
-    public void setErrorMsg(String errorMsg)
+  public void setErrorMsg(String errorMsg) {
-    {
     this.errorMsg = errorMsg;
   }
 
-    public Date getOperTime()
+  public Date getOperTime() {
-    {
     return operTime;
   }
 
-    public void setOperTime(Date operTime)
+  public void setOperTime(Date operTime) {
-    {
     this.operTime = operTime;
   }
+
+  public Long getCostTime() {
+    return costTime;
+  }
+
+  public void setCostTime(Long costTime) {
+    this.costTime = costTime;
+  }
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java

@@ -1,20 +1,21 @@
 package com.ruoyi.system.api.domain;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import java.util.Set;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 角色表 sys_role
  *
  * @author ruoyi
  */
-public class SysRole extends BaseEntity
+public class SysRole extends BaseEntity {
-{
   private static final long serialVersionUID = 1L;
 
   /** 角色ID */
@@ -31,7 +32,7 @@ public class SysRole extends BaseEntity
 
   /** 角色排序 */
   @Excel(name = "角色排序")
-    private String roleSort;
+  private Integer roleSort;
 
   /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
   @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
@@ -59,151 +60,132 @@ public class SysRole extends BaseEntity
   /** 部门组（数据权限） */
   private Long[] deptIds;
 
-    public SysRole()
+  /** 角色菜单权限 */
-    {
+  private Set<String> permissions;
 
-    }
+  public SysRole() {}
 
-    public SysRole(Long roleId)
+  public SysRole(Long roleId) {
-    {
     this.roleId = roleId;
   }
 
-    public Long getRoleId()
+  public Long getRoleId() {
-    {
     return roleId;
   }
 
-    public void setRoleId(Long roleId)
+  public void setRoleId(Long roleId) {
-    {
     this.roleId = roleId;
   }
 
-    public boolean isAdmin()
+  public boolean isAdmin() {
-    {
     return isAdmin(this.roleId);
   }
 
-    public static boolean isAdmin(Long roleId)
+  public static boolean isAdmin(Long roleId) {
-    {
     return roleId != null && 1L == roleId;
   }
 
   @NotBlank(message = "角色名称不能为空")
   @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
-    public String getRoleName()
+  public String getRoleName() {
-    {
     return roleName;
   }
 
-    public void setRoleName(String roleName)
+  public void setRoleName(String roleName) {
-    {
     this.roleName = roleName;
   }
 
   @NotBlank(message = "权限字符不能为空")
   @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
-    public String getRoleKey()
+  public String getRoleKey() {
-    {
     return roleKey;
   }
 
-    public void setRoleKey(String roleKey)
+  public void setRoleKey(String roleKey) {
-    {
     this.roleKey = roleKey;
   }
 
-    @NotBlank(message = "显示顺序不能为空")
+  @NotNull(message = "显示顺序不能为空")
-    public String getRoleSort()
+  public Integer getRoleSort() {
-    {
     return roleSort;
   }
 
-    public void setRoleSort(String roleSort)
+  public void setRoleSort(Integer roleSort) {
-    {
     this.roleSort = roleSort;
   }
 
-    public String getDataScope()
+  public String getDataScope() {
-    {
     return dataScope;
   }
 
-    public void setDataScope(String dataScope)
+  public void setDataScope(String dataScope) {
-    {
     this.dataScope = dataScope;
   }
 
-    public boolean isMenuCheckStrictly()
+  public boolean isMenuCheckStrictly() {
-    {
     return menuCheckStrictly;
   }
 
-    public void setMenuCheckStrictly(boolean menuCheckStrictly)
+  public void setMenuCheckStrictly(boolean menuCheckStrictly) {
-    {
     this.menuCheckStrictly = menuCheckStrictly;
   }
 
-    public boolean isDeptCheckStrictly()
+  public boolean isDeptCheckStrictly() {
-    {
     return deptCheckStrictly;
   }
 
-    public void setDeptCheckStrictly(boolean deptCheckStrictly)
+  public void setDeptCheckStrictly(boolean deptCheckStrictly) {
-    {
     this.deptCheckStrictly = deptCheckStrictly;
   }
 
-    public String getStatus()
+  public String getStatus() {
-    {
     return status;
   }
 
-    public void setStatus(String status)
+  public void setStatus(String status) {
-    {
     this.status = status;
   }
 
-    public String getDelFlag()
+  public String getDelFlag() {
-    {
     return delFlag;
   }
 
-    public void setDelFlag(String delFlag)
+  public void setDelFlag(String delFlag) {
-    {
     this.delFlag = delFlag;
   }
 
-    public boolean isFlag()
+  public boolean isFlag() {
-    {
     return flag;
   }
 
-    public void setFlag(boolean flag)
+  public void setFlag(boolean flag) {
-    {
     this.flag = flag;
   }
 
-    public Long[] getMenuIds()
+  public Long[] getMenuIds() {
-    {
     return menuIds;
   }
 
-    public void setMenuIds(Long[] menuIds)
+  public void setMenuIds(Long[] menuIds) {
-    {
     this.menuIds = menuIds;
   }
 
-    public Long[] getDeptIds()
+  public Long[] getDeptIds() {
-    {
     return deptIds;
   }
 
-    public void setDeptIds(Long[] deptIds)
+  public void setDeptIds(Long[] deptIds) {
-    {
     this.deptIds = deptIds;
   }
 
+  public Set<String> getPermissions() {
+    return permissions;
+  }
+
+  public void setPermissions(Set<String> permissions) {
+    this.permissions = permissions;
+  }
+
   @Override
   public String toString() {
     return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -1,30 +1,28 @@
 package com.ruoyi.system.api.domain;
 
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.annotation.Excel.Type;
 import com.ruoyi.common.core.annotation.Excels;
+import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.core.xss.Xss;
+import java.util.Date;
+import java.util.List;
+import javax.validation.constraints.*;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 用户对象 sys_user
  *
  * @author ruoyi
  */
-public class SysUser extends BaseEntity
+public class SysUser extends BaseEntity {
-{
   private static final long serialVersionUID = 1L;
 
   /** 用户ID */
-    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+  @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
   private Long userId;
 
   /** 部门ID */
@@ -44,7 +42,7 @@ public class SysUser extends BaseEntity
   private String email;
 
   /** 手机号码 */
-    @Excel(name = "手机号码")
+  @Excel(name = "手机号码", cellType = ColumnType.TEXT)
   private String phonenumber;
 
   /** 用户性别 */
@@ -57,8 +55,8 @@ public class SysUser extends BaseEntity
   /** 密码 */
   private String password;
 
-    /** 帐号状态（0正常 1停用） */
+  /** 账号状态（0正常 1停用） */
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+  @Excel(name = "账号状态", readConverterExp = "0=正常,1=停用")
   private String status;
 
   /** 删除标志（0代表存在 2代表删除） */
@@ -72,6 +70,9 @@ public class SysUser extends BaseEntity
   @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
   private Date loginDate;
 
+  /** 密码最后更新时间 */
+  private Date pwdUpdateDate;
+
   /** 部门对象 */
   @Excels({
     @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
@@ -91,212 +92,180 @@ public class SysUser extends BaseEntity
   /** 角色ID */
   private Long roleId;
 
-    public SysUser()
+  public SysUser() {}
-    {
 
-    }
+  public SysUser(Long userId) {
-
-    public SysUser(Long userId)
-    {
     this.userId = userId;
   }
 
-    public Long getUserId()
+  public Long getUserId() {
-    {
     return userId;
   }
 
-    public void setUserId(Long userId)
+  public void setUserId(Long userId) {
-    {
     this.userId = userId;
   }
 
-    public boolean isAdmin()
+  public boolean isAdmin() {
-    {
     return isAdmin(this.userId);
   }
 
-    public static boolean isAdmin(Long userId)
+  public static boolean isAdmin(Long userId) {
-    {
+    return UserConstants.isAdmin(userId);
-        return userId != null && 1L == userId;
   }
 
-    public Long getDeptId()
+  public Long getDeptId() {
-    {
     return deptId;
   }
 
-    public void setDeptId(Long deptId)
+  public void setDeptId(Long deptId) {
-    {
     this.deptId = deptId;
   }
 
+  @Xss(message = "用户昵称不能包含脚本字符")
   @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getNickName()
+  public String getNickName() {
-    {
     return nickName;
   }
 
-    public void setNickName(String nickName)
+  public void setNickName(String nickName) {
-    {
     this.nickName = nickName;
   }
 
+  @Xss(message = "用户账号不能包含脚本字符")
   @NotBlank(message = "用户账号不能为空")
   @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
-    public String getUserName()
+  public String getUserName() {
-    {
     return userName;
   }
 
-    public void setUserName(String userName)
+  public void setUserName(String userName) {
-    {
     this.userName = userName;
   }
 
   @Email(message = "邮箱格式不正确")
   @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
+  public String getEmail() {
-    {
     return email;
   }
 
-    public void setEmail(String email)
+  public void setEmail(String email) {
-    {
     this.email = email;
   }
 
   @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
-    public String getPhonenumber()
+  public String getPhonenumber() {
-    {
     return phonenumber;
   }
 
-    public void setPhonenumber(String phonenumber)
+  public void setPhonenumber(String phonenumber) {
-    {
     this.phonenumber = phonenumber;
   }
 
-    public String getSex()
+  public String getSex() {
-    {
     return sex;
   }
 
-    public void setSex(String sex)
+  public void setSex(String sex) {
-    {
     this.sex = sex;
   }
 
-    public String getAvatar()
+  public String getAvatar() {
-    {
     return avatar;
   }
 
-    public void setAvatar(String avatar)
+  public void setAvatar(String avatar) {
-    {
     this.avatar = avatar;
   }
 
-    @JsonProperty
+  public String getPassword() {
-    public String getPassword()
-    {
     return password;
   }
 
-    public void setPassword(String password)
+  public void setPassword(String password) {
-    {
     this.password = password;
   }
 
-    public String getStatus()
+  public String getStatus() {
-    {
     return status;
   }
 
-    public void setStatus(String status)
+  public void setStatus(String status) {
-    {
     this.status = status;
   }
 
-    public String getDelFlag()
+  public String getDelFlag() {
-    {
     return delFlag;
   }
 
-    public void setDelFlag(String delFlag)
+  public void setDelFlag(String delFlag) {
-    {
     this.delFlag = delFlag;
   }
 
-    public String getLoginIp()
+  public String getLoginIp() {
-    {
     return loginIp;
   }
 
-    public void setLoginIp(String loginIp)
+  public void setLoginIp(String loginIp) {
-    {
     this.loginIp = loginIp;
   }
 
-    public Date getLoginDate()
+  public Date getLoginDate() {
-    {
     return loginDate;
   }
 
-    public void setLoginDate(Date loginDate)
+  public void setLoginDate(Date loginDate) {
-    {
     this.loginDate = loginDate;
   }
 
-    public SysDept getDept()
+  public Date getPwdUpdateDate() {
-    {
+    return pwdUpdateDate;
+  }
+
+  public void setPwdUpdateDate(Date pwdUpdateDate) {
+    this.pwdUpdateDate = pwdUpdateDate;
+  }
+
+  public SysDept getDept() {
     return dept;
   }
 
-    public void setDept(SysDept dept)
+  public void setDept(SysDept dept) {
-    {
     this.dept = dept;
   }
 
-    public List<SysRole> getRoles()
+  public List<SysRole> getRoles() {
-    {
     return roles;
   }
 
-    public void setRoles(List<SysRole> roles)
+  public void setRoles(List<SysRole> roles) {
-    {
     this.roles = roles;
   }
 
-    public Long[] getRoleIds()
+  public Long[] getRoleIds() {
-    {
     return roleIds;
   }
 
-    public void setRoleIds(Long[] roleIds)
+  public void setRoleIds(Long[] roleIds) {
-    {
     this.roleIds = roleIds;
   }
 
-    public Long[] getPostIds()
+  public Long[] getPostIds() {
-    {
     return postIds;
   }
 
-    public void setPostIds(Long[] postIds)
+  public void setPostIds(Long[] postIds) {
-    {
     this.postIds = postIds;
   }
 
-    public Long getRoleId()
+  public Long getRoleId() {
-    {
     return roleId;
   }
 
-    public void setRoleId(Long roleId)
+  public void setRoleId(Long roleId) {
-    {
     this.roleId = roleId;
   }
+
   @Override
   public String toString() {
     return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -313,6 +282,7 @@ public class SysUser extends BaseEntity
         .append("delFlag", getDelFlag())
         .append("loginIp", getLoginIp())
         .append("loginDate", getLoginDate())
+        .append("pwdUpdateDate", getPwdUpdateDate())
         .append("createBy", getCreateBy())
         .append("createTime", getCreateTime())
         .append("updateBy", getUpdateBy())

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java

@@ -1,13 +1,13 @@
 package com.ruoyi.system.api.factory;
 
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.RemoteFileService;
+import com.ruoyi.system.api.domain.SysFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteFileService;
-import com.ruoyi.system.api.domain.SysFile;
 
 /**
  * 文件服务降级处理
@@ -15,21 +15,22 @@ import com.ruoyi.system.api.domain.SysFile;
  * @author ruoyi
  */
 @Component
-public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService>
+public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService> {
-{
   private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class);
 
   @Override
-    public RemoteFileService create(Throwable throwable)
+  public RemoteFileService create(Throwable throwable) {
-    {
     log.error("文件服务调用失败:{}", throwable.getMessage());
-        return new RemoteFileService()
+    return new RemoteFileService() {
-        {
       @Override
-            public R<SysFile> upload(MultipartFile file)
+      public R<SysFile> upload(MultipartFile file) {
-            {
         return R.fail("上传文件失败:" + throwable.getMessage());
       }
+
+      @Override
+      public R<Boolean> delete(String fileUrl) {
+        return R.fail("删除文件失败:" + throwable.getMessage());
+      }
     };
   }
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java

@@ -1,13 +1,13 @@
 package com.ruoyi.system.api.factory;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.RemoteLogService;
 import com.ruoyi.system.api.domain.SysLogininfor;
 import com.ruoyi.system.api.domain.SysOperLog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
 
 /**
  * 日志服务降级处理
@@ -15,28 +15,22 @@ import com.ruoyi.system.api.domain.SysOperLog;
  * @author ruoyi
  */
 @Component
-public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService>
+public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService> {
-{
   private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class);
 
   @Override
-    public RemoteLogService create(Throwable throwable)
+  public RemoteLogService create(Throwable throwable) {
-    {
     log.error("日志服务调用失败:{}", throwable.getMessage());
-        return new RemoteLogService()
+    return new RemoteLogService() {
-        {
       @Override
-            public R<Boolean> saveLog(SysOperLog sysOperLog, String source)
+      public R<Boolean> saveLog(SysOperLog sysOperLog, String source) {
-            {
+        return R.fail("保存操作日志失败:" + throwable.getMessage());
-                return null;
       }
 
       @Override
-            public R<Boolean> saveLogininfor(SysLogininfor sysLogininfor, String source)
+      public R<Boolean> saveLogininfor(SysLogininfor sysLogininfor, String source) {
-            {
+        return R.fail("保存登录日志失败:" + throwable.getMessage());
-                return null;
       }
     };
-
   }
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java

@@ -1,13 +1,13 @@
 package com.ruoyi.system.api.factory;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
 
 /**
  * 用户服务降级处理
@@ -15,27 +15,27 @@ import com.ruoyi.system.api.model.LoginUser;
  * @author ruoyi
  */
 @Component
-public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
+public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService> {
-{
   private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
 
   @Override
-    public RemoteUserService create(Throwable throwable)
+  public RemoteUserService create(Throwable throwable) {
-    {
     log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteUserService()
+    return new RemoteUserService() {
-        {
       @Override
-            public R<LoginUser> getUserInfo(String username, String source)
+      public R<LoginUser> getUserInfo(String username, String source) {
-            {
         return R.fail("获取用户失败:" + throwable.getMessage());
       }
 
       @Override
-            public R<Boolean> registerUserInfo(SysUser sysUser, String source)
+      public R<Boolean> registerUserInfo(SysUser sysUser, String source) {
-            {
         return R.fail("注册用户失败:" + throwable.getMessage());
       }
+
+      @Override
+      public R<Boolean> recordUserLogin(SysUser sysUser, String source) {
+        return R.fail("记录用户登录信息失败:" + throwable.getMessage());
+      }
     };
   }
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java

@@ -1,150 +1,113 @@
 package com.ruoyi.system.api.model;
 
+import com.ruoyi.system.api.domain.SysUser;
 import java.io.Serializable;
 import java.util.Set;
-import com.ruoyi.system.api.domain.SysUser;
 
 /**
  * 用户信息
  *
  * @author ruoyi
  */
-public class LoginUser implements Serializable
+public class LoginUser implements Serializable {
-{
   private static final long serialVersionUID = 1L;
 
-    /**
+  /** 用户唯一标识 */
-     * 用户唯一标识
-     */
   private String token;
 
-    /**
+  /** 用户名id */
-     * 用户名id
-     */
   private Long userid;
 
-    /**
+  /** 用户名 */
-     * 用户名
-     */
   private String username;
 
-    /**
+  /** 登录时间 */
-     * 登录时间
-     */
   private Long loginTime;
 
-    /**
+  /** 过期时间 */
-     * 过期时间
-     */
   private Long expireTime;
 
-    /**
+  /** 登录IP地址 */
-     * 登录IP地址
-     */
   private String ipaddr;
 
-    /**
+  /** 权限列表 */
-     * 权限列表
-     */
   private Set<String> permissions;
 
-    /**
+  /** 角色列表 */
-     * 角色列表
-     */
   private Set<String> roles;
 
-    /**
+  /** 用户信息 */
-     * 用户信息
-     */
   private SysUser sysUser;
 
-    public String getToken()
+  public String getToken() {
-    {
     return token;
   }
 
-    public void setToken(String token)
+  public void setToken(String token) {
-    {
     this.token = token;
   }
 
-    public Long getUserid()
+  public Long getUserid() {
-    {
     return userid;
   }
 
-    public void setUserid(Long userid)
+  public void setUserid(Long userid) {
-    {
     this.userid = userid;
   }
 
-    public String getUsername()
+  public String getUsername() {
-    {
     return username;
   }
 
-    public void setUsername(String username)
+  public void setUsername(String username) {
-    {
     this.username = username;
   }
 
-    public Long getLoginTime()
+  public Long getLoginTime() {
-    {
     return loginTime;
   }
 
-    public void setLoginTime(Long loginTime)
+  public void setLoginTime(Long loginTime) {
-    {
     this.loginTime = loginTime;
   }
 
-    public Long getExpireTime()
+  public Long getExpireTime() {
-    {
     return expireTime;
   }
 
-    public void setExpireTime(Long expireTime)
+  public void setExpireTime(Long expireTime) {
-    {
     this.expireTime = expireTime;
   }
 
-    public String getIpaddr()
+  public String getIpaddr() {
-    {
     return ipaddr;
   }
 
-    public void setIpaddr(String ipaddr)
+  public void setIpaddr(String ipaddr) {
-    {
     this.ipaddr = ipaddr;
   }
 
-    public Set<String> getPermissions()
+  public Set<String> getPermissions() {
-    {
     return permissions;
   }
 
-    public void setPermissions(Set<String> permissions)
+  public void setPermissions(Set<String> permissions) {
-    {
     this.permissions = permissions;
   }
 
-    public Set<String> getRoles()
+  public Set<String> getRoles() {
-    {
     return roles;
   }
 
-    public void setRoles(Set<String> roles)
+  public void setRoles(Set<String> roles) {
-    {
     this.roles = roles;
   }
 
-    public SysUser getSysUser()
+  public SysUser getSysUser() {
-    {
     return sysUser;
   }
 
-    public void setSysUser(SysUser sysUser)
+  public void setSysUser(SysUser sysUser) {
-    {
     this.sysUser = sysUser;
   }
 }

ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring.factories

@@ -1,4 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.ruoyi.system.api.factory.RemoteUserFallbackFactory,\
-  com.ruoyi.system.api.factory.RemoteLogFallbackFactory, \
-  com.ruoyi.system.api.factory.RemoteFileFallbackFactory

ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,3 @@
+com.ruoyi.system.api.factory.RemoteUserFallbackFactory
+com.ruoyi.system.api.factory.RemoteLogFallbackFactory
+com.ruoyi.system.api.factory.RemoteFileFallbackFactory

ruoyi-auth/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.3.0</version>
+        <version>3.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java

@@ -1,9 +1,9 @@
 package com.ruoyi.auth;
 
+import com.ruoyi.common.security.annotation.EnableRyFeignClients;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import com.ruoyi.common.security.annotation.EnableRyFeignClients;
 
 /**
  * 认证授权中心
@@ -12,20 +12,19 @@ import com.ruoyi.common.security.annotation.EnableRyFeignClients;
  */
 @EnableRyFeignClients
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-public class RuoYiAuthApplication
+public class RuoYiAuthApplication {
-{
+  public static void main(String[] args) {
-    public static void main(String[] args)
-    {
     SpringApplication.run(RuoYiAuthApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  认证授权中心启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+    System.out.println(
-                " .-------.       ____     __        \n" +
+        "(♥◠‿◠)ﾉﾞ  认证授权中心启动成功   ლ(´ڡ`ლ)ﾞ  \n"
-                " |  _ _   \\      \\   \\   /  /    \n" +
+            + " .-------.       ____     __        \n"
-                " | ( ' )  |       \\  _. /  '       \n" +
+            + " |  _ _   \\      \\   \\   /  /    \n"
-                " |(_ o _) /        _( )_ .'         \n" +
+            + " | ( ' )  |       \\  _. /  '       \n"
-                " | (_,_).' __  ___(_ o _)'          \n" +
+            + " |(_ o _) /        _( )_ .'         \n"
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+            + " | (_,_).' __  ___(_ o _)'          \n"
-                " |  | \\ `'   /|   `-'  /           \n" +
+            + " |  |\\ \\  |  ||   |(_,_)'         \n"
-                " |  |  \\    /  \\      /           \n" +
+            + " |  | \\ `'   /|   `-'  /           \n"
-                " ''-'   `'-'    `-..-'              ");
+            + " |  |  \\    /  \\      /           \n"
+            + " ''-'   `'-'    `-..-'              ");
   }
 }

ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -1,11 +1,5 @@
 package com.ruoyi.auth.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.auth.form.LoginBody;
 import com.ruoyi.auth.form.RegisterBody;
 import com.ruoyi.auth.service.SysLoginService;
@@ -16,6 +10,12 @@ import com.ruoyi.common.security.auth.AuthUtil;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.model.LoginUser;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * token 控制
@@ -23,17 +23,13 @@ import com.ruoyi.system.api.model.LoginUser;
  * @author ruoyi
  */
 @RestController
-public class TokenController
+public class TokenController {
-{
+  @Autowired private TokenService tokenService;
-    @Autowired
-    private TokenService tokenService;
 
-    @Autowired
+  @Autowired private SysLoginService sysLoginService;
-    private SysLoginService sysLoginService;
 
   @PostMapping("login")
-    public R<?> login(@RequestBody LoginBody form)
+  public R<?> login(@RequestBody LoginBody form) {
-    {
     // 用户登录
     LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
     // 获取登录token
@@ -41,11 +37,9 @@ public class TokenController
   }
 
   @DeleteMapping("logout")
-    public R<?> logout(HttpServletRequest request)
+  public R<?> logout(HttpServletRequest request) {
-    {
     String token = SecurityUtils.getToken(request);
-        if (StringUtils.isNotEmpty(token))
+    if (StringUtils.isNotEmpty(token)) {
-        {
       String username = JwtUtils.getUserName(token);
       // 删除用户缓存记录
       AuthUtil.logoutByToken(token);
@@ -56,11 +50,9 @@ public class TokenController
   }
 
   @PostMapping("refresh")
-    public R<?> refresh(HttpServletRequest request)
+  public R<?> refresh(HttpServletRequest request) {
-    {
     LoginUser loginUser = tokenService.getLoginUser(request);
-        if (StringUtils.isNotNull(loginUser))
+    if (StringUtils.isNotNull(loginUser)) {
-        {
       // 刷新令牌有效期
       tokenService.refreshToken(loginUser);
       return R.ok();
@@ -69,8 +61,7 @@ public class TokenController
   }
 
   @PostMapping("register")
-    public R<?> register(@RequestBody RegisterBody registerBody)
+  public R<?> register(@RequestBody RegisterBody registerBody) {
-    {
     // 用户注册
     sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
     return R.ok();

ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java

@@ -5,35 +5,26 @@ package com.ruoyi.auth.form;
  *
  * @author ruoyi
  */
-public class LoginBody
+public class LoginBody {
-{
+  /** 用户名 */
-    /**
-     * 用户名
-     */
   private String username;
 
-    /**
+  /** 用户密码 */
-     * 用户密码
-     */
   private String password;
 
-    public String getUsername()
+  public String getUsername() {
-    {
     return username;
   }
 
-    public void setUsername(String username)
+  public void setUsername(String username) {
-    {
     this.username = username;
   }
 
-    public String getPassword()
+  public String getPassword() {
-    {
     return password;
   }
 
-    public void setPassword(String password)
+  public void setPassword(String password) {
-    {
     this.password = password;
   }
 }

ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java

@@ -5,7 +5,4 @@ package com.ruoyi.auth.form;
  *
  * @author ruoyi
  */
-public class RegisterBody extends LoginBody
+public class RegisterBody extends LoginBody {}
-{
-
-}

ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -1,22 +1,23 @@
 package com.ruoyi.auth.service;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.core.constant.CacheConstants;
-import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.enums.UserStatus;
 import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.ServletUtils;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.ip.IpUtils;
+import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.RemoteLogService;
 import com.ruoyi.system.api.RemoteUserService;
-import com.ruoyi.system.api.domain.SysLogininfor;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * 登录校验方法
@@ -24,96 +25,95 @@ import com.ruoyi.system.api.model.LoginUser;
  * @author ruoyi
  */
 @Component
-public class SysLoginService
+public class SysLoginService {
-{
+  @Autowired private RemoteUserService remoteUserService;
-    @Autowired
-    private RemoteLogService remoteLogService;
 
-    @Autowired
+  @Autowired private SysPasswordService passwordService;
-    private RemoteUserService remoteUserService;
 
-    /**
+  @Autowired private SysRecordLogService recordLogService;
-     * 登录
+
-     */
+  @Autowired private RedisService redisService;
-    public LoginUser login(String username, String password)
+
-    {
+  /** 登录 */
+  public LoginUser login(String username, String password) {
     // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(username, password))
+    if (StringUtils.isAnyBlank(username, password)) {
-        {
+      recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
-            recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
       throw new ServiceException("用户/密码必须填写");
     }
     // 密码如果不在指定范围内 错误
     if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
-                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
+        || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
-        {
+      recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
-            recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
       throw new ServiceException("用户密码不在指定范围");
     }
     // 用户名不在指定范围内 错误
     if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH)
+        || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
-        {
+      recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
-            recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
       throw new ServiceException("用户名不在指定范围");
     }
+    // IP黑名单校验
+    String blackStr =
+        Convert.toStr(redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST));
+    if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr())) {
+      recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "很遗憾，访问IP已被列入系统黑名单");
+      throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
+    }
     // 查询用户信息
     R<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
 
-        if (R.FAIL == userResult.getCode())
+    if (R.FAIL == userResult.getCode()) {
-        {
       throw new ServiceException(userResult.getMsg());
     }
 
-        if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData()))
-        {
-            recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
-            throw new ServiceException("登录用户：" + username + " 不存在");
-        }
     LoginUser userInfo = userResult.getData();
     SysUser user = userResult.getData().getSysUser();
-        if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
+    if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
-        {
+      recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
-            recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
       throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
     }
-        if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
+    if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
-        {
+      recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
-            recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
       throw new ServiceException("对不起，您的账号：" + username + " 已停用");
     }
-        if (!SecurityUtils.matchesPassword(password, user.getPassword()))
+    passwordService.validate(user, password);
-        {
+    recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
-            recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
+    recordLoginInfo(user.getUserId());
-            throw new ServiceException("用户不存在/密码错误");
-        }
-        recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
     return userInfo;
   }
 
-    public void logout(String loginName)
+  /**
-    {
+   * 记录登录信息
-        recordLogininfor(loginName, Constants.LOGOUT, "退出成功");
+   *
+   * @param userId 用户ID
+   */
+  public void recordLoginInfo(Long userId) {
+    SysUser sysUser = new SysUser();
+    sysUser.setUserId(userId);
+    // 更新用户登录IP
+    sysUser.setLoginIp(IpUtils.getIpAddr());
+    // 更新用户登录时间
+    sysUser.setLoginDate(DateUtils.getNowDate());
+    remoteUserService.recordUserLogin(sysUser, SecurityConstants.INNER);
   }
 
-    /**
+  public void logout(String loginName) {
-     * 注册
+    recordLogService.recordLogininfor(loginName, Constants.LOGOUT, "退出成功");
-     */
+  }
-    public void register(String username, String password)
+
-    {
+  /** 注册 */
+  public void register(String username, String password) {
     // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(username, password))
+    if (StringUtils.isAnyBlank(username, password)) {
-        {
       throw new ServiceException("用户/密码必须填写");
     }
     if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH)
+        || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
-        {
       throw new ServiceException("账户长度必须在2到20个字符之间");
     }
     if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
-                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
+        || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
-        {
       throw new ServiceException("密码长度必须在5到20个字符之间");
     }
 
@@ -121,39 +121,13 @@ public class SysLoginService
     SysUser sysUser = new SysUser();
     sysUser.setUserName(username);
     sysUser.setNickName(username);
+    sysUser.setPwdUpdateDate(DateUtils.getNowDate());
     sysUser.setPassword(SecurityUtils.encryptPassword(password));
     R<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
 
-        if (R.FAIL == registerResult.getCode())
+    if (R.FAIL == registerResult.getCode()) {
-        {
       throw new ServiceException(registerResult.getMsg());
     }
-        recordLogininfor(username, Constants.REGISTER, "注册成功");
+    recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功");
-    }
-
-    /**
-     * 记录登录信息
-     * 
-     * @param username 用户名
-     * @param status 状态
-     * @param message 消息内容
-     * @return
-     */
-    public void recordLogininfor(String username, String status, String message)
-    {
-        SysLogininfor logininfor = new SysLogininfor();
-        logininfor.setUserName(username);
-        logininfor.setIpaddr(IpUtils.getIpAddr(ServletUtils.getRequest()));
-        logininfor.setMsg(message);
-        // 日志状态
-        if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER))
-        {
-            logininfor.setStatus("0");
-        }
-        else if (Constants.LOGIN_FAIL.equals(status))
-        {
-            logininfor.setStatus("1");
-        }
-        remoteLogService.saveLogininfor(logininfor, SecurityConstants.INNER);
   }
 }

ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java

@@ -0,0 +1,73 @@
+package com.ruoyi.auth.service;
+
+import com.ruoyi.common.core.constant.CacheConstants;
+import com.ruoyi.common.core.constant.Constants;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysUser;
+import java.util.concurrent.TimeUnit;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 登录密码方法
+ *
+ * @author ruoyi
+ */
+@Component
+public class SysPasswordService {
+  @Autowired private RedisService redisService;
+
+  private int maxRetryCount = CacheConstants.PASSWORD_MAX_RETRY_COUNT;
+
+  private Long lockTime = CacheConstants.PASSWORD_LOCK_TIME;
+
+  @Autowired private SysRecordLogService recordLogService;
+
+  /**
+   * 登录账户密码错误次数缓存键名
+   *
+   * @param username 用户名
+   * @return 缓存键key
+   */
+  private String getCacheKey(String username) {
+    return CacheConstants.PWD_ERR_CNT_KEY + username;
+  }
+
+  public void validate(SysUser user, String password) {
+    String username = user.getUserName();
+
+    Integer retryCount = redisService.getCacheObject(getCacheKey(username));
+
+    if (retryCount == null) {
+      retryCount = 0;
+    }
+
+    if (retryCount >= Integer.valueOf(maxRetryCount).intValue()) {
+      String errMsg = String.format("密码输入错误%s次，帐户锁定%s分钟", maxRetryCount, lockTime);
+      recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, errMsg);
+      throw new ServiceException(errMsg);
+    }
+
+    if (!matches(user, password)) {
+      retryCount = retryCount + 1;
+      recordLogService.recordLogininfor(
+          username, Constants.LOGIN_FAIL, String.format("密码输入错误%s次", retryCount));
+      redisService.setCacheObject(getCacheKey(username), retryCount, lockTime, TimeUnit.MINUTES);
+      throw new ServiceException("用户不存在/密码错误");
+    } else {
+      clearLoginRecordCache(username);
+    }
+  }
+
+  public boolean matches(SysUser user, String rawPassword) {
+    return SecurityUtils.matchesPassword(rawPassword, user.getPassword());
+  }
+
+  public void clearLoginRecordCache(String loginName) {
+    if (redisService.hasKey(getCacheKey(loginName))) {
+      redisService.deleteObject(getCacheKey(loginName));
+    }
+  }
+}

ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java

@@ -0,0 +1,43 @@
+package com.ruoyi.auth.service;
+
+import com.ruoyi.common.core.constant.Constants;
+import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.ip.IpUtils;
+import com.ruoyi.system.api.RemoteLogService;
+import com.ruoyi.system.api.domain.SysLogininfor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 记录日志方法
+ *
+ * @author ruoyi
+ */
+@Component
+public class SysRecordLogService {
+  @Autowired private RemoteLogService remoteLogService;
+
+  /**
+   * 记录登录信息
+   *
+   * @param username 用户名
+   * @param status 状态
+   * @param message 消息内容
+   * @return
+   */
+  public void recordLogininfor(String username, String status, String message) {
+    SysLogininfor logininfor = new SysLogininfor();
+    logininfor.setUserName(username);
+    logininfor.setIpaddr(IpUtils.getIpAddr());
+    logininfor.setMsg(message);
+    // 日志状态
+    if (StringUtils.equalsAny(
+        status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) {
+      logininfor.setStatus(Constants.LOGIN_SUCCESS_STATUS);
+    } else if (Constants.LOGIN_FAIL.equals(status)) {
+      logininfor.setStatus(Constants.LOGIN_FAIL_STATUS);
+    }
+    remoteLogService.saveLogininfor(logininfor, SecurityConstants.INNER);
+  }
+}

ruoyi-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.3.0</version>
+        <version>3.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -12,8 +12,10 @@
         <module>ruoyi-common-log</module>
         <module>ruoyi-common-core</module>
         <module>ruoyi-common-redis</module>
+        <module>ruoyi-common-seata</module>
         <module>ruoyi-common-swagger</module>
         <module>ruoyi-common-security</module>
+        <module>ruoyi-common-sensitive</module>
         <module>ruoyi-common-datascope</module>
         <module>ruoyi-common-datasource</module>
     </modules>

ruoyi-common/ruoyi-common-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.3.0</version>
+        <version>3.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -47,12 +47,6 @@
             <artifactId>transmittable-thread-local</artifactId>
         </dependency>
 
-        <!-- Apache Commons Pool2 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>
-
         <!-- Pagehelper -->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
@@ -73,8 +67,8 @@
 
         <!-- Alibaba Fastjson -->
         <dependency>
-            <groupId>com.alibaba</groupId>
+            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson</artifactId>
+            <artifactId>fastjson2</artifactId>
         </dependency>
 
         <!-- Jwt -->
@@ -101,12 +95,6 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
-        <!-- Commons Fileupload -->
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-
         <!-- excel工具 -->
         <dependency>
             <groupId>org.apache.poi</groupId>
@@ -119,12 +107,6 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
-        <!-- Swagger -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java

@@ -1,11 +1,13 @@
 package com.ruoyi.common.core.annotation;
 
+import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.math.BigDecimal;
-import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
 
 /**
  * 自定义导出Excel数据注解
@@ -14,157 +16,115 @@ import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter;
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
-public @interface Excel
+public @interface Excel {
-{
+  /** 导出时在excel中排序 */
-    /**
-     * 导出时在excel中排序
-     */
   public int sort() default Integer.MAX_VALUE;
 
-    /**
+  /** 导出到Excel中的名字. */
-     * 导出到Excel中的名字.
-     */
   public String name() default "";
 
-    /**
+  /** 日期格式, 如: yyyy-MM-dd */
-     * 日期格式, 如: yyyy-MM-dd
-     */
   public String dateFormat() default "";
 
-    /**
+  /** 读取内容转表达式 (如: 0=男,1=女,2=未知) */
-     * 读取内容转表达式 (如: 0=男,1=女,2=未知)
-     */
   public String readConverterExp() default "";
 
-    /**
+  /** 分隔符，读取字符串组内容 */
-     * 分隔符，读取字符串组内容
-     */
   public String separator() default ",";
 
-    /**
+  /** BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化) */
-     * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
-     */
   public int scale() default -1;
 
-    /**
+  /** BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN */
-     * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
-     */
   public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
 
-    /**
+  /** 导出时在excel中每个列的高度 */
-     * 导出类型（0数字 1字符串）
-     */
-    public ColumnType cellType() default ColumnType.STRING;
-
-    /**
-     * 导出时在excel中每个列的高度 单位为字符
-     */
   public double height() default 14;
 
-    /**
+  /** 导出时在excel中每个列的宽度 */
-     * 导出时在excel中每个列的宽 单位为字符
-     */
   public double width() default 16;
 
-    /**
+  /** 文字后缀,如% 90 变成90% */
-     * 文字后缀,如% 90 变成90%
-     */
   public String suffix() default "";
 
-    /**
+  /** 当值为空时,字段的默认值 */
-     * 当值为空时,字段的默认值
-     */
   public String defaultValue() default "";
 
-    /**
+  /** 提示信息 */
-     * 提示信息
-     */
   public String prompt() default "";
 
-    /**
+  /** 是否允许内容换行 */
-     * 设置只能选择不能输入的列内容.
+  public boolean wrapText() default false;
-     */
+
+  /** 设置只能选择不能输入的列内容. */
   public String[] combo() default {};
 
-    /**
+  /** 是否需要纵向合并单元格,应对需求:含有list集合单元格) */
-     * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
+  public boolean needMerge() default false;
-     */
+
+  /** 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写. */
   public boolean isExport() default true;
 
-    /**
+  /** 另一个类中的属性名称,支持多级获取,以小数点隔开 */
-     * 另一个类中的属性名称,支持多级获取,以小数点隔开
-     */
   public String targetAttr() default "";
 
-    /**
+  /** 是否自动统计数据,在最后追加一行统计数据总和 */
-     * 是否自动统计数据,在最后追加一行统计数据总和
-     */
   public boolean isStatistics() default false;
 
-    /**
+  /** 导出类型（0数字 1字符串） */
-     * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
+  public ColumnType cellType() default ColumnType.STRING;
-     */
-    public Align align() default Align.AUTO;
 
-    /**
+  /** 导出列头背景颜色 */
-     * 自定义数据处理器
+  public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
-     */
+
+  /** 导出列头字体颜色 */
+  public IndexedColors headerColor() default IndexedColors.WHITE;
+
+  /** 导出单元格背景颜色 */
+  public IndexedColors backgroundColor() default IndexedColors.WHITE;
+
+  /** 导出单元格字体颜色 */
+  public IndexedColors color() default IndexedColors.BLACK;
+
+  /** 导出字段对齐方式 */
+  public HorizontalAlignment align() default HorizontalAlignment.CENTER;
+
+  /** 自定义数据处理器 */
   public Class<?> handler() default ExcelHandlerAdapter.class;
 
-    /**
+  /** 自定义数据处理器参数 */
-     * 自定义数据处理器参数
-     */
   public String[] args() default {};
 
-    public enum Align
+  /** 字段类型（0：导出导入；1：仅导出；2：仅导入） */
-    {
-        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
+  public enum Type {
-    {
+    ALL(0),
-        ALL(0), EXPORT(1), IMPORT(2);
+    EXPORT(1),
+    IMPORT(2);
     private final int value;
 
-        Type(int value)
+    Type(int value) {
-        {
       this.value = value;
     }
 
-        public int value()
+    public int value() {
-        {
       return this.value;
     }
   }
 
-    public enum ColumnType
+  public enum ColumnType {
-    {
+    NUMERIC(0),
-        NUMERIC(0), STRING(1), IMAGE(2);
+    STRING(1),
+    IMAGE(2),
+    TEXT(3);
     private final int value;
 
-        ColumnType(int value)
+    ColumnType(int value) {
-        {
       this.value = value;
     }
 
-        public int value()
+    public int value() {
-        {
       return this.value;
     }
   }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java

@@ -12,7 +12,6 @@ import java.lang.annotation.Target;
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Excels
+public @interface Excels {
-{
   Excel[] value();
 }

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

@@ -1,24 +1,38 @@
 package com.ruoyi.common.core.constant;
 
 /**
- * 缓存的key 常量
+ * 缓存常量信息
  *
  * @author ruoyi
  */
-public class CacheConstants
+public class CacheConstants {
-{
+  /** 缓存有效期，默认720（分钟） */
-    /**
+  public static final long EXPIRATION = 720;
-     * 缓存有效期，默认720（分钟）
-     */
-    public final static long EXPIRATION = 720;
 
-    /**
+  /** 缓存刷新时间，默认120（分钟） */
-     * 缓存刷新时间，默认120（分钟）
+  public static final long REFRESH_TIME = 120;
-     */
-    public final static long REFRESH_TIME = 120;
 
-    /**
+  /** 密码最大错误次数 */
-     * 权限缓存前缀
+  public static final int PASSWORD_MAX_RETRY_COUNT = 5;
-     */
+
-    public final static String LOGIN_TOKEN_KEY = "login_tokens:";
+  /** 密码锁定时间，默认10（分钟） */
+  public static final long PASSWORD_LOCK_TIME = 10;
+
+  /** 权限缓存前缀 */
+  public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+
+  /** 验证码 redis key */
+  public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
+
+  /** 参数管理 cache key */
+  public static final String SYS_CONFIG_KEY = "sys_config:";
+
+  /** 字典管理 cache key */
+  public static final String SYS_DICT_KEY = "sys_dict:";
+
+  /** 登录账户密码错误次数 redis key */
+  public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
+
+  /** 登录IP黑名单 cache key */
+  public static final String SYS_LOGIN_BLACKIPLIST = SYS_CONFIG_KEY + "sys.login.blackIPList";
 }

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

@@ -5,117 +5,92 @@ package com.ruoyi.common.core.constant;
  *
  * @author ruoyi
  */
-public class Constants
+public class Constants {
-{
+  /** UTF-8 字符集 */
-    /**
-     * UTF-8 字符集
-     */
   public static final String UTF8 = "UTF-8";
 
-    /**
+  /** GBK 字符集 */
-     * GBK 字符集
-     */
   public static final String GBK = "GBK";
 
-    /**
+  /** www主域 */
-     * RMI 远程方法调用
+  public static final String WWW = "www.";
-     */
-    public static final String LOOKUP_RMI = "rmi://";
 
-    /**
+  /** RMI 远程方法调用 */
-     * LDAP 远程方法调用
+  public static final String LOOKUP_RMI = "rmi:";
-     */
-    public static final String LOOKUP_LDAP = "ldap://";
 
-    /**
+  /** LDAP 远程方法调用 */
-     * http请求
+  public static final String LOOKUP_LDAP = "ldap:";
-     */
+
+  /** LDAPS 远程方法调用 */
+  public static final String LOOKUP_LDAPS = "ldaps:";
+
+  /** http请求 */
   public static final String HTTP = "http://";
 
-    /**
+  /** https请求 */
-     * https请求
-     */
   public static final String HTTPS = "https://";
 
-    /**
+  /** 成功标记 */
-     * 成功标记
-     */
   public static final Integer SUCCESS = 200;
 
-    /**
+  /** 失败标记 */
-     * 失败标记
-     */
   public static final Integer FAIL = 500;
 
-    /**
+  /** 登录成功状态 */
-     * 登录成功
+  public static final String LOGIN_SUCCESS_STATUS = "0";
-     */
+
+  /** 登录失败状态 */
+  public static final String LOGIN_FAIL_STATUS = "1";
+
+  /** 登录成功 */
   public static final String LOGIN_SUCCESS = "Success";
 
-    /**
+  /** 注销 */
-     * 注销
-     */
   public static final String LOGOUT = "Logout";
 
-    /**
+  /** 注册 */
-     * 注册
-     */
   public static final String REGISTER = "Register";
 
-    /**
+  /** 登录失败 */
-     * 登录失败
-     */
   public static final String LOGIN_FAIL = "Error";
 
-    /**
+  /** 所有权限标识 */
-     * 当前记录起始索引
+  public static final String ALL_PERMISSION = "*:*:*";
-     */
+
+  /** 管理员角色权限标识 */
+  public static final String SUPER_ADMIN = "admin";
+
+  /** 当前记录起始索引 */
   public static final String PAGE_NUM = "pageNum";
 
-    /**
+  /** 每页显示记录数 */
-     * 每页显示记录数
-     */
   public static final String PAGE_SIZE = "pageSize";
 
-    /**
+  /** 排序列 */
-     * 排序列
-     */
   public static final String ORDER_BY_COLUMN = "orderByColumn";
 
-    /**
+  /** 排序的方向 "desc" 或者 "asc". */
-     * 排序的方向 "desc" 或者 "asc".
-     */
   public static final String IS_ASC = "isAsc";
 
-    /**
+  /** 验证码有效期（分钟） */
-     * 验证码 redis key
-     */
-    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
-
-    /**
-     * 验证码有效期（分钟）
-     */
   public static final long CAPTCHA_EXPIRATION = 2;
 
-
+  /** 资源映射路径 前缀 */
-    /**
-     * 参数管理 cache key
-     */
-    public static final String SYS_CONFIG_KEY = "sys_config:";
-
-    /**
-     * 字典管理 cache key
-     */
-    public static final String SYS_DICT_KEY = "sys_dict:";
-
-    /**
-     * 资源映射路径 前缀
-     */
   public static final String RESOURCE_PREFIX = "/profile";
 
-    /**
+  /** 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全） */
-     * 定时任务违规的字符
+  public static final String[] JSON_WHITELIST_STR = {"com.ruoyi"};
-     */
+
-    public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
+  /** 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） */
-            "org.springframework.jndi" };
+  public static final String[] JOB_WHITELIST_STR = {"com.ruoyi.job.task"};
+
+  /** 定时任务违规的字符 */
+  public static final String[] JOB_ERROR_STR = {
+    "java.net.URL",
+    "javax.naming.InitialContext",
+    "org.yaml.snakeyaml",
+    "org.springframework",
+    "org.apache",
+    "com.ruoyi.common.core.utils.file"
+  };
 }

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

@@ -5,8 +5,7 @@ package com.ruoyi.common.core.constant;
  *
  * @author ruoyi
  */
-public class GenConstants
+public class GenConstants {
-{
   /** 单表（增删改查） */
   public static final String TPL_CRUD = "crud";
 
@@ -41,22 +40,37 @@ public class GenConstants
   public static final String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
 
   /** 数据库数字类型 */
-    public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
+  public static final String[] COLUMNTYPE_NUMBER = {
-            "bigint", "float", "double", "decimal" };
+    "tinyint",
+    "smallint",
+    "mediumint",
+    "int",
+    "number",
+    "integer",
+    "bit",
+    "bigint",
+    "float",
+    "double",
+    "decimal"
+  };
 
   /** 页面不需要编辑字段 */
   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",
+  public static final String[] COLUMNNAME_NOT_LIST = {
-            "update_time" };
+    "id", "create_by", "create_time", "del_flag", "update_by", "update_time"
+  };
 
   /** 页面不需要查询字段 */
-    public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by",
+  public static final String[] COLUMNNAME_NOT_QUERY = {
-            "update_time", "remark" };
+    "id", "create_by", "create_time", "del_flag", "update_by", "update_time", "remark"
+  };
 
   /** Entity基类字段 */
-    public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
+  public static final String[] BASE_ENTITY = {
+    "createBy", "createTime", "updateBy", "updateTime", "remark"
+  };
 
   /** Tree基类字段 */
   public static final String[] TREE_ENTITY = {"parentName", "parentId", "orderNum", "ancestors"};
@@ -109,6 +123,9 @@ public class GenConstants
   /** 模糊查询 */
   public static final String QUERY_LIKE = "LIKE";
 
+  /** 相等查询 */
+  public static final String QUERY_EQ = "EQ";
+
   /** 需要 */
   public static final String REQUIRE = "1";
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java

@@ -5,85 +5,55 @@ package com.ruoyi.common.core.constant;
  *
  * @author ruoyi
  */
-public class HttpStatus
+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方法 */
-     * 不允许的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;
+
+  /** 系统警告消息 */
+  public static final int WARN = 601;
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java

@@ -5,8 +5,7 @@ package com.ruoyi.common.core.constant;
  *
  * @author ruoyi
  */
-public class ScheduleConstants
+public class ScheduleConstants {
-{
   public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
 
   /** 执行目标key */
@@ -24,26 +23,19 @@ public class ScheduleConstants
   /** 不触发立即执行 */
   public static final String MISFIRE_DO_NOTHING = "3";
 
-    public enum Status
+  public enum Status {
-    {
+    /** 正常 */
-        /**
-         * 正常
-         */
     NORMAL("0"),
-        /**
+    /** 暂停 */
-         * 暂停
-         */
     PAUSE("1");
 
     private String value;
 
-        private Status(String value)
+    private Status(String value) {
-        {
       this.value = value;
     }
 
-        public String getValue()
+    public String getValue() {
-        {
       return value;
     }
   }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java

@@ -5,40 +5,28 @@ package com.ruoyi.common.core.constant;
  *
  * @author ruoyi
  */
-public class SecurityConstants
+public class SecurityConstants {
-{
+  /** 用户ID字段 */
-    /**
-     * 用户ID字段
-     */
   public static final String DETAILS_USER_ID = "user_id";
 
-    /**
+  /** 用户名字段 */
-     * 用户名字段
-     */
   public static final String DETAILS_USERNAME = "username";
 
-    /**
+  /** 授权信息字段 */
-     * 授权信息字段
+  public static final String AUTHORIZATION_HEADER = "Authorization";
-     */
-    public static final String AUTHORIZATION_HEADER = "authorization";
 
-    /**
+  /** 请求来源 */
-     * 请求来源
-     */
   public static final String FROM_SOURCE = "from-source";
 
-    /**
+  /** 内部请求 */
-     * 内部请求
-     */
   public static final String INNER = "inner";
 
-    /**
+  /** 用户标识 */
-     * 用户标识
-     */
   public static final String USER_KEY = "user_key";
 
-    /**
+  /** 登录用户 */
-     * 登录用户
-     */
   public static final String LOGIN_USER = "login_user";
+
+  /** 角色权限 */
+  public static final String ROLE_PERMISSION = "role_permission";
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java

@@ -5,20 +5,13 @@ package com.ruoyi.common.core.constant;
  *
  * @author ruoyi
  */
-public class ServiceNameConstants
+public class ServiceNameConstants {
-{
+  /** 认证服务的serviceid */
-    /**
-     * 认证服务的serviceid
-     */
   public static final String AUTH_SERVICE = "ruoyi-auth";
 
-    /**
+  /** 系统模块的serviceid */
-     * 系统模块的serviceid
-     */
   public static final String SYSTEM_SERVICE = "ruoyi-system";
 
-    /**
+  /** 文件服务的serviceid */
-     * 文件服务的serviceid
-     */
   public static final String FILE_SERVICE = "ruoyi-file";
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java

@@ -5,21 +5,10 @@ package com.ruoyi.common.core.constant;
  *
  * @author ruoyi
  */
-public class TokenConstants
+public class TokenConstants {
-{
+  /** 令牌前缀 */
-    /**
-     * 令牌自定义标识
-     */
-    public static final String AUTHENTICATION = "Authorization";
-
-    /**
-     * 令牌前缀
-     */
   public static final String PREFIX = "Bearer ";
 
-    /**
+  /** 令牌秘钥 */
-     * 令牌秘钥
+  public static final String SECRET = "abcdefghijklmnopqrstuvwxyz";
-     */
-    public final static String SECRET = "abcdefghijklmnopqrstuvwxyz";
-
 }

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

@@ -5,11 +5,8 @@ package com.ruoyi.common.core.constant;
  *
  * @author ruoyi
  */
-public class UserConstants
+public class UserConstants {
-{
+  /** 平台内系统用户的唯一标志 */
-    /**
-     * 平台内系统用户的唯一标志
-     */
   public static final String SYS_USER = "SYS_USER";
 
   /** 正常状态 */
@@ -21,6 +18,9 @@ public class UserConstants
   /** 用户封禁状态 */
   public static final String USER_DISABLE = "1";
 
+  /** 角色正常状态 */
+  public static final String ROLE_NORMAL = "0";
+
   /** 角色封禁状态 */
   public static final String ROLE_DISABLE = "1";
 
@@ -52,30 +52,30 @@ public class UserConstants
   public static final String TYPE_BUTTON = "F";
 
   /** Layout组件标识 */
-    public final static String LAYOUT = "Layout";
+  public static final String LAYOUT = "Layout";
 
   /** ParentView组件标识 */
-    public final static String PARENT_VIEW = "ParentView";
+  public static final String PARENT_VIEW = "ParentView";
 
   /** InnerLink组件标识 */
-    public final static String INNER_LINK = "InnerLink";
+  public static final String INNER_LINK = "InnerLink";
 
-    /** 校验返回结果码 */
+  /** 校验是否唯一的返回标识 */
-    public final static String UNIQUE = "0";
+  public static final boolean UNIQUE = true;
 
-    public final static String NOT_UNIQUE = "1";
+  public static final boolean NOT_UNIQUE = false;
 
-    /**
+  /** 用户名长度限制 */
-     * 用户名长度限制
-     */
   public static final int USERNAME_MIN_LENGTH = 2;
 
   public static final int USERNAME_MAX_LENGTH = 20;
 
-    /**
+  /** 密码长度限制 */
-     * 密码长度限制
-     */
   public static final int PASSWORD_MIN_LENGTH = 5;
 
   public static final int PASSWORD_MAX_LENGTH = 20;
+
+  public static boolean isAdmin(Long userId) {
+    return userId != null && 1L == userId;
+  }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java

@@ -1,88 +1,82 @@
 package com.ruoyi.common.core.context;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import com.alibaba.ttl.TransmittableThreadLocal;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.core.utils.StringUtils;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * 获取当前线程变量中的 用户id、用户名称、Token等信息 
+ * 获取当前线程变量中的 用户id、用户名称、Token等信息 注意： 必须在网关通过请求头的方法传入，同时在HeaderInterceptor拦截器设置值。 否则这里无法获取
- * 注意： 必须在网关通过请求头的方法传入，同时在HeaderInterceptor拦截器设置值。 否则这里无法获取
  *
  * @author ruoyi
  */
-public class SecurityContextHolder
+public class SecurityContextHolder {
-{
+  private static final TransmittableThreadLocal<Map<String, Object>> THREAD_LOCAL =
-    private static final TransmittableThreadLocal<Map<String, Object>> THREAD_LOCAL = new TransmittableThreadLocal<>();
+      new TransmittableThreadLocal<>();
 
-    public static void set(String key, Object value)
+  public static void set(String key, Object value) {
-    {
     Map<String, Object> map = getLocalMap();
     map.put(key, value == null ? StringUtils.EMPTY : value);
   }
 
-    public static String get(String key)
+  public static String get(String key) {
-    {
     Map<String, Object> map = getLocalMap();
     return Convert.toStr(map.getOrDefault(key, StringUtils.EMPTY));
   }
 
-    public static <T> T get(String key, Class<T> clazz)
+  public static <T> T get(String key, Class<T> clazz) {
-    {
     Map<String, Object> map = getLocalMap();
     return StringUtils.cast(map.getOrDefault(key, null));
   }
 
-    public static Map<String, Object> getLocalMap()
+  public static Map<String, Object> getLocalMap() {
-    {
     Map<String, Object> map = THREAD_LOCAL.get();
-        if (map == null)
+    if (map == null) {
-        {
       map = new ConcurrentHashMap<String, Object>();
       THREAD_LOCAL.set(map);
     }
     return map;
   }
 
-    public static void setLocalMap(Map<String, Object> threadLocalMap)
+  public static void setLocalMap(Map<String, Object> threadLocalMap) {
-    {
     THREAD_LOCAL.set(threadLocalMap);
   }
 
-    public static Long getUserId()
+  public static Long getUserId() {
-    {
     return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L);
   }
 
-    public static void setUserId(String account)
+  public static void setUserId(String account) {
-    {
     set(SecurityConstants.DETAILS_USER_ID, account);
   }
 
-    public static String getUserName()
+  public static String getUserName() {
-    {
     return get(SecurityConstants.DETAILS_USERNAME);
   }
 
-    public static void setUserName(String username)
+  public static void setUserName(String username) {
-    {
     set(SecurityConstants.DETAILS_USERNAME, username);
   }
 
-    public static String getUserKey()
+  public static String getUserKey() {
-    {
     return get(SecurityConstants.USER_KEY);
   }
 
-    public static void setUserKey(String userKey)
+  public static void setUserKey(String userKey) {
-    {
     set(SecurityConstants.USER_KEY, userKey);
   }
 
-    public static void remove()
+  public static String getPermission() {
-    {
+    return get(SecurityConstants.ROLE_PERMISSION);
+  }
+
+  public static void setPermission(String permissions) {
+    set(SecurityConstants.ROLE_PERMISSION, permissions);
+  }
+
+  public static void remove() {
     THREAD_LOCAL.remove();
   }
 }

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

@@ -1,15 +1,14 @@
 package com.ruoyi.common.core.domain;
 
-import java.io.Serializable;
 import com.ruoyi.common.core.constant.Constants;
+import java.io.Serializable;
 
 /**
  * 响应信息主体
  *
  * @author ruoyi
  */
-public class R<T> implements Serializable
+public class R<T> implements Serializable {
-{
   private static final long serialVersionUID = 1L;
 
   /** 成功 */
@@ -24,48 +23,39 @@ public class R<T> implements Serializable
 
   private T data;
 
-    public static <T> R<T> ok()
+  public static <T> R<T> ok() {
-    {
     return restResult(null, SUCCESS, null);
   }
 
-    public static <T> R<T> ok(T data)
+  public static <T> R<T> ok(T data) {
-    {
     return restResult(data, SUCCESS, null);
   }
 
-    public static <T> R<T> ok(T data, String msg)
+  public static <T> R<T> ok(T data, String msg) {
-    {
     return restResult(data, SUCCESS, msg);
   }
 
-    public static <T> R<T> fail()
+  public static <T> R<T> fail() {
-    {
     return restResult(null, FAIL, null);
   }
 
-    public static <T> R<T> fail(String msg)
+  public static <T> R<T> fail(String msg) {
-    {
     return restResult(null, FAIL, msg);
   }
 
-    public static <T> R<T> fail(T data)
+  public static <T> R<T> fail(T data) {
-    {
     return restResult(data, FAIL, null);
   }
 
-    public static <T> R<T> fail(T data, String msg)
+  public static <T> R<T> fail(T data, String msg) {
-    {
     return restResult(data, FAIL, msg);
   }
 
-    public static <T> R<T> fail(int code, String msg)
+  public static <T> R<T> fail(int code, String msg) {
-    {
     return restResult(null, code, msg);
   }
 
-    private static <T> R<T> restResult(T data, int code, String msg)
+  private static <T> R<T> restResult(T data, int code, String msg) {
-    {
     R<T> apiResult = new R<>();
     apiResult.setCode(code);
     apiResult.setData(data);
@@ -73,33 +63,35 @@ public class R<T> implements Serializable
     return apiResult;
   }
 
-    public int getCode()
+  public int getCode() {
-    {
     return code;
   }
 
-    public void setCode(int code)
+  public void setCode(int code) {
-    {
     this.code = code;
   }
 
-    public String getMsg()
+  public String getMsg() {
-    {
     return msg;
   }
 
-    public void setMsg(String msg)
+  public void setMsg(String msg) {
-    {
     this.msg = msg;
   }
 
-    public T getData()
+  public T getData() {
-    {
     return data;
   }
 
-    public void setData(T data)
+  public void setData(T data) {
-    {
     this.data = data;
   }
+
+  public static <T> Boolean isError(R<T> ret) {
+    return !isSuccess(ret);
+  }
+
+  public static <T> Boolean isSuccess(R<T> ret) {
+    return R.SUCCESS == ret.getCode();
+  }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java

@@ -5,26 +5,24 @@ package com.ruoyi.common.core.enums;
  *
  * @author ruoyi
  */
-public enum UserStatus
+public enum UserStatus {
-{
+  OK("0", "正常"),
-    OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
+  DISABLE("1", "停用"),
+  DELETED("2", "删除");
 
   private final String code;
   private final String info;
 
-    UserStatus(String code, String info)
+  UserStatus(String code, String info) {
-    {
     this.code = code;
     this.info = info;
   }
 
-    public String getCode()
+  public String getCode() {
-    {
     return code;
   }
 
-    public String getInfo()
+  public String getInfo() {
-    {
     return info;
   }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public class CaptchaException extends RuntimeException
+public class CaptchaException extends RuntimeException {
-{
   private static final long serialVersionUID = 1L;
 
-    public CaptchaException(String msg)
+  public CaptchaException(String msg) {
-    {
     super(msg);
   }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java

@@ -5,27 +5,23 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public class CheckedException extends RuntimeException
+public class CheckedException extends RuntimeException {
-{
   private static final long serialVersionUID = 1L;
 
-    public CheckedException(String message)
+  public CheckedException(String message) {
-    {
     super(message);
   }
 
-    public CheckedException(Throwable cause)
+  public CheckedException(Throwable cause) {
-    {
     super(cause);
   }
 
-    public CheckedException(String message, Throwable cause)
+  public CheckedException(String message, Throwable cause) {
-    {
     super(message, cause);
   }
 
-    public CheckedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace)
+  public CheckedException(
-    {
+      String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
     super(message, cause, enableSuppression, writableStackTrace);
   }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java

@@ -5,11 +5,8 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public class DemoModeException extends RuntimeException
+public class DemoModeException extends RuntimeException {
-{
   private static final long serialVersionUID = 1L;
 
-    public DemoModeException()
+  public DemoModeException() {}
-    {
-    }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java

@@ -5,53 +5,41 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public class GlobalException extends RuntimeException
+public class GlobalException extends RuntimeException {
-{
-
   private static final long serialVersionUID = 1L;
 
-    /**
+  /** 错误提示 */
-     * 错误提示
-     */
   private String message;
 
   /**
    * 错误明细，内部调试错误
    *
-     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
+   * <p>和 {@link CommonResult#getDetailMessage()} 一致的设计
    */
   private String detailMessage;
 
-    /**
+  /** 空构造方法，避免反序列化问题 */
-     * 空构造方法，避免反序列化问题
+  public GlobalException() {}
-     */
-    public GlobalException()
-    {
-    }
 
-    public GlobalException(String message)
+  public GlobalException(String message) {
-    {
     this.message = message;
   }
 
-    public String getDetailMessage()
+  public String getDetailMessage() {
-    {
     return detailMessage;
   }
 
-    public GlobalException setDetailMessage(String detailMessage)
+  public GlobalException setDetailMessage(String detailMessage) {
-    {
     this.detailMessage = detailMessage;
     return this;
   }
 
-    public String getMessage()
+  @Override
-    {
+  public String getMessage() {
     return message;
   }
 
-    public GlobalException setMessage(String message)
+  public GlobalException setMessage(String message) {
-    {
     this.message = message;
     return this;
   }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public class InnerAuthException extends RuntimeException
+public class InnerAuthException extends RuntimeException {
-{
   private static final long serialVersionUID = 1L;
 
-    public InnerAuthException(String message)
+  public InnerAuthException(String message) {
-    {
     super(message);
   }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java

@@ -5,11 +5,8 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public class PreAuthorizeException extends RuntimeException
+public class PreAuthorizeException extends RuntimeException {
-{
   private static final long serialVersionUID = 1L;
 
-    public PreAuthorizeException()
+  public PreAuthorizeException() {}
-    {
-    }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java

@@ -5,68 +5,53 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public final class ServiceException extends RuntimeException
+public final class ServiceException extends RuntimeException {
-{
   private static final long serialVersionUID = 1L;
 
-    /**
+  /** 错误码 */
-     * 错误码
-     */
   private Integer code;
 
-    /**
+  /** 错误提示 */
-     * 错误提示
-     */
   private String message;
 
   /**
    * 错误明细，内部调试错误
    *
-     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
+   * <p>和 {@link CommonResult#getDetailMessage()} 一致的设计
    */
   private String detailMessage;
 
-    /**
+  /** 空构造方法，避免反序列化问题 */
-     * 空构造方法，避免反序列化问题
+  public ServiceException() {}
-     */
-    public ServiceException()
-    {
-    }
 
-    public ServiceException(String message)
+  public ServiceException(String message) {
-    {
     this.message = message;
   }
 
-    public ServiceException(String message, Integer code)
+  public ServiceException(String message, Integer code) {
-    {
     this.message = message;
     this.code = code;
   }
 
-    public String getDetailMessage()
+  public String getDetailMessage() {
-    {
     return detailMessage;
   }
 
-    public String getMessage()
+  @Override
-    {
+  public String getMessage() {
     return message;
   }
 
-    public Integer getCode()
+  public Integer getCode() {
-    {
     return code;
   }
 
-    public ServiceException setMessage(String message)
+  public ServiceException setMessage(String message) {
-    {
     this.message = message;
     return this;
   }
 
-    public ServiceException setDetailMessage(String detailMessage)
+  public ServiceException setDetailMessage(String detailMessage) {
-    {
     this.detailMessage = detailMessage;
     return this;
   }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java

@@ -5,22 +5,18 @@ package com.ruoyi.common.core.exception;
  *
  * @author ruoyi
  */
-public class UtilException extends RuntimeException
+public class UtilException extends RuntimeException {
-{
   private static final long serialVersionUID = 8247610319171014183L;
 
-    public UtilException(Throwable e)
+  public UtilException(Throwable e) {
-    {
     super(e.getMessage(), e);
   }
 
-    public UtilException(String message)
+  public UtilException(String message) {
-    {
     super(message);
   }
 
-    public UtilException(String message, Throwable throwable)
+  public UtilException(String message, Throwable throwable) {
-    {
     super(message, throwable);
   }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.core.exception.auth;
  *
  * @author ruoyi
  */
-public class NotLoginException extends RuntimeException
+public class NotLoginException extends RuntimeException {
-{
   private static final long serialVersionUID = 1L;
 
-    public NotLoginException(String message)
+  public NotLoginException(String message) {
-    {
     super(message);
   }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java

@@ -7,17 +7,14 @@ import org.apache.commons.lang3.StringUtils;
  *
  * @author ruoyi
  */
-public class NotPermissionException extends RuntimeException
+public class NotPermissionException extends RuntimeException {
-{
   private static final long serialVersionUID = 1L;
 
-    public NotPermissionException(String permission)
+  public NotPermissionException(String permission) {
-    {
     super(permission);
   }
 
-    public NotPermissionException(String[] permissions)
+  public NotPermissionException(String[] permissions) {
-    {
     super(StringUtils.join(permissions, ","));
   }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java

@@ -7,17 +7,14 @@ import org.apache.commons.lang3.StringUtils;
  *
  * @author ruoyi
  */
-public class NotRoleException extends RuntimeException
+public class NotRoleException extends RuntimeException {
-{
   private static final long serialVersionUID = 1L;
 
-    public NotRoleException(String role)
+  public NotRoleException(String role) {
-    {
     super(role);
   }
 
-    public NotRoleException(String[] roles)
+  public NotRoleException(String[] roles) {
-    {
     super(StringUtils.join(roles, ","));
   }
 }

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

@@ -5,75 +5,57 @@ package com.ruoyi.common.core.exception.base;
  *
  * @author ruoyi
  */
-public class BaseException extends RuntimeException
+public class BaseException extends RuntimeException {
-{
   private static final long serialVersionUID = 1L;
 
-    /**
+  /** 所属模块 */
-     * 所属模块
-     */
   private String module;
 
-    /**
+  /** 错误码 */
-     * 错误码
-     */
   private String code;
 
-    /**
+  /** 错误码对应的参数 */
-     * 错误码对应的参数
-     */
   private Object[] args;
 
-    /**
+  /** 错误消息 */
-     * 错误消息
-     */
   private String defaultMessage;
 
-    public BaseException(String module, String code, Object[] args, String defaultMessage)
+  public BaseException(String module, String code, Object[] args, String defaultMessage) {
-    {
     this.module = module;
     this.code = code;
     this.args = args;
     this.defaultMessage = defaultMessage;
   }
 
-    public BaseException(String module, String code, Object[] args)
+  public BaseException(String module, String code, Object[] args) {
-    {
     this(module, code, args, null);
   }
 
-    public BaseException(String module, String defaultMessage)
+  public BaseException(String module, String defaultMessage) {
-    {
     this(module, null, null, defaultMessage);
   }
 
-    public BaseException(String code, Object[] args)
+  public BaseException(String code, Object[] args) {
-    {
     this(null, code, args, null);
   }
 
-    public BaseException(String defaultMessage)
+  public BaseException(String defaultMessage) {
-    {
     this(null, null, null, defaultMessage);
   }
 
-    public String getModule()
+  public String getModule() {
-    {
     return module;
   }
 
-    public String getCode()
+  public String getCode() {
-    {
     return code;
   }
 
-    public Object[] getArgs()
+  public Object[] getArgs() {
-    {
     return args;
   }
 
-    public String getDefaultMessage()
+  public String getDefaultMessage() {
-    {
     return defaultMessage;
   }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java

@@ -7,13 +7,10 @@ import com.ruoyi.common.core.exception.base.BaseException;
  *
  * @author ruoyi
  */
-public class FileException extends BaseException
+public class FileException extends BaseException {
-{
   private static final long serialVersionUID = 1L;
 
-    public FileException(String code, Object[] args)
+  public FileException(String code, Object[] args, String msg) {
-    {
+    super("file", code, args, msg);
-        super("file", code, args, null);
   }
-
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java

@@ -5,12 +5,13 @@ package com.ruoyi.common.core.exception.file;
  *
  * @author ruoyi
  */
-public class FileNameLengthLimitExceededException extends FileException
+public class FileNameLengthLimitExceededException extends FileException {
-{
   private static final long serialVersionUID = 1L;
 
-    public FileNameLengthLimitExceededException(int defaultFileNameLength)
+  public FileNameLengthLimitExceededException(int defaultFileNameLength) {
-    {
+    super(
-        super("upload.filename.exceed.length", new Object[] { defaultFileNameLength });
+        "upload.filename.exceed.length",
+        new Object[] {defaultFileNameLength},
+        "the filename is too long");
   }
 }