diff --git a/README.md b/README.md index f5cb258d8..01ba9ec74 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ Nacos 2.3.2

- Version 3.3.0.4 - Dante Engine 3.3.0.4 - Dante OSS 3.3.0.4 + Version 3.3.0.5 + Dante Engine 3.3.0.5 + Dante OSS 3.3.0.5 Java 17 License AGPL 3.0 Total Visits 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 new file mode 100644 index 000000000..c35692121 Binary files /dev/null and b/configurations/backup/alibaba/3.3.0.5/nacos_config_export_20240531173140.zip differ 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 new file mode 100644 index 000000000..fc5e846f7 Binary files /dev/null and b/configurations/backup/tencent/3.3.0.5/polaris_config_202405311904.zip differ diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env index 77926991a..87487257e 100644 --- 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 index 5013f45ce..72153b1bf 100644 --- 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 index be52e68cb..733959672 100644 --- 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 index 4e624e985..6e4171da7 100644 --- 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 index 778686e14..b40c33943 100644 --- 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 index 77926991a..87487257e 100644 --- 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 index 6c1716786..8d864d531 100644 --- 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 index c855b037e..0709c9a53 100644 --- 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 index 636bf0fb6..3ba19a819 100644 --- 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 index baec72cea..74bb8471b 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -28,7 +28,7 @@ cn.herodotus.engine dependencies - 3.3.0.4 + 3.3.0.5 diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml index c6d9cebb0..51acd84e3 100644 --- a/modules/dante-module-common/pom.xml +++ b/modules/dante-module-common/pom.xml @@ -28,7 +28,7 @@ modules cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 dante-module-common diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml index 6b80f1429..b11ea8a21 100644 --- a/modules/dante-module-metadata/pom.xml +++ b/modules/dante-module-metadata/pom.xml @@ -28,7 +28,7 @@ modules cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 dante-module-metadata diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml index bee31d1bc..14e66d0d3 100644 --- a/modules/dante-module-social/pom.xml +++ b/modules/dante-module-social/pom.xml @@ -28,7 +28,7 @@ modules cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 dante-module-social diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml index 4d05dd149..305b8d40b 100644 --- a/modules/dante-module-strategy/pom.xml +++ b/modules/dante-module-strategy/pom.xml @@ -28,7 +28,7 @@ modules cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 dante-module-strategy diff --git a/modules/pom.xml b/modules/pom.xml index a88f96752..27d6390c2 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -28,7 +28,7 @@ dante-cloud cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 modules diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml index db426d7b2..a88ec9397 100644 --- a/packages/authentication-spring-boot-starter/pom.xml +++ b/packages/authentication-spring-boot-starter/pom.xml @@ -28,7 +28,7 @@ packages cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 authentication-spring-boot-starter diff --git a/packages/authentication-spring-boot-starter/src/main/java/cn/herodotus/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java b/packages/authentication-spring-boot-starter/src/main/java/cn/herodotus/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java index a2bad06f2..6e6f2beff 100644 --- a/packages/authentication-spring-boot-starter/src/main/java/cn/herodotus/dante/authentication/autoconfigure/DefaultSecurityAutoConfiguration.java +++ b/packages/authentication-spring-boot-starter/src/main/java/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 index 6be9fe7e6..b16c3ca4b 100644 --- a/packages/facility-spring-boot-starter/pom.xml +++ b/packages/facility-spring-boot-starter/pom.xml @@ -26,7 +26,7 @@ packages cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 4.0.0 diff --git a/packages/pom.xml b/packages/pom.xml index d7f6bf37c..c9b659a48 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -28,7 +28,7 @@ dante-cloud cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 packages diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml index aa2792443..42bf63042 100644 --- a/packages/service-spring-boot-starter/pom.xml +++ b/packages/service-spring-boot-starter/pom.xml @@ -28,7 +28,7 @@ packages cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 service-spring-boot-starter diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml index 9df93fa27..3faa26f48 100644 --- a/platform/dante-cloud-gateway/pom.xml +++ b/platform/dante-cloud-gateway/pom.xml @@ -28,7 +28,7 @@ platform cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 dante-cloud-gateway diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml index d03fdf8cb..27553fc51 100644 --- a/platform/dante-cloud-message/pom.xml +++ b/platform/dante-cloud-message/pom.xml @@ -27,7 +27,7 @@ cn.herodotus.dante platform - 3.3.0.4 + 3.3.0.5 dante-cloud-message diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml index 49af9c31c..a5d3f3283 100644 --- a/platform/dante-cloud-monitor/pom.xml +++ b/platform/dante-cloud-monitor/pom.xml @@ -26,11 +26,11 @@ platform cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 dante-cloud-monitor - 3.3.0.4 + 3.3.0.5 dante-cloud-monitor dante-cloud-monitor diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml index 85ae855a3..a527d9b53 100644 --- a/platform/dante-cloud-uaa/pom.xml +++ b/platform/dante-cloud-uaa/pom.xml @@ -28,7 +28,7 @@ platform cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 dante-cloud-uaa diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml index 088fb09a5..48a54aa9e 100644 --- a/platform/dante-cloud-upms/pom.xml +++ b/platform/dante-cloud-upms/pom.xml @@ -26,12 +26,12 @@ platform cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 4.0.0 dante-cloud-upms - 3.3.0.4 + 3.3.0.5 diff --git a/platform/pom.xml b/platform/pom.xml index 2e099533b..928525bdf 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -28,7 +28,7 @@ dante-cloud cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 platform diff --git a/pom.xml b/pom.xml index f948a3216..e72b913f8 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ cn.herodotus.dante dependencies - 3.3.0.4 + 3.3.0.5 dependencies/pom.xml diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml index 9cc292328..3797a2c3e 100644 --- a/services/dante-cloud-bpmn-ability/pom.xml +++ b/services/dante-cloud-bpmn-ability/pom.xml @@ -27,11 +27,11 @@ services cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 dante-cloud-bpmn-ability - 3.3.0.4 + 3.3.0.5 dante-cloud-bpmn-ability 基于Camunda工作流的服务 diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml index 95a2161b5..9eda41a31 100644 --- a/services/dante-cloud-bpmn-logic/pom.xml +++ b/services/dante-cloud-bpmn-logic/pom.xml @@ -28,7 +28,7 @@ services cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 dante-cloud-bpmn-logic diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml index ca845efda..ac4e30015 100644 --- a/services/dante-cloud-oss-ability/pom.xml +++ b/services/dante-cloud-oss-ability/pom.xml @@ -27,7 +27,7 @@ cn.herodotus.dante services - 3.3.0.4 + 3.3.0.5 dante-cloud-oss-ability diff --git a/services/pom.xml b/services/pom.xml index 3a4dcb598..975f6bcb2 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -28,7 +28,7 @@ dante-cloud cn.herodotus.dante - 3.3.0.4 + 3.3.0.5 services