!226 v3.3.0.5

Merge pull request !226 from 码匠君/develop
dromara · Jun 12, 2024 · c1d6ebe · c1d6ebe
2 parents 71a5bf3 + 34ac8fe
commit c1d6ebe
Show file tree

Hide file tree

Showing 34 changed files with 39 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -13,9 +13,9 @@
     <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://img.shields.io/badge/Nacos-2.3.2-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.3.2"></a>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.3.0.4-red.svg?logo=spring" alt="Version 3.3.0.4"></a>
-    <a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.3.0.4-red.svg?logo=spring" alt="Dante Engine 3.3.0.4"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.3.0.4-red.svg?logo=spring" alt="Dante OSS 3.3.0.4"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.3.0.5-red.svg?logo=spring" alt="Version 3.3.0.5"></a>
+    <a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.3.0.5-red.svg?logo=spring" alt="Dante Engine 3.3.0.5"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.3.0.5-red.svg?logo=spring" alt="Dante OSS 3.3.0.5"></a>
     <a href="https://bell-sw.com/pages/downloads/#downloads" target="_blank"><img src="https://img.shields.io/badge/JDK-17%2B-green.svg?logo=openjdk" alt="Java 17"></a>
     <a href="./LICENSE"><img src="https://img.shields.io/badge/License-AGPL--3.0-blue.svg?logo=apache" alt="License AGPL 3.0"></a>
     <a href="https://www.herodotus.cn"><img src="https://visitor-badge.laobi.icu/badge?page_id=dante-cloud&title=Total%20Visits" alt="Total Visits"></a>

diff --git a/configurations/backup/alibaba/3.3.0.5/nacos_config_export_20240531173140.zip b/configurations/backup/alibaba/3.3.0.5/nacos_config_export_20240531173140.zip
diff --git a/configurations/backup/tencent/3.3.0.5/polaris_config_202405311904.zip b/configurations/backup/tencent/3.3.0.5/polaris_config_202405311904.zip
diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=3.3.0.4
+VERSION=3.3.0.5
 GATEWAY_SERVICE_NAME=dante-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=dante-cloud-uaa

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.base.yml b/configurations/docker/docker-compose/linux/herodotus/env.base.yml
@@ -72,7 +72,7 @@ services:
       - /usr/local/docker-volumes/elk/logstash/conf.d:/etc/logstash/conf.d
 
   sentinel:
-    image: herodotus/sentinel-dashboard:v1.8.7
+    image: herodotus/sentinel-dashboard:v1.8.8
     container_name: sentinel-dashboard
     environment:
       SENTINEL_ADMIN_USERNAME: sentinel

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.full.debezium.yml b/configurations/docker/docker-compose/linux/herodotus/env.full.debezium.yml
@@ -78,7 +78,7 @@ services:
       - kafka
 
   sentinel:
-    image: herodotus/sentinel-dashboard:v1.8.7
+    image: herodotus/sentinel-dashboard:v1.8.8
     container_name: sentinel-dashboard
     environment:
       SENTINEL_ADMIN_USERNAME: sentinel

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.full.tencent.yml b/configurations/docker/docker-compose/linux/herodotus/env.full.tencent.yml
@@ -44,7 +44,7 @@ services:
       - zookeeper
 
   sentinel:
-    image: herodotus/sentinel-dashboard:v1.8.7
+    image: herodotus/sentinel-dashboard:v1.8.8
     container_name: sentinel-dashboard
     environment:
       SENTINEL_ADMIN_USERNAME: sentinel

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.oss.yml b/configurations/docker/docker-compose/linux/herodotus/env.oss.yml
@@ -1,6 +1,6 @@
 services:
   minio:
-    image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z
+    image: quay.io/minio/minio:RELEASE.2024-06-11T03-13-30Z
     container_name: minio
     hostname: minio
     ports:

diff --git a/configurations/docker/docker-compose/windows/herodotus/.env b/configurations/docker/docker-compose/windows/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=3.3.0.4
+VERSION=3.3.0.5
 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.base.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.yml
