:lock: 升级部分依赖版本解决漏洞安全问题

airport-vue/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://192.168.2.88:9999/airport/
+VUE_APP_API_BASE_URL=http://127.0.0.1:9999/airport/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

airport/jeecg-boot-base/jeecg-boot-base-api/pom.xml

@@ -14,7 +14,7 @@
 
     <modules>
         <module>jeecg-system-local-api</module>
-        <module>jeecg-system-cloud-api</module>
+<!--        <module>jeecg-system-cloud-api</module>-->
     </modules>
 
     <dependencies>
@@ -23,4 +23,4 @@
             <artifactId>jeecg-boot-base-core</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>

airport/jeecg-boot-base/jeecg-boot-base-core/pom.xml

@@ -185,7 +185,7 @@
 		<!-- knife4j -->
 		<dependency>
 			<groupId>com.github.xiaoymin</groupId>
-			<artifactId>knife4j-spring-boot-starter</artifactId>
+			<artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
 			<version>${knife4j-spring-boot-starter.version}</version>
 		</dependency>
 

airport/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java

@@ -5,14 +5,18 @@ import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.constant.CommonConstant;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import org.springframework.context.annotation.Import;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
 import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.ParameterBuilder;
@@ -23,18 +27,21 @@ import springfox.documentation.service.*;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;
 import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author scott
  */
 @Configuration
 @EnableSwagger2WebMvc
-@EnableKnife4j
+//@EnableKnife4j
 @Import(BeanValidatorPluginsConfiguration.class)
 public class Swagger2Config implements WebMvcConfigurer {
 
@@ -56,21 +63,55 @@ public class Swagger2Config implements WebMvcConfigurer {
      *
      * @return Docket
      */
-    @Bean(value = "defaultApi2")
-    public Docket defaultApi2() {
-        return new Docket(DocumentationType.SWAGGER_2)
-                .apiInfo(apiInfo())
-                .select()
-                //此包路径下的类，才生成接口文档
-                .apis(RequestHandlerSelectors.basePackage("org.jeecg"))
-                //加了ApiOperation注解的类，才生成接口文档
-                .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
-                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
-                .paths(PathSelectors.any())
-                .build()
-                .securitySchemes(Collections.singletonList(securityScheme()))
-                .securityContexts(securityContexts());
-                //.globalOperationParameters(setHeaderToken());
+    //@Bean(value = "defaultApi2")
+    //public Docket defaultApi2() {
+    //    return new Docket(DocumentationType.SWAGGER_2)
+    //            .apiInfo(apiInfo())
+    //            .select()
+    //            //此包路径下的类，才生成接口文档
+    //            .apis(RequestHandlerSelectors.basePackage("org.jeecg"))
+    //            //加了ApiOperation注解的类，才生成接口文档
+    //            .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
+    //            .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+    //            .paths(PathSelectors.any())
+    //            .build()
+    //            .securitySchemes(Collections.singletonList(securityScheme()))
+    //            .securityContexts(securityContexts());
+    //            //.globalOperationParameters(setHeaderToken());
+    //}
+
+    @Bean
+    public static BeanPostProcessor springfoxHandlerProviderBeanPostProcessor() {
+        return new BeanPostProcessor() {
+
+            @Override
+            public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+                //if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider) {
+                if (bean instanceof WebMvcRequestHandlerProvider) {
+                    customizeSpringfoxHandlerMappings(getHandlerMappings(bean));
+                }
+                return bean;
+            }
+
+            private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings) {
+                List<T> copy = mappings.stream()
+                        .filter(mapping -> mapping.getPatternParser() == null)
+                        .collect(Collectors.toList());
+                mappings.clear();
+                mappings.addAll(copy);
+            }
+
+            @SuppressWarnings("unchecked")
+            private List<RequestMappingInfoHandlerMapping> getHandlerMappings(Object bean) {
+                try {
+                    Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings");
+                    field.setAccessible(true);
+                    return (List<RequestMappingInfoHandlerMapping>) field.get(bean);
+                } catch (IllegalArgumentException | IllegalAccessException e) {
+                    throw new IllegalStateException(e);
+                }
+            }
+        };
     }
 
     /***

airport/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java

@@ -12,11 +12,13 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.cors.reactive.CorsWebFilter;
 import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -57,19 +59,24 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
         registry.addViewController("/").setViewName("doc.html");
     }
 
+    /**
+     * springboot 进行跨域
+     * springboot升级成2.4.0以上时对AllowedOrigin设置发生了改变，不能有”*“
+     * @return
+     */
     @Bean
     @Conditional(CorsFilterCondition.class)
     public CorsFilter corsFilter() {
         final UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource();
         final CorsConfiguration corsConfiguration = new CorsConfiguration();
-        //是否允许请求带有验证信息
+        //1,允许任何来源
+        corsConfiguration.setAllowedOriginPatterns(Collections.singletonList("*"));
+        //2,允许任何请求头
+        corsConfiguration.addAllowedHeader(CorsConfiguration.ALL);
+        //3,允许任何方法
+        corsConfiguration.addAllowedMethod(CorsConfiguration.ALL);
+        //4,允许凭证
         corsConfiguration.setAllowCredentials(true);
-        // 允许访问的客户端域名
-        corsConfiguration.addAllowedOrigin("*");
-        // 允许服务端访问的客户端请求头
-        corsConfiguration.addAllowedHeader("*");
-        // 允许访问的方法名,GET POST等
-        corsConfiguration.addAllowedMethod("*");
         urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration);
         return new CorsFilter(urlBasedCorsConfigurationSource);
     }

