diff --git a/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/pom.xml b/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/pom.xml similarity index 95% rename from easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/pom.xml rename to easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/pom.xml index 9a9a08a..f85cb98 100644 --- a/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/pom.xml +++ b/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - ${rootArtifactId}-boot + ${rootArtifactId}-startup diff --git a/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/java/Bootstrap.java b/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/java/Bootstrap.java similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/java/Bootstrap.java rename to easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/java/Bootstrap.java diff --git a/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/java/configuration/SwaggerConfiguration.java b/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/java/configuration/SwaggerConfiguration.java similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/java/configuration/SwaggerConfiguration.java rename to easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/java/configuration/SwaggerConfiguration.java diff --git a/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/application.yml b/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/application.yml similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/application.yml rename to easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/application.yml diff --git a/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/config/application-citest.yml b/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/config/application-citest.yml similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/config/application-citest.yml rename to easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/config/application-citest.yml diff --git a/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/config/application-dev.yml b/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/config/application-dev.yml similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/config/application-dev.yml rename to easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/config/application-dev.yml diff --git a/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/config/application-gld.yml b/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/config/application-gld.yml similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/config/application-gld.yml rename to easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/config/application-gld.yml diff --git a/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/import.sql b/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/import.sql similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/import.sql rename to easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/import.sql diff --git a/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/logback.xml b/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/logback.xml similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/logback.xml rename to easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/logback.xml diff --git a/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/pom.xml b/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/pom.xml index 410fe1f..312f7a7 100644 --- a/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/pom.xml +++ b/easy-maven-plugins/easy-maven-archetype-spring-cloud-micro-mybatis/src/main/resources/archetype-resources/pom.xml @@ -9,7 +9,7 @@ pom ${revision} - ${rootArtifactId}-boot + ${rootArtifactId}-startup ${rootArtifactId}-common ${rootArtifactId}-core-service ${rootArtifactId}-core-model @@ -71,7 +71,7 @@ ${groupId} - ${rootArtifactId}-boot + ${rootArtifactId}-startup ${revision} diff --git a/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/META-INF/maven/archetype-metadata.xml b/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/META-INF/maven/archetype-metadata.xml index 1ae0a3c..64ed10f 100644 --- a/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -35,7 +35,7 @@ - + src/main/java diff --git a/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/pom.xml b/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/pom.xml similarity index 95% rename from easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/pom.xml rename to easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/pom.xml index 9a9a08a..f85cb98 100644 --- a/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/pom.xml +++ b/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - ${rootArtifactId}-boot + ${rootArtifactId}-startup diff --git a/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/java/Bootstrap.java b/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/java/Bootstrap.java similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/java/Bootstrap.java rename to easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/java/Bootstrap.java diff --git a/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/java/configuration/SwaggerConfiguration.java b/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/java/configuration/SwaggerConfiguration.java similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/java/configuration/SwaggerConfiguration.java rename to easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/java/configuration/SwaggerConfiguration.java diff --git a/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/application.yml b/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/application.yml similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/application.yml rename to easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/application.yml diff --git a/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/config/application-citest.yml b/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/config/application-citest.yml similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/config/application-citest.yml rename to easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/config/application-citest.yml diff --git a/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/config/application-dev.yml b/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/config/application-dev.yml similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/config/application-dev.yml rename to easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/config/application-dev.yml diff --git a/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/config/application-gld.yml b/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/config/application-gld.yml similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/config/application-gld.yml rename to easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/config/application-gld.yml diff --git a/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/import.sql b/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/import.sql similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/import.sql rename to easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/import.sql diff --git a/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/logback.xml b/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/logback.xml similarity index 100% rename from easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-boot/src/main/resources/logback.xml rename to easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/__rootArtifactId__-startup/src/main/resources/logback.xml diff --git a/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/pom.xml b/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/pom.xml index 410fe1f..312f7a7 100644 --- a/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/pom.xml +++ b/easy-maven-plugins/easy-maven-archetype-springboot-mybatis/src/main/resources/archetype-resources/pom.xml @@ -9,7 +9,7 @@ pom ${revision} - ${rootArtifactId}-boot + ${rootArtifactId}-startup ${rootArtifactId}-common ${rootArtifactId}-core-service ${rootArtifactId}-core-model @@ -71,7 +71,7 @@ ${groupId} - ${rootArtifactId}-boot + ${rootArtifactId}-startup ${revision} diff --git a/easy-spring-boot-data-jpa/src/main/java/cn/org/easysite/spring/boot/jpa/entity/BaseEntity.java b/easy-spring-boot-data-jpa/src/main/java/cn/org/easysite/spring/boot/jpa/entity/BaseEntity.java index 40c8961..e684342 100644 --- a/easy-spring-boot-data-jpa/src/main/java/cn/org/easysite/spring/boot/jpa/entity/BaseEntity.java +++ b/easy-spring-boot-data-jpa/src/main/java/cn/org/easysite/spring/boot/jpa/entity/BaseEntity.java @@ -33,7 +33,7 @@ public class BaseEntity extends BaseObject { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id", columnDefinition = "bigint(20) COMMENT '主键ID,自动生成'") - @OrderBy("DESC") + @OrderBy(value = "DESC") private Long id; /**