@@ -70,7 +70,7 @@ services:
       - D:\\local-cached\\docker-volumes\\elk\\logstash\\conf.d:/etc/logstash/conf.d
 
   sentinel:
-    image: herodotus/sentinel-dashboard:v1.8.7
+    image: herodotus/sentinel-dashboard:v1.8.8
     container_name: sentinel-dashboard
     environment:
       SENTINEL_ADMIN_USERNAME: sentinel

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.full.debezium.yml b/configurations/docker/docker-compose/windows/herodotus/env.full.debezium.yml
@@ -78,7 +78,7 @@ services:
       - kafka
 
   sentinel:
-    image: herodotus/sentinel-dashboard:v1.8.7
+    image: herodotus/sentinel-dashboard:v1.8.8
     container_name: sentinel-dashboard
     environment:
       SENTINEL_ADMIN_USERNAME: sentinel

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.oss.yml b/configurations/docker/docker-compose/windows/herodotus/env.oss.yml
@@ -1,6 +1,6 @@
 services:
   minio:
-    image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z
+    image: quay.io/minio/minio:RELEASE.2024-06-11T03-13-30Z
     container_name: minio
     hostname: minio
     ports:

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>cn.herodotus.engine</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>dante-module-common</artifactId>

diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>dante-module-metadata</artifactId>

diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>dante-module-social</artifactId>

diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>dante-module-strategy</artifactId>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>modules</artifactId>

diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>authentication-spring-boot-starter</artifactId>

diff --git a/...ava/cn/herodotus/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java b/...ava/cn/herodotus/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java
@@ -35,6 +35,7 @@
 import cn.herodotus.engine.oauth2.management.processor.HerodotusClientDetailsService;
 import cn.herodotus.engine.oauth2.management.processor.HerodotusUserDetailsService;
 import cn.herodotus.engine.oauth2.management.service.OAuth2ApplicationService;
+import cn.herodotus.engine.rest.protect.crypto.processor.HttpCryptoProcessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -66,6 +67,7 @@ public class DefaultSecurityAutoConfiguration {
     SecurityFilterChain defaultSecurityFilterChain(
             HttpSecurity httpSecurity,
             UserDetailsService userDetailsService,
+            HttpCryptoProcessor httpCryptoProcessor,
             OAuth2AuthenticationProperties authenticationProperties,
             CaptchaRendererFactory captchaRendererFactory,
             OAuth2SessionManagementConfigurerCustomer oauth2SessionManagementConfigurerCustomer,
@@ -86,7 +88,7 @@ SecurityFilterChain defaultSecurityFilterChain(
                     exceptions.accessDeniedHandler(new HerodotusAccessDeniedHandler());
                 })
                 .oauth2ResourceServer(oauth2ResourceServerConfigurerCustomer)
-                .with(new OAuth2FormLoginSecureConfigurer<>(userDetailsService, authenticationProperties, captchaRendererFactory), (configurer) -> {});
+                .with(new OAuth2FormLoginSecureConfigurer<>(userDetailsService, authenticationProperties, captchaRendererFactory, httpCryptoProcessor), (configurer) -> {});
 
         // @formatter:on
         return httpSecurity.build();

diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/packages/pom.xml b/packages/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>packages</artifactId>

diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>service-spring-boot-starter</artifactId>

diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>dante-cloud-gateway</artifactId>

diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>platform</artifactId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>dante-cloud-message</artifactId>

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

diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>dante-cloud-uaa</artifactId>

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

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

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
         <relativePath>dependencies/pom.xml</relativePath>
     </parent>
 

diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml
@@ -27,11 +27,11 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-ability</artifactId>
-    <version>3.3.0.4</version>
+    <version>3.3.0.5</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
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-logic</artifactId>

diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>services</artifactId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>dante-cloud-oss-ability</artifactId>

diff --git a/services/pom.xml b/services/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.0.4</version>
+        <version>3.3.0.5</version>
     </parent>
 
     <artifactId>services</artifactId>