!62 v2.7.4.0

Merge pull request !62 from 码匠君/develop
dromara · Sep 23, 2022 · 8c19ec5 · 8c19ec5
2 parents 85f68b9 + c2b2723
commit 8c19ec5
Show file tree

Hide file tree

Showing 26 changed files with 53 additions and 65 deletions.
diff --git a/README.md b/README.md
@@ -6,13 +6,13 @@
 
 <p align="center">
     <a href="https://github.com/spring-projects/spring-authorization-server" target="_blank"><img src="https://img.shields.io/badge/Spring%20Authorization%20Server-0.3.1-blue" alt="Spring Authorization Server 0.3.1"></a>
-    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://shields.io/badge/Spring%20Boot-2.7.3-blue" alt="Spring Boot 2.7.3"></a>
+    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://shields.io/badge/Spring%20Boot-2.7.4-blue" alt="Spring Boot 2.7.4"></a>
     <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud-2021.0.4-blue" alt="Spring Cloud 2021.0.4"></a>
     <a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud%20Alibaba-2021.0.4.0-blue" alt="Spring Cloud Alibaba 2021.0.4.0"></a>
     <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://shields.io/badge/Nacos-2.1.1-brightgreen" alt="Nacos 2.1.1"></a>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.7.3.6-red" alt="Version 2.7.3.6"></a>
+    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.7.4.0-red" alt="Version 2.7.4.0"></a>
     <a href="https://www.oracle.com/java/technologies/javase-downloads.html" target="_blank"><img src="https://img.shields.io/badge/JDK-8%2C11%2C17-green" alt="Java 8,11,17"></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>
@@ -41,7 +41,7 @@
 
 ## 企业级技术中台微服务架构与服务能力开发平台
 
-Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台。基于 Spring Boot 2.7.3、Spring Cloud 2021.0.4、Spring Cloud Alibaba 2021.0.4.0、Spring Authorization Server 0.3.1、Nacos 2.1.1 等最新版本开发，遵循 SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流、多租户等功能，代码简洁，架构清晰，非常适合学习和企业作为基础框架使用。
+Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台。基于 Spring Boot 2.7.4、Spring Cloud 2021.0.4、Spring Cloud Alibaba 2021.0.4.0、Spring Authorization Server 0.3.1、Nacos 2.1.1 等最新版本开发，遵循 SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流、多租户等功能，代码简洁，架构清晰，非常适合学习和企业作为基础框架使用。
 
 ## 平台定位
 
@@ -139,7 +139,7 @@ Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和
 
 | 组件                        | 版本         |
 | --------------------------- |------------|
-| Spring Boot                 | 2.7.3      |
+| Spring Boot                 | 2.7.4      |
 | Spring Cloud                | 2021.0.4   |
 | Spring Cloud Alibaba        | 2021.0.4.0 |
 | Spring Authorization Server | 0.3.1      |

diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=2.7.3.6
+VERSION=2.7.4.0
 GATEWAY_SERVICE_NAME=dante-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=dante-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.7.3.6
+VERSION=2.7.4.0
 GATEWAY_SERVICE_NAME=dante-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=dante-cloud-uaa

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -32,13 +32,13 @@
     <parent>
         <groupId>cn.herodotus.engine</groupId>
         <artifactId>dependencies</artifactId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
         <relativePath/>
     </parent>
 
     <groupId>cn.herodotus.dante</groupId>
     <artifactId>dependencies</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud-dependencies</name>

diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>dante-module-common</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/modules/dante-module-security/pom.xml b/modules/dante-module-security/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>dante-module-security</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>dante-module-strategy</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/modules/dante-module-upms-logic/pom.xml b/modules/dante-module-upms-logic/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>dante-module-upms-logic</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/...n/java/cn/herodotus/dante/module/upms/logic/assistant/listener/SysRoleEntityListener.java b/...n/java/cn/herodotus/dante/module/upms/logic/assistant/listener/SysRoleEntityListener.java
@@ -64,21 +64,21 @@ protected void postLoad(SysRole entity) {
 
     @PreUpdate
     protected void preUpdate(SysRole entity) {
-        log.debug("[Herodotus] |- SysRoleEntityListener @PreUpdate actived, value is : [{}]. Trigger SysSecurityAttribute relation change event.", entity.toString());
+        log.debug("[Herodotus] |- SysRoleEntityListener @PreUpdate active, value is : [{}]. Trigger SysSecurityAttribute relation change event.", entity.toString());
         this.setAfter(clone(entity));
     }
 
     @PostUpdate
     protected void postUpdate(SysRole entity) {
-        log.debug("[Herodotus] |- SysRoleEntityListener @PostUpdate actived, value is : [{}]. Trigger SysSecurityAttribute relation change event.", entity.toString());
-        this.getApplicationContext().publishEvent(new SysSecurityAttributeRelationChangeEvent(this.getChangedItems()));
+        log.debug("[Herodotus] |- SysRoleEntityListener @PostUpdate active, value is : [{}]. Trigger SysSecurityAttribute relation change event.", entity.toString());
+        this.publishEvent(new SysSecurityAttributeRelationChangeEvent(this.getChangedItems()));
     }
 
     @PostRemove
     protected void postRemove(SysRole entity) {
-        log.debug("[Herodotus] |- SysRoleEntityListener @PostRemove actived, value is : [{}]. Trigger SysSecurityAttribute relation change event.", entity.toString());
+        log.debug("[Herodotus] |- SysRoleEntityListener @PostRemove active, value is : [{}]. Trigger SysSecurityAttribute relation change event.", entity.toString());
         if (CollectionUtils.isNotEmpty(entity.getAuthorities())) {
-            this.getApplicationContext().publishEvent(new SysSecurityAttributeRelationChangeEvent(clone(entity)));
+            this.publishEvent(new SysSecurityAttributeRelationChangeEvent(clone(entity)));
         }
     }
 }
diff --git a/modules/dante-module-upms-rest/pom.xml b/modules/dante-module-upms-rest/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>dante-module-upms-rest</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>modules</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud-modules</name>

diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>authentication-spring-boot-starter</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/...ava/cn/herodotus/dante/authentication/configuration/AuthorizationServerConfiguration.java b/...ava/cn/herodotus/dante/authentication/configuration/AuthorizationServerConfiguration.java
@@ -67,14 +67,15 @@
 import org.springframework.security.oauth2.core.oidc.OidcUserInfo;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationService;
-import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
 import org.springframework.security.oauth2.server.authorization.oidc.authentication.OidcUserInfoAuthenticationToken;
 import org.springframework.security.oauth2.server.authorization.token.JwtEncodingContext;
 import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenCustomizer;
 import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenGenerator;
-import org.springframework.security.oauth2.server.authorization.web.authentication.ClientSecretPostAuthenticationConverter;
-import org.springframework.security.oauth2.server.authorization.web.authentication.*;
+import org.springframework.security.oauth2.server.authorization.web.authentication.DelegatingAuthenticationConverter;
+import org.springframework.security.oauth2.server.authorization.web.authentication.OAuth2AuthorizationCodeAuthenticationConverter;
+import org.springframework.security.oauth2.server.authorization.web.authentication.OAuth2ClientCredentialsAuthenticationConverter;
+import org.springframework.security.oauth2.server.authorization.web.authentication.OAuth2RefreshTokenAuthenticationConverter;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.security.oauth2.server.resource.web.DefaultBearerTokenResolver;
 import org.springframework.security.rsa.crypto.KeyStoreKeyFactory;
