From cb65e1796c6378d6a7f11359cef1ab3bbcbfaa43 Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Thu, 27 Mar 2025 15:19:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=903.7.4=E7=89=88=E6=9C=AC=E5=BA=95?=
 =?UTF-8?q?=E5=B1=82=E4=BE=9D=E8=B5=96=E5=A4=A7=E5=8D=87=E7=BA=A7=E3=80=91?=
 =?UTF-8?q?=20=E9=BB=98=E8=AE=A4=E6=94=B9=E6=88=90JDK17;fastjson=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E8=87=B32.0.56;=E5=8D=87=E7=BA=A7spring-cloud?=
 =?UTF-8?q?=E5=B0=8F=E7=89=88=E6=9C=AC;=E5=8D=87=E7=BA=A7jimureport?=
 =?UTF-8?q?=E5=88=B0=E6=9C=80=E6=96=B0=E7=89=881.9.5;=E5=8D=87=E7=BA=A7wei?=
 =?UTF-8?q?xin4j=E5=88=B02.0.1;=20spring-cloud=20>2021.0.8=20spring-cloud-?=
 =?UTF-8?q?alibaba=20>2021.0.6.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/loader/DynamicRouteLoader.java  |  2 +-
 jeecg-boot/pom.xml                            | 37 ++++++++++++++-----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java
index cafdc3b7..e1147f4b 100644
--- a/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java
+++ b/jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java
@@ -9,7 +9,7 @@ import com.alibaba.nacos.api.NacosFactory;
 import com.alibaba.nacos.api.config.ConfigService;
 import com.alibaba.nacos.api.config.listener.Listener;
 import com.alibaba.nacos.api.exception.NacosException;
-import com.google.common.collect.Lists;
+import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index 9e637413..ea18ecfb 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jeecgframework.boot</groupId>
   <artifactId>jeecg-boot-parent</artifactId>
-  <version>3.7.3</version>
+  <version>3.7.4</version>
   <packaging>pom</packaging>
   <name>JEECG BOOT ${project.version}</name>
 
@@ -28,18 +28,19 @@
 	</parent>
 
 	<properties>
-		<jeecgboot.version>3.7.3</jeecgboot.version>
-		<java.version>1.8</java.version>
+		<jeecgboot.version>3.7.4</jeecgboot.version>
+		<!-- JDK版本支持17和1.8 -->
+		<java.version>17</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- 微服务 -->
-		<spring-cloud.version>2021.0.3</spring-cloud.version>
-        <spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
+		<spring-cloud.version>2021.0.8</spring-cloud.version>
+		<spring-cloud-alibaba.version>2021.0.6.2</spring-cloud-alibaba.version>
 		<alibaba.nacos.version>2.0.4</alibaba.nacos.version>
 		<seata.version>1.5.2</seata.version>
 
 		<xxl-job-core.version>2.4.1</xxl-job-core.version>
-        <fastjson.version>2.0.43</fastjson.version>
+        <fastjson.version>2.0.56</fastjson.version>
         <aviator.version>5.2.6</aviator.version>
 		<pegdown.version>1.6.0</pegdown.version>
 		<commonmark.version>0.17.0</commonmark.version>
@@ -55,7 +56,7 @@
 		<dm8.version>8.1.1.49</dm8.version>
 
 		<!-- 积木报表-->
-		<jimureport-spring-boot-starter.version>1.9.4</jimureport-spring-boot-starter.version>
+		<jimureport-spring-boot-starter.version>1.9.5</jimureport-spring-boot-starter.version>
 		<!-- 持久层 -->
 		<mybatis-plus.version>3.5.3.2</mybatis-plus.version>
 		<dynamic-datasource-spring-boot-starter.version>4.1.3</dynamic-datasource-spring-boot-starter.version>
@@ -363,7 +364,7 @@
 			<dependency>
 				<groupId>org.jeecgframework</groupId>
 				<artifactId>weixin4j</artifactId>
-				<version>2.0.0</version>
+				<version>2.0.1</version>
 				<exclusions>
 					<exclusion>
 						<artifactId>commons-beanutils</artifactId>
@@ -393,6 +394,18 @@
 				<artifactId>jimureport-spring-boot-starter</artifactId>
 				<version>${jimureport-spring-boot-starter.version}</version>
 				<exclusions>
+					<exclusion>
+						<groupId>com.alibaba</groupId>
+						<artifactId>fastjson</artifactId>
+					</exclusion>
+					<exclusion>
+						<artifactId>commons-lang</artifactId>
+						<groupId>commons-lang</groupId>
+					</exclusion>
+					<exclusion>
+						<artifactId>checker-qual</artifactId>
+						<groupId>org.checkerframework</groupId>
+					</exclusion>
 					<exclusion>
 						<artifactId>autopoi-web</artifactId>
 						<groupId>org.jeecgframework</groupId>
@@ -401,12 +414,16 @@
 						<artifactId>druid</artifactId>
 						<groupId>com.alibaba</groupId>
 					</exclusion>
+					<exclusion>
+						<artifactId>jsqlparser</artifactId>
+						<groupId>com.github.jsqlparser</groupId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.jeecgframework.jimureport</groupId>
 				<artifactId>jimureport-nosql-starter</artifactId>
-				<version>1.9.4.1</version>
+				<version>${jimureport-spring-boot-starter.version}</version>
 				<exclusions>
 					<exclusion>
 						<groupId>org.apache.calcite</groupId>
@@ -418,7 +435,7 @@
 			<dependency>
 				<groupId>org.jeecgframework.jimureport</groupId>
 				<artifactId>jimubi-spring-boot-starter</artifactId>
-				<version>${jimureport-spring-boot-starter.version}</version>
+				<version>1.9.4</version>
 			</dependency>
 			<!-- AI集成 -->
 			<dependency>