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,11 +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://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;
-* 阿里云优惠券：[点我领取](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版本。
+* 阿里云优惠券：[点我进入](http://aly.ruoyi.vip)，腾讯云优惠券：[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp;
 
 ## 系统模块
 
@@ -27,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]
@@ -115,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群： [![加入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,12 +1,12 @@
-@echo off
-echo.
-echo [信息] 清理生成路径。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-call mvn clean
-
+@echo off
+echo.
+echo [信息] 清理工程target生成路径。
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean
+
 pause

bin/package.bat

@@ -1,12 +1,12 @@
-@echo off
-echo.
-echo [信息] 打包Web工程，生成war/jar包文件。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-call mvn clean package -Dmaven.test.skip=true
-
+@echo off
+echo.
+echo [信息] 打包Web工程，生成war/jar包文件。
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean package -Dmaven.test.skip=true
+
 pause

bin/run-auth.bat

@@ -1,14 +1,14 @@
-@echo off
-echo.
-echo [信息] 运行auth工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-auth/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% ruoyi-auth.jar
-
-cd bin
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Auth工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-auth/target
+
+set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-auth.jar
+
+cd bin
 pause

bin/run-gateway.bat

@@ -1,14 +1,14 @@
-@echo off
-echo.
-echo [信息] 运行gateway工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-gateway/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% ruoyi-gateway.jar
-
-cd bin
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Gateway工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-gateway/target
+
+set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-gateway.jar
+
+cd bin
 pause

bin/run-modules-file.bat

@@ -1,14 +1,14 @@
-@echo off
-echo.
-echo [信息] 运行modules-file工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-modules/ruoyi-file/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% ruoyi-modules-file.jar
-
-cd bin
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Modules-File工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-modules/ruoyi-file/target
+
+set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-file.jar
+
+cd bin
 pause

bin/run-modules-gen.bat

@@ -1,14 +1,14 @@
-@echo off
-echo.
-echo [信息] 运行modules-gen工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-modules/ruoyi-gen/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% ruoyi-modules-gen.jar
-
-cd bin
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Modules-Gen工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-modules/ruoyi-gen/target
+
+set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-gen.jar
+
+cd bin
 pause

bin/run-modules-job.bat

@@ -1,14 +1,14 @@
-@echo off
-echo.
-echo [信息] 运行modules-job工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-modules/ruoyi-job/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% ruoyi-modules-job.jar
-
-cd bin
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Modules-Job工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-modules/ruoyi-job/target
+
+set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-job.jar
+
+cd bin
 pause

bin/run-modules-system.bat

@@ -1,14 +1,14 @@
-@echo off
-echo.
-echo [信息] 运行modules-system工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-modules/ruoyi-system/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% ruoyi-modules-system.jar
-
-cd bin
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Modules-System工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-modules/ruoyi-system/target
+
+set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-system.jar
+
+cd bin
 pause

bin/run-monitor.bat

@@ -1,14 +1,14 @@
-@echo off
-echo.
-echo [信息] 运行monitor工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-visual/ruoyi-monitor/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% ruoyi-visual-monitor.jar
-
-cd bin
+@echo off
+echo.
+echo [信息] 使用Jar命令运行Monitor工程。
+echo.
+
+cd %~dp0
+cd ../ruoyi-visual/ruoyi-monitor/target
+
+set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-visual-monitor.jar
+
+cd bin
 pause

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

@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# 使用说明，用来提示输入参数
+usage() {
+	echo "Usage: sh 执行脚本.sh [port|base|modules|stop|rm]"
+	exit 1
+}
+
+# 开启所需端口
+port(){
+	firewall-cmd --add-port=80/tcp --permanent
+	firewall-cmd --add-port=8080/tcp --permanent
+	firewall-cmd --add-port=8848/tcp --permanent
+	firewall-cmd --add-port=9848/tcp --permanent
+	firewall-cmd --add-port=9849/tcp --permanent
+	firewall-cmd --add-port=6379/tcp --permanent
+	firewall-cmd --add-port=3306/tcp --permanent
+	firewall-cmd --add-port=9100/tcp --permanent
+	firewall-cmd --add-port=9200/tcp --permanent
+	firewall-cmd --add-port=9201/tcp --permanent
+	firewall-cmd --add-port=9202/tcp --permanent
+	firewall-cmd --add-port=9203/tcp --permanent
+	firewall-cmd --add-port=9300/tcp --permanent
+	service firewalld restart
+}
+
+# 启动基础环境（必须）
+base(){
+	docker-compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos
+}
+
+# 启动程序模块（必须）
+modules(){
+	docker-compose up -d ruoyi-nginx ruoyi-gateway ruoyi-auth ruoyi-modules-system
+}
+
+# 关闭所有环境/模块
+stop(){
+	docker-compose stop
+}
+
+# 删除所有环境/模块
+rm(){
+	docker-compose rm
+}
+
+# 根据输入参数，选择执行对应方法，不输入则执行使用说明
+case "$1" in
+"port")
+	port
+;;
+"base")
+	base
+;;
+"modules")
+	modules
+;;
+"stop")
+	stop
+;;
+"rm")
+	rm
+;;
+*)
+	usage
+;;
+esac

docker/docker-compose.yml

@@ -0,0 +1,140 @@
+version : '3.8'
+services:
+  ruoyi-nacos:
+    container_name: ruoyi-nacos
+    image: nacos/nacos-server
+    build:
+      context: ./nacos
+    environment:
+      - MODE=standalone
+    volumes:
+      - ./nacos/logs/:/home/nacos/logs
+      - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
+    ports:
+      - "8848:8848"
+      - "9848:9848"
+      - "9849:9849"
+    depends_on:
+      - ruoyi-mysql
+  ruoyi-mysql:
+    container_name: ruoyi-mysql
+    image: mysql:5.7
+    build:
+      context: ./mysql
+    ports:
+      - "3306:3306"
+    volumes:
+      - ./mysql/conf:/etc/mysql/conf.d
+      - ./mysql/logs:/logs
+      - ./mysql/data:/var/lib/mysql
+    command: [
+          'mysqld',
+          '--innodb-buffer-pool-size=80M',
+          '--character-set-server=utf8mb4',
+          '--collation-server=utf8mb4_unicode_ci',
+          '--default-time-zone=+8:00',
+          '--lower-case-table-names=1'
+        ]
+    environment:
+      MYSQL_DATABASE: 'ry-cloud'
+      MYSQL_ROOT_PASSWORD: password
+  ruoyi-redis:
+    container_name: ruoyi-redis
+    image: redis
+    build:
+      context: ./redis
+    ports:
+      - "6379:6379"
+    volumes:
+      - ./redis/conf/redis.conf:/home/ruoyi/redis/redis.conf
+      - ./redis/data:/data
+    command: redis-server /home/ruoyi/redis/redis.conf
+  ruoyi-nginx:
+    container_name: ruoyi-nginx
+    image: nginx
+    build:
+      context: ./nginx
+    ports:
+      - "80:80"
+    volumes:
+      - ./nginx/html/dist:/home/ruoyi/projects/ruoyi-ui
+      - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx/logs:/var/log/nginx
+      - ./nginx/conf.d:/etc/nginx/conf.d
+    depends_on:
+      - ruoyi-gateway
+    links:
+      - ruoyi-gateway
+  ruoyi-gateway:
+    container_name: ruoyi-gateway
+    build:
+      context: ./ruoyi/gateway
+      dockerfile: ruoyi/gateway/Dockerfile
+    ports:
+      - "8080:8080"
+    depends_on:
+      - ruoyi-redis
+    links:
+      - ruoyi-redis
+  ruoyi-auth:
+    container_name: ruoyi-auth
+    build:
+      context: ./ruoyi/auth
+      dockerfile: ruoyi/auth/Dockerfile
+    ports:
+      - "9200:9200"
+    depends_on:
+      - ruoyi-redis
+    links:
+      - ruoyi-redis
+  ruoyi-modules-system:
+    container_name: ruoyi-modules-system
+    build:
+      context: ./ruoyi/modules/system
+      dockerfile: ruoyi/modules/system/Dockerfile
+    ports:
+      - "9201:9201"
+    depends_on:
+      - ruoyi-redis
+      - ruoyi-mysql
+    links:
+      - ruoyi-redis
+      - ruoyi-mysql
+  ruoyi-modules-gen:
+    container_name: ruoyi-modules-gen
+    build:
+      context: ./ruoyi/modules/gen
+      dockerfile: ruoyi/modules/gen/Dockerfile
+    ports:
+      - "9202:9202"
+    depends_on:
+      - ruoyi-mysql
+    links:
+      - ruoyi-mysql
+  ruoyi-modules-job:
+    container_name: ruoyi-modules-job
+    build:
+      context: ./ruoyi/modules/job
+      dockerfile: ruoyi/modules/job/Dockerfile
+    ports:
+      - "9203:9203"
+    depends_on:
+      - ruoyi-mysql
+    links:
+      - ruoyi-mysql
+  ruoyi-modules-file:
+    container_name: ruoyi-modules-file
+    build:
+      context: ./ruoyi/modules/file
+      dockerfile: ruoyi/modules/file/Dockerfile
+    ports:
+      - "9300:9300"
+    volumes:
+    - ./ruoyi/uploadPath:/home/ruoyi/uploadPath
+  ruoyi-visual-monitor:
+    container_name: ruoyi-visual-monitor
+    build:
+      context: ./ruoyi/visual/monitor
+      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

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

docker/nacos/Dockerfile

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

docker/nacos/conf/application.properties

