若依 3.0.0

升级swagger到最新版本v3.0.0
优化Excel导入增加空行判断
2026-01-26 19:51:56 +08:00 · 2021-06-10 09:19:42 +08:00 · 2021-06-08 20:03:37 +08:00 · 2021-06-08 19:55:09 +08:00 · 2021-06-03 13:58:05 +08:00 · 2021-06-03 13:57:52 +08:00
200 changed files with 4066 additions and 1487 deletions
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 * 采用前后端分离的模式，微服务版本前端(基于 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue))。
 * 后端采用Spring Boot、Spring Cloud & Alibaba。
 * 注册中心、配置中心选型Nacos，权限认证使用Redis。
-* 流量控制框架选型Sentinel。
+* 流量控制框架选型Sentinel，分布式事务选型Seata。
 * 如需不分离应用，请移步 [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;
@@ -24,6 +24,7 @@ com.ruoyi
 ├── ruoyi-common          // 通用模块
 │       └── ruoyi-common-core                         // 核心模块
 │       └── ruoyi-common-datascope                    // 权限范围
+│       └── ruoyi-common-datasource                   // 多数据源
 │       └── ruoyi-common-log                          // 日志记录
 │       └── ruoyi-common-redis                        // 缓存服务
 │       └── ruoyi-common-security                     // 安全模块
@@ -40,7 +41,7 @@ com.ruoyi

 ## 架构图

-<img src="https://oscimg.oschina.net/oscnet/up-63c1c1dd2dc2b91d498164d9ee33682a32a.png"/>
+<img src="https://oscimg.oschina.net/oscnet/up-82e9722ecb846786405a904bafcf19f73f3.png"/>

 ## 内置功能

@@ -107,11 +108,11 @@ com.ruoyi
    </tr>
    <tr>
        <td><img src="https://oscimg.oschina.net/oscnet/up-ff9e3066561574aca73005c5730c6a41f15.png"/></td>
-        <td><img src="https://oscimg.oschina.net/oscnet/up-6d73c2140ce694e3de4c05035fdc1868d4c.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-5e4daac0bb59612c5038448acbcef235e3a.png"/></td>
    </tr>
 </table>


 ## 若依微服务交流群

-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) 点击按钮入群。
--- a/bin/run-auth.bat
+++ b/bin/run-auth.bat
@@ -0,0 +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
+pause
--- a/bin/run-gateway.bat
+++ b/bin/run-gateway.bat
@@ -0,0 +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
+pause
--- a/bin/run-modules-file.bat
+++ b/bin/run-modules-file.bat
@@ -0,0 +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
+pause
--- a/bin/run-modules-gen.bat
+++ b/bin/run-modules-gen.bat
@@ -0,0 +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
+pause
--- a/bin/run-modules-job.bat
+++ b/bin/run-modules-job.bat
@@ -0,0 +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
+pause
--- a/bin/run-modules-system.bat
+++ b/bin/run-modules-system.bat
@@ -0,0 +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
+pause
--- a/bin/run-monitor.bat
+++ b/bin/run-monitor.bat
@@ -0,0 +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
+pause
--- a/docker/deploy.sh
+++ b/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 ruoyi-nginx
+}
+
+# 启动程序模块（必须）
+modules(){
+	docker-compose up -d 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
--- a/docker/docker-compose.yml
+++ b/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: dockerfile
+    ports:
+      - "8080:8080"
+    depends_on:
+      - ruoyi-redis
+    links:
+      - ruoyi-redis
+  ruoyi-auth:
+    container_name: ruoyi-auth
+    build:
+      context: ./ruoyi/auth
+      dockerfile: 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: 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: 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: 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: dockerfile
+    ports:
+      - "9300:9300"
+    volumes:
+    - ./ruoyi/uploadPath:/home/ruoyi/uploadPath
+  ruoyi-visual-monitor:
+    container_name: ruoyi-visual-monitor
+    build:
+      context: ./ruoyi/visual/monitor
+      dockerfile: dockerfile
+    ports:
+      - "9100:9100"
--- a/docker/mysql/db/readme.txt
+++ b/docker/mysql/db/readme.txt
@@ -0,0 +1 @@
+存放sql目录下的所有脚本，用于docker自动执行。
--- a/docker/mysql/dockerfile
+++ b/docker/mysql/dockerfile
@@ -0,0 +1,7 @@
+# 基础镜像
+FROM mysql:5.7
+# author
+MAINTAINER ruoyi
+
+# 执行sql脚本
+ADD ./db/*.sql /docker-entrypoint-initdb.d/
--- a/docker/nacos/conf/application.properties
+++ b/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=
+
+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
--- a/docker/nacos/dockerfile
+++ b/docker/nacos/dockerfile
@@ -0,0 +1,7 @@
+# 基础镜像
+FROM nacos/nacos-server
+# author
+MAINTAINER ruoyi
+
+# 复制conf文件到路径
+COPY ./conf/application.properties /home/nacos/conf/application.properties
--- a/docker/nginx/conf/nginx.conf
+++ b/docker/nginx/conf/nginx.conf
@@ -0,0 +1,36 @@
+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/;
+		}
+
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+    }
+}# requirepass 123456
--- a/docker/nginx/dockerfile
+++ b/docker/nginx/dockerfile
@@ -0,0 +1,15 @@
+# 基础镜像
+FROM nginx
+# author
+MAINTAINER 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
--- a/docker/nginx/html/dist/readme.txt
+++ b/docker/nginx/html/dist/readme.txt
@@ -0,0 +1 @@
+存放前端ruoyi-ui构建好的静态文件，用于nginx请求访问。
--- a/docker/redis/conf/redis.conf
+++ b/docker/redis/conf/redis.conf
@@ -0,0 +1 @@
+# requirepass 123456
--- a/docker/redis/dockerfile
+++ b/docker/redis/dockerfile
@@ -0,0 +1,13 @@
+# 基础镜像
+FROM redis
+# author
+MAINTAINER 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
--- a/docker/ruoyi/auth/dockerfile
+++ b/docker/ruoyi/auth/dockerfile
@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER 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"]
--- a/docker/ruoyi/auth/jar/readme.txt
+++ b/docker/ruoyi/auth/jar/readme.txt
@@ -0,0 +1 @@
+存放认证中心打包好的jar文件，用于docker启动应用。
--- a/docker/ruoyi/gateway/dockerfile
+++ b/docker/ruoyi/gateway/dockerfile
@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER 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"]
--- a/docker/ruoyi/gateway/jar/readme.txt
+++ b/docker/ruoyi/gateway/jar/readme.txt
@@ -0,0 +1 @@
+存放网关模块打包好的jar文件，用于docker启动应用。
--- a/docker/ruoyi/modules/file/dockerfile
+++ b/docker/ruoyi/modules/file/dockerfile
@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER 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"]
--- a/docker/ruoyi/modules/file/jar/readme.txt
+++ b/docker/ruoyi/modules/file/jar/readme.txt
@@ -0,0 +1 @@
+存放文件服务打包好的jar文件，用于docker启动应用。
--- a/docker/ruoyi/modules/gen/dockerfile
+++ b/docker/ruoyi/modules/gen/dockerfile
@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER 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"]
--- a/docker/ruoyi/modules/gen/jar/readme.txt
+++ b/docker/ruoyi/modules/gen/jar/readme.txt
@@ -0,0 +1 @@
+存放代码生成打包好的jar文件，用于docker启动应用。
--- a/docker/ruoyi/modules/job/dockerfile
+++ b/docker/ruoyi/modules/job/dockerfile
@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER 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"]
--- a/docker/ruoyi/modules/job/jar/readme.txt
+++ b/docker/ruoyi/modules/job/jar/readme.txt
@@ -0,0 +1 @@
+存放定时任务打包好的jar文件，用于docker启动应用。
--- a/docker/ruoyi/modules/system/dockerfile
+++ b/docker/ruoyi/modules/system/dockerfile
@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER 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"]
--- a/docker/ruoyi/modules/system/jar/readme.txt
+++ b/docker/ruoyi/modules/system/jar/readme.txt
@@ -0,0 +1 @@
+存放系统模块打包好的jar文件，用于docker启动应用。
--- a/docker/ruoyi/visual/monitor/dockerfile
+++ b/docker/ruoyi/visual/monitor/dockerfile
@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER 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"]
--- a/docker/ruoyi/visual/monitor/jar/readme.txt
+++ b/docker/ruoyi/visual/monitor/jar/readme.txt
@@ -0,0 +1 @@
+存放监控中心打包好的jar文件，用于docker启动应用。
--- a/pom.xml
+++ b/pom.xml
@@ -6,36 +6,38 @@

    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi</artifactId>
-    <version>2.4.0</version>
+    <version>3.0.0</version>

    <name>ruoyi</name>
    <url>http://www.ruoyi.vip</url>
    <description>若依微服务系统</description>

    <properties>
-        <ruoyi.version>2.4.0</ruoyi.version>
+        <ruoyi.version>3.0.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.4.RELEASE</spring-boot.version>
-        <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
-        <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
-		<spring-boot-admin.version>2.3.0</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>
+        <spring-boot.version>2.5.0</spring-boot.version>
+        <spring-cloud.version>2020.0.3</spring-cloud.version>
+        <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
+        <alibaba.nacos.version>2.0.1</alibaba.nacos.version>
+        <spring-boot-admin.version>2.4.1</spring-boot-admin.version>
+        <spring-boot.mybatis>2.1.4</spring-boot.mybatis>
+        <swagger.fox.version>3.0.0</swagger.fox.version>
+        <swagger.core.version>1.6.2</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.2</druid.version>
-        <dynamic-ds.version>3.2.1</dynamic-ds.version>
+        <druid.version>1.2.6</druid.version>
+        <dynamic-ds.version>3.3.2</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.74</fastjson.version>
-        <minio.version>8.0.3</minio.version>
+        <fastjson.version>1.2.76</fastjson.version>
+        <minio.version>8.2.1</minio.version>
 		<poi.version>4.1.2</poi.version>
        <common-pool.version>2.6.2</common-pool.version>
+        <commons-collections.version>3.2.2</commons-collections.version>
    </properties>

    <!-- 依赖声明 -->
@@ -60,6 +62,13 @@
                <scope>import</scope>
            </dependency>

+            <!-- Alibaba Nacos 配置 -->
+            <dependency>
+                <groupId>com.alibaba.nacos</groupId>
+                <artifactId>nacos-client</artifactId>
+                <version>${alibaba.nacos.version}</version>
+            </dependency>
+
            <!-- SpringBoot 依赖配置 -->
            <dependency>
                <groupId>org.springframework.boot</groupId>
@@ -142,6 +151,19 @@
                <groupId>org.apache.velocity</groupId>
                <artifactId>velocity</artifactId>
                <version>${velocity.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- Collection 增强Java集合框架 -->
+            <dependency> 
+                <groupId>commons-collections</groupId> 
+                <artifactId>commons-collections</artifactId> 
+                <version>${commons-collections.version}</version>
            </dependency>

            <!-- JSON 解析器和生成器 -->
@@ -228,7 +250,11 @@
    <packaging>pom</packaging>

    <dependencies>
-        
+        <!-- bootstrap 启动器 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
    </dependencies>

    <build>
--- a/ruoyi-api/pom.xml
+++ b/ruoyi-api/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-api/ruoyi-api-system/pom.xml
+++ b/ruoyi-api/ruoyi-api-system/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-api</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java
@@ -33,8 +33,8 @@ public class SysRole extends BaseEntity
    @Excel(name = "角色排序")
    private String roleSort;

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

    /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
@@ -2,12 +2,12 @@ package com.ruoyi.system.api.factory;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import 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;

 /**
 * 文件服务降级处理
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
@@ -2,11 +2,11 @@ package com.ruoyi.system.api.factory;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.RemoteLogService;
 import com.ruoyi.system.api.domain.SysOperLog;
-import feign.hystrix.FallbackFactory;

 /**
 * 日志服务降级处理
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
@@ -2,11 +2,11 @@ package com.ruoyi.system.api.factory;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.model.LoginUser;
-import feign.hystrix.FallbackFactory;

 /**
 * 用户服务降级处理
--- a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring.factories
+++ b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring.factories
@@ -1,3 +1,4 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
  com.ruoyi.system.api.factory.RemoteUserFallbackFactory,\
-  com.ruoyi.system.api.factory.RemoteLogFallbackFactory
+  com.ruoyi.system.api.factory.RemoteLogFallbackFactory, \
+  com.ruoyi.system.api.factory.RemoteFileFallbackFactory
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</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>
@@ -46,12 +46,6 @@
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
 		
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-		
        <!-- RuoYi Common Security-->
        <dependency>
            <groupId>com.ruoyi</groupId>
@@ -61,6 +55,7 @@
    </dependencies>
 	
    <build>
+        <finalName>${project.artifactId}</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
@@ -1,7 +1,8 @@
 package com.ruoyi.auth;

 import org.springframework.boot.SpringApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import com.ruoyi.common.security.annotation.EnableRyFeignClients;

 /**
@@ -10,7 +11,7 @@ import com.ruoyi.common.security.annotation.EnableRyFeignClients;
 * @author ruoyi
 */
@EnableRyFeignClients
-@SpringCloudApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
 public class RuoYiAuthApplication
 {
    public static void main(String[] args)
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java
@@ -17,16 +17,6 @@ public class LoginBody
     */
    private String password;

-    /**
-     * 验证码
-     */
-    private String code;
-
-    /**
-     * 唯一标识
-     */
-    private String uuid = "";
-
    public String getUsername()
    {
        return username;
@@ -46,24 +36,4 @@ public class LoginBody
    {
        this.password = password;
    }
-
-    public String getCode()
-    {
-        return code;
-    }
-
-    public void setCode(String code)
-    {
-        this.code = code;
-    }
-
-    public String getUuid()
-    {
-        return uuid;
-    }
-
-    public void setUuid(String uuid)
-    {
-        this.uuid = uuid;
-    }
 }
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -21,4 +21,5 @@ spring:
        # 配置文件格式
        file-extension: yml
        # 共享配置
-        shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -17,23 +17,29 @@

    <dependencies>

-    	<!-- SpringCloud Openfeign -->
+        <!-- SpringCloud Openfeign -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
-    	</dependency>
+        </dependency>
        
-    	<!-- Spring Context Support -->
-    	<dependency>
+        <!-- SpringCloud Loadbalancer -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </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 -->
        <dependency>
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
@@ -144,7 +144,7 @@ public @interface Excel

    public enum ColumnType
    {
-        NUMERIC(0), STRING(1);
+        NUMERIC(0), STRING(1), IMAGE(2);
        private final int value;

        ColumnType(int value)
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
@@ -13,6 +13,9 @@ public class GenConstants
    /** 树表（增删改查） */
    public static final String TPL_TREE = "tree";

+    /** 主子表（增删改查） */
+    public static final String TPL_SUB = "sub";
+
    /** 树编码字段 */
    public static final String TREE_CODE = "treeCode";

@@ -29,8 +32,10 @@ public class GenConstants
    public static final String PARENT_MENU_NAME = "parentMenuName";

    /** 数据库字符串类型 */
-    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2", "tinytext", "text",
-            "mediumtext", "longtext" };
+    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_TIME = { "datetime", "time", "date", "timestamp" };
@@ -74,8 +79,11 @@ public class GenConstants
    /** 日期控件 */
    public static final String HTML_DATETIME = "datetime";

-    /** 上传控件 */
-    public static final String HTML_UPLOAD_IMAGE = "uploadImage";
+    /** 图片上传控件 */
+    public static final String HTML_IMAGE_UPLOAD = "imageUpload";
+
+    /** 文件上传控件 */
+    public static final String HTML_FILE_UPLOAD = "fileUpload";

    /** 富文本控件 */
    public static final String HTML_EDITOR = "editor";
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -797,7 +797,21 @@ public class Convert
        }
        else if (obj instanceof byte[] || obj instanceof Byte[])
        {
-            return str((Byte[]) obj, charset);
+            if (obj instanceof byte[])
+            {
+                return str((byte[]) obj, charset);
+            }
+            else
+            {
+                Byte[] bytes = (Byte[]) obj;
+                int length = bytes.length;
+                byte[] dest = new byte[length];
+                for (int i = 0; i < length; i++)
+                {
+                    dest[i] = bytes[i];
+                }
+                return str(dest, charset);
+            }
        }
        else if (obj instanceof ByteBuffer)
        {
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
@@ -22,7 +22,7 @@ public class ExceptionUtil
        return str;
    }

-    public static String getRootErrorMseeage(Exception e)
+    public static String getRootErrorMessage(Exception e)
    {
        Throwable root = ExceptionUtils.getRootCause(e);
        root = (root == null ? e : root);
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecurityUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecurityUtils.java
@@ -17,7 +17,8 @@ public class SecurityUtils
     */
    public static String getUsername()
    {
-        return ServletUtils.getRequest().getHeader(CacheConstants.DETAILS_USERNAME);
+        String username = ServletUtils.getRequest().getHeader(CacheConstants.DETAILS_USERNAME);
+        return ServletUtils.urlDecode(username);
    }

    /**
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
@@ -1,6 +1,9 @@
 package com.ruoyi.common.core.utils;

 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.Enumeration;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -10,6 +13,7 @@ import javax.servlet.http.HttpSession;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.text.Convert;

 /**
@@ -173,4 +177,40 @@ public class ServletUtils
        }
        return false;
    }
+
+    /**
+     * 内容编码
+     * 
+     * @param str 内容
+     * @return 编码后的内容
+     */
+    public static String urlEncode(String str)
+    {
+        try
+        {
+            return URLEncoder.encode(str, Constants.UTF8);
+        }
+        catch (UnsupportedEncodingException e)
+        {
+            return "";
+        }
+    }
+
+    /**
+     * 内容解码
+     * 
+     * @param str 内容
+     * @return 解码后的内容
+     */
+    public static String urlDecode(String str)
+    {
+        try
+        {
+            return URLDecoder.decode(str, Constants.UTF8);
+        }
+        catch (UnsupportedEncodingException e)
+        {
+            return "";
+        }
+    }
 }
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
@@ -3,6 +3,7 @@ package com.ruoyi.common.core.utils;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import org.springframework.util.AntPathMatcher;
 import com.ruoyi.common.core.text.StrFormatter;

 /**
@@ -18,9 +19,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
    /** 下划线 */
    private static final char SEPARATOR = '_';

-    /** 星号 */
-    private static final String START = "*";
-
    /**
     * 获取参数不为空值
     * 
@@ -238,6 +236,30 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
        return str.substring(start, end);
    }

+    /**
+     * 判断是否为空，并且不是空白字符
+     * 
+     * @param str 要判断的value
+     * @return 结果
+     */
+    public static boolean hasText(String str)
+    {
+        return (str != null && !str.isEmpty() && containsText(str));
+    }
+
+    private static boolean containsText(CharSequence str)
+    {
+        int strLen = str.length();
+        for (int i = 0; i < strLen; i++)
+        {
+            if (!Character.isWhitespace(str.charAt(i)))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
    /**
     * 格式化文本, {} 表示占位符<br>
     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
@@ -261,7 +283,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
    }

    /**
-     * 下划线转驼峰命名
+     * 驼峰转下划线命名
     */
    public static String toUnderScoreCase(String str)
    {
@@ -413,9 +435,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
        {
            return false;
        }
-        for (String testStr : strs)
+        for (String pattern : strs)
        {
-            if (matches(str, testStr))
+            if (isMatch(pattern, str))
            {
                return true;
            }
@@ -424,95 +446,19 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
    }

    /**
-     * 查找指定字符串是否匹配指定字符串数组中的任意一个字符串
+     * 判断url是否与规则配置: 
+     * ? 表示单个字符; 
+     * * 表示一层路径内的任意字符串，不可跨层级; 
+     * ** 表示任意层路径;
     * 
-     * @param str 指定字符串
-     * @param strs 需要检查的字符串数组
-     * @return 是否匹配
+     * @param pattern 匹配规则
+     * @param url 需要匹配的url
+     * @return
     */
-    public static boolean matches(String str, String... strs)
+    public static boolean isMatch(String pattern, String url)
    {
-        if (isEmpty(str) || isEmpty(strs))
-        {
-            return false;
-        }
-        for (String testStr : strs)
-        {
-            if (matches(str, testStr))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 查找指定字符串是否匹配
-     * 
-     * @param str 指定字符串
-     * @param pattern 需要检查的字符串
-     * @return 是否匹配
-     */
-    public static boolean matches(String str, String pattern)
-    {
-        if (isEmpty(pattern) || isEmpty(str))
-        {
-            return false;
-        }
-
-        pattern = pattern.replaceAll("\\s*", ""); // 替换空格
-        int beginOffset = 0; // pattern截取开始位置
-        int formerStarOffset = -1; // 前星号的偏移位置
-        int latterStarOffset = -1; // 后星号的偏移位置
-
-        String remainingURI = str;
-        String prefixPattern = "";
-        String suffixPattern = "";
-
-        boolean result = false;
-        do
-        {
-            formerStarOffset = indexOf(pattern, START, beginOffset);
-            prefixPattern = substring(pattern, beginOffset, formerStarOffset > -1 ? formerStarOffset : pattern.length());
-
-            // 匹配前缀Pattern
-            result = remainingURI.contains(prefixPattern);
-            // 已经没有星号，直接返回
-            if (formerStarOffset == -1)
-            {
-                return result;
-            }
-
-            // 匹配失败，直接返回
-            if (!result)
-                return false;
-
-            if (!isEmpty(prefixPattern))
-            {
-                remainingURI = substringAfter(str, prefixPattern);
-            }
-
-            // 匹配后缀Pattern
-            latterStarOffset = indexOf(pattern, START, formerStarOffset + 1);
-            suffixPattern = substring(pattern, formerStarOffset + 1, latterStarOffset > -1 ? latterStarOffset : pattern.length());
-
-            result = remainingURI.contains(suffixPattern);
-            // 匹配失败，直接返回
-            if (!result)
-                return false;
-
-            if (!isEmpty(suffixPattern))
-            {
-                remainingURI = substringAfter(str, suffixPattern);
-            }
-
-            // 移动指针
-            beginOffset = latterStarOffset + 1;
-
-        }
-        while (!isEmpty(suffixPattern) && !isEmpty(remainingURI));
-
-        return true;
+        AntPathMatcher matcher = new AntPathMatcher();
+        return matcher.match(pattern, url);
    }

    @SuppressWarnings("unchecked")
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java
@@ -44,4 +44,33 @@ public class FileTypeUtils
        }
        return fileName.substring(separatorIndex + 1).toLowerCase();
    }
+
+    /**
+     * 获取文件类型
+     * 
+     * @param photoByte 文件字节码
+     * @return 后缀（不含".")
+     */
+    public static String getFileExtendName(byte[] photoByte)
+    {
+        String strFileExtendName = "JPG";
+        if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56)
+                && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97))
+        {
+            strFileExtendName = "GIF";
+        }
+        else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70))
+        {
+            strFileExtendName = "JPG";
+        }
+        else if ((photoByte[0] == 66) && (photoByte[1] == 77))
+        {
+            strFileExtendName = "BMP";
+        }
+        else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
+        {
+            strFileExtendName = "PNG";
+        }
+        return strFileExtendName;
+    }
 }
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
@@ -0,0 +1,87 @@
+package com.ruoyi.common.core.utils.file;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Arrays;
+import org.apache.poi.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 图片处理工具类
+ *
+ * @author ruoyi
+ */
+public class ImageUtils
+{
+    private static final Logger log = LoggerFactory.getLogger(ImageUtils.class);
+
+    public static byte[] getImage(String imagePath)
+    {
+        InputStream is = getFile(imagePath);
+        try
+        {
+            return IOUtils.toByteArray(is);
+        }
+        catch (Exception e)
+        {
+            log.error("图片加载异常 {}", e);
+            return null;
+        }
+        finally
+        {
+            IOUtils.closeQuietly(is);
+        }
+    }
+
+    public static InputStream getFile(String imagePath)
+    {
+        try
+        {
+            byte[] result = readFile(imagePath);
+            result = Arrays.copyOf(result, result.length);
+            return new ByteArrayInputStream(result);
+        }
+        catch (Exception e)
+        {
+            log.error("获取图片异常 {}", e);
+        }
+        return null;
+    }
+
+    /**
+     * 读取文件为字节数据
+     * 
+     * @param key 地址
+     * @return 字节数据
+     */
+    public static byte[] readFile(String url)
+    {
+        InputStream in = null;
+        ByteArrayOutputStream baos = null;
+        try
+        {
+            // 网络地址
+            URL urlObj = new URL(url);
+            URLConnection urlConnection = urlObj.openConnection();
+            urlConnection.setConnectTimeout(30 * 1000);
+            urlConnection.setReadTimeout(60 * 1000);
+            urlConnection.setDoInput(true);
+            in = urlConnection.getInputStream();
+            return IOUtils.toByteArray(in);
+        }
+        catch (Exception e)
+        {
+            log.error("访问文件异常 {}", e);
+            return null;
+        }
+        finally
+        {
+            IOUtils.closeQuietly(in);
+            IOUtils.closeQuietly(baos);
+        }
+    }
+}
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
@@ -14,6 +14,11 @@ public class IpUtils
 {
    public static String getIpAddr(HttpServletRequest request)
    {
+        if (request == null)
+        {
+            return null;
+        }
+
        String ip = null;

        // X-Forwarded-For：Squid 服务代理
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
@@ -20,10 +20,12 @@ import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.ClientAnchor;
 import org.apache.poi.ss.usermodel.DataValidation;
 import org.apache.poi.ss.usermodel.DataValidationConstraint;
 import org.apache.poi.ss.usermodel.DataValidationHelper;
 import org.apache.poi.ss.usermodel.DateUtil;
+import org.apache.poi.ss.usermodel.Drawing;
 import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
@@ -34,7 +36,9 @@ import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.util.IOUtils;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
 import org.apache.poi.xssf.usermodel.XSSFDataValidation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,6 +49,8 @@ import com.ruoyi.common.core.annotation.Excels;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.file.FileTypeUtils;
+import com.ruoyi.common.core.utils.file.ImageUtils;
 import com.ruoyi.common.core.utils.reflect.ReflectUtils;

 /**
@@ -96,6 +102,11 @@ public class ExcelUtil<T>
     */
    private List<Object[]> fields;

+    /**
+     * 最大高度
+     */
+    private short maxHeight;
+
    /**
     * 统计列表
     */
@@ -169,7 +180,8 @@ public class ExcelUtil<T>
            throw new IOException("文件sheet不存在");
        }

-        int rows = sheet.getPhysicalNumberOfRows();
+        // 获取最后一个非空行的行下标，比如总行数为n，则返回的为n-1
+        int rows = sheet.getLastRowNum();

        if (rows > 0)
        {
@@ -209,10 +221,15 @@ public class ExcelUtil<T>
                    }
                }
            }