airport/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.java

@@ -11,6 +11,8 @@ import java.util.function.Function;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.PessimisticLockingFailureException;
+import org.springframework.data.redis.cache.CacheStatistics;
+import org.springframework.data.redis.cache.CacheStatisticsCollector;
 import org.springframework.data.redis.cache.RedisCacheWriter;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -146,6 +148,16 @@ public class JeecgRedisCacheWriter implements RedisCacheWriter {
         });
     }
 
+    @Override
+    public void clearStatistics(String name) {
+
+    }
+
+    @Override
+    public RedisCacheWriter withStatisticsCollector(CacheStatisticsCollector cacheStatisticsCollector) {
+        return null;
+    }
+
     void lock(String name) {
         this.execute(name, (connection) -> {
             return this.doLock(name, connection);
@@ -218,4 +230,9 @@ public class JeecgRedisCacheWriter implements RedisCacheWriter {
     private static byte[] createCacheLockKey(String name) {
         return (name + "~lock").getBytes(StandardCharsets.UTF_8);
     }
+
+    @Override
+    public CacheStatistics getCacheStatistics(String cacheName) {
+        return null;
+    }
 }

airport/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/util/RedisUtil.java

@@ -1,9 +1,6 @@
 package org.jeecg.common.util;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +43,7 @@ public class RedisUtil {
 
 	/**
 	 * 根据key 获取过期时间
-	 * 
+	 *
 	 * @param key 键 不能为null
 	 * @return 时间(秒) 返回0代表为永久有效
 	 */
@@ -56,7 +53,7 @@ public class RedisUtil {
 
 	/**
 	 * 判断key是否存在
-	 * 
+	 *
 	 * @param key 键
 	 * @return true 存在 false不存在
 	 */
@@ -71,7 +68,7 @@ public class RedisUtil {
 
 	/**
 	 * 删除缓存
-	 * 
+	 *
 	 * @param key 可以传一个值 或多个
 	 */
 	@SuppressWarnings("unchecked")
@@ -80,7 +77,7 @@ public class RedisUtil {
 			if (key.length == 1) {
 				redisTemplate.delete(key[0]);
 			} else {
-				redisTemplate.delete(CollectionUtils.arrayToList(key));
+				redisTemplate.delete(Arrays.asList(key));
 			}
 		}
 	}
@@ -88,7 +85,7 @@ public class RedisUtil {
 	// ============================String=============================
 	/**
 	 * 普通缓存获取
-	 * 
+	 *
 	 * @param key 键
 	 * @return 值
 	 */
@@ -98,7 +95,7 @@ public class RedisUtil {
 
 	/**
 	 * 普通缓存放入
-	 * 
+	 *
 	 * @param key   键
 	 * @param value 值
 	 * @return true成功 false失败
@@ -116,7 +113,7 @@ public class RedisUtil {
 
 	/**
 	 * 普通缓存放入并设置时间
-	 * 
+	 *
 	 * @param key   键
 	 * @param value 值
 	 * @param time  时间(秒) time要大于0 如果time小于等于0 将设置无限期
@@ -138,7 +135,7 @@ public class RedisUtil {
 
 	/**
 	 * 递增
-	 * 
+	 *
 	 * @param key 键
 	 * @param by  要增加几(大于0)
 	 * @return
@@ -152,7 +149,7 @@ public class RedisUtil {
 
 	/**
 	 * 递减
-	 * 
+	 *
 	 * @param key 键
 	 * @param by  要减少几(小于0)
 	 * @return
@@ -167,7 +164,7 @@ public class RedisUtil {
 	// ================================Map=================================
 	/**
 	 * HashGet
-	 * 
+	 *
 	 * @param key  键 不能为null
 	 * @param item 项 不能为null
 	 * @return 值
@@ -178,7 +175,7 @@ public class RedisUtil {
 
 	/**
 	 * 获取hashKey对应的所有键值
-	 * 
+	 *
 	 * @param key 键
 	 * @return 对应的多个键值
 	 */
@@ -188,7 +185,7 @@ public class RedisUtil {
 
 	/**
 	 * HashSet
-	 * 
+	 *
 	 * @param key 键
 	 * @param map 对应多个键值
 	 * @return true 成功 false 失败
@@ -205,7 +202,7 @@ public class RedisUtil {
 
 	/**
 	 * HashSet 并设置时间
-	 * 
+	 *
 	 * @param key  键
 	 * @param map  对应多个键值
 	 * @param time 时间(秒)
@@ -226,7 +223,7 @@ public class RedisUtil {
 
 	/**
 	 * 向一张hash表中放入数据,如果不存在将创建
-	 * 
+	 *
 	 * @param key   键
 	 * @param item  项
 	 * @param value 值
@@ -244,7 +241,7 @@ public class RedisUtil {
 
 	/**
 	 * 向一张hash表中放入数据,如果不存在将创建
-	 * 
+	 *
 	 * @param key   键
 	 * @param item  项
 	 * @param value 值
@@ -266,7 +263,7 @@ public class RedisUtil {
 
 	/**
 	 * 删除hash表中的值
-	 * 
+	 *
 	 * @param key  键 不能为null
 	 * @param item 项 可以使多个 不能为null
 	 */
@@ -276,7 +273,7 @@ public class RedisUtil {
 
 	/**
 	 * 判断hash表中是否有该项的值
-	 * 
+	 *
 	 * @param key  键 不能为null
 	 * @param item 项 不能为null
 	 * @return true 存在 false不存在
@@ -287,7 +284,7 @@ public class RedisUtil {
 
 	/**
 	 * hash递增 如果不存在,就会创建一个 并把新增后的值返回
-	 * 
+	 *
 	 * @param key  键
 	 * @param item 项
 	 * @param by   要增加几(大于0)
@@ -299,7 +296,7 @@ public class RedisUtil {
 
 	/**
 	 * hash递减
-	 * 
+	 *
 	 * @param key  键
 	 * @param item 项
 	 * @param by   要减少记(小于0)
@@ -312,7 +309,7 @@ public class RedisUtil {
 	// ============================set=============================
 	/**
 	 * 根据key获取Set中的所有值
-	 * 
+	 *
 	 * @param key 键
 	 * @return
 	 */
@@ -327,7 +324,7 @@ public class RedisUtil {
 
 	/**
 	 * 根据value从一个set中查询,是否存在
-	 * 
+	 *
 	 * @param key   键
 	 * @param value 值
 	 * @return true 存在 false不存在
@@ -343,7 +340,7 @@ public class RedisUtil {
 
 	/**
 	 * 将数据放入set缓存
-	 * 
+	 *
 	 * @param key    键
 	 * @param values 值 可以是多个
 	 * @return 成功个数
@@ -359,7 +356,7 @@ public class RedisUtil {
 
 	/**
 	 * 将set数据放入缓存
-	 * 
+	 *
 	 * @param key    键
 	 * @param time   时间(秒)
 	 * @param values 值 可以是多个
@@ -380,7 +377,7 @@ public class RedisUtil {
 
 	/**
 	 * 获取set缓存的长度
-	 * 
+	 *
 	 * @param key 键
 	 * @return
 	 */
@@ -395,7 +392,7 @@ public class RedisUtil {
 
 	/**
 	 * 移除值为value的
-	 * 
+	 *
 	 * @param key    键
 	 * @param values 值 可以是多个
 	 * @return 移除的个数
@@ -413,7 +410,7 @@ public class RedisUtil {
 
 	/**
 	 * 获取list缓存的内容
-	 * 
+	 *
 	 * @param key   键
 	 * @param start 开始
 	 * @param end   结束 0 到 -1代表所有值
@@ -432,7 +429,7 @@ public class RedisUtil {
 
 	/**
 	 * 获取list缓存的长度
-	 * 
+	 *
 	 * @param key 键
 	 * @return
 	 */
@@ -447,7 +444,7 @@ public class RedisUtil {
 
 	/**
 	 * 通过索引 获取list中的值
-	 * 
+	 *
 	 * @param key   键
 	 * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推
 	 * @return
@@ -463,7 +460,7 @@ public class RedisUtil {
 
 	/**
 	 * 将list放入缓存
-	 * 
+	 *
 	 * @param key   键
 	 * @param value 值
 	 * @param time  时间(秒)
@@ -481,7 +478,7 @@ public class RedisUtil {
 
 	/**
 	 * 将list放入缓存
-	 * 
+	 *
 	 * @param key   键
 	 * @param value 值
 	 * @param time  时间(秒)
@@ -502,7 +499,7 @@ public class RedisUtil {
 
 	/**
 	 * 将list放入缓存
-	 * 
+	 *
 	 * @param key   键
 	 * @param value 值
 	 * @param time  时间(秒)
@@ -520,7 +517,7 @@ public class RedisUtil {
 
 	/**
 	 * 将list放入缓存
-	 * 
+	 *
 	 * @param key   键
 	 * @param value 值
 	 * @param time  时间(秒)
@@ -541,7 +538,7 @@ public class RedisUtil {
 
 	/**
 	 * 根据索引修改list中的某条数据
-	 * 
+	 *
 	 * @param key   键
 	 * @param index 索引
 	 * @param value 值
@@ -559,7 +556,7 @@ public class RedisUtil {
 
 	/**
 	 * 移除N个值为value
-	 * 
+	 *
 	 * @param key   键
 	 * @param count 移除多少个
 	 * @param value 值
@@ -588,7 +585,7 @@ public class RedisUtil {
 		try {
 			return redisTemplate.execute((RedisCallback<Set<String>>) connection -> {
 				Set<String> binaryKeys = new HashSet<>();
-				Cursor<byte[]> cursor = connection.scan(new ScanOptions.ScanOptionsBuilder().match(realKey).count(Integer.MAX_VALUE).build());
+				Cursor<byte[]> cursor = connection.scan(ScanOptions.scanOptions().match(realKey).count(Integer.MAX_VALUE).build());
 				while (cursor.hasNext()) {
 					binaryKeys.add(new String(cursor.next()));
 				}

airport/jeecg-boot-module-system/pom.xml

@@ -107,10 +107,16 @@
             </exclusions>
         </dependency>
         <!-- 积木报表 -->
-        <dependency>
+<!--        <dependency>
             <groupId>org.jeecgframework.jimureport</groupId>
             <artifactId>jimureport-spring-boot-starter</artifactId>
-            <version>1.4.32</version>
+            <version>1.5.9</version>
+        </dependency>-->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+            <scope>test</scope>
         </dependency>
 
 
@@ -119,8 +125,18 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+
+            <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.7.17</version>
                 <!--				<configuration>-->
                 <!--					<includeSystemScope>true</includeSystemScope>-->
                 <!--				</configuration>-->
@@ -141,6 +157,31 @@
                 <!--					</execution>-->
                 <!--				</executions>-->
             </plugin>
+            <!-- 漏洞扫描插件 -->
+            <!-- 配置参考地址：https://jeremylong.github.io/DependencyCheck/dependency-check-maven/configuration.html -->
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <name>airport漏洞扫描报告</name>
+                    <formats>
+                        <format>HTML</format>
+                        <format>JSON</format>
+                    </formats>
+                    <prettyPrint>true</prettyPrint>
+                    <suppressionFiles>
+                    <!-- 抑制文件 -->
+                        <suppressionFile>${project.basedir}/src/main/resources/suppression/custmoize-supperssion.xml</suppressionFile>
+                    </suppressionFiles>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <!--	<build>-->
@@ -155,4 +196,4 @@
     <!--			</plugin>-->
     <!--		</plugins>-->
     <!--	</build>-->
-</project>
+</project>

airport/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java

@@ -6,6 +6,7 @@ import org.apache.tomcat.util.scan.StandardJarScanner;
 import org.jeecg.common.util.oConvertUtils;
 import org.springframework.boot.SpringApplication;
 //import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.metrics.cache.CacheMetricsAutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
@@ -26,7 +27,7 @@ import java.net.UnknownHostException;
 @Slf4j
 @SpringBootApplication
 //@EnableAsync
-@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class})
+@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class, CacheMetricsAutoConfiguration.class})
 public class JeecgSystemApplication extends SpringBootServletInitializer {
 
     @Override
@@ -49,4 +50,4 @@ public class JeecgSystemApplication extends SpringBootServletInitializer {
 
     }
 
-}
+}

airport/jeecg-boot-module-system/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java

@@ -6,7 +6,7 @@ import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.TokenUtils;
-import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
+//import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
@@ -23,9 +23,10 @@ import java.util.Map;
 
 
 @Slf4j
-@Component
-public class JimuReportTokenService implements JmReportTokenServiceI {
-    @Autowired
+//@Component
+//public class JimuReportTokenService implements JmReportTokenServiceI {
+public class JimuReportTokenService {
+    /*@Autowired
     private ISysBaseAPI sysBaseAPI;
     @Autowired
     @Lazy
@@ -64,5 +65,5 @@ public class JimuReportTokenService implements JmReportTokenServiceI {
         map.put(SYS_ORG_CODE, userInfo.getSysOrgCode());
         // 将所有信息存放至map 解析sql/api会根据map的键值解析
         return map;
-    }
+    }*/
 }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/aop/ControllerAspect.java

@@ -14,6 +14,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
+import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.modules.utils.AirportUtil;
 import org.jetbrains.annotations.NotNull;
@@ -76,8 +77,8 @@ public class ControllerAspect {
             }
             HttpServletRequest request = sra.getRequest();
 
-            String authorization = request.getHeader("Authorization");
-            log.info("AUTHORIZATION : {}", authorization);
+            String authorization = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
+            log.info("X-Access-Token : {}", authorization);
             if (!Strings.isNullOrEmpty(authorization)) {
                 log.info("USER_NAME : {}", JwtUtil.getUsername(authorization));
             } else {

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/DemoRabbitMqListener3.java

@@ -71,7 +71,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.bouncycastle.crypto.tls.ConnectionEnd.client;
+//import static org.bouncycastle.crypto.tls.ConnectionEnd.client;
 
 /**
  * FIXME: 当前版本耦合严重，后期需要再次封装

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java

@@ -45,7 +45,7 @@ public class SysDictItemController {
 
 	@Autowired
 	private ISysDictItemService sysDictItemService;
-	
+
 	/**
 	 * @功能：查询字典数据
 	 * @param sysDictItem
@@ -66,7 +66,7 @@ public class SysDictItemController {
 		result.setResult(pageList);
 		return result;
 	}
-	
+
 	/**
 	 * @功能：新增
 	 * @return
@@ -110,7 +110,7 @@ public class SysDictItemController {
 		}
 		return result;
 	}
-	
+
 	/**
 	 * @功能：删除字典数据
 	 * @param id
@@ -132,7 +132,7 @@ public class SysDictItemController {
 		}
 		return result;
 	}
-	
+
 	/**
 	 * @功能：批量删除字典数据
 	 * @param ids
@@ -161,7 +161,7 @@ public class SysDictItemController {
 	@RequestMapping(value = "/dictItemCheck", method = RequestMethod.GET)
 	@ApiOperation("字典重复校验接口")
 	public Result<Object> doDictItemCheck(SysDictItem sysDictItem, HttpServletRequest request) {
-		int num = 0;
+		long num = 0;
 		LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>();
 		queryWrapper.eq(SysDictItem::getItemValue,sysDictItem.getItemValue());
 		queryWrapper.eq(SysDictItem::getDictId,sysDictItem.getDictId());
@@ -179,5 +179,5 @@ public class SysDictItemController {
 			return Result.error("该值不可用，系统中已存在！");
 		}
 	}
-	
+
 }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java

@@ -134,7 +134,7 @@ public class SysTenantController {
             // 过滤掉已被引用的租户
             List<Integer> idList = new ArrayList<>();
             for (String id : ls) {
-                int userCount = sysTenantService.countUserLinkTenant(id);
+                long userCount = sysTenantService.countUserLinkTenant(id);
                 if (userCount == 0) {
                     idList.add(Integer.parseInt(id));
                 }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java

@@ -22,7 +22,7 @@ public interface ISysTenantService extends IService<SysTenant> {
      * @param id
      * @return
      */
-    int countUserLinkTenant(String id);
+    long countUserLinkTenant(String id);
 
     /**
      * 根据ID删除租户，会判断是否已被引用

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java

@@ -100,7 +100,7 @@ public class SysPermissionDataRuleImpl extends ServiceImpl<SysPermissionDataRule
 		SysPermissionDataRule dataRule = this.baseMapper.selectById(dataRuleId);
 		if(dataRule!=null) {
 			this.removeById(dataRuleId);
-			Integer count =  this.baseMapper.selectCount(new LambdaQueryWrapper<SysPermissionDataRule>().eq(SysPermissionDataRule::getPermissionId, dataRule.getPermissionId()));
+			Long count =  this.baseMapper.selectCount(new LambdaQueryWrapper<SysPermissionDataRule>().eq(SysPermissionDataRule::getPermissionId, dataRule.getPermissionId()));
 			//注:同一个事务中删除后再查询是会认为数据已被删除的 若事务回滚上述删除无效
 			if(count==null || count==0) {
 				SysPermission permission = sysPermissionMapper.selectById(dataRule.getPermissionId());
@@ -110,7 +110,7 @@ public class SysPermissionDataRuleImpl extends ServiceImpl<SysPermissionDataRule
 				}
 			}
 		}
-		
+
 	}
 
 }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java

@@ -42,7 +42,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 
 	@Resource
 	private SysPermissionMapper sysPermissionMapper;
-	
+
 	@Resource
 	private ISysPermissionDataRuleService permissionDataRuleService;
 
@@ -73,7 +73,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 		}
 		String pid = sysPermission.getParentId();
 		if(oConvertUtils.isNotEmpty(pid)) {
-			int count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, pid));
+			long count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, pid));
 			if(count==1) {
 				//若父节点无其他子节点，则该父节点是叶子节点
 				this.sysPermissionMapper.setMenuLeaf(pid, 1);
@@ -94,10 +94,10 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 		//删除部门角色授权
 		sysDepartRolePermissionMapper.deleteByMap(map);
 	}
-	
+
 	/**
 	 * 根据父id删除其关联的子节点数据
-	 * 
+	 *
 	 * @return
 	 */
 	public void removeChildrenBy(String parentId) {
@@ -108,7 +108,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 		List<SysPermission> permissionList = this.list(query);
 		if (permissionList != null && permissionList.size() > 0) {
 			String id = ""; // id
-			int num = 0; // 查出的子级数量
+			long num = 0; // 查出的子级数量
 			// 如果查出的集合不为空, 则先删除所有
 			this.remove(query);
 			// 再遍历刚才查出的集合, 根据每个对象,查找其是否仍有子级
@@ -132,7 +132,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 			}
 		}
 	}
-	
+
 	/**
 	  * 逻辑删除
 	 */
@@ -145,7 +145,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 			throw new JeecgBootException("未找到菜单信息");
 		}
 		String pid = sysPermission.getParentId();
-		int count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, pid));
+		long count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, pid));
 		if(count==1) {
 			//若父节点无其他子节点，则该父节点是叶子节点
 			this.sysPermissionMapper.setMenuLeaf(pid, 1);
@@ -189,29 +189,29 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 				sysPermission.setParentId("");
 			}
 			//Step2.判断菜单下级是否有菜单，无则设置为叶子节点
-			int count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, sysPermission.getId()));
+			long count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, sysPermission.getId()));
 			if(count==0) {
 				sysPermission.setLeaf(true);
 			}
 			//----------------------------------------------------------------------
 			this.updateById(sysPermission);
-			
+
 			//如果当前菜单的父菜单变了，则需要修改新父菜单和老父菜单的，叶子节点状态
 			String pid = sysPermission.getParentId();
 			if((oConvertUtils.isNotEmpty(pid) && !pid.equals(p.getParentId())) || oConvertUtils.isEmpty(pid)&&oConvertUtils.isNotEmpty(p.getParentId())) {
 				//a.设置新的父菜单不为叶子节点
 				this.sysPermissionMapper.setMenuLeaf(pid, 0);
 				//b.判断老的菜单下是否还有其他子菜单，没有的话则设置为叶子节点
-				int cc = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, p.getParentId()));
+				long cc = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, p.getParentId()));
 				if(cc==0) {
 					if(oConvertUtils.isNotEmpty(p.getParentId())) {
 						this.sysPermissionMapper.setMenuLeaf(p.getParentId(), 1);
 					}
 				}
