From baba85b87bcb9a4a9e4e3300ec89fa157069d21e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Wed, 4 Dec 2024 11:08:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E5=8D=87=E7=BA=A7]=20Spring=20Boot=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7=E8=87=B3=203.4.0=20[?= =?UTF-8?q?=E5=8D=87=E7=BA=A7]=20Spring=20Boot=20Admin=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8D=87=E7=BA=A7=E8=87=B3=203.4.0=20[=E5=8D=87?= =?UTF-8?q?=E7=BA=A7]=20Spring=20Cloud=20=E7=89=88=E6=9C=AC=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E8=87=B3=202024.0.0=20[=E5=8D=87=E7=BA=A7]=20Spring?= =?UTF-8?q?=20Authorization=20Server=20=E7=89=88=E6=9C=AC=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E8=87=B3=201.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 35 +++++++++---------- .../docker-compose/linux/herodotus/.env | 2 +- .../docker-compose/windows/herodotus/.env | 2 +- dependencies/pom.xml | 2 +- modules/dante-module-common/pom.xml | 2 +- modules/dante-module-metadata/pom.xml | 2 +- modules/dante-module-social/pom.xml | 2 +- modules/dante-module-strategy/pom.xml | 2 +- modules/dante-monomer-autoconfigure/pom.xml | 2 +- modules/pom.xml | 2 +- .../pom.xml | 2 +- packages/facility-spring-boot-starter/pom.xml | 2 +- packages/pom.xml | 2 +- packages/service-spring-boot-starter/pom.xml | 2 +- platform/dante-cloud-gateway/pom.xml | 2 +- platform/dante-cloud-message/pom.xml | 2 +- platform/dante-cloud-monitor/pom.xml | 4 +-- platform/dante-cloud-uaa/pom.xml | 2 +- platform/dante-cloud-upms/pom.xml | 4 +-- platform/pom.xml | 2 +- pom.xml | 2 +- services/dante-cloud-bpmn-ability/pom.xml | 4 +-- services/dante-cloud-bpmn-logic/pom.xml | 2 +- services/dante-cloud-oss-ability/pom.xml | 2 +- services/dante-monomer-application/pom.xml | 2 +- services/pom.xml | 2 +- 26 files changed, 45 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index 1a4b34e1..10d9d9f7 100644 --- a/README.md +++ b/README.md @@ -6,16 +6,16 @@

Spring Authorization Server 1.3.3 - Spring Boot 3.3.6 - Spring Cloud 2023.0.3 + Spring Boot 3.4.0 + Spring Cloud 2024.0.0 Spring Cloud Alibaba 2023.0.1.2 Spring Cloud Tencent 1.14.0--2023.0.0-SNAPSHOT Nacos 2.4.3

