📝 fix: v2.6.5.0

- 重要更新 - Spring Boot 版本升级至 2.6.5 - Spring Boot Admin 版本升级至 2.6.3 - 一般更新 - 强制降低 Spring Integration 版本至 5.5.9，临时解决 Spring Integration 5.5.10 不兼容 Java 8 问题。已提交 ISSUE 至 Spring Integration 项目 [#3761](spring-projects/spring-integration#3761 Spring Integration 5.5.11 修复该问题 - 修复 @async 与 @transactional 注解冲突，导致 @transactional 失效问题。 - 修复因@transactional 失效，导致的权限数据存储死锁问题。 - 依赖更新 - Redisson 版本升级至 3.17.0 - Fastjson 版本升级至 1.2.80 - Okhttps 版本升级至 3.4.4 - Bce-java-sdk 版本升级至 0.10.201 - Alipay-sdk-java 版本升级至 4.22.67.ALL - Logback 版本升级至 1.2.11
dromara · Mar 27, 2022 · aef772a · aef772a
1 parent 928dbc1
commit aef772a
Show file tree

Hide file tree

Showing 34 changed files with 70 additions and 69 deletions.
diff --git a/README.md b/README.md
@@ -6,13 +6,13 @@
 
 <p align="center">
     <a href="https://www.oracle.com/java/technologies/javase-downloads.html" target="_blank"><img src="https://shields.io/badge/JDK-1.8%2B-green" alt="JDK 1.8+"></a>
-    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://shields.io/badge/Spring%20Boot-2.6.4-blue" alt="Spring Boot 2.6.4"></a>
+    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://shields.io/badge/Spring%20Boot-2.6.5-blue" alt="Spring Boot 2.6.5"></a>
     <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud-2021.0.1-blue" alt="Spring Cloud 2021.0.1"></a>
     <a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud%20Alibaba-2021.0.1.0-blue" alt="Spring Cloud Alibaba 2021.0.1.0"></a>
     <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://shields.io/badge/Nacos-2.0.4-brightgreen" alt="Nacos 2.0.4"></a>
     <a href="./LICENSE"><img src="https://shields.io/badge/License-Apache--2.0-blue" alt="License Apache 2.0"></a>
     <a href="https://blog.csdn.net/Pointer_v" target="_blank"><img src="https://shields.io/badge/Author-%E7%A0%81%E5%8C%A0%E5%90%9B-orange" alt="码匠君"></a>
-    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.6.4.20-red" alt="Version 2.6.4.20"></a>
+    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.6.5.0-red" alt="Version 2.6.5.0"></a>
     <a href="https://gitee.com/herodotus/eurynome-cloud"><img src="https://gitee.com/herodotus/eurynome-cloud/badge/star.svg?theme=dark" alt="Gitee star"></a>
     <a href="https://gitee.com/herodotus/eurynome-cloud"><img src="https://gitee.com/herodotus/eurynome-cloud/badge/fork.svg?theme=dark" alt="Gitee fork"></a>
 </p>
@@ -29,7 +29,7 @@
 
 ## 企业级技术中台微服务架构与服务能力开发平台
 
-Eurynome Cloud是一款企业级微服务架构和服务能力开发平台。基于Spring Boot 2.6.4、Spring Cloud 2021.0.1、Spring Cloud Alibaba 2021.0.1.0、Nacos 2.0.4 等最新版本开发，遵循SpringBoot编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能，代码简洁，架构清晰，非常适合学习和企业作为基础框架使用。
+Eurynome Cloud是一款企业级微服务架构和服务能力开发平台。基于Spring Boot 2.6.5、Spring Cloud 2021.0.1、Spring Cloud Alibaba 2021.0.1.0、Nacos 2.0.4 等最新版本开发，遵循SpringBoot编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能，代码简洁，架构清晰，非常适合学习和企业作为基础框架使用。
 
 ## 平台定位
 
@@ -77,10 +77,10 @@ Eurynome Cloud是一款企业级微服务架构和服务能力开发平台。基
 
 组件 | 版本 
 ---|---
-Spring Boot | 2.6.4
+Spring Boot | 2.6.5
 Spring Cloud | 2021.0.1 
 Spring Cloud Alibaba | 2021.0.1.0
-Spring Boot Admin | 2.6.2
+Spring Boot Admin | 2.6.3
 Nacos | 2.0.4 
 Sentinel | 1.8.3 
 Seata | 1.3.0 

diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=2.6.4.20
+VERSION=2.6.5.0
 GATEWAY_SERVICE_NAME=eurynome-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=eurynome-cloud-uaa

diff --git a/configurations/docker/docker-compose/windows/herodotus/.env b/configurations/docker/docker-compose/windows/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=2.6.4.20
+VERSION=2.6.5.0
 GATEWAY_SERVICE_NAME=eurynome-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=eurynome-cloud-uaa

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -29,13 +29,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.4</version>
+        <version>2.6.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <groupId>cn.herodotus.eurynome</groupId>
     <artifactId>dependencies</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>pom</packaging>
 
     <name>eurynome-cloud-dependencies</name>
@@ -59,10 +59,10 @@
 
     <properties>
         <!--Spring 家族-->
-        <spring-boot-dependencies.version>2.6.4</spring-boot-dependencies.version>
+        <spring-boot-dependencies.version>2.6.5</spring-boot-dependencies.version>
         <spring-cloud-dependencies.version>2021.0.1</spring-cloud-dependencies.version>
         <spring-cloud-alibaba-dependencies.version>2021.0.1.0</spring-cloud-alibaba-dependencies.version>
-        <spring-boot-admin.version>2.6.2</spring-boot-admin.version>
+        <spring-boot-admin.version>2.6.3</spring-boot-admin.version>
 
         <!--Maven Plugin 相关组件-->
         <docker-maven-plugin.version>0.39.1</docker-maven-plugin.version>
@@ -80,20 +80,20 @@
 
         <!-- 应用开发辅助工具组件 -->
         <lombok.version>1.18.22</lombok.version>
-        <redisson.version>3.16.8</redisson.version>
+        <redisson.version>3.17.0</redisson.version>
         <p6spy.version>3.9.1</p6spy.version>
         <springdoc.version>1.6.6</springdoc.version>
         <logstash-logback-encoder.version>7.0.1</logstash-logback-encoder.version>
 
         <!-- 阿里巴巴开源工具依赖 -->
-        <fastjson.version>1.2.79</fastjson.version>
+        <fastjson.version>1.2.80</fastjson.version>
         <jetcache.version>2.6.2</jetcache.version>
         <nacos.version>2.0.4</nacos.version>
         <sentinel.version>1.8.3</sentinel.version>
 
         <!-- 国内开源通用组件 -->
         <hutool.version>5.7.22</hutool.version>
-        <okhttps.version>3.4.2</okhttps.version>
+        <okhttps.version>3.4.4</okhttps.version>
         <just-auth.verison>1.16.5</just-auth.verison>
         <knife4j.version>3.0.3</knife4j.version>
         <weixin-java-sdk.version>4.2.8.B</weixin-java-sdk.version>
@@ -112,9 +112,10 @@
         <!--以下为包依赖的特殊处理-->
         <!--强制升级解决安全漏洞问题-->
         <log4j2.version>2.17.2</log4j2.version>
-        <logback.version>1.2.10</logback.version>
+        <logback.version>1.2.11</logback.version>
         <bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
         <bcpkix-jdk15on.version>1.70</bcpkix-jdk15on.version>
+        <spring-integration.version>5.5.9</spring-integration.version>
 
     </properties>
 

diff --git a/packages/eurynome-cloud-assistant/pom.xml b/packages/eurynome-cloud-assistant/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/packages/eurynome-cloud-cache/pom.xml b/packages/eurynome-cloud-cache/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-cloud-cache</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <description>将Cache和Redis相关抽取出独立组件包。降低代码耦合性，提升代码包的独立性。解决依赖过多，使用过程中还需要进行排除的问题。</description>

diff --git a/packages/eurynome-cloud-captcha/pom.xml b/packages/eurynome-cloud-captcha/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-cloud-captcha</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/eurynome-cloud-data/pom.xml b/packages/eurynome-cloud-data/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
 
     <artifactId>eurynome-cloud-data</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <description>数据相关通用代码组件包，包括JPA,Redis,数据实体等相关内容</description>

diff --git a/packages/eurynome-cloud-kernel/pom.xml b/packages/eurynome-cloud-kernel/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
 
     <artifactId>eurynome-cloud-kernel</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <description>平台通用的基础依赖，以及接入及管理等通用代码，上中台必需的基础代码。增加这层包，主要目的是抽取webflux和web依赖的通用性，降低其它包之间的耦合性，比如之前data要依赖logstash，logstash要依赖managementproperties</description>

diff --git a/packages/eurynome-cloud-message/pom.xml b/packages/eurynome-cloud-message/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-cloud-message</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/eurynome-cloud-oauth-starter/pom.xml b/packages/eurynome-cloud-oauth-starter/pom.xml
@@ -30,11 +30,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
 
     <artifactId>eurynome-cloud-oauth-starter</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/eurynome-cloud-oauth/pom.xml b/packages/eurynome-cloud-oauth/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
 
 
     <artifactId>eurynome-cloud-oauth</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/eurynome-cloud-pay/pom.xml b/packages/eurynome-cloud-pay/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-cloud-pay</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/eurynome-cloud-rest/pom.xml b/packages/eurynome-cloud-rest/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
 
     <artifactId>eurynome-cloud-rest</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/eurynome-cloud-security/pom.xml b/packages/eurynome-cloud-security/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
 
     <artifactId>eurynome-cloud-security</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/...src/main/java/cn/herodotus/eurynome/security/autoconfigure/SecurityAutoConfiguration.java b/...src/main/java/cn/herodotus/eurynome/security/autoconfigure/SecurityAutoConfiguration.java
@@ -36,10 +36,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.bus.jackson.RemoteApplicationEventScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.*;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.security.oauth2.provider.token.DefaultAccessTokenConverter;
 
@@ -71,6 +68,7 @@
  */
 @Configuration
 @EnableAsync
+@EnableAspectJAutoProxy(exposeProxy = true)
 @EnableConfigurationProperties({
         SecurityProperties.class
 })

diff --git a/packages/eurynome-cloud-starter/pom.xml b/packages/eurynome-cloud-starter/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
 
     <artifactId>eurynome-cloud-starter</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
 
     <description>通用配置starter,此包的定位是统一未来接入的微服务使用</description>
     <packaging>jar</packaging>

diff --git a/packages/eurynome-cloud-web/pom.xml b/packages/eurynome-cloud-web/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-cloud-web</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/...cloud-web/src/main/java/cn/herodotus/eurynome/web/configuration/OpenApiConfiguration.java b/...cloud-web/src/main/java/cn/herodotus/eurynome/web/configuration/OpenApiConfiguration.java
@@ -85,7 +85,7 @@ public OpenAPI createOpenAPI() {
                 .servers(getServers())
                 .info(new Info().title("Eurynome Cloud")
                         .description("Eurynome Cloud Microservices Architecture")
-                        .version("2.6.4.20")
+                        .version("2.6.5.0")
                         .license(new License().name("Apache 2.0").url("http://www.apache.org/licenses/")))
                 .externalDocs(new ExternalDocumentation()
                         .description("Eurynome Cloud Documentation")

diff --git a/packages/eurynome-cloud-websocket/pom.xml b/packages/eurynome-cloud-websocket/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-cloud-websocket</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/pom.xml b/packages/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>eurynome-cloud</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
 
     <artifactId>packages</artifactId>

diff --git a/platform/eurynome-cloud-gateway/pom.xml b/platform/eurynome-cloud-gateway/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
 
     <artifactId>eurynome-cloud-gateway</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/platform/eurynome-cloud-monitor/pom.xml b/platform/eurynome-cloud-monitor/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
 
     <artifactId>eurynome-cloud-monitor</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/...10/nacos_config_export_20220305123449.zip → ....0/nacos_config_export_20220305123449.zip b/...10/nacos_config_export_20220305123449.zip → ....0/nacos_config_export_20220305123449.zip
diff --git a/platform/eurynome-cloud-uaa/pom.xml b/platform/eurynome-cloud-uaa/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.4.20</version>
+        <version>2.6.5.0</version>
     </parent>
 
     <artifactId>eurynome-cloud-uaa</artifactId>
-    <version>2.6.4.20</version>
+    <version>2.6.5.0</version>
     <packaging>jar</packaging>
 
     <dependencies>