-            for (int i = 1; i < rows; i++)
+            for (int i = 1; i <= rows; i++)
            {
                // 从第2行开始取数据,默认第一行是表头.
                Row row = sheet.getRow(i);
+                // 判断当前行是否是空行
+                if (isRowEmpty(row))
+                {
+                    continue;
+                }
                T entity = null;
                for (Map.Entry<Integer, Field> entry : fieldsMap.entrySet())
                {
@@ -233,7 +250,15 @@ public class ExcelUtil<T>
                        }
                        else
                        {
-                            val = Convert.toStr(val);
+                            String dateFormat = field.getAnnotation(Excel.class).dateFormat();
+                            if (StringUtils.isNotEmpty(dateFormat))
+                            {
+                                val = DateUtils.parseDateToStr(dateFormat, (Date) val);
+                            }
+                            else
+                            {
+                                val = Convert.toStr(val);
+                            }
                        }
                    }
                    else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
@@ -303,7 +328,7 @@ public class ExcelUtil<T>
     */
    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName) throws IOException
    {
-        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
        response.setCharacterEncoding("utf-8");
        this.init(list, sheetName, Type.EXPORT);
        exportExcel(response.getOutputStream());
@@ -317,7 +342,7 @@ public class ExcelUtil<T>
     */
    public void importTemplateExcel(HttpServletResponse response, String sheetName) throws IOException
    {
-        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
        response.setCharacterEncoding("utf-8");
        this.init(null, sheetName, Type.IMPORT);
        exportExcel(response.getOutputStream());
@@ -328,32 +353,12 @@ public class ExcelUtil<T>
     * 
     * @return 结果
     */
-    public void exportExcel(OutputStream outputStream)
+    public void exportExcel(OutputStream out)
    {
        try
        {
-            // 取出一共有多少个sheet.
-            double sheetNo = Math.ceil(list.size() / sheetSize);
-            for (int index = 0; index <= sheetNo; index++)
-            {
-                createSheet(sheetNo, index);
-
-                // 产生一行
-                Row row = sheet.createRow(0);
-                int column = 0;
-                // 写入各个字段的列头名称
-                for (Object[] os : fields)
-                {
-                    Excel excel = (Excel) os[1];
-                    this.createCell(excel, row, column++);
-                }
-                if (Type.EXPORT.equals(type))
-                {
-                    fillExcelData(index, row);
-                    addStatisticsRow();
-                }
-            }
-            wb.write(outputStream);
+            writeSheet();
+            wb.write(out);
        }
        catch (Exception e)
        {
@@ -361,27 +366,35 @@ public class ExcelUtil<T>
        }
        finally
        {
-            if (wb != null)
+            IOUtils.closeQuietly(wb);
+            IOUtils.closeQuietly(out);
+        }
+    }
+
+    /**
+     * 创建写入数据到Sheet
+     */
+    public void writeSheet()
+    {
+        // 取出一共有多少个sheet.
+        double sheetNo = Math.ceil(list.size() / sheetSize);
+        for (int index = 0; index <= sheetNo; index++)
+        {
+            createSheet(sheetNo, index);
+
+            // 产生一行
+            Row row = sheet.createRow(0);
+            int column = 0;
+            // 写入各个字段的列头名称
+            for (Object[] os : fields)
            {
-                try
-                {
-                    wb.close();
-                }
-                catch (IOException e1)
-                {
-                    e1.printStackTrace();
-                }
+                Excel excel = (Excel) os[1];
+                this.createCell(excel, row, column++);
            }
-            if (outputStream != null)
+            if (Type.EXPORT.equals(type))
            {
-                try
-                {
-                    outputStream.close();
-                }
-                catch (IOException e1)
-                {
-                    e1.printStackTrace();
-                }
+                fillExcelData(index, row);
+                addStatisticsRow();
            }
        }
    }
@@ -510,8 +523,51 @@ public class ExcelUtil<T>
        }
        else if (ColumnType.NUMERIC == attr.cellType())
        {
-            cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
+            if (StringUtils.isNotNull(value))
+            {
+                cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
+            }
        }
+        else if (ColumnType.IMAGE == attr.cellType())
+        {
+            ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), cell.getRow().getRowNum() + 1);
+            String imagePath = Convert.toStr(value);
+            if (StringUtils.isNotEmpty(imagePath))
+            {
+                byte[] data = ImageUtils.getImage(imagePath);
+                getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
+                        cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
+            }
+        }
+    }
+
+    /**
+     * 获取画布
+     */
+    public static Drawing<?> getDrawingPatriarch(Sheet sheet)
+    {
+        if (sheet.getDrawingPatriarch() == null)
+        {
+            sheet.createDrawingPatriarch();
+        }
+        return sheet.getDrawingPatriarch();
+    }
+
+    /**
+     * 获取图片类型,设置图片插入类型
+     */
+    public int getImageType(byte[] value)
+    {
+        String type = FileTypeUtils.getFileExtendName(value);
+        if ("JPG".equalsIgnoreCase(type))
+        {
+            return Workbook.PICTURE_TYPE_JPEG;
+        }
+        else if ("PNG".equalsIgnoreCase(type))
+        {
+            return Workbook.PICTURE_TYPE_PNG;
+        }
+        return Workbook.PICTURE_TYPE_JPEG;
    }

    /**
@@ -527,7 +583,6 @@ public class ExcelUtil<T>
        {
            // 设置列宽
            sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
-            row.setHeight((short) (attr.height() * 20));
        }
        // 如果设置了提示信息则鼠标放上去提示.
        if (StringUtils.isNotEmpty(attr.prompt()))
@@ -552,7 +607,7 @@ public class ExcelUtil<T>
        try
        {
            // 设置行高
-            row.setHeight((short) (attr.height() * 20));
+            row.setHeight(maxHeight);
            // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列.
            if (attr.isExport())
            {
@@ -851,6 +906,21 @@ public class ExcelUtil<T>
            }
        }
        this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
+        this.maxHeight = getRowHeight();
+    }
+    
+    /**
+     * 根据注解获取最大行高
+     */
+    public short getRowHeight()
+    {
+        double maxHeight = 0;
+        for (Object[] os : this.fields)
+        {
+            Excel excel = (Excel) os[1];
+            maxHeight = maxHeight > excel.height() ? maxHeight : excel.height();
+        }
+        return (short) (maxHeight * 20);
    }

    /**
@@ -921,7 +991,7 @@ public class ExcelUtil<T>
                    }
                    else
                    {
-                        if ((Double) val % 1 > 0)
+                        if ((Double) val % 1 != 0)
                        {
                            val = new BigDecimal(val.toString());
                        }
@@ -952,4 +1022,27 @@ public class ExcelUtil<T>
        }
        return val;
    }
+
+    /**
+     * 判断是否是空行
+     * 
+     * @param row 判断的行
+     * @return
+     */
+    private boolean isRowEmpty(Row row)
+    {
+        if (row == null)
+        {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++)
+        {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK)
+            {
+                return false;
+            }
+        }
+        return true;
+    }
 }
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
@@ -3,12 +3,10 @@ package com.ruoyi.common.core.web.controller;
 import java.beans.PropertyEditorSupport;
 import java.util.Date;
 import java.util.List;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
