【jeecgboot 3.7.0里程碑版本发布——合并springboot3sas分支】

Merge remote-tracking branch 'origin/springboot3' into springboot3_sas

# Conflicts:
#	.gitignore
#	db/tables_nacos.sql
#	jeecg-boot-base-core/pom.xml
#	jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
#	jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
#	jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml
#	jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml
#	pom.xml

jeecg-server-cloud/jeecg-cloud-gateway/Dockerfile

@@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-gateway
 
 EXPOSE 9999
 
-ADD ./target/jeecg-cloud-gateway-3.6.1.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.1.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.7.0.jar

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.1</version>
+        <version>3.7.0</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.14.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

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();

jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile

@@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-nacos
 
 EXPOSE 8848
 
-ADD ./target/jeecg-cloud-nacos-3.6.1.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.1.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.7.0.jar

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.1</version>
+    <version>3.7.0</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>
 

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

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

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.1</version>
+        <version>3.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

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.1</version>
+        <version>3.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-system-cloud-start</artifactId>
@@ -49,6 +49,12 @@
             <artifactId>jeecg-cloud-test-rabbitmq</artifactId>
             <version>${jeecgboot.version}</version>
         </dependency>-->
+        <!-- rocketmq例子-->
+        <!--<dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-cloud-test-rocketmq</artifactId>
+            <version>${jeecgboot.version}</version>
+        </dependency>-->
         <!-- 分布式事务例子
        <dependency>
            <groupId>org.jeecgframework.boot</groupId>

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.1</version>
+        <version>3.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-cloud-monitor</artifactId>

jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/src/main/resources/application.yml

@@ -20,13 +20,14 @@ spring:
     nacos:
       discovery:
         server-addr: @config.server-addr@
+        namespace: @config.namespace@
         metadata:
           user.name: ${spring.security.user.name}
           user.password: ${spring.security.user.password}
 # 服务端点检查
 management:
-  trace:
-    http:
+  httpexchanges:
+    recording:
       enabled: true
   endpoints:
     web:

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.1.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.1.jar
+CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-sentinel-3.7.0.jar

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.1</version>
+        <version>3.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>公共测试模块</description>

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.1</version>
+        <version>3.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>消息队列测试模块</description>

jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.jeecgframework.boot</groupId>
+        <artifactId>jeecg-cloud-test</artifactId>
+        <version>3.7.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <description>消息队列测试模块</description>
+    <artifactId>jeecg-cloud-test-rocketmq</artifactId>
+
+    <dependencies>
+        <!-- rocketmq消息队列-->
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-starter3-rocketmq</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/src/main/java/org/jeecg/modules/test/rocketmq/constant/CloudConstant.java

@@ -0,0 +1,28 @@
+package org.jeecg.modules.test.rocketmq.constant;
+
+/**
+ * 微服务单元测试常量定义
+ * @author: zyf
+ * @date: 2022/04/21
+ */
+public interface CloudConstant {
+
+
+    /**
+     * MQ测试队列名字
+     */
+    public final static String MQ_JEECG_PLACE_ORDER = "jeecg_place_order";
+    public final static String MQ_JEECG_PLACE_ORDER_TIME = "jeecg_place_order_time";
+
+    /**
+     * MQ测试消息总线
+     */
+    public final static String MQ_DEMO_BUS_EVENT = "demoBusEvent";
+
+    /**
+     * 分布式锁lock key
+     */
+    public final static String REDISSON_DEMO_LOCK_KEY1 = "demoLockKey1";
+    public final static String REDISSON_DEMO_LOCK_KEY2 = "demoLockKey2";
+
+}

jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/src/main/java/org/jeecg/modules/test/rocketmq/controller/JeecgMqTestController.java

