diff --git a/README.md b/README.md index 1a4b34e1..b7b4e371 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,17 @@ ---

- Spring Authorization Server 1.3.3 - Spring Boot 3.3.6 - Spring Cloud 2023.0.3 + Spring Authorization Server 1.4.0 + 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 + Dante Engine 3.4.0.0 + Dante OSS 3.4.0.0 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.1 | | 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/backup/alibaba/3.4.0.0/nacos_config_export_20241206100322.zip b/configurations/backup/alibaba/3.4.0.0/nacos_config_export_20241206100322.zip new file mode 100644 index 00000000..c4dd84b2 Binary files /dev/null and b/configurations/backup/alibaba/3.4.0.0/nacos_config_export_20241206100322.zip differ 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/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env index fbf45bd9..313a72a0 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 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..262ac1f1 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 SPRING_PROFILES_ACTIVE=alibaba PROFILE=development DATABASE=postgresql diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 21e31fe1..8d08430a 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 diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml index fffcaf79..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.3.6.1 + 3.4.0.0 dante-module-common diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml index a78f57f6..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.3.6.1 + 3.4.0.0 dante-module-metadata diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml index cb6c683e..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.3.6.1 + 3.4.0.0 dante-module-social diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml index 2a66ca32..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.3.6.1 + 3.4.0.0 dante-module-strategy diff --git a/modules/dante-monomer-autoconfigure/pom.xml b/modules/dante-monomer-autoconfigure/pom.xml index c57f316c..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.3.6.1 + 3.4.0.0 dante-monomer-autoconfigure diff --git a/modules/pom.xml b/modules/pom.xml index dc106eb1..7c37d0d1 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 modules diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml index c24487e6..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.3.6.1 + 3.4.0.0 authentication-spring-boot-starter 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; diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml index af36b038..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.3.6.1 + 3.4.0.0 4.0.0 diff --git a/packages/pom.xml b/packages/pom.xml index 6590efc5..16ba7cbc 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 packages diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml index 6adec5e5..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.3.6.1 + 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 44e3de98..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.3.6.1 + 3.4.0.0 dante-cloud-gateway diff --git a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java index bba6d22e..69ab8f51 100644 --- a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java +++ b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java @@ -95,10 +95,9 @@ public WebFilter corsFilter() { static class GatewaySwaggerConfiguration { @Bean - public RefreshRoutesListener refreshRoutesListener(RouteLocator routeLocator, SwaggerUiConfigParameters swaggerUiConfigParameters, SwaggerUiConfigProperties swaggerUiConfigProperties) { + public RefreshRoutesListener refreshRoutesListener(RouteLocator routeLocator, SwaggerUiConfigProperties swaggerUiConfigProperties) { RefreshRoutesListener refreshRoutesListener = new RefreshRoutesListener(); refreshRoutesListener.setRouteLocator(routeLocator); - refreshRoutesListener.setSwaggerUiConfigParameters(swaggerUiConfigParameters); refreshRoutesListener.setSwaggerUiConfigProperties(swaggerUiConfigProperties); log.trace("[Herodotus] |- Bean [Refresh Routes Listener] in AliyunScanConfiguration Auto Configure."); return refreshRoutesListener; diff --git a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/handler/RefreshRoutesListener.java b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/handler/RefreshRoutesListener.java index 09550fb3..1737aae8 100644 --- a/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/handler/RefreshRoutesListener.java +++ b/platform/dante-cloud-gateway/src/main/java/org/dromara/dante/gateway/handler/RefreshRoutesListener.java @@ -61,17 +61,12 @@ public class RefreshRoutesListener implements ApplicationListener 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); } } diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml index 76d4f5a1..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.3.6.1 + 3.4.0.0 dante-cloud-message diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml index 60a19a6c..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.3.6.1 + 3.4.0.0 dante-cloud-monitor - 3.3.6.1 + 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 79a5d3c5..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.3.6.1 + 3.4.0.0 dante-cloud-uaa diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml index 2eadf44d..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.3.6.1 + 3.4.0.0 4.0.0 dante-cloud-upms - 3.3.6.1 + 3.4.0.0 diff --git a/platform/pom.xml b/platform/pom.xml index 146032b4..f386e6c8 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 platform diff --git a/pom.xml b/pom.xml index b290d3a0..342bd46c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.dromara.dante dependencies - 3.3.6.1 + 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 a8685175..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.3.6.1 + 3.4.0.0 dante-cloud-bpmn-ability - 3.3.6.1 + 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 9c7e571b..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.3.6.1 + 3.4.0.0 dante-cloud-bpmn-logic 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 diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml index e56b0396..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.3.6.1 + 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 c9975a16..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.3.6.1 + 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 782db33b..0be87a29 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 services