JeecgBoot 3.6.0大版本发布

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

@@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-gateway
 
 EXPOSE 9999
 
-ADD ./target/jeecg-cloud-gateway-3.5.5.jar ./
+ADD ./target/jeecg-cloud-gateway-3.6.0.jar ./
 
-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.5.5.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.6.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.5.5</version>
+        <version>3.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-cloud-gateway</artifactId>

jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java

@@ -205,23 +205,23 @@ public class DynamicRouteLoader implements ApplicationEventPublisherAware {
             }
             Object predicates = obj.get("predicates");
             if (predicates != null) {
-                
+                //update-begin-author:liusq---date:2023-10-15--for: [issues/5331]网关路由配置问题
                 List<PredicatesVo> list = JSON.parseArray(predicates.toString(), PredicatesVo.class);
+                //获取合并后的Predicates，防止配置多个path导致路径失效的问题
                 Map<String, List<String>> groupedPredicates = new HashMap<>();
-
                 for (PredicatesVo predicatesVo : list) {
                     String name = predicatesVo.getName();
                     List<String> args = predicatesVo.getArgs();
                     groupedPredicates.computeIfAbsent(name, k -> new ArrayList<>()).addAll(args);
                 }
-
+                //合并后的list
                 list = new ArrayList<>();
                 for (Map.Entry<String, List<String>> entry : groupedPredicates.entrySet()) {
                     String name = entry.getKey();
                     List<String> args = entry.getValue();
                     list.add(new PredicatesVo(name, args));
                 }
-                
+                //update-end-author:liusq---date:2023-10-15--for:[issues/5331]网关路由配置问题
                 List<PredicateDefinition> predicateDefinitionList = new ArrayList<>();
                 for (Object map : list) {
                     JSONObject json = JSON.parseObject(JSON.toJSONString(map));

jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/vo/PredicatesVo.java

@@ -6,11 +6,15 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 
-
+/**
+ * 路由配置VO
+ * @author lsq
+ * @Date 2023/10/15
+ */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class PredicatesVo {
     private String  name;
     private List<String> args;
-}
+}

jeecg-server-cloud/jeecg-cloud-gateway/src/test/java/TestRoutes.java

@@ -0,0 +1,37 @@
+import org.jeecg.loader.vo.PredicatesVo;
+import org.junit.Test;
+
+import java.util.*;
+
+/**
+ * @Description: 测试
+ * @author: lsq
+ * @date: 2023年10月13日 11:32
+ */
+public class TestRoutes {
+
+    @Test
+    public void TestRoutes() {
+        List<PredicatesVo> list = new ArrayList<>();
+        PredicatesVo a = new PredicatesVo();
+        a.setName("path");
+        String[] aArr={"/sys/**","/eoa/**"};
+        a.setArgs(Arrays.asList(aArr));
+        list.add(a);
+
+        PredicatesVo b = new PredicatesVo();
+        b.setName("path");
+        String[] bArr={"/sys/**","/demo/**"};
+        b.setArgs(Arrays.asList(bArr));
+        list.add(b);
+
+        Map<String, List<String>> groupedPredicates = new HashMap<>();
+        for (PredicatesVo predicatesVo : list) {
+            String name = predicatesVo.getName();
+            List<String> args1 = predicatesVo.getArgs();
+            groupedPredicates.computeIfAbsent(name, k -> new ArrayList<>()).addAll(args1);
+        }
+        System.out.println(groupedPredicates);
+    }
+
+}

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

@@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-nacos
 
 EXPOSE 8848
 
-ADD ./target/jeecg-cloud-nacos-3.5.5.jar ./
+ADD ./target/jeecg-cloud-nacos-3.6.0.jar ./
 
-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.5.5.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.6.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.5.5</version>
+    <version>3.6.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.14</version>
+        <version>2.7.10</version>
         <relativePath/>
     </parent>
 

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.5.5.jar ./
+ADD ./target/jeecg-demo-cloud-start-3.6.0.jar ./
 
-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-demo-cloud-start-3.5.5.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-demo-cloud-start-3.6.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.5.5</version>
+        <version>3.6.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.5.5.jar ./
+ADD ./target/jeecg-system-cloud-start-3.6.0.jar ./
 
-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.5.5.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.6.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.5.5</version>
+        <version>3.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-system-cloud-start</artifactId>

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

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

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.5.5</version>
+        <version>3.6.0</version>
     </parent>
     <artifactId>jeecg-cloud-sentinel</artifactId>
     <name>jeecg-cloud-sentinel</name>

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.5.5</version>
+        <version>3.6.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.5.5</version>
+        <version>3.6.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-account/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-test-seata</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.5.5</version>
+        <version>3.6.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.5.5</version>
+        <version>3.6.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.5.5</version>
+        <version>3.6.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.5.5</version>
+        <version>3.6.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.5.5</version>
+        <version>3.6.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.5.5</version>
+        <version>3.6.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

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.5.5.jar ./
+ADD ./target/jeecg-cloud-xxljob-3.6.0.jar ./
 
-CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.5.5.jar
+CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.6.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.5.5</version>
+        <version>3.6.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.5.5</version>
+        <version>3.6.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.5.5</version>
+        <version>3.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>