@@ -0,0 +1,60 @@
+package org.jeecg.modules.test.rocketmq.controller;
+
+
+import cn.hutool.core.util.RandomUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import org.jeecg.boot.starter.rabbitmq.client.RabbitMqClient;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.base.BaseMap;
+import org.jeecg.modules.test.rocketmq.constant.CloudConstant;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * RocketMqClient发送消息
+ * @author: zyf
+ * @date: 2022/04/21
+ */
+@RestController
+@RequestMapping("/sys/test")
+@Tag(name = "【微服务】MQ单元测试")
+public class JeecgMqTestController {
+
+    @Autowired
+    private RabbitMqClient rabbitMqClient;
+
+
+    /**
+     * 测试方法：快速点击发送MQ消息
+     *  观察三个接受者如何分配处理消息：HelloReceiver1、HelloReceiver2、HelloReceiver3，会均衡分配
+     *
+     * @param req
+     * @return
+     */
+    @GetMapping(value = "/rocketmq")
+    @Operation(description = "测试rocketmq")
+    public Result<?> rabbitMqClientTest(HttpServletRequest req) {
+        //rabbitmq消息队列测试
+        BaseMap map = new BaseMap();
+        map.put("orderId", RandomUtil.randomNumbers(10));
+        rabbitMqClient.sendMessage(CloudConstant.MQ_JEECG_PLACE_ORDER, map);
+        rabbitMqClient.sendMessage(CloudConstant.MQ_JEECG_PLACE_ORDER_TIME, map,2);
+        return Result.OK("MQ发送消息成功");
+    }
+
+    @GetMapping(value = "/rocketmq2")
+    @Operation(description = "rocketmq消息总线测试")
+    public Result<?> rabbitmq2(HttpServletRequest req) {
+
+        //rabbitmq消息总线测试
+        BaseMap params = new BaseMap();
+        params.put("orderId", "123456");
+        rabbitMqClient.publishEvent(CloudConstant.MQ_DEMO_BUS_EVENT, params);
+        return Result.OK("MQ发送消息成功");
+    }
+}

jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/src/main/java/org/jeecg/modules/test/rocketmq/event/DemoBusEvent.java

@@ -0,0 +1,29 @@
+package org.jeecg.modules.test.rocketmq.event;
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.boot.starter.rabbitmq.event.EventObj;
+import org.jeecg.boot.starter.rabbitmq.event.JeecgBusEventHandler;
+import org.jeecg.common.base.BaseMap;
+import org.jeecg.modules.test.rocketmq.constant.CloudConstant;
+import org.springframework.stereotype.Component;
+
+/**
+ * 消息处理器【发布订阅】
+ * @author: zyf
+ * @date: 2022/04/21
+ */
+@Slf4j
+@Component(CloudConstant.MQ_DEMO_BUS_EVENT)
+public class DemoBusEvent implements JeecgBusEventHandler {
+
+
+    @Override
+    public void onMessage(EventObj obj) {
+        if (ObjectUtil.isNotEmpty(obj)) {
+            BaseMap baseMap = obj.getBaseMap();
+            String orderId = baseMap.get("orderId");
+            log.info("业务处理----订单ID:" + orderId);
+        }
+    }
+}

jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/src/main/java/org/jeecg/modules/test/rocketmq/listener/HelloReceiver1.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.test.rocketmq.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.jeecg.common.base.BaseMap;
+import org.jeecg.modules.test.rocketmq.constant.CloudConstant;
+import org.springframework.stereotype.Component;
+
+/**
+ * 定义接收者（可以定义N个接受者，消息会均匀的发送到N个接收者中）
+ *
+ * RabbitMq接受者1
+ * （@RabbitListener声明类上，一个类只能监听一个队列）
+ * @author: zyf
+ * @date: 2022/04/21
+ */
+@Slf4j
+@Component
+@RocketMQMessageListener(topic = CloudConstant.MQ_JEECG_PLACE_ORDER, consumerGroup = "helloReceiver1")
+public class HelloReceiver1 implements RocketMQListener<BaseMap> {
+
+    public void onMessage(BaseMap baseMap) {
+        log.info("helloReceiver1接收消息：" + baseMap);
+    }
+
+}

jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/src/main/java/org/jeecg/modules/test/rocketmq/listener/HelloReceiver2.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.test.rocketmq.listener;//package org.jeecg.modules.cloud.rabbitmq;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.jeecg.common.base.BaseMap;
+import org.jeecg.modules.test.rocketmq.constant.CloudConstant;
+import org.springframework.stereotype.Component;
+
+/**
+ * 定义接收者（可以定义N个接受者，消息会均匀的发送到N个接收者中）
+ *
+ * RabbitMq接受者2
+ * （@RabbitListener声明类上，一个类只能监听一个队列）
+ * @author: zyf
+ * @date: 2022/04/21
+ */
+@Slf4j
+@Component
+@RocketMQMessageListener(topic = CloudConstant.MQ_JEECG_PLACE_ORDER, consumerGroup = "helloReceiver2")
+public class HelloReceiver2 implements RocketMQListener<BaseMap> {
+
+    public void onMessage(BaseMap baseMap) {
+        log.info("helloReceiver2接收消息：" + baseMap);
+    }
+
+}

jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/src/main/java/org/jeecg/modules/test/rocketmq/listener/HelloReceiver3.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.test.rocketmq.listener;//package org.jeecg.modules.cloud.rabbitmq;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.jeecg.common.base.BaseMap;
+import org.jeecg.modules.test.rocketmq.constant.CloudConstant;
+import org.springframework.stereotype.Component;
+
+/**
+ * 定义接收者（可以定义N个接受者，消息会均匀的发送到N个接收者中）
+ *
+ * RabbitMq接受者3【我是处理人3】
+ * （@RabbitListener声明类方法上，一个类可以多监听多个队列）
+ * @author: zyf
+ * @date: 2022/04/21
+ */
+@Slf4j
+@Component
+@RocketMQMessageListener(topic = CloudConstant.MQ_JEECG_PLACE_ORDER, consumerGroup = "helloReceiver3")
+public class HelloReceiver3 implements RocketMQListener<BaseMap> {
+
+    public void onMessage(BaseMap baseMap) {
+        log.info("helloReceiver3接收消息：" + baseMap);
+    }
+
+}

jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/src/main/java/org/jeecg/modules/test/rocketmq/listener/HelloTimeReceiver.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.test.rocketmq.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.jeecg.common.base.BaseMap;
+import org.jeecg.modules.test.rocketmq.constant.CloudConstant;
+import org.springframework.stereotype.Component;
+
+/**
+ * 定义接收者（可以定义N个接受者，消息会均匀的发送到N个接收者中）
+ * @author: zyf
+ * @date: 2022/04/21
+ */
+@Slf4j
+@Component
+@RocketMQMessageListener(topic = CloudConstant.MQ_JEECG_PLACE_ORDER_TIME, consumerGroup = "helloTimeReceiver")
+public class HelloTimeReceiver implements RocketMQListener<BaseMap> {
+
+    public void onMessage(BaseMap baseMap) {
+        log.info("helloTimeReceiver接收消息：" + baseMap);
+    }
+
+}

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.1</version>
+        <version>3.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>分布式事务测试模块</description>

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.1</version>
+        <version>3.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>分布式事务测试模块</description>

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.1</version>
+        <version>3.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>分布式事务测试模块</description>

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.1</version>
+        <version>3.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-cloud-test-seata</artifactId>

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.1</version>
+        <version>3.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.1</version>
+        <version>3.7.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -24,5 +24,6 @@
         <module>jeecg-cloud-test-more</module>
         <module>jeecg-cloud-test-rabbitmq</module>
         <module>jeecg-cloud-test-seata</module>
+        <module>jeecg-cloud-test-rocketmq</module>
     </modules>
 </project>

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

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.1</version>
+        <version>3.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.1</version>
+        <version>3.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jeecg-server-cloud/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-parent</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.1</version>
+        <version>3.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>