From feb34bb0fe254ff5002d3cc4fa2059e80ebae4ef Mon Sep 17 00:00:00 2001
From: liaozan <liaoz@schbrain.com>
Date: Sat, 26 Mar 2022 21:59:39 +0800
Subject: [PATCH] chore: subModulePrefix

---
 .../META-INF/maven/archetype-metadata.xml     | 13 ++++++-----
 .../src/main/resources/application.yaml       |  6 -----
 .../pom.xml                                   |  6 ++---
 .../pom.xml                                   |  4 ++--
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  4 ++--
 .../pom.xml                                   |  6 ++---
 .../pom.xml                                   |  4 ++--
 .../src/main/java/Application.java            |  0
 .../resources/archetype-resources/pom.xml     | 22 +++++++++----------
 10 files changed, 31 insertions(+), 36 deletions(-)
 delete mode 100644 src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/resources/application.yaml
 rename src/main/resources/archetype-resources/{__rootArtifactId__-api-impl => __subModuleNamePrefix__-api-impl}/pom.xml (78%)
 rename src/main/resources/archetype-resources/{__rootArtifactId__-api => __subModuleNamePrefix__-api}/pom.xml (85%)
 rename src/main/resources/archetype-resources/{__rootArtifactId__-common => __subModuleNamePrefix__-common}/pom.xml (90%)
 rename src/main/resources/archetype-resources/{__rootArtifactId__-dao => __subModuleNamePrefix__-dao}/pom.xml (88%)
 rename src/main/resources/archetype-resources/{__rootArtifactId__-service => __subModuleNamePrefix__-service}/pom.xml (88%)
 rename src/main/resources/archetype-resources/{__rootArtifactId__-web => __subModuleNamePrefix__-web}/pom.xml (92%)
 rename src/main/resources/archetype-resources/{__rootArtifactId__-web => __subModuleNamePrefix__-web}/src/main/java/Application.java (100%)

diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
index 4a2ef97..46fdeda 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -4,6 +4,7 @@
     <requiredProperties>
         <requiredProperty key="groupId"/>
         <requiredProperty key="artifactId"/>
+        <requiredProperty key="subModuleNamePrefix"/>
     </requiredProperties>
 
     <fileSets>
@@ -18,7 +19,7 @@
         </fileSet>
     </fileSets>
     <modules>
-        <module id="${rootArtifactId}-api" dir="__rootArtifactId__-api" name="${rootArtifactId}-api">
+        <module id="${subModuleNamePrefix}-api" dir="__subModuleNamePrefix__-api" name="${subModuleNamePrefix}-api">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
@@ -34,7 +35,7 @@
                 </fileSet>
             </fileSets>
         </module>
-        <module id="${rootArtifactId}-api-impl" dir="__rootArtifactId__-api-impl" name="${rootArtifactId}-api-impl">
+        <module id="${subModuleNamePrefix}-api-impl" dir="__subModuleNamePrefix__-api-impl" name="${subModuleNamePrefix}-api-impl">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
@@ -50,7 +51,7 @@
                 </fileSet>
             </fileSets>
         </module>
-        <module id="${rootArtifactId}-common" dir="__rootArtifactId__-common" name="${rootArtifactId}-common">
+        <module id="${subModuleNamePrefix}-common" dir="__subModuleNamePrefix__-common" name="${subModuleNamePrefix}-common">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
@@ -66,7 +67,7 @@
                 </fileSet>
             </fileSets>
         </module>
-        <module id="${rootArtifactId}-dao" dir="__rootArtifactId__-dao" name="${rootArtifactId}-dao">
+        <module id="${subModuleNamePrefix}-dao" dir="__subModuleNamePrefix__-dao" name="${subModuleNamePrefix}-dao">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
@@ -88,7 +89,7 @@
                 </fileSet>
             </fileSets>
         </module>
-        <module id="${rootArtifactId}-service" dir="__rootArtifactId__-service" name="${rootArtifactId}-service">
+        <module id="${subModuleNamePrefix}-service" dir="__subModuleNamePrefix__-service" name="${subModuleNamePrefix}-service">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
@@ -104,7 +105,7 @@
                 </fileSet>
             </fileSets>
         </module>