-
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.constant.HttpStatus;
@@ -27,7 +25,7 @@ import com.ruoyi.common.core.web.page.TableSupport;
 */
 public class BaseController
 {
-    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+    protected final Logger logger = LoggerFactory.getLogger(this.getClass());

    /**
     * 将前台传递过来的日期格式的字符串，自动转化为Date类型
@@ -85,4 +83,47 @@ public class BaseController
    {
        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
    }
+
+    /**
+     * 响应返回结果
+     * 
+     * @param result 结果
+     * @return 操作结果
+     */
+    protected AjaxResult toAjax(boolean result)
+    {
+        return result ? success() : error();
+    }
+
+    /**
+     * 返回成功
+     */
+    public AjaxResult success()
+    {
+        return AjaxResult.success();
+    }
+
+    /**
+     * 返回失败消息
+     */
+    public AjaxResult error()
+    {
+        return AjaxResult.error();
+    }
+
+    /**
+     * 返回成功消息
+     */
+    public AjaxResult success(String message)
+    {
+        return AjaxResult.success(message);
+    }
+
+    /**
+     * 返回失败消息
+     */
+    public AjaxResult error(String message)
+    {
+        return AjaxResult.error(message);
+    }
 }
--- a/ruoyi-common/ruoyi-common-datascope/pom.xml
+++ b/ruoyi-common/ruoyi-common-datascope/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
+++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
@@ -68,6 +68,7 @@ public class DataScopeAspect
    @Before("dataScopePointCut()")
    public void doBefore(JoinPoint point) throws Throwable
    {
+        clearDataScope(point);
        handleDataScope(point);
    }

