diff --git a/example/example-app/example-app-cmd-domain/pom.xml b/example/example-app/example-app-cmd-domain/pom.xml index 3ec2c103..743a3795 100644 --- a/example/example-app/example-app-cmd-domain/pom.xml +++ b/example/example-app/example-app-cmd-domain/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-app - 3.4.41 + 3.4.42 ../pom.xml diff --git a/example/example-app/example-app-cmd-meta/pom.xml b/example/example-app/example-app-cmd-meta/pom.xml index 93978462..5852c80b 100644 --- a/example/example-app/example-app-cmd-meta/pom.xml +++ b/example/example-app/example-app-cmd-meta/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-app - 3.4.41 + 3.4.42 ../pom.xml diff --git a/example/example-app/example-app-query/pom.xml b/example/example-app/example-app-query/pom.xml index d0d0b8f8..fdba18af 100644 --- a/example/example-app/example-app-query/pom.xml +++ b/example/example-app/example-app-query/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-app - 3.4.41 + 3.4.42 ../pom.xml diff --git a/example/example-app/pom.xml b/example/example-app/pom.xml index 2558b77b..b48165de 100644 --- a/example/example-app/pom.xml +++ b/example/example-app/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot springboot-example - 3.4.41 + 3.4.42 ../pom.xml pom diff --git a/example/example-domain/example-domain-leave/pom.xml b/example/example-domain/example-domain-leave/pom.xml index 46bef0fc..15def626 100644 --- a/example/example-domain/example-domain-leave/pom.xml +++ b/example/example-domain/example-domain-leave/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-domain - 3.4.41 + 3.4.42 ../pom.xml diff --git a/example/example-domain/example-domain-user/pom.xml b/example/example-domain/example-domain-user/pom.xml index 5723c837..b43d2fb1 100644 --- a/example/example-domain/example-domain-user/pom.xml +++ b/example/example-domain/example-domain-user/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-domain - 3.4.41 + 3.4.42 ../pom.xml diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml index 09986be1..c0b481ce 100644 --- a/example/example-domain/pom.xml +++ b/example/example-domain/pom.xml @@ -5,7 +5,7 @@ com.codingapi.springboot springboot-example - 3.4.41 + 3.4.42 ../pom.xml 4.0.0 diff --git a/example/example-infra/example-infra-flow/pom.xml b/example/example-infra/example-infra-flow/pom.xml index 79b8f020..d7e753a1 100644 --- a/example/example-infra/example-infra-flow/pom.xml +++ b/example/example-infra/example-infra-flow/pom.xml @@ -5,7 +5,7 @@ com.codingapi.springboot example-infra - 3.4.41 + 3.4.42 ../pom.xml diff --git a/example/example-infra/example-infra-jpa/pom.xml b/example/example-infra/example-infra-jpa/pom.xml index a1a63ffa..e94e7b39 100644 --- a/example/example-infra/example-infra-jpa/pom.xml +++ b/example/example-infra/example-infra-jpa/pom.xml @@ -5,7 +5,7 @@ com.codingapi.springboot example-infra - 3.4.41 + 3.4.42 ../pom.xml diff --git a/example/example-infra/example-infra-security/pom.xml b/example/example-infra/example-infra-security/pom.xml index 6def65b6..87bf23d7 100644 --- a/example/example-infra/example-infra-security/pom.xml +++ b/example/example-infra/example-infra-security/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-infra - 3.4.41 + 3.4.42 ../pom.xml diff --git a/example/example-infra/pom.xml b/example/example-infra/pom.xml index d93f9d96..3d5944f9 100644 --- a/example/example-infra/pom.xml +++ b/example/example-infra/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot springboot-example - 3.4.41 + 3.4.42 ../pom.xml pom diff --git a/example/example-interface/pom.xml b/example/example-interface/pom.xml index 2091fffb..d2459415 100644 --- a/example/example-interface/pom.xml +++ b/example/example-interface/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot springboot-example - 3.4.41 + 3.4.42 example-interface diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml index 6490bac0..b86ca882 100644 --- a/example/example-server/pom.xml +++ b/example/example-server/pom.xml @@ -5,7 +5,7 @@ springboot-example com.codingapi.springboot - 3.4.41 + 3.4.42 4.0.0 diff --git a/example/pom.xml b/example/pom.xml index 0fa5ea5c..cfa5cc3f 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -19,7 +19,7 @@ springboot-example - 3.4.41 + 3.4.42 springboot-example springboot-example project for Spring Boot diff --git a/pom.xml b/pom.xml index 0f576a03..b6222bca 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ com.codingapi.springboot springboot-parent - 3.4.41 + 3.4.42 https://github.com/codingapi/springboot-framewrok springboot-parent diff --git a/springboot-starter-data-authorization/pom.xml b/springboot-starter-data-authorization/pom.xml index ad44651e..ce61c113 100644 --- a/springboot-starter-data-authorization/pom.xml +++ b/springboot-starter-data-authorization/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot springboot-parent - 3.4.41 + 3.4.42 springboot-starter-data-authorization diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml index adab3cac..41c33ae5 100644 --- a/springboot-starter-data-fast/pom.xml +++ b/springboot-starter-data-fast/pom.xml @@ -5,7 +5,7 @@ springboot-parent com.codingapi.springboot - 3.4.41 + 3.4.42 4.0.0 diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/metadata/TableEntityMetadata.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/metadata/TableEntityMetadata.java index ea7576c3..5ae8f642 100644 --- a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/metadata/TableEntityMetadata.java +++ b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/metadata/TableEntityMetadata.java @@ -3,6 +3,7 @@ import jakarta.persistence.GenerationType; import lombok.Getter; import lombok.Setter; +import org.springframework.util.StringUtils; import java.lang.annotation.Annotation; import java.util.ArrayList; @@ -168,11 +169,13 @@ public void addPrimaryKeyColumn(Class type, String fieldName, String columnNa column.setFieldName(fieldName); column.setColumnName(columnName); column.setPrimaryKey(true); - GeneratedValueMeta generatedValueMeta = new GeneratedValueMeta(); - generatedValueMeta.setGenerator(generator); - generatedValueMeta.setStrategy(strategy); + if (strategy != null || StringUtils.hasText(generator)) { + GeneratedValueMeta generatedValueMeta = new GeneratedValueMeta(); + generatedValueMeta.setGenerator(generator); + generatedValueMeta.setStrategy(strategy); + column.setGeneratedValue(generatedValueMeta); + } column.setAnnotationClasses(annotationClasses); - column.setGeneratedValue(generatedValueMeta); column.setLob(isLob); column.setComment(comment); column.setUnique(unique); diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml index c8dade09..90c6e710 100644 --- a/springboot-starter-flow/pom.xml +++ b/springboot-starter-flow/pom.xml @@ -6,7 +6,7 @@ springboot-parent com.codingapi.springboot - 3.4.41 + 3.4.42 springboot-starter-flow diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml index fa93fb1f..0e51250d 100644 --- a/springboot-starter-security/pom.xml +++ b/springboot-starter-security/pom.xml @@ -6,7 +6,7 @@ springboot-parent com.codingapi.springboot - 3.4.41 + 3.4.42 springboot-starter-security diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml index 2df5657f..bc5fdbcb 100644 --- a/springboot-starter/pom.xml +++ b/springboot-starter/pom.xml @@ -5,7 +5,7 @@ com.codingapi.springboot springboot-parent - 3.4.41 + 3.4.42 springboot-starter