- Version 3.3.6.1 - Dante Engine 3.3.6.1 - Dante OSS 3.3.6.1 + Version 3.4.0.0-M1 + Dante Engine 3.4.0.0-M1 + Dante OSS 3.4.0.0-M1 Java 17 License Apache 2.0 Total Visits @@ -47,7 +47,7 @@ ## Dante Cloud 响应式版本特性 -- `Spring Boot` 已升级至 3.3.6 +- `Spring Boot` 已升级至 3.4.0 - `Spring Authorization Server` 已升级至 1.3.3 - 全面采用 Java 21，默认开启虚拟线程，以改善阻塞操作的处理降低系统资源的消耗 - 支持传统的 `阻塞式` 微服务与基于 `Reactor` 和 `WebFlux` 的 `响应式` 微服务同时运行在一套系统之中 @@ -163,12 +163,12 @@ | 组件 | 版本 | |-----------------------------|-----------------| -| Spring Boot | 3.3.6 | -| Spring Cloud | 2023.0.3 | +| Spring Boot | 3.4.0 | +| Spring Cloud | 2024.0.0 | | Spring Cloud Alibaba | 2023.0.1.2 | | Spring Cloud Tencent | 1.14.0-2023.0.0 | | Spring Authorization Server | 1.3.3 | -| Spring Boot Admin | 3.3.6 | +| Spring Boot Admin | 3.4.0 | | Nacos | 2.4.3 | | Sentinel | 1.8.8 | | Seata | 1.7.0 | @@ -218,15 +218,14 @@ ### 二、分支说明 -| 分支名称 | 对应 Spring 生态版本 | 对应 JDK 版本 | 用途 | 现状 | -|------------------------|-----------------------------------------|-----------|--------------------|-------------------------------------------------------------| -| master | Spring Boot 3.3 和 Spring Cloud 2023.0.3 | JDK 17 | 主要发布分支 | 推荐使用代码分支 | -| develop | Spring Boot 3.3 和 Spring Cloud 2023.0.3 | JDK 17 | Development 分支 | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支。开发分支不保证可用 | -| reactive-master | Spring Boot 3.3 和 Spring Cloud 2023.0.3 | JDK 21 | 响应式版本主要发布分支 | 推荐使用代码分支 | -| reactive-develop | Spring Boot 3.3 和 Spring Cloud 2023.0.3 | JDK 21 | 响应式 Development 分支 | 下一代响应式微服务版本开发分支。开发分支不保证可用 | -| 3.1.X | Spring Boot 3.1 和 Spring Cloud 2022.0.X | JDK 17 | 历史代码，不再维护 | 基于 Spring Boot 3.1 时代开发的代码分支，稳定可用，不再维护 | -| 2.7.X | Spring Boot 2.7 和 Spring Cloud 2021.0.X | JDK 8 | 历史代码，不再维护 | 基于 Spring Boot 2.7 时代开发的代码分支，稳定可用，不再维护 | -| spring-security-oauth2 | Spring Boot 2.6 和 Spring Cloud 2021.0.X | JDK 8 | 历史代码，不再维护 | 基于原 Spring Security OAuth2 实现的微服务，稳定可用，因相关组件均不在维护，所以该版本不再维护 | +| 分支名称 | 对应 Spring 生态版本 | 对应 JDK 版本 | 用途 | 现状 | +|:----------------------:|-----------------------------------------|-----------|----------------|-------------------------------------------------------------| +| master | Spring Boot 3.4 和 Spring Cloud 2024.0.0 | JDK 17 | 主要发布分支 | 推荐使用代码分支 | +| develop | Spring Boot 3.4 和 Spring Cloud 2024.0.0 | JDK 17 | Development 分支 | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支 | +| 3.2.X-3.3.X | Spring Boot 3.3 和 Spring Cloud 2023.0.X | JDK 17 | 稳定版本分支 | 稳定版本分支 | +| 3.1.X | Spring Boot 3.1 和 Spring Cloud 2022.0.X | JDK 17 | 历史版本，停止维护 | 基于 Spring Boot 3.1 时代开发的代码分支，稳定可用，不再维护 | +| 2.7.X | Spring Boot 2.7 和 Spring Cloud 2021.0.X | JDK 8 | 历史版本，停止维护 | 基于 Spring Boot 2.7 时代开发的代码分支，稳定可用，不再维护 | +| spring-security-oauth2 | Spring Boot 2.6 和 Spring Cloud 2021.0.X | JDK 8 | 历史代码，不再维护 | 基于原 Spring Security OAuth2 实现的微服务，稳定可用，因相关组件均不在维护，所以该版本不再维护 | ## [6]、工程结构 diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env index fbf45bd9..db5355bc 100644 --- a/configurations/docker/docker-compose/linux/herodotus/.env +++ b/configurations/docker/docker-compose/linux/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=3.3.6.1 +VERSION=3.4.0.0-M1 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 a1debb66..06d54a53 100644 --- a/configurations/docker/docker-compose/windows/herodotus/.env +++ b/configurations/docker/docker-compose/windows/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=3.3.6.1 +VERSION=3.4.0.0-M1 SPRING_PROFILES_ACTIVE=alibaba PROFILE=development DATABASE=postgresql diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 21e31fe1..ddd22016 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -28,7 +28,7 @@ cn.herodotus.engine dependencies - 3.3.6.1 + 3.4.0.0-M1 diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml index fffcaf79..dd1d694b 100644 --- a/modules/dante-module-common/pom.xml +++ b/modules/dante-module-common/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 3.3.6.1 + 3.4.0.0-M1 dante-module-common diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml index a78f57f6..33c95cb8 100644 --- a/modules/dante-module-metadata/pom.xml +++ b/modules/dante-module-metadata/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 3.3.6.1 + 3.4.0.0-M1 dante-module-metadata diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml index cb6c683e..36e47f9f 100644 --- a/modules/dante-module-social/pom.xml +++ b/modules/dante-module-social/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 3.3.6.1 + 3.4.0.0-M1 dante-module-social diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml index 2a66ca32..5ca3ce19 100644 --- a/modules/dante-module-strategy/pom.xml +++ b/modules/dante-module-strategy/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 3.3.6.1 + 3.4.0.0-M1 dante-module-strategy diff --git a/modules/dante-monomer-autoconfigure/pom.xml b/modules/dante-monomer-autoconfigure/pom.xml index c57f316c..dcec3b31 100644 --- a/modules/dante-monomer-autoconfigure/pom.xml +++ b/modules/dante-monomer-autoconfigure/pom.xml @@ -27,7 +27,7 @@ org.dromara.dante modules - 3.3.6.1 + 3.4.0.0-M1 dante-monomer-autoconfigure diff --git a/modules/pom.xml b/modules/pom.xml index dc106eb1..1bb8252f 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.3.6.1 + 3.4.0.0-M1 modules diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml index c24487e6..a4098661 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.3.6.1 + 3.4.0.0-M1 authentication-spring-boot-starter diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml index af36b038..bc744b48 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.3.6.1 + 3.4.0.0-M1 4.0.0 diff --git a/packages/pom.xml b/packages/pom.xml index 6590efc5..0201f0fb 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.3.6.1 + 3.4.0.0-M1 packages diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml index 6adec5e5..8fc40a36 100644 --- a/packages/service-spring-boot-starter/pom.xml +++ b/packages/service-spring-boot-starter/pom.xml @@ -32,7 +32,7 @@ packages org.dromara.dante - 3.3.6.1 + 3.4.0.0-M1 service-spring-boot-starter diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml index 44e3de98..e5a5c2e1 100644 --- a/platform/dante-cloud-gateway/pom.xml +++ b/platform/dante-cloud-gateway/pom.xml @@ -32,7 +32,7 @@ platform org.dromara.dante - 3.3.6.1 + 3.4.0.0-M1 dante-cloud-gateway diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml index 76d4f5a1..60937dc3 100644 --- a/platform/dante-cloud-message/pom.xml +++ b/platform/dante-cloud-message/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante platform - 3.3.6.1 + 3.4.0.0-M1 dante-cloud-message diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml index 60a19a6c..d4b0f83a 100644 --- a/platform/dante-cloud-monitor/pom.xml +++ b/platform/dante-cloud-monitor/pom.xml @@ -30,11 +30,11 @@ platform org.dromara.dante - 3.3.6.1 + 3.4.0.0-M1 dante-cloud-monitor - 3.3.6.1 + 3.4.0.0-M1 dante-cloud-monitor dante-cloud-monitor diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml index 79a5d3c5..b2f8c3f0 100644 --- a/platform/dante-cloud-uaa/pom.xml +++ b/platform/dante-cloud-uaa/pom.xml @@ -32,7 +32,7 @@ platform org.dromara.dante - 3.3.6.1 + 3.4.0.0-M1 dante-cloud-uaa diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml index 2eadf44d..248a7a37 100644 --- a/platform/dante-cloud-upms/pom.xml +++ b/platform/dante-cloud-upms/pom.xml @@ -30,12 +30,12 @@ platform org.dromara.dante - 3.3.6.1 + 3.4.0.0-M1 4.0.0 dante-cloud-upms - 3.3.6.1 + 3.4.0.0-M1 diff --git a/platform/pom.xml b/platform/pom.xml index 146032b4..788a1201 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.3.6.1 + 3.4.0.0-M1 platform diff --git a/pom.xml b/pom.xml index b290d3a0..0eb6f3b2 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.dromara.dante dependencies - 3.3.6.1 + 3.4.0.0-M1 dependencies/pom.xml diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml index a8685175..b3a4fe33 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.3.6.1 + 3.4.0.0-M1 dante-cloud-bpmn-ability - 3.3.6.1 + 3.4.0.0-M1 dante-cloud-bpmn-ability 基于Camunda工作流的服务 diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml index 9c7e571b..1b2408c6 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.3.6.1 + 3.4.0.0-M1 dante-cloud-bpmn-logic diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml index e56b0396..2e42a81b 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.3.6.1 + 3.4.0.0-M1 dante-cloud-oss-ability diff --git a/services/dante-monomer-application/pom.xml b/services/dante-monomer-application/pom.xml index c9975a16..74ac9b79 100644 --- a/services/dante-monomer-application/pom.xml +++ b/services/dante-monomer-application/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante services - 3.3.6.1 + 3.4.0.0-M1 dante-monomer-application diff --git a/services/pom.xml b/services/pom.xml index 782db33b..e5b02073 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.3.6.1 + 3.4.0.0-M1 services From 2c1acb9083ee11438f3067f8ee17f78e49b085e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Wed, 4 Dec 2024 11:17:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[=E9=87=8D=E6=9E=84]=20=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=9A=84=20DelegatingAuthenticationConverter?= =?UTF-8?q?=20=E7=B1=BB=E6=9B=BF=E6=8D=A2=E8=A2=AB=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=E4=B8=BA=E8=BF=87=E6=97=B6=E7=9A=84=20DelegatingAuthentication?= =?UTF-8?q?Converter=20=E7=B1=BB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthorizationServerAutoConfiguration.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java index a1d32fa5..926e2756 100644 --- a/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java +++ b/packages/authentication-spring-boot-starter/src/main/java/org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java @@ -66,16 +66,20 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.core.session.SessionRegistry; import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.encrypt.KeyStoreKeyFactory; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration; import org.springframework.security.oauth2.server.authorization.config.annotation.web.configurers.OAuth2AuthorizationServerConfigurer; import org.springframework.security.oauth2.server.authorization.settings.AuthorizationServerSettings; -import org.springframework.security.oauth2.server.authorization.web.authentication.*; -import org.springframework.security.rsa.crypto.KeyStoreKeyFactory; +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.OAuth2DeviceCodeAuthenticationConverter; +import org.springframework.security.oauth2.server.authorization.web.authentication.OAuth2RefreshTokenAuthenticationConverter; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.access.intercept.AuthorizationFilter; import org.springframework.security.web.authentication.AuthenticationConverter; +import org.springframework.security.web.authentication.DelegatingAuthenticationConverter; import org.springframework.security.web.util.matcher.RequestMatcher; import java.io.IOException; From 8bba924f843769fc5487a84568cb6e7dabbc7316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Thu, 5 Dec 2024 22:49:38 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[=E9=87=8D=E6=9E=84]=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E6=89=80=E6=9C=89=20IdGenerator=20=E5=91=BD=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84=20Exception=20?= =?UTF-8?q?=E6=8A=9B=E5=87=BA=E4=BB=A3=E7=A0=81=E3=80=82=20[=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D]=20=E4=BF=AE=E5=A4=8D=20Hibernate=206.6=20=E5=AF=B9?= =?UTF-8?q?=E4=BA=8E=E6=8C=87=E5=AE=9A=E4=B8=BB=E9=94=AE=E7=9A=84=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=EF=BC=8C=E6=8A=9B?= =?UTF-8?q?=E5=87=BA=20`Row=20was=20updated=20or=20deleted=20by=20another?= =?UTF-8?q?=20transaction=20(or=20unsaved-value=20mapping=20was=20incorrec?= =?UTF-8?q?t)`=20=E5=BC=82=E5=B8=B8=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backup/yamls/common/dante-cloud-rest.yaml | 4 ++++ .../dante/bpmn/logic/entity/ActIdGroup.java | 4 ++-- .../dante/bpmn/logic/entity/ActIdTenant.java | 4 ++-- .../bpmn/logic/entity/ActIdTenantMember.java | 4 ++-- .../dante/bpmn/logic/entity/ActIdUser.java | 4 ++-- ...dGenerator.java => ActIdGroupIdGenerator.java} | 4 ++-- ...orType.java => ActIdGroupIdGeneratorType.java} | 15 +++++---------- ...Generator.java => ActIdTenantIdGenerator.java} | 4 ++-- ...rType.java => ActIdTenantIdGeneratorType.java} | 15 +++++---------- ...tor.java => ActIdTenantMemberIdGenerator.java} | 4 ++-- ...java => ActIdTenantMemberIdGeneratorType.java} | 15 +++++---------- ...idGenerator.java => ActIdUserIdGenerator.java} | 4 ++-- ...torType.java => ActIdUserIdGeneratorType.java} | 8 ++++---- 13 files changed, 39 insertions(+), 50 deletions(-) rename services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/{ActIdGroupUuidGenerator.java => ActIdGroupIdGenerator.java} (94%) rename services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/{ActIdGroupUuidGeneratorType.java => ActIdGroupIdGeneratorType.java} (77%) rename services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/{ActIdTenantUuidGenerator.java => ActIdTenantIdGenerator.java} (94%) rename services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/{ActIdTenantUuidGeneratorType.java => ActIdTenantIdGeneratorType.java} (77%) rename services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/{ActIdTenantMemberUuidGenerator.java => ActIdTenantMemberIdGenerator.java} (94%) rename services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/{ActIdTenantMemberUuidGeneratorType.java => ActIdTenantMemberIdGeneratorType.java} (77%) rename services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/{ActIdUserUuidGenerator.java => ActIdUserIdGenerator.java} (94%) rename services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/{ActIdUserUuidGeneratorType.java => ActIdUserIdGeneratorType.java} (88%) diff --git a/configurations/backup/yamls/common/dante-cloud-rest.yaml b/configurations/backup/yamls/common/dante-cloud-rest.yaml index 1a88726b..52d37d10 100644 --- a/configurations/backup/yamls/common/dante-cloud-rest.yaml +++ b/configurations/backup/yamls/common/dante-cloud-rest.yaml @@ -35,6 +35,10 @@ spring: loadbalancer: nacos: enabled: true + http: + client: + factory: jdk + feign: sentinel: enabled: true diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdGroup.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdGroup.java index 43bbbc33..c0c2627a 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdGroup.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdGroup.java @@ -31,7 +31,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; import org.dromara.dante.bpmn.logic.domain.base.BaseEntity; -import org.dromara.dante.bpmn.logic.generator.ActIdGroupUuidGenerator; +import org.dromara.dante.bpmn.logic.generator.ActIdGroupIdGenerator; /** *

