Merge branch 'master' into springboot3

# Conflicts: # db/tables_nacos.sql # jeecg-boot-base-core/pom.xml # jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java # jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java # jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFilesController.java # jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java # jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFiles.java # jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java # jeecg-module-system/jeecg-system-start/pom.xml # jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml # jeecg-server-cloud/jeecg-cloud-gateway/pom.xml # jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml # pom.xml
2025-10-14 07:02:12 +00:00 · 2024-03-25 09:39:13 +08:00
parent 4caff75cce 2cfc39b23f
commit 06b41ae479
159 changed files with 22885 additions and 16825 deletions
--- a/jeecg-server-cloud/jeecg-cloud-gateway/Dockerfile
+++ b/jeecg-server-cloud/jeecg-cloud-gateway/Dockerfile
@@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-gateway

 EXPOSE 9999

-ADD ./target/jeecg-cloud-gateway-3.6.2.jar ./
+ADD ./target/jeecg-cloud-gateway-3.6.3.jar ./

-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.6.2.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.6.3.jar
--- a/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml
+++ b/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-server-cloud</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>jeecg-cloud-gateway</artifactId>
@@ -76,6 +76,11 @@
            <artifactId>knife4j-gateway-spring-boot-starter</artifactId>
            <version>${knife4j-spring-boot-starter.version}</version>
        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
    </dependencies>
    <build>
        <plugins>
--- a/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile
+++ b/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile
@@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-nacos

 EXPOSE 8848

-ADD ./target/jeecg-cloud-nacos-3.6.2.jar ./
+ADD ./target/jeecg-cloud-nacos-3.6.3.jar ./

-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.6.2.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.6.3.jar
--- a/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml
+++ b/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml
@@ -5,12 +5,12 @@
    <artifactId>jeecg-cloud-nacos</artifactId>
    <name>jeecg-cloud-nacos</name>
    <description>nacos启动模块</description>
-    <version>3.6.2</version>
+    <version>3.6.3</version>

    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.10</version>
+        <version>2.7.18</version>
        <relativePath/>
    </parent>

--- a/jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile
+++ b/jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile
@@ -10,6 +10,6 @@ WORKDIR /jeecg-demo-cloud

 EXPOSE 7002

-ADD ./target/jeecg-demo-cloud-start-3.6.2.jar ./
+ADD ./target/jeecg-demo-cloud-start-3.6.3.jar ./

-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-demo-cloud-start-3.6.2.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-demo-cloud-start-3.6.3.jar
--- a/jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml
+++ b/jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-server-cloud</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile
+++ b/jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile
@@ -10,6 +10,6 @@ WORKDIR /jeecg-system-cloud

 EXPOSE 7001

-ADD ./target/jeecg-system-cloud-start-3.6.2.jar ./
+ADD ./target/jeecg-system-cloud-start-3.6.3.jar ./

-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.6.2.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.6.3.jar
--- a/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml
+++ b/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-server-cloud</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>jeecg-system-cloud-start</artifactId>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-visual</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>jeecg-cloud-monitor</artifactId>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/Dockerfile
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/Dockerfile
@@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-sentinel

 EXPOSE 8848

-ADD ./target/jeecg-cloud-sentinel-3.6.2.jar ./
+ADD ./target/jeecg-cloud-sentinel-3.6.3.jar ./

-CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-sentinel-3.6.2.jar
+CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-sentinel-3.6.3.jar
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-cloud-test</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <description>公共测试模块</description>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-cloud-test</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <description>消息队列测试模块</description>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-cloud-test-seata</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <description>分布式事务测试模块</description>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-cloud-test-seata</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <description>分布式事务测试模块</description>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-cloud-test-seata</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <description>分布式事务测试模块</description>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-cloud-test</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>jeecg-cloud-test-seata</artifactId>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-cloud-test</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-visual</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/Dockerfile
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/Dockerfile
@@ -10,7 +10,7 @@ WORKDIR /jeecg-cloud-xxljob

 EXPOSE 9080

-ADD ./target/jeecg-cloud-xxljob-3.6.2.jar ./
+ADD ./target/jeecg-cloud-xxljob-3.6.3.jar ./

-CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.6.2.jar
+CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.6.3.jar

--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-visual</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/jeecg-server-cloud/jeecg-visual/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-server-cloud</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/jeecg-server-cloud/pom.xml
+++ b/jeecg-server-cloud/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-boot-parent</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>