@@ -0,0 +1,32 @@
+spring.datasource.platform=mysql
+db.num=1
+db.url.0=jdbc:mysql://ruoyi-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
+db.user=root
+db.password=password
+
+nacos.naming.empty-service.auto-clean=true
+nacos.naming.empty-service.clean.initial-delay-ms=50000
+nacos.naming.empty-service.clean.period-time-ms=30000
+
+management.endpoints.web.exposure.include=*
+
+management.metrics.export.elastic.enabled=false
+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=/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/**
+
+nacos.core.auth.system.type=nacos
+nacos.core.auth.enabled=false
+nacos.core.auth.default.token.expire.seconds=18000
+nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
+nacos.core.auth.caching.enabled=true
+nacos.core.auth.enable.userAgentAuthWhite=false
+nacos.core.auth.server.identity.key=serverIdentity
+nacos.core.auth.server.identity.value=security
+
+nacos.istio.mcp.server.enabled=false

docker/nginx/Dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM nginx
+# author
+LABEL org.opencontainers.image.authors="ruoyi"
+
+# 挂载目录
+VOLUME /home/ruoyi/projects/ruoyi-ui
+# 创建目录
+RUN mkdir -p /home/ruoyi/projects/ruoyi-ui
+# 指定路径
+WORKDIR /home/ruoyi/projects/ruoyi-ui
+# 复制conf文件到路径
+COPY ./conf/nginx.conf /etc/nginx/nginx.conf
+# 复制html文件到路径
+COPY ./html/dist /home/ruoyi/projects/ruoyi-ui

docker/nginx/conf/nginx.conf

@@ -0,0 +1,41 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        location / {
+            root   /home/ruoyi/projects/ruoyi-ui;
+            try_files $uri $uri/ /index.html;
+            index  index.html index.htm;
+        }
+
+        location /prod-api/{
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header REMOTE-HOST $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            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;
+        }
+    }
+}

docker/nginx/html/dist/readme.txt

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

docker/redis/Dockerfile

@@ -0,0 +1,13 @@
+# 基础镜像
+FROM redis
+# author
+LABEL org.opencontainers.image.authors="ruoyi"
+
+# 挂载目录
+VOLUME /home/ruoyi/redis
+# 创建目录
+RUN mkdir -p /home/ruoyi/redis
+# 指定路径
+WORKDIR /home/ruoyi/redis
+# 复制conf文件到路径
+COPY ./conf/redis.conf /home/ruoyi/redis/redis.conf

docker/redis/conf/redis.conf

@@ -0,0 +1 @@
+# requirepass 123456

docker/ruoyi/auth/Dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+LABEL org.opencontainers.image.authors="ruoyi"
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-auth.jar /home/ruoyi/ruoyi-auth.jar
+# 启动认证服务
+ENTRYPOINT ["java","-jar","ruoyi-auth.jar"]

docker/ruoyi/auth/jar/readme.txt

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

docker/ruoyi/gateway/Dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+LABEL org.opencontainers.image.authors="ruoyi"
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-gateway.jar /home/ruoyi/ruoyi-gateway.jar
+# 启动网关服务
+ENTRYPOINT ["java","-jar","ruoyi-gateway.jar"]

docker/ruoyi/gateway/jar/readme.txt

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

docker/ruoyi/modules/file/Dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+LABEL org.opencontainers.image.authors="ruoyi"
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-modules-file.jar /home/ruoyi/ruoyi-modules-file.jar
+# 启动文件服务
+ENTRYPOINT ["java","-jar","ruoyi-modules-file.jar"]

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

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

docker/ruoyi/modules/gen/Dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+LABEL org.opencontainers.image.authors="ruoyi"
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-modules-gen.jar /home/ruoyi/ruoyi-modules-gen.jar
+# 启动代码生成服务
+ENTRYPOINT ["java","-jar","ruoyi-modules-gen.jar"]

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

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

docker/ruoyi/modules/job/Dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+LABEL org.opencontainers.image.authors="ruoyi"
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-modules-job.jar /home/ruoyi/ruoyi-modules-job.jar
+# 启动定时任务服务
+ENTRYPOINT ["java","-jar","ruoyi-modules-job.jar"]

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

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

docker/ruoyi/modules/system/Dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+LABEL org.opencontainers.image.authors="ruoyi"
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-modules-system.jar /home/ruoyi/ruoyi-modules-system.jar
+# 启动系统服务
+ENTRYPOINT ["java","-jar","ruoyi-modules-system.jar"]

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

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

docker/ruoyi/visual/monitor/Dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+LABEL org.opencontainers.image.authors="ruoyi"
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-visual-monitor.jar /home/ruoyi/ruoyi-visual-monitor.jar
+# 启动系统服务
+ENTRYPOINT ["java","-jar","ruoyi-visual-monitor.jar"]

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

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

pom.xml

@@ -2,247 +2,373 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.ruoyi</groupId>
-    <artifactId>ruoyi</artifactId>
-    <version>2.5.0</version>
+  <groupId>com.ruoyi</groupId>
+  <artifactId>ruoyi</artifactId>
+  <version>3.6.6</version>
 
-    <name>ruoyi</name>
-    <url>http://www.ruoyi.vip</url>
-    <description>若依微服务系统</description>
+  <name>ruoyi</name>
+  <url>http://www.ruoyi.vip</url>
+  <description>若依微服务系统</description>
 
-    <properties>
-        <ruoyi.version>2.5.0</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.3.7.RELEASE</spring-boot.version>
-        <spring-cloud.version>Hoxton.SR9</spring-cloud.version>
-        <spring-cloud-alibaba.version>2.2.5.RELEASE</spring-cloud-alibaba.version>
-		<spring-boot-admin.version>2.3.1</spring-boot-admin.version>
-        <spring-boot.mybatis>2.1.3</spring-boot.mybatis>
-        <swagger.fox.version>2.9.2</swagger.fox.version>
-        <swagger.core.version>1.5.24</swagger.core.version>
-        <tobato.version>1.26.5</tobato.version>
-        <kaptcha.version>2.3.2</kaptcha.version>
-        <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
-        <druid.version>1.2.4</druid.version>
-        <dynamic-ds.version>3.2.1</dynamic-ds.version>
-        <commons.io.version>2.5</commons.io.version>
-        <commons.fileupload.version>1.3.3</commons.fileupload.version>
-        <velocity.version>1.7</velocity.version>
-        <fastjson.version>1.2.75</fastjson.version>
-        <minio.version>8.0.3</minio.version>
-		<poi.version>4.1.2</poi.version>
-        <common-pool.version>2.6.2</common-pool.version>
-    </properties>
-
-    <!-- 依赖声明 -->
-    <dependencyManagement>
-        <dependencies>
-
-            <!-- SpringCloud 微服务 -->
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-			<!-- SpringCloud Alibaba 微服务 -->
-            <dependency>
-                <groupId>com.alibaba.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>${spring-cloud-alibaba.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- SpringBoot 依赖配置 -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-			
-            <!--  SpringBoot 监控客户端 -->
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-starter-client</artifactId>
-                <version>${spring-boot-admin.version}</version>
-            </dependency>
-			
-            <!-- FastDFS 分布式文件系统 -->
-            <dependency>
-                <groupId>com.github.tobato</groupId>
-                <artifactId>fastdfs-client</artifactId>
-                <version>${tobato.version}</version>
-            </dependency>
-			
-            <!-- Mybatis 依赖配置 -->
-            <dependency>
-                <groupId>org.mybatis.spring.boot</groupId>
-                <artifactId>mybatis-spring-boot-starter</artifactId>
-                <version>${spring-boot.mybatis}</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>
-                <artifactId>kaptcha</artifactId>
-                <version>${kaptcha.version}</version>
-            </dependency>
-
-            <!-- pagehelper 分页插件 -->
-            <dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>${pagehelper.boot.version}</version>
-            </dependency>
-
-            <!-- io常用工具类 -->
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>${commons.io.version}</version>
-            </dependency>
-
-            <!-- excel工具 -->
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-ooxml</artifactId>
-                <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>
-                <artifactId>velocity</artifactId>
-                <version>${velocity.version}</version>
-            </dependency>
-
-            <!-- JSON 解析器和生成器 -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>${fastjson.version}</version>
-            </dependency>
-            
-            <!-- 公共资源池 -->
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-pool2</artifactId>
-                <version>${common-pool.version}</version>
-            </dependency>
-
-            <!-- 核心模块 -->
-	        <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-core</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-			
-            <!-- 接口模块 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-swagger</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-	        
-            <!-- 安全模块 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-security</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-	        
-            <!-- 权限范围 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-datascope</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-            
-            <!-- 多数据源 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-datasource</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-			
-            <!-- 日志记录 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-log</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-			
-            <!-- 缓存服务 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-redis</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-			
-            <!-- 系统接口 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-api-system</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-			
-        </dependencies>
-    </dependencyManagement>
-
-    <modules>
-		<module>ruoyi-auth</module>
-		<module>ruoyi-gateway</module>
-		<module>ruoyi-visual</module>
-		<module>ruoyi-modules</module>
-		<module>ruoyi-api</module>
-		<module>ruoyi-common</module>
-    </modules>
-    <packaging>pom</packaging>
+  <properties>
+    <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.7.18</spring-boot.version>
+    <spring-cloud.version>2021.0.9</spring-cloud.version>
+    <spring-cloud-alibaba.version>2021.0.6.1</spring-cloud-alibaba.version>
+    <spring-boot-admin.version>2.7.16</spring-boot-admin.version>
+    <tobato.version>1.27.2</tobato.version>
+    <kaptcha.version>2.3.3</kaptcha.version>
+    <pagehelper.boot.version>2.0.0</pagehelper.boot.version>
+    <druid.version>1.2.23</druid.version>
+    <dynamic-ds.version>4.3.1</dynamic-ds.version>
+    <commons.io.version>2.19.0</commons.io.version>
+    <velocity.version>2.3</velocity.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>
+    <springdoc.version>1.6.9</springdoc.version>
+    <transmittable-thread-local.version>2.14.4</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>
+        <artifactId>spring-cloud-dependencies</artifactId>
+        <version>${spring-cloud.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
+      <!-- SpringCloud Alibaba 微服务 -->
+      <dependency>
+        <groupId>com.alibaba.cloud</groupId>
+        <artifactId>spring-cloud-alibaba-dependencies</artifactId>
+        <version>${spring-cloud-alibaba.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
+      <!-- SpringBoot 依赖配置 -->
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${spring-boot.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
+      <!-- 覆盖logback的依赖配置-->
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+        <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 分布式文件系统 -->
+      <dependency>
+        <groupId>com.github.tobato</groupId>
+        <artifactId>fastdfs-client</artifactId>
+        <version>${tobato.version}</version>
+      </dependency>
+
+      <!-- Springdoc webmvc 依赖配置 -->
+      <dependency>
+        <groupId>org.springdoc</groupId>
+        <artifactId>springdoc-openapi-ui</artifactId>
+        <version>${springdoc.version}</version>
+      </dependency>
+
+      <!-- 验证码 -->
+      <dependency>
+        <groupId>pro.fessional</groupId>
+        <artifactId>kaptcha</artifactId>
+        <version>${kaptcha.version}</version>
+      </dependency>
+
+      <!-- pagehelper 分页插件 -->
+      <dependency>
+        <groupId>com.github.pagehelper</groupId>
+        <artifactId>pagehelper-spring-boot-starter</artifactId>
+        <version>${pagehelper.boot.version}</version>
+      </dependency>
+
+      <!-- io常用工具类 -->
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>${commons.io.version}</version>
+      </dependency>
+
+      <!-- excel工具 -->
+      <dependency>
+        <groupId>org.apache.poi</groupId>
+        <artifactId>poi-ooxml</artifactId>
+        <version>${poi.version}</version>
+      </dependency>
+
+      <!-- 代码生成使用模板 -->
+      <dependency>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity-engine-core</artifactId>
+        <version>${velocity.version}</version>
+      </dependency>
+
+      <!-- JSON 解析器和生成器 -->
+      <dependency>
+        <groupId>com.alibaba.fastjson2</groupId>
+        <artifactId>fastjson2</artifactId>
+        <version>${fastjson.version}</version>
+      </dependency>
+
+      <!-- JWT -->
+      <dependency>
+        <groupId>io.jsonwebtoken</groupId>
+        <artifactId>jjwt</artifactId>
+        <version>${jjwt.version}</version>
+      </dependency>
+
+      <!-- 线程传递值 -->
+      <dependency>
+        <groupId>com.alibaba</groupId>
+        <artifactId>transmittable-thread-local</artifactId>
+        <version>${transmittable-thread-local.version}</version>
+      </dependency>
+
+      <!-- 核心模块 -->
+      <dependency>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common-core</artifactId>
+        <version>${ruoyi.version}</version>
+      </dependency>
+
+      <!-- 接口模块 -->
+      <dependency>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common-swagger</artifactId>
+        <version>${ruoyi.version}</version>
+      </dependency>
+
+      <!-- 安全模块 -->
+      <dependency>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common-security</artifactId>
+        <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>
+        <artifactId>ruoyi-common-datascope</artifactId>
+        <version>${ruoyi.version}</version>
+      </dependency>
+
+      <!-- 多数据源 -->
+      <dependency>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common-datasource</artifactId>
+        <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>
+        <artifactId>ruoyi-common-log</artifactId>
+        <version>${ruoyi.version}</version>
+      </dependency>
+
+      <!-- 缓存服务 -->
+      <dependency>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common-redis</artifactId>
+        <version>${ruoyi.version}</version>
+      </dependency>
+
+      <!-- 系统接口 -->
+      <dependency>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-api-system</artifactId>
+        <version>${ruoyi.version}</version>
+      </dependency>
+
     </dependencies>
+  </dependencyManagement>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <modules>
+    <module>ruoyi-auth</module>
+    <module>ruoyi-gateway</module>
+    <module>ruoyi-visual</module>
+    <module>ruoyi-modules</module>
+    <module>ruoyi-api</module>
+    <module>ruoyi-common</module>
+  </modules>
+  <packaging>pom</packaging>
 
-</project>
+  <dependencies>
+    <!-- bootstrap 启动器 -->
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-bootstrap</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
+          <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>2.5.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>2.5.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,29 +1,42 @@
 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)
-public interface RemoteFileService
-{
-    /**
-     * 上传文件
-     *
-     * @param file 文件信息
-     * @return 结果
-     */
-    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public R<SysFile> upload(@RequestPart(value = "file") MultipartFile file);
+@FeignClient(
+    contextId = "remoteFileService",
+    value = ServiceNameConstants.FILE_SERVICE,
+    fallbackFactory = RemoteFileFallbackFactory.class)
+public interface RemoteFileService {
+  /**
+   * 上传文件
+   *
+   * @param file 文件信息
+   * @return 结果
+   */
+  @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,40 +1,48 @@
 package com.ruoyi.system.api;
 
+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.RequestParam;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.SysOperLog;
-import com.ruoyi.system.api.factory.RemoteLogFallbackFactory;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 /**
  * 日志服务
- * 
+ *
  * @author ruoyi
  */
-@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class)
-public interface RemoteLogService
-{
-    /**
-     * 保存系统日志
-     *
-     * @param sysOperLog 日志实体
-     * @return 结果
-     */
-    @PostMapping("/operlog")
-    R<Boolean> saveLog(@RequestBody SysOperLog sysOperLog);
+@FeignClient(
+    contextId = "remoteLogService",
+    value = ServiceNameConstants.SYSTEM_SERVICE,
+    fallbackFactory = RemoteLogFallbackFactory.class)
+public interface RemoteLogService {
+  /**
+   * 保存系统日志
+   *
+   * @param sysOperLog 日志实体
+   * @param source 请求来源
+   * @return 结果
+   */
+  @PostMapping("/operlog")
+  public R<Boolean> saveLog(
+      @RequestBody SysOperLog sysOperLog,
+      @RequestHeader(SecurityConstants.FROM_SOURCE) String source)
+      throws Exception;
 
-    /**
-     * 保存访问记录
-     *
-     * @param username 用户名称
-     * @param status 状态
-     * @param message 消息
-     * @return 结果
-     */
-    @PostMapping("/logininfor")
-    R<Boolean> saveLogininfor(@RequestParam("username") String username, @RequestParam("status") String status,
-            @RequestParam("message") String message);
+  /**
+   * 保存访问记录
+   *
+   * @param sysLogininfor 访问实体
+   * @param source 请求来源
+   * @return 结果
+   */
+  @PostMapping("/logininfor")
+  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,27 +1,60 @@
 package com.ruoyi.system.api;
 
+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 com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
-import com.ruoyi.system.api.model.LoginUser;
+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)
-public interface RemoteUserService
-{
-    /**
-     * 通过用户名查询用户信息
-     *
-     * @param username 用户名
-     * @return 结果
-     */
-    @GetMapping(value = "/user/info/{username}")
-    public R<LoginUser> getUserInfo(@PathVariable("username") String username);
+@FeignClient(
+    contextId = "remoteUserService",
+    value = ServiceNameConstants.SYSTEM_SERVICE,
+    fallbackFactory = RemoteUserFallbackFactory.class)
+public interface RemoteUserService {
+  /**
+   * 通过用户名查询用户信息
+   *
+   * @param username 用户名
+   * @param source 请求来源
+   * @return 结果
+   */
+  @GetMapping("/user/info/{username}")
+  public R<LoginUser> getUserInfo(
+      @PathVariable("username") String username,
+      @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+  /**
+   * 注册用户信息
+   *
+   * @param sysUser 用户信息
+   * @param source 请求来源
+   * @return 结果
+   */
+  @PostMapping("/user/register")
+  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,202 +1,178 @@
 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
-{
-    private static final long serialVersionUID = 1L;
+public class SysDept extends BaseEntity {
+  private static final long serialVersionUID = 1L;
 
-    /** 部门ID */
-    private Long deptId;
+  /** 部门ID */
+  private Long deptId;
 
-    /** 父部门ID */
-    private Long parentId;
+  /** 父部门ID */
+  private Long parentId;
 
-    /** 祖级列表 */
-    private String ancestors;
+  /** 祖级列表 */
+  private String ancestors;
 
-    /** 部门名称 */
-    private String deptName;
+  /** 部门名称 */
+  private String deptName;
 
-    /** 显示顺序 */
-    private String orderNum;
+  /** 显示顺序 */
+  private Integer orderNum;
 
-    /** 负责人 */
-    private String leader;
+  /** 负责人 */
+  private String leader;
 
-    /** 联系电话 */
-    private String phone;
+  /** 联系电话 */
+  private String phone;
 
-    /** 邮箱 */
-    private String email;
+  /** 邮箱 */
+  private String email;
 
-    /** 部门状态:0正常,1停用 */
-    private String status;
+  /** 部门状态:0正常,1停用 */
+  private String status;
 
-    /** 删除标志（0代表存在 2代表删除） */
-    private String delFlag;
+  /** 删除标志（0代表存在 2代表删除） */
+  private String delFlag;
 
-    /** 父部门名称 */
-    private String parentName;
-    
-    /** 子部门 */
-    private List<SysDept> children = new ArrayList<SysDept>();
+  /** 父部门名称 */
+  private String parentName;
 
-    public Long getDeptId()
-    {
-        return deptId;
-    }
+  /** 子部门 */
+  private List<SysDept> children = new ArrayList<SysDept>();
 
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
-    }
+  public Long getDeptId() {
+    return deptId;
+  }
 
-    public Long getParentId()
-    {
-        return parentId;
-    }
+  public void setDeptId(Long deptId) {
+    this.deptId = deptId;
+  }
 
-    public void setParentId(Long parentId)
-    {
-        this.parentId = parentId;
-    }
+  public Long getParentId() {
+    return parentId;
+  }
 
-    public String getAncestors()
-    {
-        return ancestors;
-    }
+  public void setParentId(Long parentId) {
+    this.parentId = parentId;
+  }
 
-    public void setAncestors(String ancestors)
-    {
-        this.ancestors = ancestors;
-    }
+  public String getAncestors() {
+    return ancestors;
+  }
 
-    @NotBlank(message = "部门名称不能为空")
-    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
-    public String getDeptName()
-    {
-        return deptName;
-    }
+  public void setAncestors(String ancestors) {
+    this.ancestors = ancestors;
+  }
 
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
+  @NotBlank(message = "部门名称不能为空")
+  @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
+  public String getDeptName() {
+    return deptName;
+  }
 
-    @NotBlank(message = "显示顺序不能为空")
-    public String getOrderNum()
-    {
-        return orderNum;
-    }
+  public void setDeptName(String deptName) {
+    this.deptName = deptName;
+  }
 
-    public void setOrderNum(String orderNum)
-    {
-        this.orderNum = orderNum;
-    }
+  @NotNull(message = "显示顺序不能为空")
+  public Integer getOrderNum() {
+    return orderNum;
+  }
 
-    public String getLeader()
-    {
-        return leader;
-    }
+  public void setOrderNum(Integer orderNum) {
+    this.orderNum = orderNum;
+  }
 
-    public void setLeader(String leader)
-    {
-        this.leader = leader;
-    }
+  public String getLeader() {
+    return leader;
+  }
 
-    @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
-    public String getPhone()
-    {
-        return phone;
-    }
+  public void setLeader(String leader) {
+    this.leader = leader;
+  }
 
-    public void setPhone(String phone)
-    {
-        this.phone = phone;
-    }
+  @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
+  public String getPhone() {
+    return phone;
+  }
 
-    @Email(message = "邮箱格式不正确")
-    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
-    {
-        return email;
-    }
+  public void setPhone(String phone) {
+    this.phone = phone;
+  }
 
-    public void setEmail(String email)
-    {
-        this.email = email;
-    }
+  @Email(message = "邮箱格式不正确")
+  @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+  public String getEmail() {
+    return email;
+  }
 
-    public String getStatus()
-    {
-        return status;
-    }
+  public void setEmail(String email) {
+    this.email = email;
+  }
 
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
+  public String getStatus() {
+    return status;
+  }
 
-    public String getDelFlag()
-    {
-        return delFlag;
-    }
+  public void setStatus(String status) {
+    this.status = status;
+  }
 
-    public void setDelFlag(String delFlag)
-    {
-        this.delFlag = delFlag;
-    }
+  public String getDelFlag() {
+    return delFlag;
+  }
 
-    public String getParentName()
-    {
-        return parentName;
-    }
+  public void setDelFlag(String delFlag) {
+    this.delFlag = delFlag;
+  }
 
-    public void setParentName(String parentName)
-    {
-        this.parentName = parentName;
-    }
+  public String getParentName() {
+    return parentName;
+  }
 
-    public List<SysDept> getChildren()
-    {
-        return children;
-    }
+  public void setParentName(String parentName) {
+    this.parentName = parentName;
+  }
 
-    public void setChildren(List<SysDept> children)
-    {
-        this.children = children;
-    }
+  public List<SysDept> getChildren() {
+    return children;
+  }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("deptId", getDeptId())
-            .append("parentId", getParentId())
-            .append("ancestors", getAncestors())
-            .append("deptName", getDeptName())
-            .append("orderNum", getOrderNum())
-            .append("leader", getLeader())
-            .append("phone", getPhone())
-            .append("email", getEmail())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
+  public void setChildren(List<SysDept> children) {
+    this.children = children;
+  }
+
+  @Override
+  public String toString() {
+    return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+        .append("deptId", getDeptId())
+        .append("parentId", getParentId())
+        .append("ancestors", getAncestors())
+        .append("deptName", getDeptName())
+        .append("orderNum", getOrderNum())
+        .append("leader", getLeader())
+        .append("phone", getPhone())
+        .append("email", getEmail())
+        .append("status", getStatus())
+        .append("delFlag", getDelFlag())
+        .append("createBy", getCreateBy())
+        .append("createTime", getCreateTime())
+        .append("updateBy", getUpdateBy())
+        .append("updateTime", getUpdateTime())
+        .toString();
+  }
 }

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

@@ -0,0 +1,156 @@
+package com.ruoyi.system.api.domain;
+
+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 {
+  private static final long serialVersionUID = 1L;
+
+  /** 字典编码 */
+  @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
+  private Long dictCode;
+
+  /** 字典排序 */
+  @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
+  private Long dictSort;
+
+  /** 字典标签 */
+  @Excel(name = "字典标签")
+  private String dictLabel;
+
+  /** 字典键值 */
+  @Excel(name = "字典键值")
+  private String dictValue;
+
+  /** 字典类型 */
+  @Excel(name = "字典类型")
+  private String dictType;
+
+  /** 样式属性（其他样式扩展） */
+  private String cssClass;
+
+  /** 表格字典样式 */
+  private String listClass;
+
+  /** 是否默认（Y是 N否） */
+  @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
+  private String isDefault;
+
+  /** 状态（0正常 1停用） */
+  @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+  private String status;
+
+  public Long getDictCode() {
+    return dictCode;
+  }
+
+  public void setDictCode(Long dictCode) {
+    this.dictCode = dictCode;
+  }
+
+  public Long getDictSort() {
+    return dictSort;
+  }
+
+  public void setDictSort(Long dictSort) {
+    this.dictSort = dictSort;
+  }
+
+  @NotBlank(message = "字典标签不能为空")
+  @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
+  public String getDictLabel() {
+    return dictLabel;
+  }
+
+  public void setDictLabel(String dictLabel) {
+    this.dictLabel = dictLabel;
+  }
+
+  @NotBlank(message = "字典键值不能为空")
+  @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
+  public String getDictValue() {
+    return dictValue;
+  }
+
+  public void setDictValue(String dictValue) {
+    this.dictValue = dictValue;
+  }
+
+  @NotBlank(message = "字典类型不能为空")
+  @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
+  public String getDictType() {
+    return dictType;
+  }
+
+  public void setDictType(String dictType) {
+    this.dictType = dictType;
+  }
+
+  @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
+  public String getCssClass() {
+    return cssClass;
+  }
+
+  public void setCssClass(String cssClass) {
+    this.cssClass = cssClass;
+  }
+
+  public String getListClass() {
+    return listClass;
+  }
+
+  public void setListClass(String listClass) {
+    this.listClass = listClass;
+  }
+
+  public boolean getDefault() {
+    return UserConstants.YES.equals(this.isDefault);
+  }
+
+  public String getIsDefault() {
+    return isDefault;
+  }
+
+  public void setIsDefault(String isDefault) {
+    this.isDefault = isDefault;
+  }
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  @Override
+  public String toString() {
+    return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+        .append("dictCode", getDictCode())
+        .append("dictSort", getDictSort())
+        .append("dictLabel", getDictLabel())
+        .append("dictValue", getDictValue())
+        .append("dictType", getDictType())
+        .append("cssClass", getCssClass())
+        .append("listClass", getListClass())
+        .append("isDefault", getIsDefault())
+        .append("status", getStatus())
+        .append("createBy", getCreateBy())
+        .append("createTime", getCreateTime())
+        .append("updateBy", getUpdateBy())
+        .append("updateTime", getUpdateTime())
+        .append("remark", getRemark())
+        .toString();
+  }
+}

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

@@ -0,0 +1,87 @@
+package com.ruoyi.system.api.domain;
+
+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 {
+  private static final long serialVersionUID = 1L;
+
+  /** 字典主键 */
+  @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
+  private Long dictId;
+
+  /** 字典名称 */
+  @Excel(name = "字典名称")
+  private String dictName;
+
+  /** 字典类型 */
+  @Excel(name = "字典类型")
+  private String dictType;
+
+  /** 状态（0正常 1停用） */
+  @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+  private String status;
+
+  public Long getDictId() {
+    return dictId;
+  }
+
+  public void setDictId(Long dictId) {
+    this.dictId = dictId;
+  }
+
+  @NotBlank(message = "字典名称不能为空")
+  @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
+  public String getDictName() {
+    return dictName;
+  }
+
+  public void setDictName(String dictName) {
+    this.dictName = dictName;
+  }
+
+  @NotBlank(message = "字典类型不能为空")
+  @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
+  @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
+  public String getDictType() {
+    return dictType;
+  }
+
+  public void setDictType(String dictType) {
+    this.dictType = dictType;
+  }
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  @Override
+  public String toString() {
+    return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+        .append("dictId", getDictId())
+        .append("dictName", getDictName())
+        .append("dictType", getDictType())
+        .append("status", getStatus())
+        .append("createBy", getCreateBy())
+        .append("createTime", getCreateTime())
+        .append("updateBy", getUpdateBy())
+        .append("updateTime", getUpdateTime())
+        .append("remark", getRemark())
+        .toString();
+  }
+}

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

@@ -5,46 +5,37 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 文件信息
- * 
+ *
  * @author ruoyi
  */
-public class SysFile
-{
-    /**
-     * 文件名称
-     */
-    private String name;
+public class SysFile {
+  /** 文件名称 */
+  private String name;
 
-    /**
-     * 文件地址
-     */
-    private String url;
+  /** 文件地址 */
+  private String url;
 
-    public String getName()
-    {
-        return name;
-    }
+  public String getName() {
+    return name;
+  }
 
-    public void setName(String name)
-    {
-        this.name = name;
-    }
+  public void setName(String name) {
+    this.name = name;
+  }
 
-    public String getUrl()
-    {
-        return url;
-    }
+  public String getUrl() {
+    return url;
+  }
 
-    public void setUrl(String url)
-    {
-        this.url = url;
-    }
+  public void setUrl(String url) {
+    this.url = url;
+  }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("name", getName())
-            .append("url", getUrl())
-            .toString();
-    }
+  @Override
+  public String toString() {
+    return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+        .append("name", getName())
+        .append("url", getUrl())
+        .toString();
+  }
 }

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

@@ -0,0 +1,89 @@
+package com.ruoyi.system.api.domain;
+
+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 {
+  private static final long serialVersionUID = 1L;
+
+  /** ID */
+  @Excel(name = "序号", cellType = ColumnType.NUMERIC)
+  private Long infoId;
+
+  /** 用户账号 */
+  @Excel(name = "用户账号")
+  private String userName;
+
+  /** 状态 0成功 1失败 */
+  @Excel(name = "状态", readConverterExp = "0=成功,1=失败")
+  private String status;
+
+  /** 地址 */
+  @Excel(name = "地址")
+  private String ipaddr;
+
+  /** 描述 */
+  @Excel(name = "描述")
+  private String msg;
+
+  /** 访问时间 */
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+  private Date accessTime;
+
+  public Long getInfoId() {
+    return infoId;
+  }
+
+  public void setInfoId(Long infoId) {
+    this.infoId = infoId;
+  }
+
+  public String getUserName() {
+    return userName;
+  }
+
+  public void setUserName(String userName) {
+    this.userName = userName;
+  }
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  public String getIpaddr() {
+    return ipaddr;
+  }
+
+  public void setIpaddr(String ipaddr) {
+    this.ipaddr = ipaddr;
+  }
+
+  public String getMsg() {
+    return msg;
+  }
+
+  public void setMsg(String msg) {
+    this.msg = msg;
+  }
+
+  public Date getAccessTime() {
+    return 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,241 +1,220 @@
 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
-{
-    private static final long serialVersionUID = 1L;
+public class SysOperLog extends BaseEntity {
+  private static final long serialVersionUID = 1L;
 
-    /** 日志主键 */
-    @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
-    private Long operId;
+  /** 日志主键 */
+  @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
+  private Long operId;
 
-    /** 操作模块 */
-    @Excel(name = "操作模块")
-    private String title;
+  /** 操作模块 */
+  @Excel(name = "操作模块")
+  private String title;
 
-    /** 业务类型（0其它 1新增 2修改 3删除） */
-    @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
-    private Integer businessType;
+  /** 业务类型（0其它 1新增 2修改 3删除） */
+  @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
+  private Integer businessType;
 
-    /** 业务类型数组 */
-    private Integer[] businessTypes;
+  /** 业务类型数组 */
+  private Integer[] businessTypes;
 
-    /** 请求方法 */
-    @Excel(name = "请求方法")
-    private String method;
+  /** 请求方法 */
+  @Excel(name = "请求方法")
+  private String method;
 
-    /** 请求方式 */
-    @Excel(name = "请求方式")
-    private String requestMethod;
+  /** 请求方式 */
+  @Excel(name = "请求方式")
+  private String requestMethod;
 
-    /** 操作类别（0其它 1后台用户 2手机端用户） */
-    @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
-    private Integer operatorType;
+  /** 操作类别（0其它 1后台用户 2手机端用户） */
+  @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
+  private Integer operatorType;
 
-    /** 操作人员 */
-    @Excel(name = "操作人员")
-    private String operName;
+  /** 操作人员 */
+  @Excel(name = "操作人员")
+  private String operName;
 
-    /** 部门名称 */
-    @Excel(name = "部门名称")
-    private String deptName;
+  /** 部门名称 */
+  @Excel(name = "部门名称")
+  private String deptName;
 
-    /** 请求url */
-    @Excel(name = "请求地址")
-    private String operUrl;
+  /** 请求url */
+  @Excel(name = "请求地址")
+  private String operUrl;
 
-    /** 操作地址 */
-    @Excel(name = "操作地址")
-    private String operIp;
+  /** 操作地址 */
+  @Excel(name = "操作地址")
+  private String operIp;
 
-    /** 请求参数 */
-    @Excel(name = "请求参数")
-    private String operParam;
+  /** 请求参数 */
+  @Excel(name = "请求参数")
+  private String operParam;
 
-    /** 返回参数 */
-    @Excel(name = "返回参数")
-    private String jsonResult;
+  /** 返回参数 */
+  @Excel(name = "返回参数")
+  private String jsonResult;
 
-    /** 操作状态（0正常 1异常） */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
-    private Integer status;
+  /** 操作状态（0正常 1异常） */
+  @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
+  private Integer status;
 
-    /** 错误消息 */
-    @Excel(name = "错误消息")
-    private String errorMsg;
+  /** 错误消息 */
+  @Excel(name = "错误消息")
+  private String errorMsg;
 
-    /** 操作时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date operTime;
+  /** 操作时间 */
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+  private Date operTime;
 
-    public Long getOperId()
-    {
-        return operId;
-    }
+  /** 消耗时间 */
+  @Excel(name = "消耗时间", suffix = "毫秒")
+  private Long costTime;
 
-    public void setOperId(Long operId)
-    {
-        this.operId = operId;
-    }
+  public Long getOperId() {
+    return operId;
+  }
 
-    public String getTitle()
-    {
-        return title;
-    }
+  public void setOperId(Long operId) {
+    this.operId = operId;
+  }
 
-    public void setTitle(String title)
-    {
-        this.title = title;
-    }
+  public String getTitle() {
+    return title;
+  }
 
-    public Integer getBusinessType()
-    {
-        return businessType;
-    }
+  public void setTitle(String title) {
+    this.title = title;
+  }
 
-    public void setBusinessType(Integer businessType)
-    {
-        this.businessType = businessType;
-    }
+  public Integer getBusinessType() {
+    return businessType;
+  }
 
-    public Integer[] getBusinessTypes()
-    {
-        return businessTypes;
-    }
+  public void setBusinessType(Integer businessType) {
+    this.businessType = businessType;
+  }
 
-    public void setBusinessTypes(Integer[] businessTypes)
-    {
-        this.businessTypes = businessTypes;
-    }
+  public Integer[] getBusinessTypes() {
+    return businessTypes;
+  }
 
-    public String getMethod()
-    {
-        return method;
-    }
+  public void setBusinessTypes(Integer[] businessTypes) {
+    this.businessTypes = businessTypes;
+  }
 
-    public void setMethod(String method)
-    {
-        this.method = method;
-    }
+  public String getMethod() {
+    return method;
+  }
 
-    public String getRequestMethod()
-    {
-        return requestMethod;
-    }
+  public void setMethod(String method) {
+    this.method = method;
+  }
 
-    public void setRequestMethod(String requestMethod)
-    {
-        this.requestMethod = requestMethod;
-    }
+  public String getRequestMethod() {
+    return requestMethod;
+  }
 
-    public Integer getOperatorType()
-    {
-        return operatorType;
-    }
+  public void setRequestMethod(String requestMethod) {
+    this.requestMethod = requestMethod;
+  }
 
-    public void setOperatorType(Integer operatorType)
-    {
-        this.operatorType = operatorType;
-    }
+  public Integer getOperatorType() {
+    return operatorType;
+  }
 
-    public String getOperName()
-    {
-        return operName;
-    }
+  public void setOperatorType(Integer operatorType) {
+    this.operatorType = operatorType;
+  }
 
-    public void setOperName(String operName)
-    {
-        this.operName = operName;
-    }
+  public String getOperName() {
+    return operName;
+  }
 
-    public String getDeptName()
-    {
-        return deptName;
-    }
+  public void setOperName(String operName) {
+    this.operName = operName;
+  }
 
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
+  public String getDeptName() {
+    return deptName;
+  }
 
-    public String getOperUrl()
-    {
-        return operUrl;
-    }
+  public void setDeptName(String deptName) {
+    this.deptName = deptName;
+  }
 
-    public void setOperUrl(String operUrl)
-    {
-        this.operUrl = operUrl;
-    }
+  public String getOperUrl() {
+    return operUrl;
+  }
 
-    public String getOperIp()
-    {
-        return operIp;
-    }
+  public void setOperUrl(String operUrl) {
+    this.operUrl = operUrl;
+  }
 
-    public void setOperIp(String operIp)
-    {
-        this.operIp = operIp;
-    }
+  public String getOperIp() {
+    return operIp;
+  }
 
-    public String getOperParam()
-    {
-        return operParam;
-    }
+  public void setOperIp(String operIp) {
+    this.operIp = operIp;
+  }
 
-    public void setOperParam(String operParam)
-    {
-        this.operParam = operParam;
-    }
+  public String getOperParam() {
+    return operParam;
+  }
 
-    public String getJsonResult()
-    {
-        return jsonResult;
-    }
+  public void setOperParam(String operParam) {
+    this.operParam = operParam;
+  }
 
-    public void setJsonResult(String jsonResult)
-    {
-        this.jsonResult = jsonResult;
-    }
+  public String getJsonResult() {
+    return jsonResult;
+  }
 
-    public Integer getStatus()
-    {
-        return status;
-    }
+  public void setJsonResult(String jsonResult) {
+    this.jsonResult = jsonResult;
+  }
 
-    public void setStatus(Integer status)
-    {
-        this.status = status;
-    }
+  public Integer getStatus() {
+    return status;
+  }
 
-    public String getErrorMsg()
-    {
-        return errorMsg;
-    }
+  public void setStatus(Integer status) {
+    this.status = status;
+  }
 
-    public void setErrorMsg(String errorMsg)
-    {
-        this.errorMsg = errorMsg;
-    }
+  public String getErrorMsg() {
+    return errorMsg;
+  }
 
-    public Date getOperTime()
-    {
-        return operTime;
-    }
+  public void setErrorMsg(String errorMsg) {
+    this.errorMsg = errorMsg;
+  }
 
-    public void setOperTime(Date operTime)
-    {
-        this.operTime = operTime;
-    }
+  public Date getOperTime() {
+    return 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,225 +1,208 @@
 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
-{
-    private static final long serialVersionUID = 1L;
+public class SysRole extends BaseEntity {
+  private static final long serialVersionUID = 1L;
 
-    /** 角色ID */
-    @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
-    private Long roleId;
+  /** 角色ID */
+  @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
+  private Long roleId;
 
-    /** 角色名称 */
-    @Excel(name = "角色名称")
-    private String roleName;
+  /** 角色名称 */
+  @Excel(name = "角色名称")
+  private String roleName;
 
-    /** 角色权限 */
-    @Excel(name = "角色权限")
-    private String roleKey;
+  /** 角色权限 */
+  @Excel(name = "角色权限")
+  private String roleKey;
 
-    /** 角色排序 */
-    @Excel(name = "角色排序")
-    private String roleSort;
+  /** 角色排序 */
+  @Excel(name = "角色排序")
+  private Integer roleSort;
 
-    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */
-    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限")
-    private String dataScope;
+  /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
+  @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
+  private String dataScope;
 
-    /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
-    private boolean menuCheckStrictly;
+  /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
+  private boolean menuCheckStrictly;
 
-    /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
-    private boolean deptCheckStrictly;
+  /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
+  private boolean deptCheckStrictly;
 
-    /** 角色状态（0正常 1停用） */
-    @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
-    private String status;
+  /** 角色状态（0正常 1停用） */
+  @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
+  private String status;
 
-    /** 删除标志（0代表存在 2代表删除） */
-    private String delFlag;
+  /** 删除标志（0代表存在 2代表删除） */
+  private String delFlag;
 
-    /** 用户是否存在此角色标识 默认不存在 */
-    private boolean flag = false;
+  /** 用户是否存在此角色标识 默认不存在 */
+  private boolean flag = false;
 
-    /** 菜单组 */
-    private Long[] menuIds;
+  /** 菜单组 */
+  private Long[] menuIds;
 
-    /** 部门组（数据权限） */
-    private Long[] deptIds;
+  /** 部门组（数据权限） */
+  private Long[] deptIds;
 
-    public SysRole()
-    {
+  /** 角色菜单权限 */
+  private Set<String> permissions;
 
-    }
+  public SysRole() {}
 
-    public SysRole(Long roleId)
-    {
-        this.roleId = roleId;
-    }
+  public SysRole(Long roleId) {
+    this.roleId = roleId;
+  }
 
-    public Long getRoleId()
-    {
-        return roleId;
-    }
+  public Long getRoleId() {
+    return roleId;
+  }
 
-    public void setRoleId(Long roleId)
-    {
-        this.roleId = roleId;
-    }
+  public void setRoleId(Long roleId) {
+    this.roleId = roleId;
+  }
 
-    public boolean isAdmin()
-    {
-        return isAdmin(this.roleId);
-    }
+  public boolean isAdmin() {
+    return isAdmin(this.roleId);
+  }
 
-    public static boolean isAdmin(Long roleId)
-    {
-        return roleId != null && 1L == roleId;
-    }
+  public static boolean isAdmin(Long roleId) {
+    return roleId != null && 1L == roleId;
+  }
 
-    @NotBlank(message = "角色名称不能为空")
-    @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
-    public String getRoleName()
-    {
-        return roleName;
-    }
+  @NotBlank(message = "角色名称不能为空")
+  @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
+  public String getRoleName() {
+    return roleName;
+  }
 
-    public void setRoleName(String roleName)
-    {
-        this.roleName = roleName;
-    }
+  public void setRoleName(String roleName) {
+    this.roleName = roleName;
+  }
 
-    @NotBlank(message = "权限字符不能为空")
-    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
-    public String getRoleKey()
-    {
-        return roleKey;
-    }
+  @NotBlank(message = "权限字符不能为空")
+  @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
+  public String getRoleKey() {
+    return roleKey;
+  }
 
-    public void setRoleKey(String roleKey)
-    {
-        this.roleKey = roleKey;
-    }
+  public void setRoleKey(String roleKey) {
+    this.roleKey = roleKey;
+  }
 
-    @NotBlank(message = "显示顺序不能为空")
-    public String getRoleSort()
-    {
-        return roleSort;
-    }
+  @NotNull(message = "显示顺序不能为空")
+  public Integer getRoleSort() {
+    return roleSort;
+  }
 
-    public void setRoleSort(String roleSort)
-    {
-        this.roleSort = roleSort;
-    }
+  public void setRoleSort(Integer roleSort) {
+    this.roleSort = roleSort;
+  }
 
-    public String getDataScope()
-    {
-        return dataScope;
-    }
+  public String getDataScope() {
+    return dataScope;
+  }
 
-    public void setDataScope(String dataScope)
-    {
-        this.dataScope = dataScope;
-    }
+  public void setDataScope(String dataScope) {
+    this.dataScope = dataScope;
+  }
 
-    public boolean isMenuCheckStrictly()
-    {
-        return menuCheckStrictly;
-    }
+  public boolean isMenuCheckStrictly() {
+    return menuCheckStrictly;
+  }
 
-    public void setMenuCheckStrictly(boolean menuCheckStrictly)
-    {
-        this.menuCheckStrictly = menuCheckStrictly;
-    }
+  public void setMenuCheckStrictly(boolean menuCheckStrictly) {
+    this.menuCheckStrictly = menuCheckStrictly;
+  }
 
-    public boolean isDeptCheckStrictly()
-    {
-        return deptCheckStrictly;
-    }
+  public boolean isDeptCheckStrictly() {
+    return deptCheckStrictly;
+  }
 
-    public void setDeptCheckStrictly(boolean deptCheckStrictly)
-    {
-        this.deptCheckStrictly = deptCheckStrictly;
-    }
+  public void setDeptCheckStrictly(boolean deptCheckStrictly) {
+    this.deptCheckStrictly = deptCheckStrictly;
+  }
 
-    public String getStatus()
-    {
-        return status;
-    }
+  public String getStatus() {
+    return status;
+  }
 
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
+  public void setStatus(String status) {
+    this.status = status;
+  }
 
-    public String getDelFlag()
-    {
-        return delFlag;
-    }
+  public String getDelFlag() {
+    return delFlag;
+  }
 
-    public void setDelFlag(String delFlag)
-    {
-        this.delFlag = delFlag;
-    }
+  public void setDelFlag(String delFlag) {
+    this.delFlag = delFlag;
+  }
 
-    public boolean isFlag()
-    {
-        return flag;
-    }
+  public boolean isFlag() {
+    return flag;
+  }
 
-    public void setFlag(boolean flag)
-    {
-        this.flag = flag;
-    }
+  public void setFlag(boolean flag) {
+    this.flag = flag;
+  }
 
-    public Long[] getMenuIds()
-    {
-        return menuIds;
-    }
+  public Long[] getMenuIds() {
+    return menuIds;
+  }
 
-    public void setMenuIds(Long[] menuIds)
-    {
-        this.menuIds = menuIds;
-    }
+  public void setMenuIds(Long[] menuIds) {
+    this.menuIds = menuIds;
+  }
 
-    public Long[] getDeptIds()
-    {
-        return deptIds;
-    }
+  public Long[] getDeptIds() {
+    return deptIds;
+  }
 
-    public void setDeptIds(Long[] deptIds)
-    {
-        this.deptIds = deptIds;
-    }
-    
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("roleId", getRoleId())
-            .append("roleName", getRoleName())
-            .append("roleKey", getRoleKey())
-            .append("roleSort", getRoleSort())
-            .append("dataScope", getDataScope())
-            .append("menuCheckStrictly", isMenuCheckStrictly())
-            .append("deptCheckStrictly", isDeptCheckStrictly())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
+  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)
+        .append("roleId", getRoleId())
+        .append("roleName", getRoleName())
+        .append("roleKey", getRoleKey())
+        .append("roleSort", getRoleSort())
+        .append("dataScope", getDataScope())
+        .append("menuCheckStrictly", isMenuCheckStrictly())
+        .append("deptCheckStrictly", isDeptCheckStrictly())
+        .append("status", getStatus())
+        .append("delFlag", getDelFlag())
+        .append("createBy", getCreateBy())
+        .append("createTime", getCreateTime())
+        .append("updateBy", getUpdateBy())
+        .append("updateTime", getUpdateTime())
+        .append("remark", getRemark())
+        .toString();
+  }
 }

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

@@ -1,326 +1,294 @@
 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
-{
-    private static final long serialVersionUID = 1L;
+public class SysUser extends BaseEntity {
+  private static final long serialVersionUID = 1L;
 
-    /** 用户ID */
-    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
-    private Long userId;
+  /** 用户ID */
+  @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
+  private Long userId;
 
-    /** 部门ID */
-    @Excel(name = "部门编号", type = Type.IMPORT)
-    private Long deptId;
+  /** 部门ID */
+  @Excel(name = "部门编号", type = Type.IMPORT)
+  private Long deptId;
 
-    /** 用户账号 */
-    @Excel(name = "登录名称")
-    private String userName;
+  /** 用户账号 */
+  @Excel(name = "登录名称")
+  private String userName;
 
-    /** 用户昵称 */
-    @Excel(name = "用户名称")
-    private String nickName;
+  /** 用户昵称 */
+  @Excel(name = "用户名称")
+  private String nickName;
 
-    /** 用户邮箱 */
-    @Excel(name = "用户邮箱")
-    private String email;
+  /** 用户邮箱 */
+  @Excel(name = "用户邮箱")
+  private String email;
 
-    /** 手机号码 */
-    @Excel(name = "手机号码")
-    private String phonenumber;
+  /** 手机号码 */
+  @Excel(name = "手机号码", cellType = ColumnType.TEXT)
+  private String phonenumber;
 
-    /** 用户性别 */
-    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
-    private String sex;
+  /** 用户性别 */
+  @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+  private String sex;
 
-    /** 用户头像 */
-    private String avatar;
+  /** 用户头像 */
+  private String avatar;
 
-    /** 密码 */
-    private String password;
+  /** 密码 */
+  private String password;
 
-    /** 盐加密 */
-    private String salt;
+  /** 账号状态（0正常 1停用） */
+  @Excel(name = "账号状态", readConverterExp = "0=正常,1=停用")
+  private String status;
 
-    /** 帐号状态（0正常 1停用） */
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
-    private String status;
+  /** 删除标志（0代表存在 2代表删除） */
+  private String delFlag;
 
-    /** 删除标志（0代表存在 2代表删除） */
-    private String delFlag;
+  /** 最后登录IP */
+  @Excel(name = "最后登录IP", type = Type.EXPORT)
+  private String loginIp;
 
-    /** 最后登录IP */
-    @Excel(name = "最后登录IP", type = Type.EXPORT)
-    private String loginIp;
+  /** 最后登录时间 */
+  @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+  private Date loginDate;
 
-    /** 最后登录时间 */
-    @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),
-        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
-    })
-    private SysDept dept;
+  /** 部门对象 */
+  @Excels({
+    @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
+    @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+  })
+  private SysDept dept;
 
-    /** 角色对象 */
-    private List<SysRole> roles;
+  /** 角色对象 */
+  private List<SysRole> roles;
 
-    /** 角色组 */
-    private Long[] roleIds;
+  /** 角色组 */
+  private Long[] roleIds;
 
-    /** 岗位组 */
-    private Long[] postIds;
+  /** 岗位组 */
+  private Long[] postIds;
 
-    public SysUser()
-    {
+  /** 角色ID */
+  private Long roleId;
 
-    }
+  public SysUser() {}
 
-    public SysUser(Long userId)
-    {
-        this.userId = userId;
-    }
+  public SysUser(Long userId) {
+    this.userId = userId;
+  }
 
-    public Long getUserId()
-    {
-        return userId;
-    }
+  public Long getUserId() {
+    return userId;
+  }
 
-    public void setUserId(Long userId)
-    {
-        this.userId = userId;
-    }
+  public void setUserId(Long userId) {
+    this.userId = userId;
+  }
 
-    public boolean isAdmin()
-    {
-        return isAdmin(this.userId);
-    }
+  public boolean isAdmin() {
+    return isAdmin(this.userId);
+  }
 
-    public static boolean isAdmin(Long userId)
-    {
-        return userId != null && 1L == userId;
-    }
+  public static boolean isAdmin(Long userId) {
+    return UserConstants.isAdmin(userId);
+  }
 
-    public Long getDeptId()
-    {
-        return deptId;
-    }
+  public Long getDeptId() {
+    return deptId;
+  }
 
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
-    }
+  public void setDeptId(Long deptId) {
+    this.deptId = deptId;
+  }
 
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getNickName()
-    {
-        return nickName;
-    }
+  @Xss(message = "用户昵称不能包含脚本字符")
+  @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+  public String getNickName() {
+    return nickName;
+  }
 
-    public void setNickName(String nickName)
-    {
-        this.nickName = nickName;
-    }
+  public void setNickName(String nickName) {
+    this.nickName = nickName;
+  }
 
-    @NotBlank(message = "用户账号不能为空")
-    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
-    public String getUserName()
-    {
-        return userName;
-    }
+  @Xss(message = "用户账号不能包含脚本字符")
+  @NotBlank(message = "用户账号不能为空")
+  @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
+  public String getUserName() {
+    return userName;
+  }
 
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
+  public void setUserName(String userName) {
+    this.userName = userName;
+  }
 
-    @Email(message = "邮箱格式不正确")
-    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
-    {
-        return email;
-    }
+  @Email(message = "邮箱格式不正确")
+  @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+  public String getEmail() {
+    return email;
+  }
 
-    public void setEmail(String email)
-    {
-        this.email = email;
-    }
+  public void setEmail(String email) {
+    this.email = email;
+  }
 
-    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
-    public String getPhonenumber()
-    {
-        return phonenumber;
-    }
+  @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
+  public String getPhonenumber() {
+    return phonenumber;
+  }
 
-    public void setPhonenumber(String phonenumber)
-    {
-        this.phonenumber = phonenumber;
-    }
+  public void setPhonenumber(String phonenumber) {
+    this.phonenumber = phonenumber;
+  }
 
-    public String getSex()
-    {
-        return sex;
-    }
+  public String getSex() {
+    return sex;
+  }
 
-    public void setSex(String sex)
-    {
-        this.sex = sex;
-    }
+  public void setSex(String sex) {
+    this.sex = sex;
+  }
 
-    public String getAvatar()
-    {
-        return avatar;
-    }
+  public String getAvatar() {
+    return avatar;
+  }
 
-    public void setAvatar(String avatar)
-    {
-        this.avatar = avatar;
-    }
+  public void setAvatar(String avatar) {
+    this.avatar = avatar;
+  }
 
-    @JsonProperty
-    public String getPassword()
-    {
-        return password;
-    }
+  public String getPassword() {
+    return password;
+  }
 
-    public void setPassword(String password)
-    {
-        this.password = password;
-    }
+  public void setPassword(String password) {
+    this.password = password;
+  }
 
-    public String getSalt()
-    {
-        return salt;
-    }
+  public String getStatus() {
+    return status;
+  }
 
-    public void setSalt(String salt)
-    {
-        this.salt = salt;
-    }
+  public void setStatus(String status) {
+    this.status = status;
+  }
 
-    public String getStatus()
-    {
-        return status;
-    }
+  public String getDelFlag() {
+    return delFlag;
+  }
 
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
+  public void setDelFlag(String delFlag) {
+    this.delFlag = delFlag;
+  }
 
-    public String getDelFlag()
-    {
-        return delFlag;
-    }
+  public String getLoginIp() {
+    return loginIp;
+  }
 
-    public void setDelFlag(String delFlag)
-    {
-        this.delFlag = delFlag;
-    }
+  public void setLoginIp(String loginIp) {
+    this.loginIp = loginIp;
+  }
 
-    public String getLoginIp()
-    {
-        return loginIp;
-    }
+  public Date getLoginDate() {
+    return loginDate;
+  }
 
-    public void setLoginIp(String loginIp)
-    {
-        this.loginIp = loginIp;
-    }
+  public void setLoginDate(Date loginDate) {
+    this.loginDate = loginDate;
+  }
 
-    public Date getLoginDate()
-    {
-        return loginDate;
-    }
+  public Date getPwdUpdateDate() {
+    return pwdUpdateDate;
+  }
 
-    public void setLoginDate(Date loginDate)
-    {
-        this.loginDate = loginDate;
-    }
+  public void setPwdUpdateDate(Date pwdUpdateDate) {
+    this.pwdUpdateDate = pwdUpdateDate;
+  }
 
-    public SysDept getDept()
-    {
-        return dept;
-    }
+  public SysDept getDept() {
+    return dept;
+  }
 
-    public void setDept(SysDept dept)
-    {
-        this.dept = dept;
-    }
+  public void setDept(SysDept dept) {
+    this.dept = dept;
+  }
 
-    public List<SysRole> getRoles()
-    {
-        return roles;
-    }
+  public List<SysRole> getRoles() {
+    return roles;
+  }
 
-    public void setRoles(List<SysRole> roles)
-    {
-        this.roles = roles;
-    }
+  public void setRoles(List<SysRole> roles) {
+    this.roles = roles;
+  }
 
-    public Long[] getRoleIds()
-    {
-        return roleIds;
-    }
+  public Long[] getRoleIds() {
+    return roleIds;
+  }
 
-    public void setRoleIds(Long[] roleIds)
-    {
-        this.roleIds = roleIds;
-    }
+  public void setRoleIds(Long[] roleIds) {
+    this.roleIds = roleIds;
+  }
 
-    public Long[] getPostIds()
-    {
-        return postIds;
-    }
+  public Long[] getPostIds() {
+    return postIds;
+  }
 
-    public void setPostIds(Long[] postIds)
-    {
-        this.postIds = postIds;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("deptId", getDeptId())
-            .append("userName", getUserName())
-            .append("nickName", getNickName())
-            .append("email", getEmail())
-            .append("phonenumber", getPhonenumber())
-            .append("sex", getSex())
-            .append("avatar", getAvatar())
-            .append("password", getPassword())
-            .append("salt", getSalt())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("loginIp", getLoginIp())
-            .append("loginDate", getLoginDate())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("dept", getDept())
-            .toString();
-    }
+  public void setPostIds(Long[] postIds) {
+    this.postIds = postIds;
+  }
+
+  public Long getRoleId() {
+    return roleId;
+  }
+
+  public void setRoleId(Long roleId) {
+    this.roleId = roleId;
+  }
+
+  @Override
+  public String toString() {
+    return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+        .append("userId", getUserId())
+        .append("deptId", getDeptId())
+        .append("userName", getUserName())
+        .append("nickName", getNickName())
+        .append("email", getEmail())
+        .append("phonenumber", getPhonenumber())
+        .append("sex", getSex())
+        .append("avatar", getAvatar())
+        .append("password", getPassword())
+        .append("status", getStatus())
+        .append("delFlag", getDelFlag())
+        .append("loginIp", getLoginIp())
+        .append("loginDate", getLoginDate())
+        .append("pwdUpdateDate", getPwdUpdateDate())
+        .append("createBy", getCreateBy())
+        .append("createTime", getCreateTime())
+        .append("updateBy", getUpdateBy())
+        .append("updateTime", getUpdateTime())
+        .append("remark", getRemark())
+        .append("dept", getDept())
+        .toString();
+  }
 }

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

@@ -1,35 +1,36 @@
 package com.ruoyi.system.api.factory;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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;
-import feign.hystrix.FallbackFactory;
+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;
 
 /**
  * 文件服务降级处理
- * 
+ *
  * @author ruoyi
  */
 @Component
-public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class);
+public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService> {
+  private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class);
 
-    @Override
-    public RemoteFileService create(Throwable throwable)
-    {
-        log.error("文件服务调用失败:{}", throwable.getMessage());
-        return new RemoteFileService()
-        {
-            @Override
-            public R<SysFile> upload(MultipartFile file)
-            {
-                return R.fail("上传文件失败:" + throwable.getMessage());
-            }
-        };
-    }
+  @Override
+  public RemoteFileService create(Throwable throwable) {
+    log.error("文件服务调用失败:{}", throwable.getMessage());
+    return new RemoteFileService() {
+      @Override
+      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,41 +1,36 @@
 package com.ruoyi.system.api.factory;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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 feign.hystrix.FallbackFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
 
 /**
  * 日志服务降级处理
- * 
+ *
  * @author ruoyi
  */
 @Component
-public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class);
+public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService> {
+  private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class);
 
-    @Override
-    public RemoteLogService create(Throwable throwable)
-    {
-        log.error("日志服务调用失败:{}", throwable.getMessage());
-        return new RemoteLogService()
-        {
-            @Override
-            public R<Boolean> saveLog(SysOperLog sysOperLog)
-            {
-                return null;
-            }
+  @Override
+  public RemoteLogService create(Throwable throwable) {
+    log.error("日志服务调用失败:{}", throwable.getMessage());
+    return new RemoteLogService() {
+      @Override
+      public R<Boolean> saveLog(SysOperLog sysOperLog, String source) {
+        return R.fail("保存操作日志失败:" + throwable.getMessage());
+      }
 
-            @Override
-            public R<Boolean> saveLogininfor(String username, String status, String message)
-            {
-                return null;
-            }
-        };
-
-    }
+      @Override
+      public R<Boolean> saveLogininfor(SysLogininfor sysLogininfor, String source) {
+        return R.fail("保存登录日志失败:" + throwable.getMessage());
+      }
+    };
+  }
 }

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

@@ -1,34 +1,41 @@
 package com.ruoyi.system.api.factory;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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 feign.hystrix.FallbackFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
 
 /**
  * 用户服务降级处理
- * 
+ *
  * @author ruoyi
  */
 @Component
-public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService> {
+  private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
 
-    @Override
-    public RemoteUserService create(Throwable throwable)
-    {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteUserService()
-        {
-            @Override
-            public R<LoginUser> getUserInfo(String username)
-            {
-                return R.fail("获取用户失败:" + throwable.getMessage());
-            }
-        };
-    }
+  @Override
+  public RemoteUserService create(Throwable throwable) {
+    log.error("用户服务调用失败:{}", throwable.getMessage());
+    return new RemoteUserService() {
+      @Override
+      public R<LoginUser> getUserInfo(String username, String source) {
+        return R.fail("获取用户失败:" + throwable.getMessage());
+      }
+
+      @Override
+      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
-{
-    private static final long serialVersionUID = 1L;
+public class LoginUser implements Serializable {
+  private static final long serialVersionUID = 1L;
 
-    /**
-     * 用户唯一标识
-     */
-    private String token;
+  /** 用户唯一标识 */
+  private String token;
 
-    /**
-     * 用户名id
-     */
-    private Long userid;
+  /** 用户名id */
+  private Long userid;
 
-    /**
-     * 用户名
-     */
-    private String username;
+  /** 用户名 */
+  private String username;
 
-    /**
-     * 登录时间
-     */
-    private Long loginTime;
+  /** 登录时间 */
+  private Long loginTime;
 
-    /**
-     * 过期时间
-     */
-    private Long expireTime;
+  /** 过期时间 */
+  private Long expireTime;
 
-    /**
-     * 登录IP地址
-     */
-    private String ipaddr;
+  /** 登录IP地址 */
+  private String ipaddr;
 
-    /**
-     * 权限列表
-     */
-    private Set<String> permissions;
+  /** 权限列表 */
+  private Set<String> permissions;
 
-    /**
-     * 角色列表
-     */
-    private Set<String> roles;
+  /** 角色列表 */
+  private Set<String> roles;
 
-    /**
-     * 用户信息
-     */
-    private SysUser sysUser;
+  /** 用户信息 */
+  private SysUser sysUser;
 
-    public String getToken()
-    {
-        return token;
-    }
+  public String getToken() {
+    return token;
+  }
 
-    public void setToken(String token)
-    {
-        this.token = token;
-    }
+  public void setToken(String token) {
+    this.token = token;
+  }
 
-    public Long getUserid()
-    {
-        return userid;
-    }
+  public Long getUserid() {
+    return userid;
+  }
 
-    public void setUserid(Long userid)
-    {
-        this.userid = userid;
-    }
+  public void setUserid(Long userid) {
+    this.userid = userid;
+  }
 
-    public String getUsername()
-    {
-        return username;
-    }
+  public String getUsername() {
+    return username;
+  }
 
-    public void setUsername(String username)
-    {
-        this.username = username;
-    }
+  public void setUsername(String username) {
+    this.username = username;
+  }
 
-    public Long getLoginTime()
-    {
-        return loginTime;
-    }
+  public Long getLoginTime() {
+    return loginTime;
+  }
 
-    public void setLoginTime(Long loginTime)
-    {
-        this.loginTime = loginTime;
-    }
+  public void setLoginTime(Long loginTime) {
+    this.loginTime = loginTime;
+  }
 
-    public Long getExpireTime()
-    {
-        return expireTime;
-    }
+  public Long getExpireTime() {
+    return expireTime;
+  }
 
-    public void setExpireTime(Long expireTime)
-    {
-        this.expireTime = expireTime;
-    }
+  public void setExpireTime(Long expireTime) {
+    this.expireTime = expireTime;
+  }
 
-    public String getIpaddr()
-    {
-        return ipaddr;
-    }
+  public String getIpaddr() {
+    return ipaddr;
+  }
 
-    public void setIpaddr(String ipaddr)
-    {
-        this.ipaddr = ipaddr;
-    }
+  public void setIpaddr(String ipaddr) {
+    this.ipaddr = ipaddr;
+  }
 
-    public Set<String> getPermissions()
-    {
-        return permissions;
-    }
+  public Set<String> getPermissions() {
+    return permissions;
+  }
 
-    public void setPermissions(Set<String> permissions)
-    {
-        this.permissions = permissions;
-    }
+  public void setPermissions(Set<String> permissions) {
+    this.permissions = permissions;
+  }
 
-    public Set<String> getRoles()
-    {
-        return roles;
-    }
+  public Set<String> getRoles() {
+    return roles;
+  }
 
-    public void setRoles(Set<String> roles)
-    {
-        this.roles = roles;
-    }
+  public void setRoles(Set<String> roles) {
+    this.roles = roles;
+  }
 
-    public SysUser getSysUser()
-    {
-        return sysUser;
-    }
+  public SysUser getSysUser() {
+    return sysUser;
+  }
 
-    public void setSysUser(SysUser sysUser)
-    {
-        this.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>2.5.0</version>
+        <version>3.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
@@ -16,19 +16,19 @@
     
     <dependencies>
         
-        <!-- SpringCloud Ailibaba Nacos -->
+        <!-- SpringCloud Alibaba Nacos -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
         
-        <!-- SpringCloud Ailibaba Nacos Config -->
+        <!-- SpringCloud Alibaba Nacos Config -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
         
-        <!-- SpringCloud Ailibaba Sentinel -->
+        <!-- SpringCloud Alibaba Sentinel -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
@@ -45,12 +45,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
 		
         <!-- RuoYi Common Security-->
         <dependency>

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

@@ -1,30 +1,30 @@
 package com.ruoyi.auth;
 
-import org.springframework.boot.SpringApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
 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;
 
 /**
  * 认证授权中心
- * 
+ *
  * @author ruoyi
  */
 @EnableRyFeignClients
-@SpringCloudApplication
-public class RuoYiAuthApplication
-{
-    public static void main(String[] args)
-    {
-        SpringApplication.run(RuoYiAuthApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  认证授权中心启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
-    }
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+public class RuoYiAuthApplication {
+  public static void main(String[] args) {
+    SpringApplication.run(RuoYiAuthApplication.class, args);
+    System.out.println(
+        "(♥◠‿◠)ﾉﾞ  认证授权中心启动成功   ლ(´ڡ`ლ)ﾞ  \n"
+            + " .-------.       ____     __        \n"
+            + " |  _ _   \\      \\   \\   /  /    \n"
+            + " | ( ' )  |       \\  _. /  '       \n"
+            + " |(_ o _) /        _( )_ .'         \n"
+            + " | (_,_).' __  ___(_ o _)'          \n"
+            + " |  |\\ \\  |  ||   |(_,_)'         \n"
+            + " |  | \\ `'   /|   `-'  /           \n"
+            + " |  |  \\    /  \\      /           \n"
+            + " ''-'   `'-'    `-..-'              ");
+  }
 }

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

@@ -1,66 +1,69 @@
 package com.ruoyi.auth.controller;
 
+import com.ruoyi.auth.form.LoginBody;
+import com.ruoyi.auth.form.RegisterBody;
+import com.ruoyi.auth.service.SysLoginService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.JwtUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+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;
-import com.ruoyi.auth.form.LoginBody;
-import com.ruoyi.auth.service.SysLoginService;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.system.api.model.LoginUser;
 
 /**
  * token 控制
- * 
+ *
  * @author ruoyi
  */
 @RestController
-public class TokenController
-{
-    @Autowired
-    private TokenService tokenService;
+public class TokenController {
+  @Autowired private TokenService tokenService;
 
-    @Autowired
-    private SysLoginService sysLoginService;
+  @Autowired private SysLoginService sysLoginService;
 
-    @PostMapping("login")
-    public R<?> login(@RequestBody LoginBody form)
-    {
-        // 用户登录
-        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
-        // 获取登录token
-        return R.ok(tokenService.createToken(userInfo));
+  @PostMapping("login")
+  public R<?> login(@RequestBody LoginBody form) {
+    // 用户登录
+    LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
+    // 获取登录token
+    return R.ok(tokenService.createToken(userInfo));
+  }
+
+  @DeleteMapping("logout")
+  public R<?> logout(HttpServletRequest request) {
+    String token = SecurityUtils.getToken(request);
+    if (StringUtils.isNotEmpty(token)) {
+      String username = JwtUtils.getUserName(token);
+      // 删除用户缓存记录
+      AuthUtil.logoutByToken(token);
+      // 记录用户退出日志
+      sysLoginService.logout(username);
     }
+    return R.ok();
+  }
 
-    @DeleteMapping("logout")
-    public R<?> logout(HttpServletRequest request)
-    {
-        LoginUser loginUser = tokenService.getLoginUser(request);
-        if (StringUtils.isNotNull(loginUser))
-        {
-            String username = loginUser.getUsername();
-            // 删除用户缓存记录
-            tokenService.delLoginUser(loginUser.getToken());
-            // 记录用户退出日志
-            sysLoginService.logout(username);
-        }
-        return R.ok();
+  @PostMapping("refresh")
+  public R<?> refresh(HttpServletRequest request) {
+    LoginUser loginUser = tokenService.getLoginUser(request);
+    if (StringUtils.isNotNull(loginUser)) {
+      // 刷新令牌有效期
+      tokenService.refreshToken(loginUser);
+      return R.ok();
     }
+    return R.ok();
+  }
 
-    @PostMapping("refresh")
-    public R<?> refresh(HttpServletRequest request)
-    {
-        LoginUser loginUser = tokenService.getLoginUser(request);
-        if (StringUtils.isNotNull(loginUser))
-        {
-            // 刷新令牌有效期
-            tokenService.refreshToken(loginUser);
-            return R.ok();
-        }
-        return R.ok();
-    }
+  @PostMapping("register")
+  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

@@ -2,38 +2,29 @@ package com.ruoyi.auth.form;
 
 /**
  * 用户登录对象
- * 
+ *
  * @author ruoyi
  */
-public class LoginBody
-{
-    /**
-     * 用户名
-     */
-    private String username;
+public class LoginBody {
+  /** 用户名 */
+  private String username;
 
-    /**
-     * 用户密码
-     */
-    private String password;
+  /** 用户密码 */
+  private String password;
 
-    public String getUsername()
-    {
-        return username;
-    }
+  public String getUsername() {
+    return username;
+  }
 
-    public void setUsername(String username)
-    {
-        this.username = username;
-    }
+  public void setUsername(String username) {
+    this.username = username;
+  }
 
-    public String getPassword()
-    {
-        return password;
-    }
+  public String getPassword() {
+    return password;
+  }
 
-    public void setPassword(String password)
-    {
-        this.password = password;
-    }
+  public void setPassword(String password) {
+    this.password = password;
+  }
 }

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

@@ -0,0 +1,8 @@
+package com.ruoyi.auth.form;
+
+/**
+ * 用户注册对象
+ *
+ * @author ruoyi
+ */
+public class RegisterBody extends LoginBody {}

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

@@ -1,95 +1,133 @@
 package com.ruoyi.auth.service;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import com.ruoyi.common.core.constant.CacheConstants;
 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.BaseException;
-import com.ruoyi.common.core.utils.SecurityUtils;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.system.api.RemoteLogService;
+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.RemoteUserService;
 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;
 
 /**
  * 登录校验方法
- * 
+ *
  * @author ruoyi
  */
 @Component
-public class SysLoginService
-{
-    @Autowired
-    private RemoteLogService remoteLogService;
+public class SysLoginService {
+  @Autowired private RemoteUserService remoteUserService;
 
-    @Autowired
-    private RemoteUserService remoteUserService;
+  @Autowired private SysPasswordService passwordService;
 
-    /**
-     * 登录
-     */
-    public LoginUser login(String username, String password)
-    {
-        // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(username, password))
-        {
-            remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
-            throw new BaseException("用户/密码必须填写");
-        }
-        // 密码如果不在指定范围内 错误
-        if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
-                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
-        {
-            remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
-            throw new BaseException("用户密码不在指定范围");
-        }
-        // 用户名不在指定范围内 错误
-        if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH)
-        {
-            remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
-            throw new BaseException("用户名不在指定范围");
-        }
-        // 查询用户信息
-        R<LoginUser> userResult = remoteUserService.getUserInfo(username);
+  @Autowired private SysRecordLogService recordLogService;
 
-        if (R.FAIL == userResult.getCode())
-        {
-            throw new BaseException(userResult.getMsg());
-        }
+  @Autowired private RedisService redisService;
 
-        if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData()))
-        {
-            remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
-            throw new BaseException("登录用户：" + username + " 不存在");
-        }
-        LoginUser userInfo = userResult.getData();
-        SysUser user = userResult.getData().getSysUser();
-        if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
-        {
-            remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
+  /** 登录 */
+  public LoginUser login(String username, String password) {
+    // 用户名或密码为空 错误
+    if (StringUtils.isAnyBlank(username, password)) {
+      recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
+      throw new ServiceException("用户/密码必须填写");
+    }
+    // 密码如果不在指定范围内 错误
+    if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
+        || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
+      recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
+      throw new ServiceException("用户密码不在指定范围");
+    }
+    // 用户名不在指定范围内 错误
+    if (username.length() < UserConstants.USERNAME_MIN_LENGTH
+        || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
+      recordLogService.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);
 
-            throw new BaseException("对不起，您的账号：" + username + " 已被删除");
-        }
-        if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
-        {
-            remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
-            throw new BaseException("对不起，您的账号：" + username + " 已停用");
-        }
-        if (!SecurityUtils.matchesPassword(password, user.getPassword()))
-        {
-            remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
-            throw new BaseException("用户不存在/密码错误");
-        }
-        remoteLogService.saveLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
-        return userInfo;
+    if (R.FAIL == userResult.getCode()) {
+      throw new ServiceException(userResult.getMsg());
     }
 
-    public void logout(String loginName)
-    {
-        remoteLogService.saveLogininfor(loginName, Constants.LOGOUT, "退出成功");
+    LoginUser userInfo = userResult.getData();
+    SysUser user = userResult.getData().getSysUser();
+    if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
+      recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
+      throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
     }
-}
+    if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
+      recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
+      throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+    }
+    passwordService.validate(user, password);
+    recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
+    recordLoginInfo(user.getUserId());
+    return userInfo;
+  }
+
+  /**
+   * 记录登录信息
+   *
+   * @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) {
+    // 用户名或密码为空 错误
+    if (StringUtils.isAnyBlank(username, password)) {
+      throw new ServiceException("用户/密码必须填写");
+    }
+    if (username.length() < UserConstants.USERNAME_MIN_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) {
+      throw new ServiceException("密码长度必须在5到20个字符之间");
+    }
+
+    // 注册用户信息
+    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()) {
+      throw new ServiceException(registerResult.getMsg());
+    }
+    recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功");
+  }
+}

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>2.5.0</version>
+        <version>3.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -12,17 +12,19 @@
         <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>
+        <module>ruoyi-common-datasource</module>
     </modules>
 
     <artifactId>ruoyi-common</artifactId>
     <packaging>pom</packaging>
 
     <description>
-	    ruoyi-common通用模块
+        ruoyi-common通用模块
     </description>
 
 </project>

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

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>2.5.0</version>
+        <version>3.6.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,28 +17,34 @@
 
     <dependencies>
 
-    	<!-- SpringCloud Openfeign -->
+        <!-- SpringCloud Openfeign -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
-    	</dependency>
+        </dependency>
+        
+        <!-- SpringCloud Loadbalancer -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
 
-    	<!-- Spring Context Support -->
-    	<dependency>
+        <!-- Spring Context Support -->
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
-    	</dependency>
+        </dependency>
 
-    	<!-- Spring Web -->
-    	<dependency>
+        <!-- Spring Web -->
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-    	</dependency>
+        </dependency>
 
-        <!-- Apache Commons Pool2 -->
+        <!-- Transmittable ThreadLocal -->
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
+            <groupId>com.alibaba</groupId>
+            <artifactId>transmittable-thread-local</artifactId>
         </dependency>
 
         <!-- Pagehelper -->
@@ -61,8 +67,20 @@
 
         <!-- Alibaba Fastjson -->
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+        </dependency>
+
+        <!-- Jwt -->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+        </dependency>
+
+        <!-- Jaxb -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
         </dependency>
 
         <!-- Apache Lang3 -->
@@ -77,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>
@@ -95,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,160 +1,131 @@
 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 org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
 
 /**
  * 自定义导出Excel数据注解
- * 
+ *
  * @author ruoyi
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
-public @interface Excel
-{
-    /**
-     * 导出时在excel中排序
-     */
-    public int sort() default Integer.MAX_VALUE;
+public @interface Excel {
+  /** 导出时在excel中排序 */
+  public int sort() default Integer.MAX_VALUE;
 
-    /**
-     * 导出到Excel中的名字.
-     */
-    public String name() default "";
+  /** 导出到Excel中的名字. */
+  public String name() default "";
 
-    /**
-     * 日期格式, 如: yyyy-MM-dd
-     */
-    public String dateFormat() default "";
+  /** 日期格式, 如: yyyy-MM-dd */
+  public String dateFormat() default "";
 
-    /**
-     * 读取内容转表达式 (如: 0=男,1=女,2=未知)
-     */
-    public String readConverterExp() default "";
+  /** 读取内容转表达式 (如: 0=男,1=女,2=未知) */
+  public String readConverterExp() default "";
 
-    /**
-     * 分隔符，读取字符串组内容
-     */
-    public String separator() default ",";
+  /** 分隔符，读取字符串组内容 */
+  public String separator() default ",";
 
-    /**
-     * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
-     */
-    public int scale() default -1;
+  /** BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化) */
+  public int scale() default -1;
 
-    /**
-     * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
-     */
-    public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
+  /** BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN */
+  public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
 
-    /**
-     * 导出类型（0数字 1字符串）
-     */
-    public ColumnType cellType() default ColumnType.STRING;
+  /** 导出时在excel中每个列的高度 */
+  public double height() default 14;
 
-    /**
-     * 导出时在excel中每个列的高度 单位为字符
-     */
-    public double height() default 14;
+  /** 导出时在excel中每个列的宽度 */
+  public double width() default 16;
 
-    /**
-     * 导出时在excel中每个列的宽 单位为字符
-     */
-    public double width() default 16;
+  /** 文字后缀,如% 90 变成90% */
+  public String suffix() default "";
 
-    /**
-     * 文字后缀,如% 90 变成90%
-     */
-    public String suffix() default "";
+  /** 当值为空时,字段的默认值 */
+  public String defaultValue() default "";
 
-    /**
-     * 当值为空时,字段的默认值
-     */
-    public String defaultValue() default "";
+  /** 提示信息 */
+  public String prompt() default "";
 
-    /**
-     * 提示信息
-     */
-    public String prompt() default "";
+  /** 是否允许内容换行 */
+  public boolean wrapText() default false;
 
-    /**
-     * 设置只能选择不能输入的列内容.
-     */
-    public String[] combo() default {};
+  /** 设置只能选择不能输入的列内容. */
+  public String[] combo() default {};
 
-    /**
-     * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
-     */
-    public boolean isExport() default true;
+  /** 是否需要纵向合并单元格,应对需求:含有list集合单元格) */
+  public boolean needMerge() default false;
 
-    /**
-     * 另一个类中的属性名称,支持多级获取,以小数点隔开
-     */
-    public String targetAttr() default "";
+  /** 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写. */
+  public boolean isExport() default true;
 
-    /**
-     * 是否自动统计数据,在最后追加一行统计数据总和
-     */
-    public boolean isStatistics() default false;
+  /** 另一个类中的属性名称,支持多级获取,以小数点隔开 */
+  public String targetAttr() default "";
 
-    /**
-     * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
-     */
-    Align align() default Align.AUTO;
+  /** 是否自动统计数据,在最后追加一行统计数据总和 */
+  public boolean isStatistics() default false;
 
-    public enum Align
-    {
-        AUTO(0), LEFT(1), CENTER(2), RIGHT(3);
-        private final int value;
+  /** 导出类型（0数字 1字符串） */
+  public ColumnType cellType() default ColumnType.STRING;
 
-        Align(int value)
-        {
-            this.value = value;
-        }
+  /** 导出列头背景颜色 */
+  public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
 
-        public int value()
-        {
-            return this.value;
-        }
+  /** 导出列头字体颜色 */
+  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 {};
+
+  /** 字段类型（0：导出导入；1：仅导出；2：仅导入） */
+  Type type() default Type.ALL;
+
+  public enum Type {
+    ALL(0),
+    EXPORT(1),
+    IMPORT(2);
+    private final int value;
+
+    Type(int value) {
+      this.value = value;
     }
 
-    /**
-     * 字段类型（0：导出导入；1：仅导出；2：仅导入）
-     */
-    Type type() default Type.ALL;
+    public int value() {
+      return this.value;
+    }
+  }
 
-    public enum Type
-    {
-        ALL(0), EXPORT(1), IMPORT(2);
-        private final int value;
+  public enum ColumnType {
+    NUMERIC(0),
+    STRING(1),
+    IMAGE(2),
+    TEXT(3);
+    private final int value;
 
-        Type(int value)
-        {
-            this.value = value;
-        }
-
-        public int value()
-        {
-            return this.value;
-        }
+    ColumnType(int value) {
+      this.value = value;
     }
 
-    public enum ColumnType
-    {
-        NUMERIC(0), STRING(1), IMAGE(2);
-        private final int value;
-
-        ColumnType(int value)
-        {
-            this.value = value;
-        }
-
-        public int value()
-        {
-            return this.value;
-        }
+    public int value() {
+      return this.value;
     }
-}
+  }
+}

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

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

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

@@ -1,39 +1,38 @@
 package com.ruoyi.common.core.constant;
 
 /**
- * 缓存的key 常量
- * 
+ * 缓存常量信息
+ *
  * @author ruoyi
  */
-public class CacheConstants
-{
-    /**
-     * 令牌自定义标识
-     */
-    public static final String HEADER = "Authorization";
+public class CacheConstants {
+  /** 缓存有效期，默认720（分钟） */
+  public static final long EXPIRATION = 720;
 
-    /**
-     * 令牌前缀
-     */
-    public static final String TOKEN_PREFIX = "Bearer ";
+  /** 缓存刷新时间，默认120（分钟） */
+  public static final long REFRESH_TIME = 120;
 
-    /**
-     * 权限缓存前缀
-     */
-    public final static String LOGIN_TOKEN_KEY = "login_tokens:";
+  /** 密码最大错误次数 */
+  public static final int PASSWORD_MAX_RETRY_COUNT = 5;
 
-    /**
-     * 用户ID字段
-     */
-    public static final String DETAILS_USER_ID = "user_id";
+  /** 密码锁定时间，默认10（分钟） */
+  public static final long PASSWORD_LOCK_TIME = 10;
 
-    /**
-     * 用户名字段
-     */
-    public static final String DETAILS_USERNAME = "username";
+  /** 权限缓存前缀 */
+  public static final String LOGIN_TOKEN_KEY = "login_tokens:";
 
-    /**
-     * 授权信息字段
-     */
-    public static final String AUTHORIZATION_HEADER = "authorization";
+  /** 验证码 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

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

@@ -2,113 +2,130 @@ package com.ruoyi.common.core.constant;
 
 /**
  * 代码生成通用常量
- * 
+ *
  * @author ruoyi
  */
-public class GenConstants
-{
-    /** 单表（增删改查） */
-    public static final String TPL_CRUD = "crud";
+public class GenConstants {
+  /** 单表（增删改查） */
+  public static final String TPL_CRUD = "crud";
 
-    /** 树表（增删改查） */
-    public static final String TPL_TREE = "tree";
+  /** 树表（增删改查） */
+  public static final String TPL_TREE = "tree";
 
-    /** 主子表（增删改查） */
-    public static final String TPL_SUB = "sub";
+  /** 主子表（增删改查） */
+  public static final String TPL_SUB = "sub";
 
-    /** 树编码字段 */
-    public static final String TREE_CODE = "treeCode";
+  /** 树编码字段 */
+  public static final String TREE_CODE = "treeCode";
 
-    /** 树父编码字段 */
-    public static final String TREE_PARENT_CODE = "treeParentCode";
+  /** 树父编码字段 */
+  public static final String TREE_PARENT_CODE = "treeParentCode";
 
-    /** 树名称字段 */
-    public static final String TREE_NAME = "treeName";
+  /** 树名称字段 */
+  public static final String TREE_NAME = "treeName";
 
-    /** 上级菜单ID字段 */
-    public static final String PARENT_MENU_ID = "parentMenuId";
+  /** 上级菜单ID字段 */
+  public static final String PARENT_MENU_ID = "parentMenuId";
 
-    /** 上级菜单名称字段 */
-    public static final String PARENT_MENU_NAME = "parentMenuName";
+  /** 上级菜单名称字段 */
+  public static final String PARENT_MENU_NAME = "parentMenuName";
 
-    /** 数据库字符串类型 */
-    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
+  /** 数据库字符串类型 */
+  public static final String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
 
-    /** 数据库文本类型 */
-    public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" };
+  /** 数据库文本类型 */
+  public static final String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
 
-    /** 数据库时间类型 */
-    public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
+  /** 数据库时间类型 */
+  public static final String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
 
-    /** 数据库数字类型 */
-    public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
-            "bigint", "float", "double", "decimal" };
+  /** 数据库数字类型 */
+  public static final String[] COLUMNTYPE_NUMBER = {
+    "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_EDIT = {"id", "create_by", "create_time", "del_flag"};
 
-    /** 页面不需要显示的列表字段 */
-    public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by",
-            "update_time" };
+  /** 页面不需要显示的列表字段 */
+  public static final String[] COLUMNNAME_NOT_LIST = {
+    "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",
-            "update_time", "remark" };
+  /** 页面不需要查询字段 */
+  public static final String[] COLUMNNAME_NOT_QUERY = {
+    "id", "create_by", "create_time", "del_flag", "update_by", "update_time", "remark"
+  };
 
-    /** Entity基类字段 */
-    public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
+  /** Entity基类字段 */
+  public static final String[] BASE_ENTITY = {
+    "createBy", "createTime", "updateBy", "updateTime", "remark"
+  };
 
-    /** Tree基类字段 */
-    public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors" };
+  /** Tree基类字段 */
+  public static final String[] TREE_ENTITY = {"parentName", "parentId", "orderNum", "ancestors"};
 
-    /** 文本框 */
-    public static final String HTML_INPUT = "input";
+  /** 文本框 */
+  public static final String HTML_INPUT = "input";
 
-    /** 文本域 */
-    public static final String HTML_TEXTAREA = "textarea";
+  /** 文本域 */
+  public static final String HTML_TEXTAREA = "textarea";
 
-    /** 下拉框 */
-    public static final String HTML_SELECT = "select";
+  /** 下拉框 */
+  public static final String HTML_SELECT = "select";
 
-    /** 单选框 */
-    public static final String HTML_RADIO = "radio";
+  /** 单选框 */
+  public static final String HTML_RADIO = "radio";
 
-    /** 复选框 */
-    public static final String HTML_CHECKBOX = "checkbox";
+  /** 复选框 */
+  public static final String HTML_CHECKBOX = "checkbox";
 
-    /** 日期控件 */
-    public static final String HTML_DATETIME = "datetime";
+  /** 日期控件 */
+  public static final String HTML_DATETIME = "datetime";
 
-    /** 图片上传控件 */
-    public static final String HTML_IMAGE_UPLOAD = "imageUpload";
+  /** 图片上传控件 */
+  public static final String HTML_IMAGE_UPLOAD = "imageUpload";
 
-    /** 文件上传控件 */
-    public static final String HTML_FILE_UPLOAD = "fileUpload";
+  /** 文件上传控件 */
+  public static final String HTML_FILE_UPLOAD = "fileUpload";
 
-    /** 富文本控件 */
-    public static final String HTML_EDITOR = "editor";
+  /** 富文本控件 */
+  public static final String HTML_EDITOR = "editor";
 
-    /** 字符串类型 */
-    public static final String TYPE_STRING = "String";
+  /** 字符串类型 */
+  public static final String TYPE_STRING = "String";
 
-    /** 整型 */
-    public static final String TYPE_INTEGER = "Integer";
+  /** 整型 */
+  public static final String TYPE_INTEGER = "Integer";
 
-    /** 长整型 */
-    public static final String TYPE_LONG = "Long";
+  /** 长整型 */
+  public static final String TYPE_LONG = "Long";
 
-    /** 浮点型 */
-    public static final String TYPE_DOUBLE = "Double";
+  /** 浮点型 */
+  public static final String TYPE_DOUBLE = "Double";
 
-    /** 高精度计算类型 */
-    public static final String TYPE_BIGDECIMAL = "BigDecimal";
+  /** 高精度计算类型 */
+  public static final String TYPE_BIGDECIMAL = "BigDecimal";
 
-    /** 时间类型 */
-    public static final String TYPE_DATE = "Date";
+  /** 时间类型 */
+  public static final String TYPE_DATE = "Date";
 
-    /** 模糊查询 */
-    public static final String QUERY_LIKE = "LIKE";
+  /** 模糊查询 */
+  public static final String QUERY_LIKE = "LIKE";
 
-    /** 需要 */
-    public static final String REQUIRE = "1";
+  /** 相等查询 */
+  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

@@ -2,88 +2,58 @@ package com.ruoyi.common.core.constant;
 
 /**
  * 返回状态码
- * 
+ *
  * @author ruoyi
  */
-public class HttpStatus
-{
-    /**
-     * 操作成功
-     */
-    public static final int SUCCESS = 200;
+public class HttpStatus {
+  /** 操作成功 */
+  public static final int SUCCESS = 200;
 
-    /**
-     * 对象创建成功
-     */
-    public static final int CREATED = 201;
+  /** 对象创建成功 */
+  public static final int CREATED = 201;
 
-    /**
-     * 请求已经被接受
-     */
-    public static final int ACCEPTED = 202;
+  /** 请求已经被接受 */
+  public static final int ACCEPTED = 202;
 
-    /**
-     * 操作已经执行成功，但是没有返回数据
-     */
-    public static final int NO_CONTENT = 204;
+  /** 操作已经执行成功，但是没有返回数据 */
+  public static final int NO_CONTENT = 204;
 
-    /**
-     * 资源已被移除
-     */
-    public static final int MOVED_PERM = 301;
+  /** 资源已被移除 */
+  public static final int MOVED_PERM = 301;
 
-    /**
-     * 重定向
-     */
-    public static final int SEE_OTHER = 303;
+  /** 重定向 */
+  public static final int SEE_OTHER = 303;
 
-    /**
-     * 资源没有被修改
-     */
-    public static final int NOT_MODIFIED = 304;
+  /** 资源没有被修改 */
+  public static final int NOT_MODIFIED = 304;
 
-    /**
-     * 参数列表错误（缺少，格式不匹配）
-     */
-    public static final int BAD_REQUEST = 400;
+  /** 参数列表错误（缺少，格式不匹配） */
+  public static final int BAD_REQUEST = 400;
 
-    /**
-     * 未授权
-     */
-    public static final int UNAUTHORIZED = 401;
+  /** 未授权 */
+  public static final int UNAUTHORIZED = 401;
 
-    /**
-     * 访问受限，授权过期
-     */
-    public static final int FORBIDDEN = 403;
+  /** 访问受限，授权过期 */
+  public static final int FORBIDDEN = 403;
 
-    /**
-     * 资源，服务未找到
-     */
-    public static final int NOT_FOUND = 404;
+  /** 资源，服务未找到 */
+  public static final int NOT_FOUND = 404;
 
-    /**
-     * 不允许的http方法
-     */
-    public static final int BAD_METHOD = 405;
+  /** 不允许的http方法 */
+  public static final int BAD_METHOD = 405;
 
-    /**
-     * 资源冲突，或者资源被锁
-     */
-    public static final int CONFLICT = 409;
+  /** 资源冲突，或者资源被锁 */
+  public static final int CONFLICT = 409;
 
-    /**
-     * 不支持的数据，媒体类型
-     */
-    public static final int UNSUPPORTED_TYPE = 415;
+  /** 不支持的数据，媒体类型 */
+  public static final int UNSUPPORTED_TYPE = 415;
 
-    /**
-     * 系统内部错误
-     */
-    public static final int ERROR = 500;
+  /** 系统内部错误 */
+  public static final int ERROR = 500;
 
-    /**
-     * 接口未实现
-     */
-    public static final int NOT_IMPLEMENTED = 501;
+  /** 接口未实现 */
+  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

@@ -2,49 +2,41 @@ package com.ruoyi.common.core.constant;
 
 /**
  * 任务调度通用常量
- * 
+ *
  * @author ruoyi
  */
-public class ScheduleConstants
-{
-    public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
+public class ScheduleConstants {
+  public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
 
-    /** 执行目标key */
-    public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
+  /** 执行目标key */
+  public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
 
-    /** 默认 */
-    public static final String MISFIRE_DEFAULT = "0";
+  /** 默认 */
+  public static final String MISFIRE_DEFAULT = "0";
 
-    /** 立即触发执行 */
-    public static final String MISFIRE_IGNORE_MISFIRES = "1";
+  /** 立即触发执行 */
+  public static final String MISFIRE_IGNORE_MISFIRES = "1";
 
-    /** 触发一次执行 */
-    public static final String MISFIRE_FIRE_AND_PROCEED = "2";
+  /** 触发一次执行 */
+  public static final String MISFIRE_FIRE_AND_PROCEED = "2";
 
-    /** 不触发立即执行 */
-    public static final String MISFIRE_DO_NOTHING = "3";
+  /** 不触发立即执行 */
+  public static final String MISFIRE_DO_NOTHING = "3";
 
-    public enum Status
-    {
-        /**
-         * 正常
-         */
-        NORMAL("0"),
-        /**
-         * 暂停
-         */
-        PAUSE("1");
+  public enum Status {
+    /** 正常 */
+    NORMAL("0"),
+    /** 暂停 */
+    PAUSE("1");
 
-        private String value;
+    private String value;
 
-        private Status(String value)
-        {
-            this.value = value;
-        }
-
-        public String getValue()
-        {
-            return value;
-        }
+    private Status(String value) {
+      this.value = value;
     }
+
+    public String getValue() {
+      return value;
+    }
+  }
 }

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

@@ -0,0 +1,32 @@
+package com.ruoyi.common.core.constant;
+
+/**
+ * 权限相关通用常量
+ *
+ * @author ruoyi
+ */
+public class SecurityConstants {
+  /** 用户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 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

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

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

@@ -0,0 +1,14 @@
+package com.ruoyi.common.core.constant;
+
+/**
+ * Token的Key常量
+ *
+ * @author ruoyi
+ */
+public class TokenConstants {
+  /** 令牌前缀 */
+  public static final String PREFIX = "Bearer ";
+
+  /** 令牌秘钥 */
+  public static final String SECRET = "abcdefghijklmnopqrstuvwxyz";
+}

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

@@ -2,77 +2,80 @@ package com.ruoyi.common.core.constant;
 
 /**
  * 用户常量信息
- * 
+ *
  * @author ruoyi
  */
-public class UserConstants
-{
-    /**
-     * 平台内系统用户的唯一标志
-     */
-    public static final String SYS_USER = "SYS_USER";
+public class UserConstants {
+  /** 平台内系统用户的唯一标志 */
+  public static final String SYS_USER = "SYS_USER";
 
-    /** 正常状态 */
-    public static final String NORMAL = "0";
+  /** 正常状态 */
+  public static final String NORMAL = "0";
 
-    /** 异常状态 */
-    public static final String EXCEPTION = "1";
+  /** 异常状态 */
+  public static final String EXCEPTION = "1";
 
-    /** 用户封禁状态 */
-    public static final String USER_DISABLE = "1";
+  /** 用户封禁状态 */
+  public static final String USER_DISABLE = "1";
 
-    /** 角色封禁状态 */
-    public static final String ROLE_DISABLE = "1";
+  /** 角色正常状态 */
+  public static final String ROLE_NORMAL = "0";
 
-    /** 部门正常状态 */
-    public static final String DEPT_NORMAL = "0";
+  /** 角色封禁状态 */
+  public static final String ROLE_DISABLE = "1";
 
-    /** 部门停用状态 */
-    public static final String DEPT_DISABLE = "1";
+  /** 部门正常状态 */
+  public static final String DEPT_NORMAL = "0";
 
-    /** 字典正常状态 */
-    public static final String DICT_NORMAL = "0";
+  /** 部门停用状态 */
+  public static final String DEPT_DISABLE = "1";
 
-    /** 是否为系统默认（是） */
-    public static final String YES = "Y";
+  /** 字典正常状态 */
+  public static final String DICT_NORMAL = "0";
 
-    /** 是否菜单外链（是） */
-    public static final String YES_FRAME = "0";
+  /** 是否为系统默认（是） */
+  public static final String YES = "Y";
 
-    /** 是否菜单外链（否） */
-    public static final String NO_FRAME = "1";
+  /** 是否菜单外链（是） */
+  public static final String YES_FRAME = "0";
 
-    /** 菜单类型（目录） */
-    public static final String TYPE_DIR = "M";
+  /** 是否菜单外链（否） */
+  public static final String NO_FRAME = "1";
 
-    /** 菜单类型（菜单） */
-    public static final String TYPE_MENU = "C";
+  /** 菜单类型（目录） */
+  public static final String TYPE_DIR = "M";
 
-    /** 菜单类型（按钮） */
-    public static final String TYPE_BUTTON = "F";
+  /** 菜单类型（菜单） */
+  public static final String TYPE_MENU = "C";
 
-    /** Layout组件标识 */
-    public final static String LAYOUT = "Layout";
+  /** 菜单类型（按钮） */
+  public static final String TYPE_BUTTON = "F";
 
-    /** ParentView组件标识 */
-    public final static String PARENT_VIEW = "ParentView";
+  /** Layout组件标识 */
+  public static final String LAYOUT = "Layout";
 
-    /** 校验返回结果码 */
-    public final static String UNIQUE = "0";
+  /** ParentView组件标识 */
+  public static final String PARENT_VIEW = "ParentView";
 
-    public final static String NOT_UNIQUE = "1";
+  /** InnerLink组件标识 */
+  public static final String INNER_LINK = "InnerLink";
 
-    /**
-     * 用户名长度限制
-     */
-    public static final int USERNAME_MIN_LENGTH = 2;
+  /** 校验是否唯一的返回标识 */
+  public static final boolean UNIQUE = true;
 
-    public static final int USERNAME_MAX_LENGTH = 20;
+  public static final boolean NOT_UNIQUE = false;
 
-    /**
-     * 密码长度限制
-     */
-    public static final int PASSWORD_MIN_LENGTH = 5;
+  /** 用户名长度限制 */
+  public static final int USERNAME_MIN_LENGTH = 2;
 
-    public static final int PASSWORD_MAX_LENGTH = 20;
+  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

@@ -0,0 +1,82 @@
+package com.ruoyi.common.core.context;
+
+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等信息 注意： 必须在网关通过请求头的方法传入，同时在HeaderInterceptor拦截器设置值。 否则这里无法获取
+ *
+ * @author ruoyi
+ */
+public class SecurityContextHolder {
+  private static final TransmittableThreadLocal<Map<String, Object>> THREAD_LOCAL =
+      new TransmittableThreadLocal<>();
+
+  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) {
+    Map<String, Object> map = getLocalMap();
+    return Convert.toStr(map.getOrDefault(key, StringUtils.EMPTY));
+  }
+
+  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() {
+    Map<String, Object> map = THREAD_LOCAL.get();
+    if (map == null) {
+      map = new ConcurrentHashMap<String, Object>();
+      THREAD_LOCAL.set(map);
+    }
+    return map;
+  }
+
+  public static void setLocalMap(Map<String, Object> threadLocalMap) {
+    THREAD_LOCAL.set(threadLocalMap);
+  }
+
+  public static Long getUserId() {
+    return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L);
+  }
+
+  public static void setUserId(String account) {
+    set(SecurityConstants.DETAILS_USER_ID, account);
+  }
+
+  public static String getUserName() {
+    return get(SecurityConstants.DETAILS_USERNAME);
+  }
+
+  public static void setUserName(String username) {
+    set(SecurityConstants.DETAILS_USERNAME, username);
+  }
+
+  public static String getUserKey() {
+    return get(SecurityConstants.USER_KEY);
+  }
+
+  public static void setUserKey(String userKey) {
+    set(SecurityConstants.USER_KEY, userKey);
+  }
+
+  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,105 +1,97 @@
 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
-{
-    private static final long serialVersionUID = 1L;
+public class R<T> implements Serializable {
+  private static final long serialVersionUID = 1L;
 
-    /** 成功 */
-    public static final int SUCCESS = Constants.SUCCESS;
+  /** 成功 */
+  public static final int SUCCESS = Constants.SUCCESS;
 
-    /** 失败 */
-    public static final int FAIL = Constants.FAIL;
+  /** 失败 */
+  public static final int FAIL = Constants.FAIL;
 
-    private int code;
+  private int code;
 
-    private String msg;
+  private String msg;
 
-    private T data;
+  private T data;
 
-    public static <T> R<T> ok()
-    {
-        return restResult(null, SUCCESS, null);
-    }
+  public static <T> R<T> ok() {
+    return restResult(null, SUCCESS, null);
+  }
 
-    public static <T> R<T> ok(T data)
-    {
-        return restResult(data, SUCCESS, null);
-    }
+  public static <T> R<T> ok(T data) {
+    return restResult(data, SUCCESS, null);
+  }
 
-    public static <T> R<T> ok(T data, String msg)
-    {
-        return restResult(data, SUCCESS, msg);
-    }
+  public static <T> R<T> ok(T data, String msg) {
+    return restResult(data, SUCCESS, msg);
+  }
 
-    public static <T> R<T> fail()
-    {
-        return restResult(null, FAIL, null);
-    }
+  public static <T> R<T> fail() {
+    return restResult(null, FAIL, null);
+  }
 
-    public static <T> R<T> fail(String msg)
-    {
-        return restResult(null, FAIL, msg);
-    }
+  public static <T> R<T> fail(String msg) {
+    return restResult(null, FAIL, msg);
+  }
 
-    public static <T> R<T> fail(T data)
-    {
-        return restResult(data, FAIL, null);
-    }
+  public static <T> R<T> fail(T data) {
+    return restResult(data, FAIL, null);
+  }
 
-    public static <T> R<T> fail(T data, String msg)
-    {
-        return restResult(data, FAIL, 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)
-    {
-        return restResult(null, code, msg);
-    }
+  public static <T> R<T> fail(int code, String msg) {
+    return restResult(null, code, msg);
+  }
 
-    private static <T> R<T> restResult(T data, int code, String msg)
-    {
-        R<T> apiResult = new R<>();
-        apiResult.setCode(code);
-        apiResult.setData(data);
-        apiResult.setMsg(msg);
-        return apiResult;
-    }
+  private static <T> R<T> restResult(T data, int code, String msg) {
+    R<T> apiResult = new R<>();
+    apiResult.setCode(code);
+    apiResult.setData(data);
+    apiResult.setMsg(msg);
+    return apiResult;
+  }
 
-    public int getCode()
-    {
-        return code;
-    }
+  public int getCode() {
+    return code;
+  }
 
-    public void setCode(int code)
-    {
-        this.code = code;
-    }
+  public void setCode(int code) {
+    this.code = code;
+  }
 
-    public String getMsg()
-    {
-        return msg;
-    }
+  public String getMsg() {
+    return msg;
+  }
 
-    public void setMsg(String msg)
-    {
-        this.msg = msg;
-    }
+  public void setMsg(String msg) {
+    this.msg = msg;
+  }
 
-    public T getData()
-    {
-        return data;
-    }
+  public T getData() {
+    return data;
+  }
 
-    public void setData(T data)
-    {
-        this.data = 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

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

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

@@ -1,79 +0,0 @@
-package com.ruoyi.common.core.exception;
-
-/**
- * 基础异常
- * 
- * @author ruoyi
- */
-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)
-    {
-        this.module = module;
-        this.code = code;
-        this.args = args;
-        this.defaultMessage = defaultMessage;
-    }
-
-    public BaseException(String module, String code, Object[] args)
-    {
-        this(module, code, args, null);
-    }
-
-    public BaseException(String module, String defaultMessage)
-    {
-        this(module, null, null, defaultMessage);
-    }
-
-    public BaseException(String code, Object[] args)
-    {
-        this(null, code, args, null);
-    }
-
-    public BaseException(String defaultMessage)
-    {
-        this(null, null, null, defaultMessage);
-    }
-
-    public String getModule()
-    {
-        return module;
-    }
-
-    public String getCode()
-    {
-        return code;
-    }
-
-    public Object[] getArgs()
-    {
-        return args;
-    }
-
-    public String getDefaultMessage()
-    {
-        return defaultMessage;
-    }
-}

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

@@ -2,15 +2,13 @@ package com.ruoyi.common.core.exception;
 
 /**
  * 验证码错误异常类
- * 
+ *
  * @author ruoyi
  */
-public class CaptchaException extends RuntimeException
-{
-    private static final long serialVersionUID = 1L;
+public class CaptchaException extends RuntimeException {
+  private static final long serialVersionUID = 1L;
 
-    public CaptchaException(String msg)
-    {
-        super(msg);
-    }
+  public CaptchaException(String msg) {
+    super(msg);
+  }
 }

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

@@ -2,30 +2,26 @@ package com.ruoyi.common.core.exception;
 
 /**
  * 检查异常
- * 
+ *
  * @author ruoyi
  */
-public class CheckedException extends RuntimeException
-{
-    private static final long serialVersionUID = 1L;
+public class CheckedException extends RuntimeException {
+  private static final long serialVersionUID = 1L;
 
-    public CheckedException(String message)
-    {
-        super(message);
-    }
+  public CheckedException(String message) {
+    super(message);
+  }
 
-    public CheckedException(Throwable cause)
-    {
-        super(cause);
-    }
+  public CheckedException(Throwable cause) {
+    super(cause);
+  }
 
-    public CheckedException(String message, Throwable cause)
-    {
-        super(message, cause);
-    }
+  public CheckedException(String message, Throwable cause) {
+    super(message, cause);
+  }
 
-    public CheckedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace)
-    {
-        super(message, cause, enableSuppression, 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/CustomException.java

@@ -1,43 +0,0 @@
-package com.ruoyi.common.core.exception;
-
-/**
- * 自定义异常
- * 
- * @author ruoyi
- */
-public class CustomException extends RuntimeException
-{
-    private static final long serialVersionUID = 1L;
-
-    private Integer code;
-
-    private String message;
-
-    public CustomException(String message)
-    {
-        this.message = message;
-    }
-
-    public CustomException(String message, Integer code)
-    {
-        this.message = message;
-        this.code = code;
-    }
-
-    public CustomException(String message, Throwable e)
-    {
-        super(message, e);
-        this.message = message;
-    }
-
-    @Override
-    public String getMessage()
-    {
-        return message;
-    }
-
-    public Integer getCode()
-    {
-        return code;
-    }
-}

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

@@ -2,14 +2,11 @@ package com.ruoyi.common.core.exception;
 
 /**
  * 演示模式异常
- * 
+ *
  * @author ruoyi
  */
-public class DemoModeException extends RuntimeException
-{
-    private static final long serialVersionUID = 1L;
+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

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

@@ -0,0 +1,14 @@
+package com.ruoyi.common.core.exception;
+
+/**
+ * 内部认证异常
+ *
+ * @author ruoyi
+ */
+public class InnerAuthException extends RuntimeException {
+  private static final long serialVersionUID = 1L;
+
+  public InnerAuthException(String message) {
+    super(message);
+  }
+}

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

@@ -2,14 +2,11 @@ package com.ruoyi.common.core.exception;
 
 /**
  * 权限异常
- * 
+ *
  * @author ruoyi
  */
-public class PreAuthorizeException extends RuntimeException
-{
-    private static final long serialVersionUID = 1L;
+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

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

@@ -2,25 +2,21 @@ package com.ruoyi.common.core.exception;
 
 /**
  * 工具类异常
- * 
+ *
  * @author ruoyi
  */
-public class UtilException extends RuntimeException
-{
-    private static final long serialVersionUID = 8247610319171014183L;
+public class UtilException extends RuntimeException {
+  private static final long serialVersionUID = 8247610319171014183L;
 
-    public UtilException(Throwable e)
-    {
-        super(e.getMessage(), e);
-    }
+  public UtilException(Throwable e) {
+    super(e.getMessage(), e);
+  }
 
-    public UtilException(String message)
-    {
-        super(message);
-    }
+  public UtilException(String message) {
+    super(message);
+  }
 
-    public UtilException(String message, Throwable throwable)
-    {
-        super(message, 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

@@ -0,0 +1,14 @@
+package com.ruoyi.common.core.exception.auth;
+
+/**
+ * 未能通过的登录认证异常
+ *
+ * @author ruoyi
+ */
+public class NotLoginException extends RuntimeException {
+  private static final long serialVersionUID = 1L;
+
+  public NotLoginException(String message) {
+    super(message);
+  }
+}

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

@@ -0,0 +1,20 @@
+package com.ruoyi.common.core.exception.auth;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 未能通过的权限认证异常
+ *
+ * @author ruoyi
+ */
+public class NotPermissionException extends RuntimeException {
+  private static final long serialVersionUID = 1L;
+
+  public NotPermissionException(String permission) {
+    super(permission);
+  }
+
+  public NotPermissionException(String[] permissions) {
+    super(StringUtils.join(permissions, ","));
+  }
+}

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

@@ -0,0 +1,20 @@
+package com.ruoyi.common.core.exception.auth;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 未能通过的角色认证异常
+ *
+ * @author ruoyi
+ */
+public class NotRoleException extends RuntimeException {
+  private static final long serialVersionUID = 1L;
+
+  public NotRoleException(String role) {
+    super(role);
+  }
+
+  public NotRoleException(String[] roles) {
+    super(StringUtils.join(roles, ","));
+  }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.common.core.exception.base;
+
+/**
+ * 基础异常
+ *
+ * @author ruoyi
+ */
+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) {
+    this.module = module;
+    this.code = code;
+    this.args = args;
+    this.defaultMessage = defaultMessage;
+  }
+
+  public BaseException(String module, String code, Object[] args) {
+    this(module, code, args, null);
+  }
+
+  public BaseException(String module, String defaultMessage) {
+    this(module, null, null, defaultMessage);
+  }
+
+  public BaseException(String code, Object[] args) {
+    this(null, code, args, null);
+  }
+
+  public BaseException(String defaultMessage) {
+    this(null, null, null, defaultMessage);
+  }
+
+  public String getModule() {
+    return module;
+  }
+
+  public String getCode() {
+    return code;
+  }
+
+  public Object[] getArgs() {
+    return args;
+  }
+
+  public String getDefaultMessage() {
+    return defaultMessage;
+  }
+}