!254 v3.4.0.0

Merge pull request !254 from 码匠君/develop
dromara · Dec 7, 2024 · 58fb8d8 · 58fb8d8
2 parents 4bbd905 + 616ec5d
commit 58fb8d8
Show file tree

Hide file tree

Showing 44 changed files with 96 additions and 108 deletions.
diff --git a/README.md b/README.md
@@ -5,17 +5,17 @@
 ---
 
 <p align="center">
-    <a href="https://github.com/spring-projects/spring-authorization-server" target="_blank"><img src="https://img.shields.io/badge/Spring%20Authorization%20Server-1.3.3-blue.svg?logo=spring" alt="Spring Authorization Server 1.3.3"></a>
-    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.3.6-blue.svg?logo=spring" alt="Spring Boot 3.3.6"></a>
-    <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2023.0.3-blue.svg?logo=spring" alt="Spring Cloud 2023.0.3"></a>
+    <a href="https://github.com/spring-projects/spring-authorization-server" target="_blank"><img src="https://img.shields.io/badge/Spring%20Authorization%20Server-1.4.0-blue.svg?logo=spring" alt="Spring Authorization Server 1.4.0"></a>
+    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.4.0-blue.svg?logo=spring" alt="Spring Boot 3.4.0"></a>
+    <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2024.0.0-blue.svg?logo=spring" alt="Spring Cloud 2024.0.0"></a>
     <a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2023.0.1.2-blue.svg?logo=alibabadotcom" alt="Spring Cloud Alibaba 2023.0.1.2"></a>
     <a href="https://github.com/Tencent/spring-cloud-tencent" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Tencent-1.14.0--2023.0.0-blue.svg?logo=tencentqq" alt="Spring Cloud Tencent 1.14.0--2023.0.0-SNAPSHOT"></a>
     <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://img.shields.io/badge/Nacos-2.4.3-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.4.3"></a>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.3.6.1-red.svg?logo=spring" alt="Version 3.3.6.1"></a>
-    <a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.3.6.1-red.svg?logo=spring" alt="Dante Engine 3.3.6.1"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.3.6.1-red.svg?logo=spring" alt="Dante OSS 3.3.6.1"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.4.0.0-red.svg?logo=spring" alt="Version 3.4.0.0"></a>
+    <a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.4.0.0-red.svg?logo=spring" alt="Dante Engine 3.4.0.0"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.4.0.0-red.svg?logo=spring" alt="Dante OSS 3.4.0.0"></a>
     <a href="https://bell-sw.com/pages/downloads/#downloads" target="_blank"><img src="https://img.shields.io/badge/JDK-17%2B-green.svg?logo=openjdk" alt="Java 17"></a>
     <a href="./LICENSE"><img src="https://shields.io/badge/License-Apache--2.0-blue.svg?logo=apache" alt="License Apache 2.0"></a>
     <a href="https://www.herodotus.cn"><img src="https://visitor-badge.laobi.icu/badge?page_id=dante-cloud&title=Total%20Visits" alt="Total Visits"></a>
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -28,7 +28,7 @@
     <parent>
         <groupId>cn.herodotus.engine</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>dante-module-common</artifactId>

diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>dante-module-metadata</artifactId>

diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>dante-module-social</artifactId>

diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>dante-module-strategy</artifactId>

diff --git a/modules/dante-monomer-autoconfigure/pom.xml b/modules/dante-monomer-autoconfigure/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.dromara.dante</groupId>
         <artifactId>modules</artifactId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>dante-monomer-autoconfigure</artifactId>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>modules</artifactId>

diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>authentication-spring-boot-starter</artifactId>

diff --git a/.../org/dromara/dante/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java b/.../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
@@ -30,7 +30,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/packages/pom.xml b/packages/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>packages</artifactId>

diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>service-spring-boot-starter</artifactId>

diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>dante-cloud-gateway</artifactId>

diff --git a/...te-cloud-gateway/src/main/java/org/dromara/dante/gateway/config/GatewayConfiguration.java b/...te-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/...-cloud-gateway/src/main/java/org/dromara/dante/gateway/handler/RefreshRoutesListener.java b/...-cloud-gateway/src/main/java/org/dromara/dante/gateway/handler/RefreshRoutesListener.java
@@ -61,17 +61,12 @@ public class RefreshRoutesListener implements ApplicationListener<RefreshRoutesE
     @Value("${spring.application.name}")
     private String self;
     private RouteLocator routeLocator;
-    private SwaggerUiConfigParameters swaggerUiConfigParameters;
     private SwaggerUiConfigProperties swaggerUiConfigProperties;
 
     public void setRouteLocator(RouteLocator routeLocator) {
         this.routeLocator = routeLocator;
     }
 
-    public void setSwaggerUiConfigParameters(SwaggerUiConfigParameters swaggerUiConfigParameters) {
-        this.swaggerUiConfigParameters = swaggerUiConfigParameters;
-    }
-
     public void setSwaggerUiConfigProperties(SwaggerUiConfigProperties swaggerUiConfigProperties) {
         this.swaggerUiConfigProperties = swaggerUiConfigProperties;
     }
@@ -86,9 +81,8 @@ public void onApplicationEvent(RefreshRoutesEvent refreshRoutesEvent) {
 
         Set<AbstractSwaggerUiConfigProperties.SwaggerUrl> 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
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.dromara.dante</groupId>
         <artifactId>platform</artifactId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>dante-cloud-message</artifactId>

diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml
@@ -30,11 +30,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>dante-cloud-monitor</artifactId>
-    <version>3.3.6.1</version>
+    <version>3.4.0.0</version>
     <name>dante-cloud-monitor</name>
     <description>dante-cloud-monitor</description>
     <dependencies>

diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>dante-cloud-uaa</artifactId>

diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dante-cloud-upms</artifactId>
-    <version>3.3.6.1</version>
+    <version>3.4.0.0</version>
 
     <dependencies>
         <dependency>

diff --git a/platform/pom.xml b/platform/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>platform</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.dromara.dante</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
         <relativePath>dependencies/pom.xml</relativePath>
     </parent>
 

diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml
@@ -31,11 +31,11 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-ability</artifactId>
-    <version>3.3.6.1</version>
+    <version>3.4.0.0</version>
 
     <name>dante-cloud-bpmn-ability</name>
     <description>基于Camunda工作流的服务</description>

diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.6.1</version>
+        <version>3.4.0.0</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-logic</artifactId>

diff --git a/.../dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdGroup.java b/.../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;
 
 /**
  * <p>Description: 工作流组表 </p>
@@ -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/...dante-cloud-bpmn-logic/src/main/java/org/dromara/dante/bpmn/logic/entity/ActIdTenant.java b/...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;
 
 /**
  * <p>Description: Camunda租户 </p>
@@ -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;