-				
+
 			}
 		}
-		
+
 	}
 
 	@Override
@@ -226,9 +226,9 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 	public void deletePermRuleByPermId(String id) {
 		LambdaQueryWrapper<SysPermissionDataRule> query = new LambdaQueryWrapper<>();
 		query.eq(SysPermissionDataRule::getPermissionId, id);
-		int countValue = this.permissionDataRuleService.count(query);
+		long countValue = this.permissionDataRuleService.count(query);
 		if(countValue > 0) {
-			this.permissionDataRuleService.remove(query);	
+			this.permissionDataRuleService.remove(query);
 		}
 	}
 

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java

@@ -33,7 +33,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
     }
 
     @Override
-    public int countUserLinkTenant(String id) {
+    public long countUserLinkTenant(String id) {
         LambdaQueryWrapper<SysUser> userQueryWrapper = new LambdaQueryWrapper<>();
         userQueryWrapper.eq(SysUser::getRelTenantIds, id);
         userQueryWrapper.or().like(SysUser::getRelTenantIds, "%," + id);
@@ -46,7 +46,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
     @Override
     public boolean removeTenantById(String id) {
         // 查找出已被关联的用户数量
-        int userCount = this.countUserLinkTenant(id);
+        long userCount = this.countUserLinkTenant(id);
         if (userCount > 0) {
             throw new JeecgBootException("该租户已被引用，无法删除！");
         }

airport/jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -24,7 +24,7 @@ airport:
   mq:
     msgHandlerEvent: false
   system:
-    host: http://192.168.2.88:9999/airport
+    host: http://127.0.0.1:9999/airport
     exportNum: 300
 
 spring:
@@ -34,13 +34,15 @@ spring:
 #    suffix: .html
 #    mode: HTML
 #    encoding: UTF-8
+  main:
+    allow-circular-references: true
   # 配置RabbitMQ服务器>>>>>>单机配置
   rabbitmq:
-    host: 111.229.112.155
+    host: 120.79.86.50
     port: 5672
-    username: admin
-    password: AirportAdmin2023+
-    virtual-host: /airport
+    username: zl
+    password: 123456
+    virtual-host: /
     listener: #开启消费者确认机制
       simple:
         # 每次从RabbitMQ获取的消息数量
@@ -111,7 +113,7 @@ spring:
             instanceName: MyScheduler
             instanceId: AUTO
           jobStore:
-            class: org.quartz.impl.jdbcjobstore.JobStoreTX
+            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
             driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
             tablePrefix: QRTZ_
             isClustered: true
@@ -195,9 +197,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://120.79.86.50:3306/airport?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/airport?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: b610a50f4cc1971e
+          password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
   #        multi-datasource1:
@@ -243,7 +245,7 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置
@@ -344,11 +346,29 @@ knife4j:
   #开启增强配置
   enable: true
   #开启生产环境屏蔽
-  production: true
+  production: false
   basic:
     enable: false
     username: jeecg
     password: jeecg1314
+  openapi:
+    title: 后台服务API接口文档
+    description: "后台API接口"
+    email: xiaoymin@foxmail.com
+    concat: 宙斯维创
+    url: https://docs.xiaominfo.com
+    version: 1.0
+    license: Apache 2.0
+    license-url: https://stackoverflow.com/
+    terms-of-service-url: https://stackoverflow.com/
+    group:
+      test1:
+        group-name: 默认
+        api-rule: package
+        api-rule-resources:
+          - org.jeecg
+  setting:
+    swagger-model-name: Swagger模型
 #第三方登录
 justauth:
   enabled: true
@@ -396,4 +416,4 @@ third-app:
       client-id: ??
       # appSecret
       client-secret: ??
-      agent-id: ??
+      agent-id: ??

airport/jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -41,6 +41,8 @@ spring:
 #    suffix: .html
 #    mode: HTML
 #    encoding: UTF-8
+  main:
+    allow-circular-references: true
   # 配置RabbitMQ服务器>>>>>>单机配置
   rabbitmq:
     host: 111.229.112.155
@@ -118,7 +120,7 @@ spring:
             instanceName: MyScheduler
             instanceId: AUTO
           jobStore:
-            class: org.quartz.impl.jdbcjobstore.JobStoreTX
+            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
             driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
             tablePrefix: QRTZ_
             isClustered: true
@@ -358,6 +360,25 @@ knife4j:
     enable: false
     username: jeecg
     password: jeecg1314
+  openapi:
+    title: 后台服务API接口文档
+    description: "后台API接口"
+    email: xiaoymin@foxmail.com
+    concat: 宙斯维创
+    url: https://docs.xiaominfo.com
+    version: 1.0
+    license: Apache 2.0
+    license-url: https://stackoverflow.com/
+    terms-of-service-url: https://stackoverflow.com/
+    group:
+      test1:
+        group-name: 默认
+        api-rule: package
+        api-rule-resources:
+          - org.jeecg
+  setting:
+    swagger-model-name: Swagger模型
+
 #第三方登录
 justauth:
   enabled: true

airport/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_database.properties

@@ -1,8 +1,8 @@
 #mysql
 diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://120.79.86.50:3306/airport?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+url=jdbc:mysql://127.0.0.1:3306/airport?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 username=root
-password=b610a50f4cc1971e
+password=root
 database_name=airport
 
 #oracle
@@ -24,4 +24,4 @@ database_name=airport
 #url=jdbc:sqlserver://192.168.1.200:1433;DatabaseName=jeecg
 #username=sa
 #password=SA
-#database_name=jeecg
+#database_name=jeecg

airport/jeecg-boot-module-system/src/test/java/org/jeecg/SecurityToolsTest.java

@@ -1,10 +1,12 @@
 package org.jeecg;
 
+import cn.hutool.core.date.ChineseDate;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.rabbitmq.client.*;
 import org.jeecg.common.util.security.SecurityTools;
 import org.jeecg.common.util.security.entity.*;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
@@ -84,4 +86,76 @@ public class SecurityToolsTest {
         channel.close();
         connection.close();
     }
+
+    @Test
+    public void testChineseDate() {
+        System.out.println("                                                                           @@@@@                        \n" +
+                "                                                                          @O]@o@\\            @@@@@@^    \n" +
+                "                                                                        ,=^ ,\\\\O@`         /@O/@@@/`    \n" +
+                "                                                                         =@   @@@@        /@oO@\\ /      \n" +
+                "                                                                          @      ,@/     @^  @\\/@`      \n" +
+                "                                                                          =@       @\\   /\\    /@o[      \n" +
+                "                                                                           O\\       @\\ =/    ,@`        \n" +
+                "                                                          ,@@O\\             =@`      \\@@o`   @/         \n" +
+                "                                                       ,@@@^@//@\\`            \\@`     \\@@[`  @          \n" +
+                "                                                     ,/@@O@^/@\\oO@@@]          ,@\\     ,\\@^,@^          \n" +
+                "                                                  ,`@@oO@O@@ooO@@@OOo//@@@\\]`    @@@`    ,@@/           \n" +
+                "                                                ,/@@@/@@O/@O@@`  ,          [@@@O@         @@           \n" +
+                "                                             ]@@O[` `[[[\\@\\o[,/@\\,`            ,\\@@]       =\\`          \n" +
+                "                                          ]@//\\^       @@^     ,O@@\\\\`            O@@       =\\          \n" +
+                "                                       ]@@O^        ,/@\\o          ,` ,[@@o^       ,O@`      @          \n" +
+                "                                     /@O`     ,O]/@@/`                   ,@          \\@^     @          \n" +
+                "                                   @@[o      \\/O@`                        \\@^         @@O` ,O@          \n" +
+                "                                 ]@/           @[                       ,@@O@@]       ,@   ,@@`         \n" +
+                "                               =@@`         ]@@^/                   =/@@@o    @@@      @   =@           \n" +
+                "                              ,@@`        ,[`` @^                ,@@`[ @@^   //        @  =@O           \n" +
+                "                              @^               =@         ,]@@/[\\@/     @/  /@        O@ ,@/            \n" +
+                "                             \\@               ,/@@@[[`   =O@Oooo/@        ,@@/        @^=@^      ]/@@[[[\n" +
+                "                             @/            ,/@O`         ,@/`  \\@        ,@/         //=@o\\   /@@`     ]\n" +
+                "                            =@            /^                   [@         @\\        /@/Oo`,/@@[,     ,=@\n" +
+                "                            @@                                  @`               ]@@@@O/` =@O      /@@OO\n" +
+                "                            @^                        ,    ,   ,@         ` ,`]@@/`             ]@@/o   \n" +
+                "                           =^                     @@@@^     [\\@@@\\]]]/]@@@@O@@^            ,]@@/        \n" +
+                "                           =^                  ]@/^                        =@O        ,/@/Oo`[[         \n" +
+                "                           =^                /@/[                                 ]/@/,                 \n" +
+                "                           =^             ,=@o                                ,/@/`                     \n" +
+                "                           =^             /@                               \\/@O/                        \n" +
+                "                     ,]]` @@@`           ,@[                            ,/@O///                         \n" +
+                "                   /@Oo\\o@@\\o@           \\^                         ,,/@/                               \n" +
+                "                  @OooO@@@@^             \\`                       ,@@`                                  \n" +
+                "              ,/@@/`,[@@,[@`                                   ]/@[                                     \n" +
+                "            ,@`oo@O   =@  [\\                                ]/@O/                                       \n" +
+                "            =@  ==/   /@]  ,^                           `/@//                                           \n" +
+                "          ,/@[   @^    \\^                           ,]@@O^                                              \n" +
+                "       `/@@/@     @`    @O^                     ]/@@/[[[`                                               \n" +
+                "     =@@Oooo@`    @^    ,@@                ]@@@[[`,`                                                    \n" +
+                "   /@Oo^    =\\     @^     \\@\\          ]@@ooo@\\`                                                        \n" +
+                " =@         ,O     =@\\      @@`      @@@]@^ \\o@^                                                        \n" +
+                "@^           =O`    =@O`     O@@@` ,@@ooo@^   =^`                                                       \n" +
+                "^             O\\     ,@@`       ,@@@@OO]@@`   =@                                                        \n" +
+                "               \\^      \\@\\                    @\\                                                        \n" +
+                "               [\\@      ,@@\\                ,@O                                                         \n" +
+                "                 \\@@`     \\@@\\             @@o^                                                         \n" +
+                "                  [\\@]       `[\\@@\\/@]]@@@/                                                             \n" +
+                "                     @@\\              =@^                                                               \n");
+        //通过公历构建
+        ChineseDate date = new ChineseDate(DateUtil.parseDate("2023-11-01"));
+        // 九月
+        System.out.println(date.getChineseMonth());
+        // 九月
+        System.out.println(date.getChineseMonthName());
+        // 十八
+        System.out.println(date.getChineseDay());
+        // 癸卯
+        System.out.println(date.getCyclical());
+        // 生肖：兔
+        System.out.println(date.getChineseZodiac());
+        // 传统节日（部分支持，逗号分隔）：春节
+        System.out.println(date.getFestivals());
+        // 癸卯兔年 九月十八
+        System.out.println(date.toString());
+        // 天干地支：癸卯年壬戌月癸亥日
+        System.out.println(date.getCyclicalYMD());
+
+    }
 }

airport/jeecg-boot-module-system/src/test/java/org/jeecg/modules/online/desform/test/DesformApiTest.java

@@ -6,6 +6,7 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.RestUtil;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

airport/pom.xml

@@ -4,11 +4,11 @@
   <artifactId>jeecg-boot-parent</artifactId>
   <version>3.1.0</version>
   <packaging>pom</packaging>
-  
+
   	<parent>
 	    <groupId>org.springframework.boot</groupId>
 	    <artifactId>spring-boot-starter-parent</artifactId>
-	    <version>2.3.5.RELEASE</version>
+	    <version>2.7.17</version>
 	    <relativePath/>
 	</parent>
 
@@ -16,25 +16,25 @@
 		<jeecgboot.version>3.1.0</jeecgboot.version>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
-        <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
+<!--?        <spring-cloud.version>Hoxton.SR8</spring-cloud.version>-->
+<!--?        <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>-->
 		<xxl-job-core.version>2.2.0</xxl-job-core.version>
-        <fastjson.version>1.2.78</fastjson.version>
-		<knife4j-spring-boot-starter.version>2.0.9</knife4j-spring-boot-starter.version>
-		<knife4j-spring-ui.version>2.0.9</knife4j-spring-ui.version>
+        <fastjson.version>1.2.83</fastjson.version>
+		<knife4j-spring-boot-starter.version>4.0.0</knife4j-spring-boot-starter.version>
+		<knife4j-spring-ui.version>4.2.0</knife4j-spring-ui.version>
 		<!-- 数据库驱动 -->
-		<postgresql.version>42.2.6</postgresql.version>
+		<postgresql.version>42.3.8</postgresql.version>
 		<ojdbc6.version>11.2.0.3</ojdbc6.version>
 		<sqljdbc4.version>4.0</sqljdbc4.version>
-		<mysql-connector-java.version>8.0.27</mysql-connector-java.version>
+		<mysql-connector-java.version>8.0.33</mysql-connector-java.version>
 		<!-- 动态数据源-->
 		<dynamic-datasource-spring-boot-starter.version>3.2.0</dynamic-datasource-spring-boot-starter.version>
-		<hutool.version>5.3.8</hutool.version>
+		<hutool.version>5.8.22</hutool.version>
 		<redisson.version>3.16.1</redisson.version>
 		<commons-beanutils.version>1.9.4</commons-beanutils.version>
 		<guava.version>29.0-jre</guava.version>
-		<mybatis-plus.version>3.4.3.1</mybatis-plus.version>
-		<druid.version>1.1.22</druid.version>
+		<mybatis-plus.version>3.5.4.1</mybatis-plus.version>
+		<druid.version>1.2.20</druid.version>
 		<commons.version>2.6</commons.version>
 		<aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
 		<aliyun.oss.version>3.11.2</aliyun.oss.version>
@@ -109,26 +109,30 @@
 			<artifactId>fastjson</artifactId>
 			<version>${fastjson.version}</version>
 		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
 	</dependencies>
 
 	<dependencyManagement>
 		<dependencies>
 			<!-- spring-cloud-->
-			<dependency>
+<!--?			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
                 <version>${spring-cloud.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
-			</dependency>
+			</dependency>-->
 			<!-- spring-cloud-alibaba -->
-			<dependency>
+<!--?			<dependency>
 				<groupId>com.alibaba.cloud</groupId>
 				<artifactId>spring-cloud-alibaba-dependencies</artifactId>
                 <version>${spring-cloud-alibaba.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
-			</dependency>
+			</dependency>-->
 
 			<!-- system 模块-->
 			<dependency>
@@ -187,7 +191,7 @@
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>
 				<artifactId>jeecg-boot-starter-rabbitmq</artifactId>
-				<version>${jeecgboot.version}</version>
+				<version>3.6.0</version>
 			</dependency>
 
 
@@ -322,7 +326,8 @@
 		        <groupId>org.apache.maven.plugins</groupId>
 		        <artifactId>maven-surefire-plugin</artifactId>
 		        <configuration>
-		          <skipTests>true</skipTests>
+                    <skipTests>true</skipTests>
+                    <encoding>UTF-8</encoding>
 		        </configuration>
 	        </plugin>
 	         <!-- 避免font文件的二进制文件格式压缩破坏 -->
@@ -451,4 +456,4 @@
 			</properties>
 		</profile>
     </profiles>
-</project>
+</project>