diff --git a/README.md b/README.md index b7890415594ec9c08ebc6cf03ed19153642f0c33..6f295532717911a2337cf9a4f8a3631db2b8e99c 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ Nacos 3.1.0

- Version 3.5.6.2 - Dante Engine 3.5.6.2 - Dante OSS 3.5.6.2 + Version 3.5.6.3 + Dante Engine 3.5.6.3 + Dante OSS 3.5.6.3 Java 17 License Apache 2.0 码匠君 diff --git a/configurations/backup/alibaba/3.5.6.3/nacos_config_export_20251010223156.zip b/configurations/backup/alibaba/3.5.6.3/nacos_config_export_20251010223156.zip new file mode 100644 index 0000000000000000000000000000000000000000..5acec71cfb55308e417962a32e23d8b4a99147cb Binary files /dev/null and b/configurations/backup/alibaba/3.5.6.3/nacos_config_export_20251010223156.zip differ diff --git a/configurations/backup/tencent/3.5.6.3/polaris_config_202405311904.zip b/configurations/backup/tencent/3.5.6.3/polaris_config_202405311904.zip new file mode 100644 index 0000000000000000000000000000000000000000..fc5e846f76735d9b78272a4ea05763f13783cfb5 Binary files /dev/null and b/configurations/backup/tencent/3.5.6.3/polaris_config_202405311904.zip differ diff --git a/configurations/backup/yamls/common/dante-cloud-platform.yaml b/configurations/backup/yamls/common/dante-cloud-platform.yaml index eb6fe1e730e1fc77fd0e1e4814ec0f81a2c0a45a..bffce117a7c9db9e00cac6f91550c4aa6e743dbf 100644 --- a/configurations/backup/yamls/common/dante-cloud-platform.yaml +++ b/configurations/backup/yamls/common/dante-cloud-platform.yaml @@ -32,8 +32,6 @@ management: exposure: include: '*' endpoint: - shutdown: - enabled: true health: show-details: ALWAYS diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env index b0b792427632032ef3ccd9a7cdca60f78fcc71f3..43238c00edcbba9f4fa7376d15416dd3dce04cee 100644 --- a/configurations/docker/docker-compose/linux/herodotus/.env +++ b/configurations/docker/docker-compose/linux/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=3.5.6.2 +VERSION=3.5.6.3 SPRING_PROFILES_ACTIVE=alibaba PROFILE=development DATABASE=postgresql diff --git a/configurations/docker/docker-compose/windows/herodotus/.env b/configurations/docker/docker-compose/windows/herodotus/.env index 6c209b9073f333716cef134d95c12a45739602c2..0541cbe9f86037f04b9d05c46eaabaed90b0c09e 100644 --- a/configurations/docker/docker-compose/windows/herodotus/.env +++ b/configurations/docker/docker-compose/windows/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=3.5.6.2 +VERSION=3.5.6.3 SPRING_PROFILES_ACTIVE=alibaba PROFILE=development DATABASE=postgresql diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 006955bb95dcdaf88371c0fa3d6cbdc55d7918cc..ce11a3bd649a4aacd031c049f5fcde0dc677affc 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -28,7 +28,7 @@ cn.herodotus.engine dependencies - 3.5.6.2 + 3.5.6.3 diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml index c3600fa8583a62a8c810e6c801c0f18bc3169f92..b8f3a0d428392c40029ecb31639e62e01086a021 100644 --- a/modules/dante-module-common/pom.xml +++ b/modules/dante-module-common/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 3.5.6.2 + 3.5.6.3 dante-module-common diff --git a/modules/dante-monomer-autoconfigure/pom.xml b/modules/dante-monomer-autoconfigure/pom.xml index 109a966fb522854835d71767153a3f1094098a1a..4e6c6ad56daf4e8ac7b4066509b8f0e538949c95 100644 --- a/modules/dante-monomer-autoconfigure/pom.xml +++ b/modules/dante-monomer-autoconfigure/pom.xml @@ -27,7 +27,7 @@ org.dromara.dante modules - 3.5.6.2 + 3.5.6.3 dante-monomer-autoconfigure diff --git a/modules/pom.xml b/modules/pom.xml index 6665ad12e3cce75a7e7a960cb8562ae8a1e9bee7..449294a8544c1d14ffa4f772b0b78030dd7a4c11 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.6.2 + 3.5.6.3 modules diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml index 091af9d1a2ccc88eab0a057d07f6244c0038f34f..636fad60746ccd2b8e1d3b8035bdb09abbeeca3e 100644 --- a/packages/authentication-spring-boot-starter/pom.xml +++ b/packages/authentication-spring-boot-starter/pom.xml @@ -32,7 +32,7 @@ packages org.dromara.dante - 3.5.6.2 + 3.5.6.3 authentication-spring-boot-starter diff --git a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationAutoConfiguration.java b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationAutoConfiguration.java index f34cd0bdb68ed5b7dff1b956676a301af0323d86..5900ff639bbdc822c322ca76983c7aa298c8d37c 100644 --- a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationAutoConfiguration.java +++ b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationAutoConfiguration.java @@ -34,6 +34,7 @@ import cn.herodotus.engine.oauth2.authentication.configurer.OAuth2Authentication import cn.herodotus.engine.oauth2.authentication.configurer.OAuth2AuthenticationProviderConfigurer; import cn.herodotus.engine.oauth2.authentication.utils.OAuth2ConfigurerUtils; import cn.herodotus.engine.oauth2.authorization.servlet.ServletOAuth2AuthorizationConfigurerManager; +import cn.herodotus.engine.oauth2.core.properties.OAuth2AuthenticationProperties; import cn.herodotus.engine.web.service.properties.EndpointProperties; import cn.herodotus.engine.web.servlet.tenant.MultiTenantFilter; import com.nimbusds.jose.jwk.JWKSet; @@ -117,6 +118,7 @@ public class AuthorizationAutoConfiguration { .authorizeHttpRequests(authorizeRequests -> authorizeRequests.anyRequest().authenticated()) .formLogin(authenticationConfigurerManager.getOAuth2FormLoginConfigurerCustomizer()) .sessionManagement(authorizationConfigurerManager.getOAuth2SessionManagementConfigurerCustomer()) + .exceptionHandling(authenticationConfigurerManager.getOAuth2ExceptionHandlingConfigurerCustomizer()) .addFilterBefore(new MultiTenantFilter(), AuthorizationFilter.class) .with(new OAuth2AuthenticationProviderConfigurer(sessionRegistry, passwordEncoder, userDetailsService, authenticationConfigurerManager.getOAuth2AuthenticationProperties()), (configurer) -> { }); @@ -125,9 +127,9 @@ public class AuthorizationAutoConfiguration { } @Bean - public JWKSource jwkSource(OAuth2AuthorizationProperties authorizationProperties) throws NoSuchAlgorithmException { + public JWKSource jwkSource(OAuth2AuthenticationProperties authenticationProperties) throws NoSuchAlgorithmException { - OAuth2AuthorizationProperties.Jwk jwk = authorizationProperties.getJwk(); + OAuth2AuthenticationProperties.Jwk jwk = authenticationProperties.getJwk(); KeyPair keyPair = null; if (jwk.getCertificate() == Certificate.CUSTOM) { diff --git a/packages/authorization-servlet-spring-boot-starter/pom.xml b/packages/authorization-servlet-spring-boot-starter/pom.xml index 1ffe50295f8e647f0529278341c9703fe7a2520d..cfc2cfa4f374af74b07c727e86285108dc8dac77 100644 --- a/packages/authorization-servlet-spring-boot-starter/pom.xml +++ b/packages/authorization-servlet-spring-boot-starter/pom.xml @@ -32,7 +32,7 @@ packages org.dromara.dante - 3.5.6.2 + 3.5.6.3 authorization-servlet-spring-boot-starter diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml index 2d49c01cedec29861beefc73753dce27e9d3f5b0..c1ae18941e231f623340d0c5514ff56eca82b164 100644 --- a/packages/facility-spring-boot-starter/pom.xml +++ b/packages/facility-spring-boot-starter/pom.xml @@ -30,7 +30,7 @@ packages org.dromara.dante - 3.5.6.2 + 3.5.6.3 4.0.0 diff --git a/packages/pom.xml b/packages/pom.xml index d139a6056204046b58296cde7b8275d5e3e663fa..47b648e64357420c491febeeeb34491f0ed75729 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.6.2 + 3.5.6.3 packages diff --git a/packages/rpc-client-uaa-spring-boot-starter/pom.xml b/packages/rpc-client-uaa-spring-boot-starter/pom.xml index b7b5077e140f40170961f6591270ca8fa5ffb8c0..66f9c3aa8deb7f3db3386191355ecdbbf776e265 100644 --- a/packages/rpc-client-uaa-spring-boot-starter/pom.xml +++ b/packages/rpc-client-uaa-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante packages - 3.5.6.2 + 3.5.6.3 rpc-client-uaa-spring-boot-starter diff --git a/packages/rpc-server-upms-spring-boot-starter/pom.xml b/packages/rpc-server-upms-spring-boot-starter/pom.xml index e1d252efc533de9ec0b0c0a30cab01c73bb2f67d..69fce65b69fca689a6ab9e2d7e840cdd395b2451 100644 --- a/packages/rpc-server-upms-spring-boot-starter/pom.xml +++ b/packages/rpc-server-upms-spring-boot-starter/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante packages - 3.5.6.2 + 3.5.6.3 rpc-server-upms-spring-boot-starter diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml index 037e553dd548e1dd3e993b8941386c1a73c735ea..3445f08101027144725bc1e272fedf2552d69494 100644 --- a/platform/dante-cloud-gateway/pom.xml +++ b/platform/dante-cloud-gateway/pom.xml @@ -32,7 +32,7 @@ platform org.dromara.dante - 3.5.6.2 + 3.5.6.3 dante-cloud-gateway diff --git a/platform/dante-cloud-gateway/src/main/resources/application.yml b/platform/dante-cloud-gateway/src/main/resources/application.yml index e3e56112f50da203bc57c0b252a5767a96bad69b..3c2bb69abc42d2101fd84b221896c8323c645f1a 100644 --- a/platform/dante-cloud-gateway/src/main/resources/application.yml +++ b/platform/dante-cloud-gateway/src/main/resources/application.yml @@ -24,10 +24,18 @@ spring: ##等于1去掉一级 filters: - StripPrefix=1 + metrics: + enabled: true loadbalancer: retry: enabled: true # 内部已经默认开启这里列出来说明比较重要 + # 临时修复如果先启动 Gateway 再启动其它服务，服务发现就会失败，调用接口出现 404 的问题 fix: #ID18CG + nacos: + discovery: + heart-beat: + enabled: true + springdoc: webjars: prefix: /document @@ -93,6 +101,7 @@ logging: org.springframework.cloud.gateway: debug # 开发、调试需要的日志 cn.herodotus: trace + org.dromara: debug com.alicp.jetcache: info --- diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml index 13b408b051157aa788b0e442dac7eafa3e63729f..f5e53352a0702979ff25ffac705cd9e141d44221 100644 --- a/platform/dante-cloud-message/pom.xml +++ b/platform/dante-cloud-message/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante platform - 3.5.6.2 + 3.5.6.3 dante-cloud-message diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml index d92d65a8c09bcb029eead994bdba6f811954ef24..78e757b70e820eb5db03b053c27bc18197278b80 100644 --- a/platform/dante-cloud-monitor/pom.xml +++ b/platform/dante-cloud-monitor/pom.xml @@ -30,11 +30,11 @@ platform org.dromara.dante - 3.5.6.2 + 3.5.6.3 dante-cloud-monitor - 3.5.6.2 + 3.5.6.3 dante-cloud-monitor dante-cloud-monitor diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml index 5aba12627bb2104ad25ae0dac9e3788cc6435809..c870d8153fb43d85933ee6c67ed9bb35ca6fb6c8 100644 --- a/platform/dante-cloud-uaa/pom.xml +++ b/platform/dante-cloud-uaa/pom.xml @@ -32,7 +32,7 @@ platform org.dromara.dante - 3.5.6.2 + 3.5.6.3 dante-cloud-uaa diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml index 359198dd1def1bc964f8235fe2306695cc4dbf26..606916a782354d884a0e9acd32099b989a0184f9 100644 --- a/platform/dante-cloud-upms/pom.xml +++ b/platform/dante-cloud-upms/pom.xml @@ -30,12 +30,12 @@ platform org.dromara.dante - 3.5.6.2 + 3.5.6.3 4.0.0 dante-cloud-upms - 3.5.6.2 + 3.5.6.3 diff --git a/platform/pom.xml b/platform/pom.xml index be0ebd4afdac40230bc513c701c168f4b3bc2acc..fdc7868b3627f45142d93ee3775cb31992279f3d 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.6.2 + 3.5.6.3 platform diff --git a/pom.xml b/pom.xml index 899389faf0a07d3efe3865cb8a817f6f093c39f3..1b0f07e9c357fa6d236c75dea4a524067da9c9a3 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.dromara.dante dependencies - 3.5.6.2 + 3.5.6.3 dependencies/pom.xml diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml index 53e771e7012e9e1dc06f8040bd7326aa901283e4..a71bb4683bab84446350f4f814db049b9e1e007e 100644 --- a/services/dante-cloud-bpmn-ability/pom.xml +++ b/services/dante-cloud-bpmn-ability/pom.xml @@ -31,11 +31,11 @@ services org.dromara.dante - 3.5.6.2 + 3.5.6.3 dante-cloud-bpmn-ability - 3.5.6.2 + 3.5.6.3 dante-cloud-bpmn-ability 基于Camunda工作流的服务 diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml index 69b51f496211218076cbaa687c9281bf5cfc7d62..25e35cccb1ba25d200139ac66f0bfeb0ffb72a4a 100644 --- a/services/dante-cloud-bpmn-logic/pom.xml +++ b/services/dante-cloud-bpmn-logic/pom.xml @@ -32,7 +32,7 @@ services org.dromara.dante - 3.5.6.2 + 3.5.6.3 dante-cloud-bpmn-logic diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml index 6c0302fcfc4801bc910462d44a6a03411f899b17..8ab06bcb62512f795c7d036e5dd8dfe6386431e9 100644 --- a/services/dante-cloud-oss-ability/pom.xml +++ b/services/dante-cloud-oss-ability/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante services - 3.5.6.2 + 3.5.6.3 dante-cloud-oss-ability diff --git a/services/dante-monomer-application/pom.xml b/services/dante-monomer-application/pom.xml index 77c81bc85cddaa82a694c6c703f9e70e0e523564..57521b47fe238056a4a6eb63cb7b77324f09535e 100644 --- a/services/dante-monomer-application/pom.xml +++ b/services/dante-monomer-application/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante services - 3.5.6.2 + 3.5.6.3 dante-monomer-application diff --git a/services/pom.xml b/services/pom.xml index 739458caf3cfc53d2b09080a5d74ea4a0eabf205..a3b75051c7c2e5583f7bcf1a450c529fbdec2526 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.5.6.2 + 3.5.6.3 services