diff --git a/pom.xml b/pom.xml index 30bb6bf..5013ee4 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ spring-boot-service-template-common spring-boot-service-template-jpa - spring-boot-service-template-task + spring-boot-service-template-jpa-task @@ -43,6 +43,11 @@ spring-boot-service-template-common ${project.version} + + com.lanyuanxiaoyao + spring-boot-service-template-jpa + ${project.version} + @@ -105,6 +110,21 @@ maven-compiler-plugin 3.14.0 + + org.hibernate + hibernate-jpamodelgen + ${hibernate.version} + + + io.github.openfeign.querydsl + querydsl-apt + ${querydsl.version} + + + jakarta.persistence + jakarta.persistence-api + 3.2.0 + diff --git a/spring-boot-service-template-jpa-task/pom.xml b/spring-boot-service-template-jpa-task/pom.xml new file mode 100644 index 0000000..04ad087 --- /dev/null +++ b/spring-boot-service-template-jpa-task/pom.xml @@ -0,0 +1,69 @@ + + + 4.0.0 + + com.lanyuanxiaoyao + spring-boot-service-template + 1.1.0-SNAPSHOT + + + spring-boot-service-template-jpa-task + + + + com.lanyuanxiaoyao + spring-boot-service-template-jpa + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + package + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + + + org.hibernate + hibernate-jpamodelgen + ${hibernate.version} + + + io.github.openfeign.querydsl + querydsl-apt + ${querydsl.version} + jpa + + + jakarta.persistence + jakarta.persistence-api + 3.2.0 + + + + -Aquerydsl.entityAccessors=true + -Aquerydsl.createDefaultVariable=true + + + + + + \ No newline at end of file diff --git a/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/entity/IdOnlyEntity.java b/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/entity/IdOnlyEntity.java index 9cec640..52ed64d 100644 --- a/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/entity/IdOnlyEntity.java +++ b/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/entity/IdOnlyEntity.java @@ -1,6 +1,5 @@ package com.lanyuanxiaoyao.service.template.jpa.entity; -import com.lanyuanxiaoyao.service.template.jpa.helper.SnowflakeId; import jakarta.persistence.EntityListeners; import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; diff --git a/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/helper/SnowflakeId.java b/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/entity/SnowflakeId.java similarity index 87% rename from spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/helper/SnowflakeId.java rename to spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/entity/SnowflakeId.java index 89720eb..0fd64c0 100644 --- a/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/helper/SnowflakeId.java +++ b/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/entity/SnowflakeId.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.template.jpa.helper; +package com.lanyuanxiaoyao.service.template.jpa.entity; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/helper/SnowflakeIdGenerator.java b/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/entity/SnowflakeIdGenerator.java similarity index 97% rename from spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/helper/SnowflakeIdGenerator.java rename to spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/entity/SnowflakeIdGenerator.java index a68b790..74b2357 100644 --- a/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/helper/SnowflakeIdGenerator.java +++ b/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/entity/SnowflakeIdGenerator.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.template.jpa.helper; +package com.lanyuanxiaoyao.service.template.jpa.entity; import java.io.Serializable; import java.time.Instant; @@ -9,7 +9,6 @@ import org.hibernate.id.factory.spi.StandardGenerator; @Slf4j public class SnowflakeIdGenerator implements IdentifierGenerator, StandardGenerator { - @Override public Serializable generate(SharedSessionContractImplementor session, Object object) { try { diff --git a/spring-boot-service-template-task/pom.xml b/spring-boot-service-template-task/pom.xml deleted file mode 100644 index 535e4bf..0000000 --- a/spring-boot-service-template-task/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - 4.0.0 - - com.lanyuanxiaoyao - spring-boot-service-template - 1.1.0-SNAPSHOT - - - spring-boot-service-template-task - - - - - - - \ No newline at end of file