@@ -128,13 +129,6 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
         });
         authorizationServerConfigurer.tokenRevocationEndpoint(endpoint -> endpoint.errorResponseHandler(failureHandler));
         authorizationServerConfigurer.clientAuthentication(endpoint -> {
-            AuthenticationConverter authenticationConverter = new DelegatingAuthenticationConverter(
-                    Arrays.asList(
-                            new JwtClientAssertionAuthenticationConverter(),
-                            new ClientSecretBasicAuthenticationConverter(),
-                            new ClientSecretPostAuthenticationConverter(),
-                            new PublicClientAuthenticationConverter()));
-            endpoint.authenticationConverter(authenticationConverter);
             endpoint.errorResponseHandler(failureHandler);
         });
         authorizationServerConfigurer.tokenEndpoint(endpoint -> {
@@ -183,15 +177,9 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
                     public <O extends AuthenticationProvider> O postProcess(O object) {
                         OAuth2AuthorizationService authorizationService = OAuth2ConfigurerUtils.getAuthorizationService(httpSecurity);
 
-                        if (org.springframework.security.oauth2.server.authorization.authentication.ClientSecretAuthenticationProvider.class.isAssignableFrom(object.getClass())) {
-                            RegisteredClientRepository registeredClientRepository = OAuth2ConfigurerUtils.getRegisteredClientRepository(httpSecurity);
-                            ClientSecretAuthenticationProvider provider = new ClientSecretAuthenticationProvider(registeredClientRepository, authorizationService, clientDetailsService);
-                            log.debug("[Herodotus] |- Custom ClientSecretAuthenticationProvider is in effect!");
-                            return (O) provider;
-                        }
                         if (org.springframework.security.oauth2.server.authorization.authentication.OAuth2ClientCredentialsAuthenticationProvider.class.isAssignableFrom(object.getClass())) {
                             OAuth2TokenGenerator<? extends OAuth2Token> tokenGenerator = OAuth2ConfigurerUtils.getTokenGenerator(httpSecurity);
-                            OAuth2ClientCredentialsAuthenticationProvider provider = new OAuth2ClientCredentialsAuthenticationProvider(authorizationService, tokenGenerator);
+                            OAuth2ClientCredentialsAuthenticationProvider provider = new OAuth2ClientCredentialsAuthenticationProvider(authorizationService, tokenGenerator, clientDetailsService);
                             log.debug("[Herodotus] |- Custom OAuth2ClientCredentialsAuthenticationProvider is in effect!");
                             return (O) provider;
                         }

diff --git a/packages/pom.xml b/packages/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>packages</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud-packages</name>

diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>service-spring-boot-starter</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>dante-cloud-gateway</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml
@@ -30,11 +30,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>dante-cloud-monitor</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <name>dante-cloud-monitor</name>
     <description>dante-cloud-monitor</description>
     <dependencies>

diff --git a/...-cloud-monitor/src/main/resources/imports/v2.7.3.5/nacos_config_export_20220912201555.zip b/...-cloud-monitor/src/main/resources/imports/v2.7.3.5/nacos_config_export_20220912201555.zip
diff --git a/....4/nacos_config_export_20220912201555.zip → ....0/nacos_config_export_20220912201555.zip b/....4/nacos_config_export_20220912201555.zip → ....0/nacos_config_export_20220912201555.zip
diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>dante-cloud-uaa</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dante-cloud-upms</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
 
     <dependencies>
         <dependency>

diff --git a/platform/pom.xml b/platform/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>platform</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -32,12 +32,12 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>dependencies</artifactId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
         <relativePath>dependencies/pom.xml</relativePath>
     </parent>
 
     <artifactId>dante-cloud</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud</name>

diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml
@@ -31,11 +31,11 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-ability</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
 
     <name>dante-cloud-bpmn-ability</name>
     <description>基于Camunda工作流的服务</description>

diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-logic</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/services/pom.xml b/services/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.3.6</version>
+        <version>2.7.4.0</version>
     </parent>
 
     <artifactId>services</artifactId>
-    <version>2.7.3.6</version>
+    <version>2.7.4.0</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud-services</name>