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 cafdc3b72..e1147f4b4 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 9e6374130..ea18ecfb7 100644 --- a/jeecg-boot/pom.xml +++ b/jeecg-boot/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.jeecgframework.boot jeecg-boot-parent - 3.7.3 + 3.7.4 pom JEECG BOOT ${project.version} @@ -28,18 +28,19 @@ - 3.7.3 - 1.8 + 3.7.4 + + 17 UTF-8 - 2021.0.3 - 2021.0.1.0 + 2021.0.8 + 2021.0.6.2 2.0.4 1.5.2 2.4.1 - 2.0.43 + 2.0.56 5.2.6 1.6.0 0.17.0 @@ -55,7 +56,7 @@ 8.1.1.49 - 1.9.4 + 1.9.5 3.5.3.2 4.1.3 @@ -363,7 +364,7 @@ org.jeecgframework weixin4j - 2.0.0 + 2.0.1 commons-beanutils @@ -393,6 +394,18 @@ jimureport-spring-boot-starter ${jimureport-spring-boot-starter.version} + + com.alibaba + fastjson + + + commons-lang + commons-lang + + + checker-qual + org.checkerframework + autopoi-web org.jeecgframework @@ -401,12 +414,16 @@ druid com.alibaba + + jsqlparser + com.github.jsqlparser + org.jeecgframework.jimureport jimureport-nosql-starter - 1.9.4.1 + ${jimureport-spring-boot-starter.version} org.apache.calcite @@ -418,7 +435,7 @@ org.jeecgframework.jimureport jimubi-spring-boot-starter - ${jimureport-spring-boot-starter.version} + 1.9.4