@@ -169,4 +170,17 @@ public class DataScopeAspect
        }
        return null;
    }
+
+    /**
+     * 拼接权限sql前先清空params.dataScope参数防止注入
+     */
+    private void clearDataScope(final JoinPoint joinPoint)
+    {
+        Object params = joinPoint.getArgs()[0];
+        if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
+        {
+            BaseEntity baseEntity = (BaseEntity) params;
+            baseEntity.getParams().put(DATA_SCOPE, "");
+        }
+    }
 }
--- a/ruoyi-common/ruoyi-common-datasource/pom.xml
+++ b/ruoyi-common/ruoyi-common-datasource/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
@@ -31,5 +31,11 @@
            <version>${dynamic-ds.version}</version>
        </dependency>
        
+        <!-- SpringBoot Seata -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
+        </dependency>
+
    </dependencies>
 </project>
--- a/ruoyi-common/ruoyi-common-log/pom.xml
+++ b/ruoyi-common/ruoyi-common-log/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
@@ -18,9 +18,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Component;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;
 import com.alibaba.fastjson.JSON;
-import com.ruoyi.common.core.constant.CacheConstants;
+import com.ruoyi.common.core.utils.SecurityUtils;
 import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.ip.IpUtils;
@@ -93,8 +94,7 @@ public class LogAspect
            operLog.setJsonResult(JSON.toJSONString(jsonResult));

            operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
-            HttpServletRequest request = ServletUtils.getRequest();
-            String username = request.getHeader(CacheConstants.DETAILS_USERNAME);
+            String username = SecurityUtils.getUsername();
            if (StringUtils.isNotBlank(username))
            {
                operLog.setOperName(username);
@@ -190,7 +190,7 @@ public class LogAspect
        {
            for (int i = 0; i < paramsArray.length; i++)
            {
-                if (!isFilterObject(paramsArray[i]))
+                if (StringUtils.isNotNull(paramsArray[i]) && !isFilterObject(paramsArray[i]))
                {
                    try
                    {
@@ -237,6 +237,7 @@ public class LogAspect
                return entry.getValue() instanceof MultipartFile;
            }
        }
-        return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse;
+        return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
+                || o instanceof BindingResult;
    }
 }
--- a/ruoyi-common/ruoyi-common-redis/pom.xml
+++ b/ruoyi-common/ruoyi-common-redis/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
@@ -8,8 +8,10 @@ import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;

 /**
 * redis配置
@@ -21,7 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class RedisConfig extends CachingConfigurerSupport
 {
    @Bean
-    @SuppressWarnings(value = { "unchecked", "rawtypes", "deprecation" })
+    @SuppressWarnings(value = { "unchecked", "rawtypes" })
    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory)
    {
        RedisTemplate<Object, Object> template = new RedisTemplate<>();
@@ -31,12 +33,17 @@ public class RedisConfig extends CachingConfigurerSupport

        ObjectMapper mapper = new ObjectMapper();
        mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
        serializer.setObjectMapper(mapper);

-        template.setValueSerializer(serializer);
        // 使用StringRedisSerializer来序列化和反序列化redis的key值
        template.setKeySerializer(new StringRedisSerializer());
+        template.setValueSerializer(serializer);
+
+        // Hash的key也采用StringRedisSerializer的序列化方式
+        template.setHashKeySerializer(new StringRedisSerializer());
+        template.setHashValueSerializer(serializer);
+
        template.afterPropertiesSet();
        return template;
    }
--- a/ruoyi-common/ruoyi-common-security/pom.xml
+++ b/ruoyi-common/ruoyi-common-security/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
@@ -11,8 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.PatternMatchUtils;
-import org.springframework.util.StringUtils;
 import com.ruoyi.common.core.exception.PreAuthorizeException;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.annotation.PreAuthorize;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.system.api.model.LoginUser;
@@ -50,7 +50,7 @@ public class PreAuthorizeAspect
            return point.proceed();
        }

-        if (!StringUtils.isEmpty(annotation.hasPermi()))
+        if (StringUtils.isNotEmpty(annotation.hasPermi()))
        {
            if (hasPermi(annotation.hasPermi()))
            {
@@ -58,7 +58,7 @@ public class PreAuthorizeAspect
            }
            throw new PreAuthorizeException();
        }
-        else if (!StringUtils.isEmpty(annotation.lacksPermi()))
+        else if (StringUtils.isNotEmpty(annotation.lacksPermi()))
        {
            if (lacksPermi(annotation.lacksPermi()))
            {
@@ -74,7 +74,7 @@ public class PreAuthorizeAspect
            }
            throw new PreAuthorizeException();
        }
-        else if (!StringUtils.isEmpty(annotation.hasRole()))
+        else if (StringUtils.isNotEmpty(annotation.hasRole()))
        {
            if (hasRole(annotation.hasRole()))
            {
@@ -82,7 +82,7 @@ public class PreAuthorizeAspect
            }
            throw new PreAuthorizeException();
        }
-        else if (!StringUtils.isEmpty(annotation.lacksRole()))
+        else if (StringUtils.isNotEmpty(annotation.lacksRole()))
        {
            if (lacksRole(annotation.lacksRole()))
            {
@@ -111,7 +111,7 @@ public class PreAuthorizeAspect
    public boolean hasPermi(String permission)
    {
        LoginUser userInfo = tokenService.getLoginUser();
-        if (StringUtils.isEmpty(userInfo) || CollectionUtils.isEmpty(userInfo.getPermissions()))
+        if (StringUtils.isNull(userInfo) || CollectionUtils.isEmpty(userInfo.getPermissions()))
        {
            return false;
        }
@@ -138,7 +138,7 @@ public class PreAuthorizeAspect
    public boolean hasAnyPermi(String[] permissions)
    {
        LoginUser userInfo = tokenService.getLoginUser();
-        if (StringUtils.isEmpty(userInfo) || CollectionUtils.isEmpty(userInfo.getPermissions()))
+        if (StringUtils.isNull(userInfo) || CollectionUtils.isEmpty(userInfo.getPermissions()))
        {
            return false;
        }
@@ -162,7 +162,7 @@ public class PreAuthorizeAspect
    public boolean hasRole(String role)
    {
        LoginUser userInfo = tokenService.getLoginUser();
-        if (StringUtils.isEmpty(userInfo) || CollectionUtils.isEmpty(userInfo.getRoles()))
+        if (StringUtils.isNull(userInfo) || CollectionUtils.isEmpty(userInfo.getRoles()))
        {
            return false;
        }
@@ -196,7 +196,7 @@ public class PreAuthorizeAspect
    public boolean hasAnyRoles(String[] roles)
    {
        LoginUser userInfo = tokenService.getLoginUser();
-        if (StringUtils.isEmpty(userInfo) || CollectionUtils.isEmpty(userInfo.getRoles()))
+        if (StringUtils.isNull(userInfo) || CollectionUtils.isEmpty(userInfo.getRoles()))
        {
            return false;
        }
@@ -220,6 +220,6 @@ public class PreAuthorizeAspect
    private boolean hasPermissions(Collection<String> authorities, String permission)
    {
        return authorities.stream().filter(StringUtils::hasText)
-                .anyMatch(x -> ALL_PERMISSION.contains(x) || PatternMatchUtils.simpleMatch(permission, x));
+                .anyMatch(x -> ALL_PERMISSION.contains(x) || PatternMatchUtils.simpleMatch(x, permission));
    }
 }
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
@@ -2,6 +2,7 @@ package com.ruoyi.common.security.feign;

 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
+import com.ruoyi.common.core.utils.ip.IpUtils;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.constant.CacheConstants;
 import com.ruoyi.common.core.utils.ServletUtils;
@@ -40,6 +41,9 @@ public class FeignRequestInterceptor implements RequestInterceptor
            {
                requestTemplate.header(CacheConstants.AUTHORIZATION_HEADER, authentication);
            }
+
+            // 配置客户端IP
+            requestTemplate.header("X-Forwarded-For", IpUtils.getIpAddr(ServletUtils.getRequest()));
        }
    }
 }
--- a/ruoyi-common/ruoyi-common-swagger/pom.xml
+++ b/ruoyi-common/ruoyi-common-swagger/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
@@ -23,7 +23,7 @@
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>

-        <!-- Swagger-->
+        <!-- Swagger -->
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>
--- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java
+++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java
@@ -3,13 +3,12 @@ package com.ruoyi.common.swagger.config;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Predicate;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
@@ -18,8 +17,10 @@ import springfox.documentation.service.ApiKey;
 import springfox.documentation.service.AuthorizationScope;
 import springfox.documentation.service.Contact;
 import springfox.documentation.service.SecurityReference;
+import springfox.documentation.service.SecurityScheme;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.ApiSelectorBuilder;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;

@@ -60,27 +61,26 @@ public class SwaggerAutoConfiguration
        {
            swaggerProperties.getExcludePath().addAll(DEFAULT_EXCLUDE_PATH);
        }
+
        List<Predicate<String>> excludePath = new ArrayList<>();
        swaggerProperties.getExcludePath().forEach(path -> excludePath.add(PathSelectors.ant(path)));

-        //noinspection Guava
-        return new Docket(DocumentationType.SWAGGER_2)
-                .host(swaggerProperties.getHost())
+        ApiSelectorBuilder builder = new Docket(DocumentationType.SWAGGER_2).host(swaggerProperties.getHost())
                .apiInfo(apiInfo(swaggerProperties)).select()
-                .apis(RequestHandlerSelectors.basePackage(swaggerProperties.getBasePackage()))
-                .paths(Predicates.and(Predicates.not(Predicates.or(excludePath)), Predicates.or(basePath)))
-                .build()
-                .securitySchemes(securitySchemes())
-                .securityContexts(securityContexts())
-                .pathMapping("/");
+                .apis(RequestHandlerSelectors.basePackage(swaggerProperties.getBasePackage()));
+
+        swaggerProperties.getBasePath().forEach(p -> builder.paths(PathSelectors.ant(p)));
+        swaggerProperties.getExcludePath().forEach(p -> builder.paths(PathSelectors.ant(p).negate()));
+
+        return builder.build().securitySchemes(securitySchemes()).securityContexts(securityContexts()).pathMapping("/");
    }

    /**
     * 安全模式，这里指定token通过Authorization头请求头传递
     */
-    private List<ApiKey> securitySchemes()
+    private List<SecurityScheme> securitySchemes()
    {
-        List<ApiKey> apiKeyList = new ArrayList<ApiKey>();
+        List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
        apiKeyList.add(new ApiKey("Authorization", "Authorization", "header"));
        return apiKeyList;
    }
@@ -94,7 +94,7 @@ public class SwaggerAutoConfiguration
        securityContexts.add(
                SecurityContext.builder()
                        .securityReferences(defaultAuth())
-                        .forPaths(PathSelectors.regex("^(?!auth).*$"))
+                        .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
                        .build());
        return securityContexts;
    }
--- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java
+++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java
@@ -0,0 +1,22 @@
+package com.ruoyi.common.swagger.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * swagger 资源映射路径
+ * 
+ * @author ruoyi
+ */
+@Configuration
+public class SwaggerWebConfiguration implements WebMvcConfigurer
+{
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry)
+    {
+        /** swagger-ui 地址 */
+        registry.addResourceHandler("/swagger-ui/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
+    }
+}
--- a/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring.factories
+++ b/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,3 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.ruoyi.common.swagger.config.SwaggerAutoConfiguration
+  com.ruoyi.common.swagger.config.SwaggerAutoConfiguration,\
+  com.ruoyi.common.swagger.config.SwaggerWebConfiguration
--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -22,25 +22,25 @@
            <artifactId>spring-cloud-starter-gateway</artifactId>
        </dependency>

-        <!-- 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>
        </dependency>

-        <!-- SpringCloud Ailibaba Sentinel Gateway -->
+        <!-- SpringCloud Alibaba Sentinel Gateway -->
        <dependency>
            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
@@ -85,6 +85,7 @@
    </dependencies>

    <build>
+        <finalName>${project.artifactId}</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java
@@ -3,14 +3,12 @@ package com.ruoyi.gateway;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;

 /**
 * 网关启动程序
 * 
 * @author ruoyi
 */
-@EnableDiscoveryClient
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
 public class RuoYiGatewayApplication
 {
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
@@ -1,11 +1,9 @@
 package com.ruoyi.gateway.config;

-import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
-import com.alibaba.csp.sentinel.adapter.gateway.sc.SentinelGatewayFilter;
 import com.ruoyi.gateway.handler.SentinelFallbackHandler;

 /**
@@ -22,11 +20,4 @@ public class GatewayConfig
    {
        return new SentinelFallbackHandler();
    }
-
-    @Bean
-    @Order(-1)
-    public GlobalFilter sentinelGatewayFilter()
-    {
-        return new SentinelGatewayFilter();
-    }
 }
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java
@@ -7,11 +7,18 @@ import org.springframework.cloud.gateway.config.GatewayProperties;
 import org.springframework.cloud.gateway.route.RouteLocator;
 import org.springframework.cloud.gateway.support.NameUtils;
 import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.config.ResourceHandlerRegistry;
+import org.springframework.web.reactive.config.WebFluxConfigurer;
 import springfox.documentation.swagger.web.SwaggerResource;
 import springfox.documentation.swagger.web.SwaggerResourcesProvider;

+/**
+ * 聚合系统接口
+ * 
+ * @author ruoyi
+ */
@Component
-public class SwaggerProvider implements SwaggerResourcesProvider
+public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigurer
 {
    /**
     * Swagger2默认的url后缀
@@ -58,4 +65,12 @@ public class SwaggerProvider implements SwaggerResourcesProvider
        swaggerResource.setSwaggerVersion("2.0");
        return swaggerResource;
    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry)
+    {
+        /** swagger-ui 地址 */
+        registry.addResourceHandler("/swagger-ui/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
+    }
 }
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.constant.CacheConstants;
 import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.gateway.config.properties.IgnoreWhiteProperties;
@@ -78,7 +79,7 @@ public class AuthFilter implements GlobalFilter, Ordered
        redisService.expire(getTokenKey(token), EXPIRE_TIME);
        // 设置用户信息到请求
        ServerHttpRequest mutableReq = exchange.getRequest().mutate().header(CacheConstants.DETAILS_USER_ID, userid)
-                .header(CacheConstants.DETAILS_USERNAME, username).build();
+                .header(CacheConstants.DETAILS_USERNAME, ServletUtils.urlEncode(username)).build();
        ServerWebExchange mutableExchange = exchange.mutate().request(mutableReq).build();

        return chain.filter(mutableExchange);
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java
@@ -28,8 +28,9 @@ public class BlackListUrlFilter extends AbstractGatewayFilterFactory<BlackListUr
            if (config.matchBlacklist(url))
            {
                ServerHttpResponse response = exchange.getResponse();
+                response.getHeaders().add("Content-Type", "application/json;charset=UTF-8");
                return exchange.getResponse().writeWith(
-                        Mono.just(response.bufferFactory().wrap(JSON.toJSONBytes(AjaxResult.error("服务拒绝访问")))));
+                        Mono.just(response.bufferFactory().wrap(JSON.toJSONBytes(AjaxResult.error("请求地址不允许访问")))));
            }

            return chain.filter(exchange);
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java
@@ -21,7 +21,7 @@ public class SentinelFallbackHandler implements WebExceptionHandler
    {
        ServerHttpResponse serverHttpResponse = exchange.getResponse();
        serverHttpResponse.getHeaders().add("Content-Type", "application/json;charset=UTF-8");
-        byte[] datas = "{\"status\":429,\"message\":\"请求超过最大数，请稍后再试\"}".getBytes(StandardCharsets.UTF_8);
+        byte[] datas = "{\"code\":429,\"msg\":\"请求超过最大数，请稍后再试\"}".getBytes(StandardCharsets.UTF_8);
        DataBuffer buffer = serverHttpResponse.bufferFactory().wrap(datas);
        return serverHttpResponse.writeWith(Mono.just(buffer));
    }
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -23,7 +23,8 @@ spring:
        # 配置文件格式
        file-extension: yml
        # 共享配置
-        shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
    sentinel:
      # 取消控制台懒加载
      eager: true
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/ruoyi-file/pom.xml
+++ b/ruoyi-modules/ruoyi-file/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -17,19 +17,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>
@@ -41,13 +41,6 @@
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
 		
-        <!-- Swagger -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-        
        <!-- FastDFS -->
        <dependency>
            <groupId>com.github.tobato</groupId>
@@ -76,6 +69,7 @@
    </dependencies>

    <build>
+        <finalName>${project.artifactId}</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYFileApplication.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYFileApplication.java
@@ -3,7 +3,6 @@ package com.ruoyi.file;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;

 /**
@@ -12,7 +11,6 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 * @author ruoyi
 */
