3.7.0大版本发布

2025-09-08 16:27:56 +00:00 · 2024-06-11 22:58:04 +08:00
parent 857fb53fa1
commit a6b6e7c9d4
205 changed files with 3807 additions and 768 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.3.jar ./
+ADD ./target/jeecg-cloud-gateway-3.7.0.jar ./

-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar 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.7.0.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.3</version>
+        <version>3.7.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>jeecg-cloud-gateway</artifactId>
@@ -79,7 +79,7 @@
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>3.14.0</version>
        </dependency>
    </dependencies>
    <build>
--- a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/filter/GlobalAccessTokenFilter.java
+++ b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/filter/GlobalAccessTokenFilter.java
@@ -34,7 +34,12 @@ public class GlobalAccessTokenFilter implements GlobalFilter, Ordered {
        String scheme = exchange.getRequest().getURI().getScheme();
        String host = exchange.getRequest().getURI().getHost();
        int port = exchange.getRequest().getURI().getPort();
-        String basePath = scheme + "://" + host + ":" + port;
+        //update-begin---author:chenrui ---date:20240603  for：地址中没有带端口(http/https默认)时port是-1------------
+        String basePath = scheme + "://" + host;
+        if (port != -1) {
+            basePath += ":" + port;
+        }
+        //update-end---author:chenrui ---date:20240603  for：地址中没有带端口(http/https默认)时port是-1------------
        // 1. 重写StripPrefix(获取真实的URL)
        addOriginalRequestUrl(exchange, exchange.getRequest().getURI());
        String rawPath = exchange.getRequest().getURI().getRawPath();
--- a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.java
+++ b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/SwaggerResourceController.java
@@ -25,7 +25,7 @@ public class SwaggerResourceController {
     */
    @Value("${knife4j.production:#{null}}")
    private Boolean production;
-
+    
    @Autowired
    public SwaggerResourceController(MySwaggerResourceProvider swaggerResourceProvider) {
        this.swaggerResourceProvider = swaggerResourceProvider;
--- 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.3.jar ./
+ADD ./target/jeecg-cloud-nacos-3.7.0.jar ./

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

    <parent>
        <groupId>org.springframework.boot</groupId>
--- a/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml
+++ b/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml
@@ -7,8 +7,9 @@ server:
      pattern: '%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i'
    basedir: ''
 spring:
-  datasource:
-    platform: mysql
+  sql:
+    init:
+      platform: mysql
 db:
  num: 1
  password:
@@ -27,7 +28,6 @@ management:
 nacos:
  core:
    auth:
-      #是否开启鉴权（JeecgNacosApplication.enabled属性优先级更高）
      enabled: false
      caching:
        enabled: true
--- 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.3.jar ./
+ADD ./target/jeecg-demo-cloud-start-3.7.0.jar ./

-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar 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.7.0.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.3</version>
+        <version>3.7.0</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.3.jar ./
+ADD ./target/jeecg-system-cloud-start-3.7.0.jar ./

-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar 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.7.0.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.3</version>
+        <version>3.7.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>jeecg-system-cloud-start</artifactId>
--- a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java
+++ b/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java
@@ -16,7 +16,6 @@ import org.springframework.core.env.Environment;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.EnableScheduling;

-import java.lang.management.ManagementFactory;
 import java.net.InetAddress;
 import java.net.UnknownHostException;

@@ -36,7 +35,6 @@ public class JeecgSystemCloudApplication extends SpringBootServletInitializer im
    private RedisTemplate<String, Object> redisTemplate;
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-
        return application.sources(JeecgSystemCloudApplication.class);
    }

--- 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.3</version>
+        <version>3.7.0</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.3.jar ./
+ADD ./target/jeecg-cloud-sentinel-3.7.0.jar ./

-CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar 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.7.0.jar
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-visual</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.3</version>
+        <version>3.7.0</version>
    </parent>
    <artifactId>jeecg-cloud-sentinel</artifactId>
    <name>jeecg-cloud-sentinel</name>
--- 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.3</version>
+        <version>3.7.0</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.3</version>
+        <version>3.7.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <description>消息队列测试模块</description>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>org.jeecgframework.boot</groupId>
        <artifactId>jeecg-cloud-test</artifactId>
-        <version>3.6.3</version>
+        <version>3.7.0</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.3</version>
+        <version>3.7.0</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.3</version>
+        <version>3.7.0</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.3</version>
+        <version>3.7.0</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.3</version>
+        <version>3.7.0</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.3</version>
+        <version>3.7.0</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.3</version>
+        <version>3.7.0</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.3.jar ./
+ADD ./target/jeecg-cloud-xxljob-3.7.0.jar ./

-CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.6.3.jar
+CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.7.0.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.3</version>
+        <version>3.7.0</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.3</version>
+        <version>3.7.0</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.3</version>
+        <version>3.7.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>