-        <module id="${rootArtifactId}-web" dir="__rootArtifactId__-web" name="${rootArtifactId}-web">
+        <module id="${subModuleNamePrefix}-web" dir="__subModuleNamePrefix__-web" name="${subModuleNamePrefix}-web">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/resources/application.yaml b/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/resources/application.yaml
deleted file mode 100644
index d409676..0000000
--- a/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/resources/application.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-spring:
-  application:
-    name: ${rootArtifactId}
-apollo:
-  bootstrap:
-    namespaces: application,kp.common.spring.jdbc,kp.common.eureka
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-api-impl/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/pom.xml
similarity index 78%
rename from src/main/resources/archetype-resources/__rootArtifactId__-api-impl/pom.xml
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/pom.xml
index 5db6c64..f5251ae 100644
--- a/src/main/resources/archetype-resources/__rootArtifactId__-api-impl/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/pom.xml
@@ -11,7 +11,7 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>${artifactId}</artifactId>
+    <artifactId>${subModuleNamePrefix}-api-impl</artifactId>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
@@ -20,11 +20,11 @@
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>${rootArtifactId}-api</artifactId>
+            <artifactId>${subModuleNamePrefix}-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>${rootArtifactId}-service</artifactId>
+            <artifactId>${subModuleNamePrefix}-service</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api/pom.xml
similarity index 85%
rename from src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-api/pom.xml
index b3850a2..8120ab0 100644
--- a/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api/pom.xml
@@ -11,12 +11,12 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>${artifactId}</artifactId>
+    <artifactId>${subModuleNamePrefix}-api</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>${rootArtifactId}-common</artifactId>
+            <artifactId>${subModuleNamePrefix}-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-common/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-common/pom.xml
similarity index 90%
rename from src/main/resources/archetype-resources/__rootArtifactId__-common/pom.xml
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-common/pom.xml
index 7dc9ef3..1a7e22a 100644
--- a/src/main/resources/archetype-resources/__rootArtifactId__-common/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-common/pom.xml
@@ -11,7 +11,7 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>${artifactId}</artifactId>
+    <artifactId>${subModuleNamePrefix}-common</artifactId>
 
     <dependencies>
         <dependency>
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-dao/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-dao/pom.xml
similarity index 88%
rename from src/main/resources/archetype-resources/__rootArtifactId__-dao/pom.xml
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-dao/pom.xml
index ff6f9bf..2ca72a1 100644
--- a/src/main/resources/archetype-resources/__rootArtifactId__-dao/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-dao/pom.xml
@@ -11,7 +11,7 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>${artifactId}</artifactId>
+    <artifactId>${subModuleNamePrefix}-dao</artifactId>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
@@ -20,7 +20,7 @@
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>${rootArtifactId}-common</artifactId>
+            <artifactId>${subModuleNamePrefix}-common</artifactId>
         </dependency>
         <dependency>
             <groupId>com.schbrain.framework</groupId>
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-service/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-service/pom.xml
similarity index 88%
rename from src/main/resources/archetype-resources/__rootArtifactId__-service/pom.xml
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-service/pom.xml
index 073b427..c5d026e 100644
--- a/src/main/resources/archetype-resources/__rootArtifactId__-service/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-service/pom.xml
@@ -11,7 +11,7 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>${artifactId}</artifactId>
+    <artifactId>${subModuleNamePrefix}-service</artifactId>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
@@ -20,11 +20,11 @@
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>${rootArtifactId}-dao</artifactId>
+            <artifactId>${subModuleNamePrefix}-dao</artifactId>
         </dependency>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>${rootArtifactId}-api</artifactId>
+            <artifactId>${subModuleNamePrefix}-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.schbrain.framework</groupId>
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/pom.xml
similarity index 92%
rename from src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-web/pom.xml
index a09cdb1..2bdcf48 100644
--- a/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/pom.xml
@@ -11,7 +11,7 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>${rootArtifactId}-web</artifactId>
+    <artifactId>${subModuleNamePrefix}-web</artifactId>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
@@ -20,7 +20,7 @@
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>${rootArtifactId}-api-impl</artifactId>
+            <artifactId>${subModuleNamePrefix}-api-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>com.schbrain.common</groupId>
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/Application.java b/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/src/main/java/Application.java
similarity index 100%
rename from src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/Application.java
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-web/src/main/java/Application.java
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index fbab78e..ff2d115 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -21,39 +21,39 @@
     </properties>
 
     <modules>
-        <module>${rootArtifactId}-api</module>
-        <module>${rootArtifactId}-api-impl</module>
-        <module>${rootArtifactId}-common</module>
-        <module>${rootArtifactId}-dao</module>
-        <module>${rootArtifactId}-service</module>
-        <module>${rootArtifactId}-web</module>
+        <module>${subModuleNamePrefix}-api</module>
+        <module>${subModuleNamePrefix}-api-impl</module>
+        <module>${subModuleNamePrefix}-common</module>
+        <module>${subModuleNamePrefix}-dao</module>
+        <module>${subModuleNamePrefix}-service</module>
+        <module>${subModuleNamePrefix}-web</module>
     </modules>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>${rootArtifactId}-api</artifactId>
+                <artifactId>${subModuleNamePrefix}-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>${rootArtifactId}-api-impl</artifactId>
+                <artifactId>${subModuleNamePrefix}-api-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>${rootArtifactId}-common</artifactId>
+                <artifactId>${subModuleNamePrefix}-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>${rootArtifactId}-dao</artifactId>
+                <artifactId>${subModuleNamePrefix}-dao</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>${rootArtifactId}-service</artifactId>
+                <artifactId>${subModuleNamePrefix}-service</artifactId>
                 <version>${project.version}</version>
             </dependency>
         </dependencies>
-- 
GitLab