@EnableCustomSwagger2
-@EnableDiscoveryClient
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
 public class RuoYFileApplication
 {
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
@@ -8,7 +8,7 @@ import io.minio.MinioClient;
 /**
 * Minio 配置信息
 *
- * @author ruoiy
+ * @author ruoyi
 */
@Configuration
@ConfigurationProperties(prefix = "minio")
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java
@@ -40,6 +40,7 @@ public class LocalSysFileServiceImpl implements ISysFileService
     * @return 访问地址
     * @throws Exception
     */
+    @Override
    public String uploadFile(MultipartFile file) throws Exception
    {
        String name = FileUploadUtils.upload(localFilePath, file);
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
@@ -29,6 +29,7 @@ public class MinioSysFileServiceImpl implements ISysFileService
     * @return 访问地址
     * @throws Exception
     */
+    @Override
    public String uploadFile(MultipartFile file) throws Exception
    {
        String fileName = FileUploadUtils.extractFilename(file);
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
@@ -3,7 +3,6 @@ package com.ruoyi.file.utils;
 import java.io.File;
 import java.io.IOException;
 import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException;
 import com.ruoyi.common.core.exception.file.FileSizeLimitExceededException;
@@ -30,12 +29,6 @@ public class FileUploadUtils
     */
    public static final int DEFAULT_FILE_NAME_LENGTH = 100;

-    /**
-     * 资源映射路径 前缀
-     */
-    @Value("${file.prefix}")
-    public String localFilePrefix;
-
    /**
     * 根据文件路径上传
     *
@@ -61,7 +54,7 @@ public class FileUploadUtils
     *
     * @param baseDir 相对应用的基目录
     * @param file 上传的文件
-     * @param extension 上传文件类型
+     * @param allowedExtension 上传文件类型
     * @return 返回上传成功的文件名
     * @throws FileSizeLimitExceededException 如果超出最大大小
     * @throws FileNameLengthLimitExceededException 文件名太长
@@ -110,7 +103,7 @@ public class FileUploadUtils
                desc.getParentFile().mkdirs();
            }
        }
-        return desc;
+        return desc.isAbsolute() ? desc : desc.getAbsoluteFile();
    }

    private static final String getPathFileName(String fileName) throws IOException
@@ -123,9 +116,8 @@ public class FileUploadUtils
     * 文件大小校验
     *
     * @param file 上传的文件
-     * @return
     * @throws FileSizeLimitExceededException 如果超出最大大小
-     * @throws InvalidExtensionException
+     * @throws InvalidExtensionException 文件校验异常
     */
    public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
            throws FileSizeLimitExceededException, InvalidExtensionException
@@ -170,9 +162,9 @@ public class FileUploadUtils
    /**
     * 判断MIME类型是否是允许的MIME类型
     *
-     * @param extension
-     * @param allowedExtension
-     * @return
+     * @param extension 上传文件类型
+     * @param allowedExtension 允许上传文件类型
+     * @return true/false
     */
    public static final boolean isAllowedExtension(String extension, String[] allowedExtension)
    {
--- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
@@ -21,4 +21,5 @@ spring:
        # 配置文件格式
        file-extension: yml
        # 共享配置
-        shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
--- a/ruoyi-modules/ruoyi-gen/pom.xml
+++ b/ruoyi-modules/ruoyi-gen/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
-        <version>2.4.0</version>
+        <version>3.0.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -17,19 +17,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>
@@ -41,7 +41,7 @@
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
 		
-        <!-- Swagger -->
+        <!-- Swagger UI -->
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger-ui</artifactId>
@@ -54,6 +54,12 @@
            <artifactId>velocity</artifactId>
        </dependency>
        
+        <!-- Commons Collections -->
+        <dependency> 
+            <groupId>commons-collections</groupId> 
+            <artifactId>commons-collections</artifactId> 
+        </dependency>
+        
        <!-- Mysql Connector -->
        <dependency>
            <groupId>mysql</groupId>
@@ -75,6 +81,7 @@
    </dependencies>

    <build>
+        <finalName>${project.artifactId}</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java
@@ -1,7 +1,7 @@
 package com.ruoyi.gen;

 import org.springframework.boot.SpringApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import com.ruoyi.common.security.annotation.EnableCustomConfig;
 import com.ruoyi.common.security.annotation.EnableRyFeignClients;
 import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
@@ -14,7 +14,7 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
@EnableCustomConfig
@EnableCustomSwagger2   
@EnableRyFeignClients
-@SpringCloudApplication
+@SpringBootApplication
 public class RuoYiGenApplication
 {
    public static void main(String[] args)
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
@@ -63,10 +63,12 @@ public class GenController extends BaseController
    public AjaxResult getInfo(@PathVariable Long talbleId)
    {
        GenTable table = genTableService.selectGenTableById(talbleId);
+        List<GenTable> tables = genTableService.selectGenTableAll();
        List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("info", table);
        map.put("rows", list);
+        map.put("tables", tables);
        return AjaxResult.success(map);
    }

@@ -98,7 +100,7 @@ public class GenController extends BaseController
    /**
     * 导入表结构（保存）
     */
-    @PreAuthorize(hasPermi = "tool:gen:list")
+    @PreAuthorize(hasPermi = "tool:gen:import")
    @Log(title = "代码生成", businessType = BusinessType.IMPORT)
    @PostMapping("/importTable")
    public AjaxResult importTableSave(String tables)
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
@@ -28,11 +28,17 @@ public class GenTable extends BaseEntity
    @NotBlank(message = "表描述不能为空")
    private String tableComment;

+    /** 关联父表的表名 */
+    private String subTableName;
+
+    /** 本表关联父表的外键名 */
+    private String subTableFkName;
+
    /** 实体类名称(首字母大写) */
    @NotBlank(message = "实体类名称不能为空")
    private String className;

-    /** 使用的模板（crud单表操作 tree树表操作） */
+    /** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */
    private String tplCategory;

    /** 生成包路径 */
@@ -64,6 +70,9 @@ public class GenTable extends BaseEntity
    /** 主键信息 */
    private GenTableColumn pkColumn;

+    /** 子表信息 */
+    private GenTable subTable;
+
    /** 表列信息 */
    @Valid
    private List<GenTableColumn> columns;
@@ -116,6 +125,26 @@ public class GenTable extends BaseEntity
        this.tableComment = tableComment;
    }

+    public String getSubTableName()
+    {
+        return subTableName;
+    }
+
+    public void setSubTableName(String subTableName)
+    {
+        this.subTableName = subTableName;
+    }
+
+    public String getSubTableFkName()
+    {
+        return subTableFkName;
+    }
+
+    public void setSubTableFkName(String subTableFkName)
+    {
+        this.subTableFkName = subTableFkName;
+    }
+
    public String getClassName()
    {
        return className;
@@ -216,6 +245,15 @@ public class GenTable extends BaseEntity
        this.pkColumn = pkColumn;
    }

+    public GenTable getSubTable()
+    {
+        return subTable;
+    }
+
+    public void setSubTable(GenTable subTable)
+    {
+        this.subTable = subTable;
+    }
    public List<GenTableColumn> getColumns()
    {
        return columns;
@@ -286,6 +324,15 @@ public class GenTable extends BaseEntity
        this.parentMenuName = parentMenuName;
    }

+    public boolean isSub()
+    {
+        return isSub(this.tplCategory);
+    }
+
+    public static boolean isSub(String tplCategory)
+    {
+        return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
+    }
    public boolean isTree()
    {
        return isTree(this.tplCategory);
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
@@ -60,7 +60,7 @@ public class GenTableColumn extends BaseEntity
    /** 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） */
    private String queryType;

-    /** 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、upload上传控件、editor富文本控件） */
+    /** 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件） */
    private String htmlType;

    /** 字典类型 */
@@ -139,6 +139,11 @@ public class GenTableColumn extends BaseEntity
        return javaField;
    }

+    public String getCapJavaField()
+    {
+        return StringUtils.capitalize(javaField);
+    }
+
    public void setIsPk(String isPk)
    {
        this.isPk = isPk;
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java
@@ -34,6 +34,13 @@ public interface GenTableMapper
     */
    public List<GenTable> selectDbTableListByNames(String[] tableNames);

+    /**
+     * 查询所有表信息
+     * 
+     * @return 表信息集合
+     */
+    public List<GenTable> selectGenTableAll();
+
    /**
     * 查询表ID业务信息
     * 
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
@@ -102,6 +102,17 @@ public class GenTableServiceImpl implements IGenTableService
        return genTableMapper.selectDbTableListByNames(tableNames);
    }

+    /**
+     * 查询所有表信息
+     * 
+     * @return 表信息集合
+     */
+    @Override
+    public List<GenTable> selectGenTableAll()
+    {
+        return genTableMapper.selectGenTableAll();
+    }
+
    /**
     * 修改业务
     * 
@@ -179,14 +190,16 @@ public class GenTableServiceImpl implements IGenTableService
     * @param tableId 表编号
     * @return 预览数据列表
     */
+    @Override
    public Map<String, String> previewCode(Long tableId)
    {
        Map<String, String> dataMap = new LinkedHashMap<>();
        // 查询表信息
        GenTable table = genTableMapper.selectGenTableById(tableId);
-        // 查询列信息
-        List<GenTableColumn> columns = table.getColumns();
-        setPkColumn(table, columns);
+        // 设置主子表信息
+        setSubTable(table);
+        // 设置主键列信息
+        setPkColumn(table);
        VelocityInitializer.initVelocity();

        VelocityContext context = VelocityUtils.prepareContext(table);
@@ -230,9 +243,10 @@ public class GenTableServiceImpl implements IGenTableService
    {
        // 查询表信息
        GenTable table = genTableMapper.selectGenTableByName(tableName);
-        // 查询列信息
-        List<GenTableColumn> columns = table.getColumns();
-        setPkColumn(table, columns);
+        // 设置主子表信息
+        setSubTable(table);
+        // 设置主键列信息
+        setPkColumn(table);

        VelocityInitializer.initVelocity();

@@ -275,6 +289,10 @@ public class GenTableServiceImpl implements IGenTableService
        List<String> tableColumnNames = tableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());

        List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
+        if (StringUtils.isEmpty(dbTableColumns))
+        {
+            throw new CustomException("同步数据失败，原表结构不存在");
+        }
        List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());

        dbTableColumns.forEach(column -> {
@@ -318,9 +336,10 @@ public class GenTableServiceImpl implements IGenTableService
    {
        // 查询表信息
        GenTable table = genTableMapper.selectGenTableByName(tableName);
-        // 查询列信息
-        List<GenTableColumn> columns = table.getColumns();
-        setPkColumn(table, columns);
+        // 设置主子表信息
+        setSubTable(table);
+        // 设置主键列信息
+        setPkColumn(table);

        VelocityInitializer.initVelocity();

@@ -374,6 +393,17 @@ public class GenTableServiceImpl implements IGenTableService
            {
                throw new CustomException("树名称字段不能为空");
            }
+            else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory()))
+            {
+                if (StringUtils.isEmpty(genTable.getSubTableName()))
+                {
+                    throw new CustomException("关联子表的表名不能为空");
+                }
+                else if (StringUtils.isEmpty(genTable.getSubTableFkName()))
+                {
+                    throw new CustomException("子表关联的外键名不能为空");
+                }
+            }
        }
    }

@@ -381,11 +411,10 @@ public class GenTableServiceImpl implements IGenTableService
     * 设置主键列信息
     * 
     * @param table 业务表信息
-     * @param columns 业务字段列表
     */
-    public void setPkColumn(GenTable table, List<GenTableColumn> columns)
+    public void setPkColumn(GenTable table)
    {
-        for (GenTableColumn column : columns)
+        for (GenTableColumn column : table.getColumns())
        {
            if (column.isPk())
            {
@@ -395,7 +424,35 @@ public class GenTableServiceImpl implements IGenTableService
        }
        if (StringUtils.isNull(table.getPkColumn()))
        {
-            table.setPkColumn(columns.get(0));
+            table.setPkColumn(table.getColumns().get(0));
+        }
+        if (GenConstants.TPL_SUB.equals(table.getTplCategory()))
+        {
+            for (GenTableColumn column : table.getSubTable().getColumns())
+            {
+                if (column.isPk())
+                {
+                    table.getSubTable().setPkColumn(column);
+                    break;
+                }
+            }
+            if (StringUtils.isNull(table.getSubTable().getPkColumn()))
+            {
+                table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
+            }
+        }
+    }
+    /**
+     * 设置主子表信息
+     * 
+     * @param table 业务表信息
+     */
+    public void setSubTable(GenTable table)
+    {
+        String subTableName = table.getSubTableName();
+        if (StringUtils.isNotEmpty(subTableName))
+        {
+            table.setSubTable(genTableMapper.selectGenTableByName(subTableName));
        }
    }

--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java
@@ -35,6 +35,13 @@ public interface IGenTableService
     */
    public List<GenTable> selectDbTableListByNames(String[] tableNames);

+    /**
+     * 查询所有表信息
+     * 
+     * @return 表信息集合
+     */
+    public List<GenTable> selectGenTableAll();
+
    /**
     * 查询业务信息
     * 
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java
@@ -40,13 +40,14 @@ public class GenUtils
        column.setCreateBy(table.getCreateBy());
        // 设置java字段名
        column.setJavaField(StringUtils.toCamelCase(columnName));
+        // 设置默认类型
+        column.setJavaType(GenConstants.TYPE_STRING);

-        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType))
+        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType))
        {
-            column.setJavaType(GenConstants.TYPE_STRING);
            // 字符串长度超过500设置为文本域
            Integer columnLength = getColumnLength(column.getColumnType());
-            String htmlType = columnLength >= 500 ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;
+            String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;
            column.setHtmlType(htmlType);
        }
        else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType))
@@ -58,7 +59,7 @@ public class GenUtils
        {
            column.setHtmlType(GenConstants.HTML_INPUT);

-            // 如果是浮点型
+            // 如果是浮点型 统一用BigDecimal
            String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
            if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
            {
@@ -111,10 +112,15 @@ public class GenUtils
        {
            column.setHtmlType(GenConstants.HTML_SELECT);
        }
-        // 文件字段设置上传控件
+        // 图片字段设置图片上传控件
        else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
        {
-            column.setHtmlType(GenConstants.HTML_UPLOAD_IMAGE);
+            column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
+        }
+        // 文件字段设置文件上传控件
+        else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
+        {
+            column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
        }
        // 内容字段设置富文本控件
        else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java
@@ -22,7 +22,7 @@ public class VelocityInitializer
            // 加载classpath目录下的vm文件
            p.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
            // 定义字符集
-            p.setProperty(Velocity.ENCODING_DEFAULT, Constants.UTF8);
+            p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8);
            p.setProperty(Velocity.OUTPUT_ENCODING, Constants.UTF8);
            // 初始化Velocity引擎，指定配置Properties
            Velocity.init(p);
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
@@ -54,7 +54,7 @@ public class VelocityUtils
        velocityContext.put("author", genTable.getFunctionAuthor());
        velocityContext.put("datetime", DateUtils.getDate());
        velocityContext.put("pkColumn", genTable.getPkColumn());
-        velocityContext.put("importList", getImportList(genTable.getColumns()));
+        velocityContext.put("importList", getImportList(genTable));
        velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
        velocityContext.put("columns", genTable.getColumns());
        velocityContext.put("table", genTable);
@@ -63,6 +63,10 @@ public class VelocityUtils
        {
            setTreeVelocityContext(velocityContext, genTable);
        }
+        if (GenConstants.TPL_SUB.equals(tplCategory))
+        {
+            setSubVelocityContext(velocityContext, genTable);
+        }
        return velocityContext;
    }

@@ -96,6 +100,24 @@ public class VelocityUtils
        }
    }

+    public static void setSubVelocityContext(VelocityContext context, GenTable genTable)
+    {
+        GenTable subTable = genTable.getSubTable();
+        String subTableName = genTable.getSubTableName();
+        String subTableFkName = genTable.getSubTableFkName();
+        String subClassName = genTable.getSubTable().getClassName();
+        String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName);
+
+        context.put("subTable", subTable);
+        context.put("subTableName", subTableName);
+        context.put("subTableFkName", subTableFkName);
+        context.put("subTableFkClassName", subTableFkClassName);
+        context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName));
+        context.put("subClassName", subClassName);
+        context.put("subclassName", StringUtils.uncapitalize(subClassName));
+        context.put("subImportList", getImportList(genTable.getSubTable()));
+    }
+
    /**
     * 获取模板信息
     *
@@ -120,6 +142,11 @@ public class VelocityUtils
        {
            templates.add("vm/vue/index-tree.vue.vm");
        }
+        else if (GenConstants.TPL_SUB.equals(tplCategory))
+        {
+            templates.add("vm/vue/index.vue.vm");
+            templates.add("vm/java/sub-domain.java.vm");
+        }
        return templates;
    }

@@ -147,6 +174,10 @@ public class VelocityUtils
        {
            fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
        }
+        if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory()))
+        {
+            fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
+        }
        else if (template.contains("mapper.java.vm"))
        {
            fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
@@ -202,12 +233,18 @@ public class VelocityUtils
    /**
     * 根据列类型获取导入包
     * 
-     * @param columns 列集合
+     * @param genTable 业务表对象
     * @return 返回需要导入的包列表
     */
-    public static HashSet<String> getImportList(List<GenTableColumn> columns)
+    public static HashSet<String> getImportList(GenTable genTable)
    {
+        List<GenTableColumn> columns = genTable.getColumns();
+        GenTable subGenTable = genTable.getSubTable();
        HashSet<String> importList = new HashSet<String>();
+        if (StringUtils.isNotNull(subGenTable))
+        {
+            importList.add("java.util.List");
+        }
        for (GenTableColumn column : columns)
        {
            if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType()))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
RuoYi	70a5e47b66	若依 3.0.0	2021-06-10 09:19:42 +08:00
RuoYi	8722e184d6	升级swagger到最新版本v3.0.0	2021-06-08 20:03:37 +08:00
RuoYi	819ad04e3e	优化Excel导入增加空行判断	2021-06-08 19:55:09 +08:00
RuoYi	ab89a5efcc	富文本工具栏配置视频	2021-06-03 13:58:05 +08:00
RuoYi	2fbb10bfd2	修复导出角色数据范围翻译缺少仅本人	2021-06-03 13:57:52 +08:00
RuoYi	3fba7d5d92	开启nacos/gRpc端口	2021-06-03 13:56:21 +08:00
RuoYi	d8d8758cfa	修复关闭confirm提示框控制台报错问题	2021-06-03 13:55:22 +08:00
RuoYi	5ba3e031f2	升级springcloud到最新版2020.0.3	2021-06-03 10:35:47 +08:00
若依	cc658b9ece	!66 代码生成优化 Merge pull request !66 from 雪忆天堂/N/A	2021-06-03 10:35:16 +08:00
RuoYi	1ed627798e	修复表单构建选择下拉选择控制台报错问题	2021-06-02 21:39:43 +08:00
RuoYi	bc4c7a02d3	菜单权限标识长度限制100	2021-06-02 21:39:31 +08:00
RuoYi	17493a2a15	优化图片工具类读取文件	2021-06-02 12:00:20 +08:00
RuoYi	63d7e816ff	添加docker支持	2021-06-02 09:58:36 +08:00
RuoYi	fc7bd9a35d	升级nacos到最新版2.0.1 性能提升	2021-05-31 14:53:50 +08:00
RuoYi	7ebcb4bf8a	修复升级cloud引起的代码生成报错	2021-05-30 18:20:35 +08:00
RuoYi	67feb9947e	优化参数&字典缓存操作	2021-05-27 21:13:48 +08:00
RuoYi	af479c7838	修复两处存在SQL注入漏洞问题	2021-05-27 21:13:01 +08:00
RuoYi	2f3949d732	升级Spring Cloud相关组件到最新版	2021-05-27 09:46:19 +08:00
RuoYi	79c8b17bee	Redis设置HashKey序列化	2021-05-26 10:58:57 +08:00
RuoYi	12d3e3d0d8	新增IE浏览器版本过低提示页面	2021-05-26 10:57:11 +08:00
RuoYi	fc33d88334	去除job多余的Serializable	2021-05-26 10:56:26 +08:00
RuoYi	09b49f46e8	升级fastjson到最新版1.2.76	2021-05-26 10:55:34 +08:00
RuoYi	379ea3f6bc	升级druid到最新版本v1.2.6	2021-05-26 10:53:36 +08:00
RuoYi	84b975ac7f	修复请求形参未传值记录日志异常问题	2021-05-26 10:52:38 +08:00
RuoYi	c7b6858433	修正方法名单词拼写错误	2021-05-26 10:47:43 +08:00
RuoYi	33bae9509b	修正mapper模板注释	2021-05-26 10:46:10 +08:00
雪忆天堂	d0cc511bbc	代码生成优化	2021-05-25 16:27:41 +08:00
RuoYi	d855fd67b4	删除操作日志记录日志	2021-05-11 16:52:21 +08:00
RuoYi	7f802e8274	树级结构更新子节点使用replaceFirst	2021-05-11 16:52:07 +08:00
RuoYi	b48e6fb19a	修正代码生成导入表权限标识	2021-04-26 18:19:38 +08:00
若依	de4dd01d97	!61 优化注释 Merge pull request !61 from mask/master	2021-04-26 18:14:25 +08:00
RuoYi	d04a93d75d	修复开启TopNav后，左侧打开外链问题	2021-04-21 16:33:05 +08:00
Mask	fb8eac7064	优化注释	2021-04-21 16:31:21 +08:00
RuoYi	f26c32881c	修复一级菜单包屑显示重复问题	2021-04-21 15:49:16 +08:00
Ricky	2419815bc1	优化ExcelUtil空值处理	2021-04-21 09:59:06 +08:00
RuoYi	cb9fa33b5a	主题颜色保存配置	2021-04-19 17:05:20 +08:00
RuoYi	eb69f8e614	过滤BindingResult对象，防止异常	2021-04-18 22:32:19 +08:00
RuoYi	1eb9581d36	兼容顶部栏一级菜单内部跳转	2021-04-18 22:31:30 +08:00
RuoYi	7789620a15	修正模板字符编码	2021-04-18 22:31:03 +08:00
RuoYi	c3ba1a092c	升级mybatis到最新版2.1.4	2021-04-18 22:30:07 +08:00
Ricky	3ef167e416	优化树表代码生成模板	2021-04-15 10:51:03 +08:00
RuoYi	8e1a9a2433	固定顶部导航栏&窗口大小改变实时更新栏数	2021-04-14 11:02:43 +08:00
RuoYi	cd73787dc7	数据监控默认地址修改	2021-04-13 18:14:53 +08:00
RuoYi	1624a63cff	恢复tansParams方法	2021-04-13 15:36:05 +08:00
RuoYi	db4a8b0e90	布局设置支持保存&重置配置	2021-04-13 15:10:33 +08:00
RuoYi	d989e4a717	富文本编辑器支持自定义上传地址	2021-04-13 15:08:07 +08:00
RuoYi	a664602e28	优化代码生成导出模板名称	2021-04-13 14:54:54 +08:00
RuoYi	f44b453d76	优化主子表代码生成模板	2021-04-13 14:53:50 +08:00
RuoYi	1298d02379	新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）	2021-04-12 10:20:25 +08:00
RuoYi	92a93f7cf8	修正通知公告日志记录类型	2021-04-12 10:19:13 +08:00
RuoYi	94a6a5a7d9	页签新增关闭右侧	2021-04-10 21:24:28 +08:00
RuoYi	2ca3f9b640	修复树表数据显示不全&加载慢问题	2021-04-09 10:36:09 +08:00
RuoYi	286bedaa40	删除多余的初始字典数据	2021-04-08 22:21:06 +08:00
RuoYi	edd1cfaf43	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud	2021-04-08 22:19:54 +08:00
RuoYi	accd7ebc93	修改主题后mini类型按钮无效问题	2021-04-08 22:19:43 +08:00
RuoYi	b7b755f0c6	通用下载完成后删除节点	2021-04-08 22:19:16 +08:00
RuoYi	87fcfe0c56	优化注释	2021-04-08 22:19:05 +08:00
RuoYi	89a9188dd4	用户&角色单条删除时使其逻辑删除	2021-04-08 22:18:18 +08:00
若依	45b0e82432	!58 取消了druid的wall配置 Merge pull request !58 from 啦啦啦少年/master	2021-04-08 22:17:16 +08:00
liuxingxing	5d3125463c	druid 配置了wall	2021-04-06 15:35:40 +08:00
RuoYi	1ab84cb0e5	修复firefox下表单构建拖拽会新打卡一个选项卡	2021-03-30 17:46:43 +08:00
RuoYi	e58c159225	添加新群号	2021-03-29 18:15:44 +08:00
若依	2edb885ae5	!55 页面超链接修改 Merge pull request !55 from 零度/master	2021-03-25 17:27:57 +08:00
lingdu	b037ee9caf	页面源码地址修改，页面文档地址修改	2021-03-24 21:48:00 +08:00
RuoYi	27d137a4ae	显隐列初始默认隐藏列	2021-03-24 17:33:44 +08:00
RuoYi	25f94db9c5	关闭用户头像上传窗口时恢复原图	2021-03-24 17:33:29 +08:00
RuoYi	457ec516f7	个人信息添加手机&邮箱重复验证	2021-03-21 11:09:44 +08:00
若依	29cd58d3f4	!53 修复异步操作导致的request null,IP获取错误 Merge pull request !53 from TwelveT/N/A	2021-03-20 08:59:05 +08:00
TwelveT	262d06ea3a	修复异步操作导致的request null,IP获取错误	2021-03-19 14:46:06 +08:00
RuoYi	0f733b89dc	通用Controller添加响应返回消息	2021-03-16 16:27:34 +08:00
RuoYi	265b680a61	调整sql默认为当前时间	2021-03-16 16:27:09 +08:00
若依	2b7bb59d12	!49 修复Byte[]类型参数死循环的问题 Merge pull request !49 from 周艺峰/master	2021-03-14 22:07:45 +08:00
RuoYi	41fa57d778	velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞	2021-03-14 21:53:51 +08:00
若依	6ad1df166b	!51 增加feign客户端IP头部信息 Merge pull request !51 from TwelveT/N/A	2021-03-14 21:31:40 +08:00
TwelveT	24e7ed38a5	增加feign客户端IP头部信息	2021-03-07 23:47:43 +08:00
RuoYi	fd0e9202d8	seata-boot-starter替换为cloud-alibaba-seata	2021-03-07 20:26:59 +08:00
RuoYi	0922410a22	富文本编辑组件支持只读	2021-03-07 15:21:48 +08:00
RuoYi	4edaa14e28	删除多余的代码	2021-03-07 15:21:33 +08:00
周艺峰	a2dede8448	修复Byte[]类型参数死循环的问题	2021-03-04 09:28:51 +08:00
RuoYi	dc83ba0356	更新脚本&优化代码	2021-02-28 21:33:50 +08:00
JuJu	60c815ab76	修复部分更新方法过滤失败与单*匹配不精确问题	2021-02-28 17:21:02 +08:00
DokiYoloo	48cf4250b4	修复AuthFilter白名单过滤匹配不精准	2021-02-25 23:35:22 +08:00
RuoYi	ede8456ea0	修复网关黑名单过滤器中文乱码问题	2021-02-23 18:05:41 +08:00
RuoYi	4dc51fae53	修正注释	2021-02-23 10:27:54 +08:00
RuoYi	192f58e690	修改ip字段长度防止ipv6地址长度不够	2021-02-10 12:53:25 +08:00
RuoYi	852b32eabb	角色非自定义权限范围清空选择值	2021-02-06 10:35:44 +08:00
RuoYi	5e167eb6e1	修复四级菜单无法显示问题	2021-02-06 09:33:45 +08:00
RuoYi	31aefd15f7	若依 2.5.0	2021-02-02 13:31:07 +08:00
RuoYi	716405d22b	update README.md	2021-02-02 11:40:58 +08:00
RuoYi	3c33fe21fa	升级spring-boot-alibaba到最新版2.2.5	2021-02-02 11:38:53 +08:00
DokiYoloo	e1e05b761a	!43 角色管理-编辑角色-功能权限显示异常 Merge pull request !43 from wihi/master	2021-01-30 17:19:23 +08:00
wanghuan	1804d4fce6	修复角色管理-编辑角色-功能权限显示异常	2021-01-30 16:35:11 +08:00
RuoYi	0dcc955ced	更换过期的共享配置属性	2021-01-27 18:00:50 +08:00
RuoYi	53076612f8	增加分布式事务seata支持	2021-01-27 10:47:01 +08:00
RuoYi	f0f2cde0f9	update swagger	2021-01-26 10:52:31 +08:00
若依	0546504cae	!39 修复sentinel流量告警无提示 Merge pull request !39 from 9527/master	2021-01-26 10:50:09 +08:00
RuoYi	17652c3a2f	升级element-ui到最新版本2.15.0	2021-01-24 12:07:17 +08:00
ysj	e96d12975f	修复sentinel流量告警前端不响应	2021-01-21 10:06:29 +08:00
RuoYi	a9b51070ed	添加启动执行脚本	2021-01-17 12:06:33 +08:00
若依	a8c7b9102b	!38 返回绝对路径 Merge pull request !38 from xlongwei/N/A	2021-01-17 12:02:21 +08:00
xlongwei	ca04b583a9	返回绝对路径	2021-01-16 13:25:39 +08:00
RuoYi	99390fda05	update README.md	2021-01-14 13:22:53 +08:00
RuoYi	be12108139	修复生成树表代码异常	2021-01-13 17:53:28 +08:00
RuoYi	1dec234174	升级spring-boot到最新版本2.3.7	2021-01-13 17:46:26 +08:00
RuoYi	3fc684b346	升级spring-cloud到Hoxton.SR9	2021-01-13 17:45:30 +08:00
RuoYi	12d8add3e4	升级spring-boot-admin到最新版2.3.1	2021-01-13 17:43:49 +08:00
RuoYi	372b77c662	升级fastjson到最新版1.2.75	2021-01-13 17:24:26 +08:00
RuoYi	5891960756	代码生成模板支持主子表	2021-01-08 11:08:59 +08:00
RuoYi	c5899bfbf0	修复导入数据为负浮点数时丢失精度问题	2021-01-08 11:08:43 +08:00
RuoYi	4125f44179	用户显隐列添加不同key防止被复用	2021-01-07 13:37:33 +08:00
RuoYi	09a0058379	表格右侧工具栏组件支持显隐列	2021-01-06 17:50:01 +08:00
RuoYi	3fdcac939a	升级druid到最新版本v1.2.4	2021-01-06 12:01:05 +08:00
RuoYi	4cc4e8a8fa	编码解码用户名，防止中文出现乱码	2021-01-06 12:00:41 +08:00
RuoYi	dee4653b9b	代码生成支持文件上传组件	2021-01-06 11:59:13 +08:00
若依	2c610dc465	!37 update ruoyi-ui/src/components/FileUpload/index.vue. Merge pull request !37 from ouwei2020/N/A	2021-01-06 11:57:57 +08:00
ouwei2020	2c323ca3ff	update ruoyi-ui/src/components/FileUpload/index.vue.	2021-01-06 11:09:23 +08:00
DokiYolo	a95be9d418	解决header获取username中文情况下乱码	2021-01-06 10:06:57 +08:00
RuoYi	a445462153	代码生成支持文件上传组件	2021-01-05 21:34:27 +08:00
RuoYi	843f08984b	图片组件添加预览&移除功能	2021-01-05 21:08:01 +08:00
RuoYi	2b3820223c	修复IE11浏览器报错问题	2021-01-05 10:30:05 +08:00
RuoYi	a5d0028b39	操作按钮组调整为朴素按钮样式	2021-01-05 10:20:26 +08:00
RuoYi	449704180b	Update copyright	2021-01-04 17:54:40 +08:00
JuJu	8a18873b81	修正操作日志删除接口路径	2021-01-01 12:47:46 +08:00
JuJu	199228f6cb	spring.factories增加RemoteFileFallbackFactory	2021-01-01 12:41:28 +08:00
RuoYi	6d0b4f5d16	用户手机邮箱&菜单组件修改允许空字符串	2020-12-29 17:29:22 +08:00
RuoYi	4cc0e2650c	代码生成数据库文本类型生成表单文本域	2020-12-29 11:27:58 +08:00
RuoYi	06074571f5	Excel注解支持Image图片导出	2020-12-27 10:05:28 +08:00
RuoYi	2698ea58d4	代码生成日期控件区分范围	2020-12-25 09:36:22 +08:00
RuoYi	8c9eb7d6b6	修正侧边栏静态路由丢失问题	2020-12-24 19:33:09 +08:00
RuoYi	79472708d9	防止get请求参数值为false或0等特殊值会导致无法正确的传参	2020-12-22 16:25:16 +08:00
RuoYi	586908b4d7	若依 2.4.0	2020-12-22 10:40:42 +08:00
				`@@ -0,0 +1 @@`
				`存放sql目录下的所有脚本，用于docker自动执行。`
				`@@ -0,0 +1 @@`
				`存放前端ruoyi-ui构建好的静态文件，用于nginx请求访问。`
				`@@ -0,0 +1 @@`
				`存放认证中心打包好的jar文件，用于docker启动应用。`
				`@@ -0,0 +1 @@`
				`存放网关模块打包好的jar文件，用于docker启动应用。`
				`@@ -0,0 +1 @@`
				`存放文件服务打包好的jar文件，用于docker启动应用。`
				`@@ -0,0 +1 @@`
				`存放代码生成打包好的jar文件，用于docker启动应用。`
				`@@ -0,0 +1 @@`
				`存放定时任务打包好的jar文件，用于docker启动应用。`
				`@@ -0,0 +1 @@`
				`存放系统模块打包好的jar文件，用于docker启动应用。`
				`@@ -0,0 +1 @@`
				`存放监控中心打包好的jar文件，用于docker启动应用。`