Description: 工作流组表

@@ -50,7 +50,7 @@ public class ActIdGroup extends BaseEntity { @JsonProperty("department_id") @Schema(title = "部门ID") @Id - @ActIdGroupUuidGenerator + @ActIdGroupIdGenerator @Column(name = "id_", length = 64) private String id; diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenant.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenant.java index 98e4a7dc..23893ce9 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenant.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenant.java @@ -31,7 +31,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; import org.dromara.dante.bpmn.logic.domain.base.BaseEntity; -import org.dromara.dante.bpmn.logic.generator.ActIdTenantUuidGenerator; +import org.dromara.dante.bpmn.logic.generator.ActIdTenantIdGenerator; /** *

Description: Camunda租户

@@ -48,7 +48,7 @@ public class ActIdTenant extends BaseEntity { @JsonProperty("organization_id") @Schema(title = "租户ID") @Id - @ActIdTenantUuidGenerator + @ActIdTenantIdGenerator @Column(name = "id_", length = 64) private String id; diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenantMember.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenantMember.java index 8a8bb4c8..5d8b7d78 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenantMember.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenantMember.java @@ -31,7 +31,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; import org.dromara.dante.bpmn.logic.domain.base.BaseEntity; -import org.dromara.dante.bpmn.logic.generator.ActIdTenantMemberUuidGenerator; +import org.dromara.dante.bpmn.logic.generator.ActIdTenantMemberIdGenerator; /** *

Description: Camunda 租户成员

@@ -55,7 +55,7 @@ public class ActIdTenantMember extends BaseEntity { @JsonProperty("ownership_id") @Schema(title = "人员ID") @Id - @ActIdTenantMemberUuidGenerator + @ActIdTenantMemberIdGenerator @Column(name = "id_", length = 64) private String id; diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdUser.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdUser.java index e47c4058..3e50cf1b 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdUser.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdUser.java @@ -31,7 +31,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; import org.dromara.dante.bpmn.logic.domain.base.BaseEntity; -import org.dromara.dante.bpmn.logic.generator.ActIdUserUuidGenerator; +import org.dromara.dante.bpmn.logic.generator.ActIdUserIdGenerator; import java.util.Date; @@ -52,7 +52,7 @@ public class ActIdUser extends BaseEntity { @JsonProperty("employee_id") @Schema(title = "人员ID") @Id - @ActIdUserUuidGenerator + @ActIdUserIdGenerator @Column(name = "id_", length = 64) private String id; diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdGroupUuidGenerator.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdGroupIdGenerator.java similarity index 94% rename from services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdGroupUuidGenerator.java rename to services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdGroupIdGenerator.java index f7d99c62..3dd864a1 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdGroupUuidGenerator.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdGroupIdGenerator.java @@ -40,8 +40,8 @@ * @author : gengwei.zheng * @date : 2022/11/7 17:38 */ -@IdGeneratorType(ActIdGroupUuidGeneratorType.class) +@IdGeneratorType(ActIdGroupIdGeneratorType.class) @Retention(RetentionPolicy.RUNTIME) @Target({FIELD, METHOD}) -public @interface ActIdGroupUuidGenerator { +public @interface ActIdGroupIdGenerator { } diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdGroupUuidGeneratorType.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdGroupIdGeneratorType.java similarity index 77% rename from services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdGroupUuidGeneratorType.java rename to services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdGroupIdGeneratorType.java index da7285a7..2b91bfd9 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdGroupUuidGeneratorType.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdGroupIdGeneratorType.java @@ -25,11 +25,9 @@ package org.dromara.dante.bpmn.logic.generator; -import cn.herodotus.engine.data.core.identifier.AbstractUuidGenerator; -import org.apache.commons.lang3.ObjectUtils; +import cn.herodotus.engine.data.core.identifier.AbstractIdGeneratorType; import org.apache.commons.lang3.StringUtils; import org.dromara.dante.bpmn.logic.entity.ActIdGroup; -import org.hibernate.HibernateException; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.id.factory.spi.CustomIdGeneratorCreationContext; @@ -41,17 +39,14 @@ * @author : gengwei.zheng * @date : 2021/7/20 12:57 */ -public class ActIdGroupUuidGeneratorType extends AbstractUuidGenerator { +public class ActIdGroupIdGeneratorType extends AbstractIdGeneratorType { - public ActIdGroupUuidGeneratorType(ActIdGroupUuidGenerator config, Member idMember, CustomIdGeneratorCreationContext creationContext) { - super(idMember); + public ActIdGroupIdGeneratorType(ActIdGroupIdGenerator config, Member member, CustomIdGeneratorCreationContext context) { + super(member); } @Override - public Object generate(SharedSessionContractImplementor session, Object object) throws HibernateException { - if (ObjectUtils.isEmpty(object)) { - throw new HibernateException(new NullPointerException()); - } + public Object generate(SharedSessionContractImplementor session, Object object) { ActIdGroup actIdGroup = (ActIdGroup) object; diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantUuidGenerator.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantIdGenerator.java similarity index 94% rename from services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantUuidGenerator.java rename to services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantIdGenerator.java index 70a458d7..9537fc07 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantUuidGenerator.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantIdGenerator.java @@ -40,8 +40,8 @@ * @author : gengwei.zheng * @date : 2022/11/7 17:38 */ -@IdGeneratorType(ActIdTenantUuidGeneratorType.class) +@IdGeneratorType(ActIdTenantIdGeneratorType.class) @Retention(RetentionPolicy.RUNTIME) @Target({FIELD, METHOD}) -public @interface ActIdTenantUuidGenerator { +public @interface ActIdTenantIdGenerator { } diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantUuidGeneratorType.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantIdGeneratorType.java similarity index 77% rename from services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantUuidGeneratorType.java rename to services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantIdGeneratorType.java index d9a83d66..9b039a9b 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantUuidGeneratorType.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantIdGeneratorType.java @@ -25,11 +25,9 @@ package org.dromara.dante.bpmn.logic.generator; -import cn.herodotus.engine.data.core.identifier.AbstractUuidGenerator; -import org.apache.commons.lang3.ObjectUtils; +import cn.herodotus.engine.data.core.identifier.AbstractIdGeneratorType; import org.apache.commons.lang3.StringUtils; import org.dromara.dante.bpmn.logic.entity.ActIdTenant; -import org.hibernate.HibernateException; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.id.factory.spi.CustomIdGeneratorCreationContext; @@ -41,17 +39,14 @@ * @author : gengwei.zheng * @date : 2021/7/20 13:01 */ -public class ActIdTenantUuidGeneratorType extends AbstractUuidGenerator { +public class ActIdTenantIdGeneratorType extends AbstractIdGeneratorType { - public ActIdTenantUuidGeneratorType(ActIdTenantUuidGenerator config, Member idMember, CustomIdGeneratorCreationContext creationContext) { - super(idMember); + public ActIdTenantIdGeneratorType(ActIdTenantIdGenerator config, Member member, CustomIdGeneratorCreationContext context) { + super(member); } @Override - public Object generate(SharedSessionContractImplementor session, Object object) throws HibernateException { - if (ObjectUtils.isEmpty(object)) { - throw new HibernateException(new NullPointerException()); - } + public Object generate(SharedSessionContractImplementor session, Object object) { ActIdTenant actIdTenant = (ActIdTenant) object; diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantMemberUuidGenerator.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantMemberIdGenerator.java similarity index 94% rename from services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantMemberUuidGenerator.java rename to services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantMemberIdGenerator.java index 20b636a9..f6c3afbd 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantMemberUuidGenerator.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantMemberIdGenerator.java @@ -40,8 +40,8 @@ * @author : gengwei.zheng * @date : 2022/11/7 17:38 */ -@IdGeneratorType(ActIdTenantMemberUuidGeneratorType.class) +@IdGeneratorType(ActIdTenantMemberIdGeneratorType.class) @Retention(RetentionPolicy.RUNTIME) @Target({FIELD, METHOD}) -public @interface ActIdTenantMemberUuidGenerator { +public @interface ActIdTenantMemberIdGenerator { } diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantMemberUuidGeneratorType.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantMemberIdGeneratorType.java similarity index 77% rename from services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantMemberUuidGeneratorType.java rename to services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantMemberIdGeneratorType.java index 28186a38..b2075ad3 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantMemberUuidGeneratorType.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdTenantMemberIdGeneratorType.java @@ -25,11 +25,9 @@ package org.dromara.dante.bpmn.logic.generator; -import cn.herodotus.engine.data.core.identifier.AbstractUuidGenerator; -import org.apache.commons.lang3.ObjectUtils; +import cn.herodotus.engine.data.core.identifier.AbstractIdGeneratorType; import org.apache.commons.lang3.StringUtils; import org.dromara.dante.bpmn.logic.entity.ActIdTenantMember; -import org.hibernate.HibernateException; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.id.factory.spi.CustomIdGeneratorCreationContext; @@ -41,17 +39,14 @@ * @author : gengwei.zheng * @date : 2021/7/20 13:09 */ -public class ActIdTenantMemberUuidGeneratorType extends AbstractUuidGenerator { +public class ActIdTenantMemberIdGeneratorType extends AbstractIdGeneratorType { - public ActIdTenantMemberUuidGeneratorType(ActIdTenantMemberUuidGenerator config, Member idMember, CustomIdGeneratorCreationContext creationContext) { - super(idMember); + public ActIdTenantMemberIdGeneratorType(ActIdTenantMemberIdGenerator config, Member member, CustomIdGeneratorCreationContext context) { + super(member); } @Override - public Object generate(SharedSessionContractImplementor session, Object object) throws HibernateException { - if (ObjectUtils.isEmpty(object)) { - throw new HibernateException(new NullPointerException()); - } + public Object generate(SharedSessionContractImplementor session, Object object) { ActIdTenantMember actIdTenantMember = (ActIdTenantMember) object; diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdUserUuidGenerator.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdUserIdGenerator.java similarity index 94% rename from services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdUserUuidGenerator.java rename to services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdUserIdGenerator.java index 8ce75cc2..3107e3e3 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdUserUuidGenerator.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdUserIdGenerator.java @@ -40,8 +40,8 @@ * @author : gengwei.zheng * @date : 2022/11/7 17:38 */ -@IdGeneratorType(ActIdUserUuidGeneratorType.class) +@IdGeneratorType(ActIdUserIdGeneratorType.class) @Retention(RetentionPolicy.RUNTIME) @Target({FIELD, METHOD}) -public @interface ActIdUserUuidGenerator { +public @interface ActIdUserIdGenerator { } diff --git a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdUserUuidGeneratorType.java b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdUserIdGeneratorType.java similarity index 88% rename from services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdUserUuidGeneratorType.java rename to services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdUserIdGeneratorType.java index 8d602fa2..3cae7798 100644 --- a/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdUserUuidGeneratorType.java +++ b/services/dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/generator/ActIdUserIdGeneratorType.java @@ -25,7 +25,7 @@ package org.dromara.dante.bpmn.logic.generator; -import cn.herodotus.engine.data.core.identifier.AbstractUuidGenerator; +import cn.herodotus.engine.data.core.identifier.AbstractIdGeneratorType; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.dromara.dante.bpmn.logic.entity.ActIdUser; @@ -41,10 +41,10 @@ * @author : gengwei.zheng * @date : 2021/7/20 12:51 */ -public class ActIdUserUuidGeneratorType extends AbstractUuidGenerator { +public class ActIdUserIdGeneratorType extends AbstractIdGeneratorType { - public ActIdUserUuidGeneratorType(ActIdUserUuidGenerator config, Member idMember, CustomIdGeneratorCreationContext creationContext) { - super(idMember); + public ActIdUserIdGeneratorType(ActIdUserIdGenerator config, Member member, CustomIdGeneratorCreationContext context) { + super(member); } @Override From 216c99c3bab2a2ee0faac244bd2047332de0ccc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Sat, 7 Dec 2024 14:20:55 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20Gateway=20=E6=9C=8D=E5=8A=A1=E4=B8=8D=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=96=B0=E7=89=88=20Springdoc=20=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nacos_config_export_20241206100322.zip | Bin 0 -> 12637 bytes .../gateway/config/GatewayConfiguration.java | 3 +-- .../gateway/handler/RefreshRoutesListener.java | 8 +------- 3 files changed, 2 insertions(+), 9 deletions(-) create mode 100644 configurations/backup/alibaba/3.4.0.0-M1/nacos_config_export_20241206100322.zip diff --git a/configurations/backup/alibaba/3.4.0.0-M1/nacos_config_export_20241206100322.zip b/configurations/backup/alibaba/3.4.0.0-M1/nacos_config_export_20241206100322.zip new file mode 100644 index 0000000000000000000000000000000000000000..c4dd84b2e5fb60008b788695e5c1d768f262e057 GIT binary patch literal 12637 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 swaggerUrls = routes.stream().map(this::createSwaggerUrl).collect(Collectors.toSet()); - if (ObjectUtils.isNotEmpty(swaggerUiConfigParameters)) { + if (ObjectUtils.isNotEmpty(swaggerUiConfigProperties)) { log.debug("[Herodotus] |- Services is Changed, update Urls"); - swaggerUiConfigParameters.setUrls(swaggerUrls); swaggerUiConfigProperties.setUrls(swaggerUrls); } } From 616ec5d8c568f7a2dd996289c94d0d2eb5d9ea1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Sat, 7 Dec 2024 17:05:17 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=8E=89=20feat:=20v3.4.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 主要更新 - [升级] Spring Boot 版本升级至 3.4.0 - [升级] Spring Boot Admin 版本升级至 3.4.1 - [升级] Spring Cloud 版本升级至 2024.0.0 - [升级] Spring Authorization Server 版本升级至 1.4.0 - [回滚] Spring Cloud Alibaba 版本回滚至 2023.0.1.2 - 其它更新 - [新增] 新增 RestClient 配置并与 RestTemplate 融合，以RestTemplate 作为 RestClient 基础引擎。 - [修复] 修复 Hibernate 6.6 对于指定主键的实体无法保存，抛出 `Row was updated or deleted by another transaction (or unsaved-value mapping was incorrect)` 异常错误。 - [修复] 修复 Spring Cloud Bus 原始服务信息定义错误导致消息无法发送问题。 - [修复] 修复以 import 方式导入 springdoc 依赖，会出现 ui 包与 api 包版本不同，从而导致服务启动错误问题。 - [修复] 修复 Gateway 服务不兼容新版 Springdoc 引起的启动异常问题。 - [重构] 添加 webjars-locator-lite 依赖，改用 webjars lite 方式替换原有 webjars 资源加载方式 - [重构] 改用最新的 DelegatingAuthenticationConverter 类替换被标记为过时的 DelegatingAuthenticationConverter 类。 - [重构] 适配最新的 KeyStoreKeyFactory 包路径 - [重构] 重构 WebClient 配置，去除无用的配置内容 - [重构] 变更 HttpClient 与 Openfeign 使用相同配置方式，改用各自独立的方式进行配置。 - [重构] 改用 Openfeign SpringMvcContract 新接口定义重写原有配置和方法。 - [重构] 重构 Snowflake 主键生成器代码及命名 - [重构] 重构所有 IdGenerator 命名，去除无用的 Exception 抛出代码。 - [重构] 调整数据相关模块中重复的代码位置，减少不必要的重复定义类 - 依赖更新 - [升级] alipay-sdk-java 版本升级至 4.40.8.ALL - [升级] mybatis 版本升级至 3.5.17 - [升级] redisson 版本升级至 3.40.0 - [升级] weixin-java 版本升级至 4.6.8.B - [升级] checker-qual 版本升级至 3.48.3 - [升级] springdoc 版本升级至 2.7.0 --- README.md | 10 +++++----- .../nacos_config_export_20241206100322.zip | Bin .../docker/docker-compose/linux/herodotus/.env | 2 +- .../docker/docker-compose/windows/herodotus/.env | 2 +- dependencies/pom.xml | 2 +- modules/dante-module-common/pom.xml | 2 +- modules/dante-module-metadata/pom.xml | 2 +- modules/dante-module-social/pom.xml | 2 +- modules/dante-module-strategy/pom.xml | 2 +- modules/dante-monomer-autoconfigure/pom.xml | 2 +- modules/pom.xml | 2 +- packages/authentication-spring-boot-starter/pom.xml | 2 +- packages/facility-spring-boot-starter/pom.xml | 2 +- packages/pom.xml | 2 +- packages/service-spring-boot-starter/pom.xml | 2 +- platform/dante-cloud-gateway/pom.xml | 2 +- platform/dante-cloud-message/pom.xml | 2 +- platform/dante-cloud-monitor/pom.xml | 4 ++-- platform/dante-cloud-uaa/pom.xml | 2 +- platform/dante-cloud-upms/pom.xml | 4 ++-- platform/pom.xml | 2 +- pom.xml | 2 +- services/dante-cloud-bpmn-ability/pom.xml | 4 ++-- services/dante-cloud-bpmn-logic/pom.xml | 2 +- services/dante-cloud-oss-ability/pom.xml | 2 +- services/dante-monomer-application/pom.xml | 2 +- .../src/main/resources/application.yml | 3 +++ services/pom.xml | 2 +- 28 files changed, 36 insertions(+), 33 deletions(-) rename configurations/backup/alibaba/{3.4.0.0-M1 => 3.4.0.0}/nacos_config_export_20241206100322.zip (100%) diff --git a/README.md b/README.md index 10d9d9f7..b7b4e371 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ---

- Spring Authorization Server 1.3.3 + Spring Authorization Server 1.4.0 Spring Boot 3.4.0 Spring Cloud 2024.0.0 Spring Cloud Alibaba 2023.0.1.2 @@ -13,9 +13,9 @@ Nacos 2.4.3

- Version 3.4.0.0-M1 - Dante Engine 3.4.0.0-M1 - Dante OSS 3.4.0.0-M1 + Version 3.4.0.0 + Dante Engine 3.4.0.0 + Dante OSS 3.4.0.0 Java 17 License Apache 2.0 Total Visits @@ -168,7 +168,7 @@ | Spring Cloud Alibaba | 2023.0.1.2 | | Spring Cloud Tencent | 1.14.0-2023.0.0 | | Spring Authorization Server | 1.3.3 | -| Spring Boot Admin | 3.4.0 | +| Spring Boot Admin | 3.4.1 | | Nacos | 2.4.3 | | Sentinel | 1.8.8 | | Seata | 1.7.0 | diff --git a/configurations/backup/alibaba/3.4.0.0-M1/nacos_config_export_20241206100322.zip b/configurations/backup/alibaba/3.4.0.0/nacos_config_export_20241206100322.zip similarity index 100% rename from configurations/backup/alibaba/3.4.0.0-M1/nacos_config_export_20241206100322.zip rename to configurations/backup/alibaba/3.4.0.0/nacos_config_export_20241206100322.zip diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env index db5355bc..313a72a0 100644 --- a/configurations/docker/docker-compose/linux/herodotus/.env +++ b/configurations/docker/docker-compose/linux/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=3.4.0.0-M1 +VERSION=3.4.0.0 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 06d54a53..262ac1f1 100644 --- a/configurations/docker/docker-compose/windows/herodotus/.env +++ b/configurations/docker/docker-compose/windows/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=3.4.0.0-M1 +VERSION=3.4.0.0 SPRING_PROFILES_ACTIVE=alibaba PROFILE=development DATABASE=postgresql diff --git a/dependencies/pom.xml b/dependencies/pom.xml index ddd22016..8d08430a 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -28,7 +28,7 @@ cn.herodotus.engine dependencies - 3.4.0.0-M1 + 3.4.0.0 diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml index dd1d694b..fa9ab802 100644 --- a/modules/dante-module-common/pom.xml +++ b/modules/dante-module-common/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 3.4.0.0-M1 + 3.4.0.0 dante-module-common diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml index 33c95cb8..413567cb 100644 --- a/modules/dante-module-metadata/pom.xml +++ b/modules/dante-module-metadata/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 3.4.0.0-M1 + 3.4.0.0 dante-module-metadata diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml index 36e47f9f..bf9f0e66 100644 --- a/modules/dante-module-social/pom.xml +++ b/modules/dante-module-social/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 3.4.0.0-M1 + 3.4.0.0 dante-module-social diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml index 5ca3ce19..d53dba7c 100644 --- a/modules/dante-module-strategy/pom.xml +++ b/modules/dante-module-strategy/pom.xml @@ -32,7 +32,7 @@ modules org.dromara.dante - 3.4.0.0-M1 + 3.4.0.0 dante-module-strategy diff --git a/modules/dante-monomer-autoconfigure/pom.xml b/modules/dante-monomer-autoconfigure/pom.xml index dcec3b31..a8bb1a56 100644 --- a/modules/dante-monomer-autoconfigure/pom.xml +++ b/modules/dante-monomer-autoconfigure/pom.xml @@ -27,7 +27,7 @@ org.dromara.dante modules - 3.4.0.0-M1 + 3.4.0.0 dante-monomer-autoconfigure diff --git a/modules/pom.xml b/modules/pom.xml index 1bb8252f..7c37d0d1 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.4.0.0-M1 + 3.4.0.0 modules diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml index a4098661..a1eda163 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.4.0.0-M1 + 3.4.0.0 authentication-spring-boot-starter diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml index bc744b48..db6153ec 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.4.0.0-M1 + 3.4.0.0 4.0.0 diff --git a/packages/pom.xml b/packages/pom.xml index 0201f0fb..16ba7cbc 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.4.0.0-M1 + 3.4.0.0 packages diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml index 8fc40a36..ce6bbf91 100644 --- a/packages/service-spring-boot-starter/pom.xml +++ b/packages/service-spring-boot-starter/pom.xml @@ -32,7 +32,7 @@ packages org.dromara.dante - 3.4.0.0-M1 + 3.4.0.0 service-spring-boot-starter diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml index e5a5c2e1..4a44bd4f 100644 --- a/platform/dante-cloud-gateway/pom.xml +++ b/platform/dante-cloud-gateway/pom.xml @@ -32,7 +32,7 @@ platform org.dromara.dante - 3.4.0.0-M1 + 3.4.0.0 dante-cloud-gateway diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml index 60937dc3..b480c4b6 100644 --- a/platform/dante-cloud-message/pom.xml +++ b/platform/dante-cloud-message/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante platform - 3.4.0.0-M1 + 3.4.0.0 dante-cloud-message diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml index d4b0f83a..c8752df8 100644 --- a/platform/dante-cloud-monitor/pom.xml +++ b/platform/dante-cloud-monitor/pom.xml @@ -30,11 +30,11 @@ platform org.dromara.dante - 3.4.0.0-M1 + 3.4.0.0 dante-cloud-monitor - 3.4.0.0-M1 + 3.4.0.0 dante-cloud-monitor dante-cloud-monitor diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml index b2f8c3f0..c662c584 100644 --- a/platform/dante-cloud-uaa/pom.xml +++ b/platform/dante-cloud-uaa/pom.xml @@ -32,7 +32,7 @@ platform org.dromara.dante - 3.4.0.0-M1 + 3.4.0.0 dante-cloud-uaa diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml index 248a7a37..17c7812c 100644 --- a/platform/dante-cloud-upms/pom.xml +++ b/platform/dante-cloud-upms/pom.xml @@ -30,12 +30,12 @@ platform org.dromara.dante - 3.4.0.0-M1 + 3.4.0.0 4.0.0 dante-cloud-upms - 3.4.0.0-M1 + 3.4.0.0 diff --git a/platform/pom.xml b/platform/pom.xml index 788a1201..f386e6c8 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.4.0.0-M1 + 3.4.0.0 platform diff --git a/pom.xml b/pom.xml index 0eb6f3b2..342bd46c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.dromara.dante dependencies - 3.4.0.0-M1 + 3.4.0.0 dependencies/pom.xml diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml index b3a4fe33..2f8246a7 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.4.0.0-M1 + 3.4.0.0 dante-cloud-bpmn-ability - 3.4.0.0-M1 + 3.4.0.0 dante-cloud-bpmn-ability 基于Camunda工作流的服务 diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml index 1b2408c6..7a2e672c 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.4.0.0-M1 + 3.4.0.0 dante-cloud-bpmn-logic diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml index 2e42a81b..acebaad5 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.4.0.0-M1 + 3.4.0.0 dante-cloud-oss-ability diff --git a/services/dante-monomer-application/pom.xml b/services/dante-monomer-application/pom.xml index 74ac9b79..fd396889 100644 --- a/services/dante-monomer-application/pom.xml +++ b/services/dante-monomer-application/pom.xml @@ -31,7 +31,7 @@ org.dromara.dante services - 3.4.0.0-M1 + 3.4.0.0 dante-monomer-application diff --git a/services/dante-monomer-application/src/main/resources/application.yml b/services/dante-monomer-application/src/main/resources/application.yml index c72a0a89..4173e375 100644 --- a/services/dante-monomer-application/src/main/resources/application.yml +++ b/services/dante-monomer-application/src/main/resources/application.yml @@ -26,6 +26,9 @@ spring: repository-type: indexed save-mode: always flush-mode: immediate + http: + client: + factory: jdk jasypt: encryptor: diff --git a/services/pom.xml b/services/pom.xml index e5b02073..0be87a29 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -32,7 +32,7 @@ dante-cloud org.dromara.dante - 3.4.0.0-M1 + 3.4.0.0 services