From 03fb02c6b1f622f4904cdeb368f4e674d03d8113 Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Mon, 20 Mar 2023 17:48:13 +0800
Subject: [PATCH] Update archetype struct

---
 .../META-INF/maven/archetype-metadata.xml     | 16 ++++++
 .../__subModuleNamePrefix__-api-impl/.gitkeep |  1 +
 .../__subModuleNamePrefix__-api-impl/pom.xml  |  6 +-
 .../__subModuleNamePrefix__-api/.gitkeep      |  1 +
 .../__subModuleNamePrefix__-api/pom.xml       |  4 +-
 .../__subModuleNamePrefix__-common/.gitkeep   |  1 +
 .../__subModuleNamePrefix__-common/pom.xml    |  4 +-
 .../__subModuleNamePrefix__-dal/.gitkeep      |  1 +
 .../__subModuleNamePrefix__-dal/pom.xml       |  4 +-
 .../__subModuleNamePrefix__-facade/.gitkeep   |  1 +
 .../__subModuleNamePrefix__-facade/pom.xml    |  4 +-
 .../__subModuleNamePrefix__-service/.gitkeep  |  1 +
 .../__subModuleNamePrefix__-service/pom.xml   |  4 +-
 .../__subModuleNamePrefix__-starter/.gitkeep  |  1 +
 .../__subModuleNamePrefix__-starter/pom.xml   | 57 +++++++++++++++++++
 .../src/main/java/Application.java            |  0
 .../src/main/resources/application.yaml       |  0
 .../src/test/java/ApplicationTest.java        |  0
 .../src/test/resources/application.yaml       |  0
 .../__subModuleNamePrefix__-web/.gitkeep      |  1 +
 .../__subModuleNamePrefix__-web/pom.xml       | 30 +---------
 .../resources/archetype-resources/pom.xml     | 10 ++++
 22 files changed, 106 insertions(+), 41 deletions(-)
 create mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/.gitkeep
 create mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-api/.gitkeep
 create mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-common/.gitkeep
 create mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-dal/.gitkeep
 create mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-facade/.gitkeep
 create mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-service/.gitkeep
 create mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/.gitkeep
 create mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/pom.xml
 rename src/main/resources/archetype-resources/{__subModuleNamePrefix__-web => __subModuleNamePrefix__-starter}/src/main/java/Application.java (100%)
 rename src/main/resources/archetype-resources/{__subModuleNamePrefix__-web => __subModuleNamePrefix__-starter}/src/main/resources/application.yaml (100%)
 rename src/main/resources/archetype-resources/{__subModuleNamePrefix__-web => __subModuleNamePrefix__-starter}/src/test/java/ApplicationTest.java (100%)
 rename src/main/resources/archetype-resources/{__subModuleNamePrefix__-web => __subModuleNamePrefix__-starter}/src/test/resources/application.yaml (100%)
 create mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-web/.gitkeep

diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
index c04af24..90e2c9d 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -122,6 +122,22 @@
             </fileSets>
         </module>
         <module id="${subModuleNamePrefix}-web" dir="__subModuleNamePrefix__-web" name="${subModuleNamePrefix}-web">
+            <fileSets>
+                <fileSet filtered="true" encoding="UTF-8" packaged="true">
+                    <directory>src/main/java</directory>
+                    <includes>
+                        <include>**/*.java</include>
+                    </includes>
+                </fileSet>
+                <fileSet filtered="true" encoding="UTF-8">
+                    <directory/>
+                    <includes>
+                        <include>pom.xml</include>
+                    </includes>
+                </fileSet>
+            </fileSets>
+        </module>
+        <module id="${subModuleNamePrefix}-starter" dir="__subModuleNamePrefix__-starter" name="${subModuleNamePrefix}-starter">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/.gitkeep b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/.gitkeep
new file mode 100644
index 0000000..ae3a4cb
--- /dev/null
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/.gitkeep
@@ -0,0 +1 @@
+Remove me after you add files in this module
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/pom.xml
index f5251ae..3239cd3 100644
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>${subModuleNamePrefix}-service</artifactId>
+            <artifactId>${subModuleNamePrefix}-facade</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-api/.gitkeep b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api/.gitkeep
new file mode 100644
index 0000000..ae3a4cb
--- /dev/null
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api/.gitkeep
@@ -0,0 +1 @@
+Remove me after you add files in this module
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-api/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api/pom.xml
index 16a4310..d0511a9 100644
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-api/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-common/.gitkeep b/src/main/resources/archetype-resources/__subModuleNamePrefix__-common/.gitkeep
new file mode 100644
index 0000000..ae3a4cb
--- /dev/null
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-common/.gitkeep
@@ -0,0 +1 @@
+Remove me after you add files in this module
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-common/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-common/pom.xml
index 1a7e22a..07dcf7f 100644
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-common/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-dal/.gitkeep b/src/main/resources/archetype-resources/__subModuleNamePrefix__-dal/.gitkeep
new file mode 100644
index 0000000..ae3a4cb
--- /dev/null
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-dal/.gitkeep
@@ -0,0 +1 @@
+Remove me after you add files in this module
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-dal/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-dal/pom.xml
index f995b0c..2e4f63d 100644
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-dal/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-dal/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-facade/.gitkeep b/src/main/resources/archetype-resources/__subModuleNamePrefix__-facade/.gitkeep
new file mode 100644
index 0000000..ae3a4cb
--- /dev/null
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-facade/.gitkeep
@@ -0,0 +1 @@
+Remove me after you add files in this module
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-facade/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-facade/pom.xml
index c090e35..245647c 100644
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-facade/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-facade/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-service/.gitkeep b/src/main/resources/archetype-resources/__subModuleNamePrefix__-service/.gitkeep
new file mode 100644
index 0000000..ae3a4cb
--- /dev/null
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-service/.gitkeep
@@ -0,0 +1 @@
+Remove me after you add files in this module
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-service/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-service/pom.xml
index f116b13..f149822 100644
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-service/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-service/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/.gitkeep b/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/.gitkeep
new file mode 100644
index 0000000..ae3a4cb
--- /dev/null
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/.gitkeep
@@ -0,0 +1 @@
+Remove me after you add files in this module
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/pom.xml
new file mode 100644
index 0000000..4b51345
--- /dev/null
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>${groupId}</groupId>
+        <artifactId>${rootArtifactId}</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>${subModuleNamePrefix}-starter</artifactId>
+
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>${subModuleNamePrefix}-api-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>${subModuleNamePrefix}-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.schbrain.framework</groupId>
+            <artifactId>logger-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.schbrain.maven.plugin</groupId>
+                <artifactId>integration-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>io.github.git-commit-id</groupId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/src/main/java/Application.java b/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/src/main/java/Application.java
similarity index 100%
rename from src/main/resources/archetype-resources/__subModuleNamePrefix__-web/src/main/java/Application.java
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/src/main/java/Application.java
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/src/main/resources/application.yaml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/src/main/resources/application.yaml
similarity index 100%
rename from src/main/resources/archetype-resources/__subModuleNamePrefix__-web/src/main/resources/application.yaml
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/src/main/resources/application.yaml
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/src/test/java/ApplicationTest.java b/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/src/test/java/ApplicationTest.java
similarity index 100%
rename from src/main/resources/archetype-resources/__subModuleNamePrefix__-web/src/test/java/ApplicationTest.java
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/src/test/java/ApplicationTest.java
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/src/test/resources/application.yaml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/src/test/resources/application.yaml
similarity index 100%
rename from src/main/resources/archetype-resources/__subModuleNamePrefix__-web/src/test/resources/application.yaml
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/src/test/resources/application.yaml
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/.gitkeep b/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/.gitkeep
new file mode 100644
index 0000000..ae3a4cb
--- /dev/null
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/.gitkeep
@@ -0,0 +1 @@
+Remove me after you add files in this module
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/pom.xml
index dc032ea..449582c 100644
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -26,32 +26,6 @@
             <groupId>com.schbrain.common</groupId>
             <artifactId>web-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.schbrain.framework</groupId>
-            <artifactId>logger-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>com.schbrain.maven.plugin</groupId>
-                <artifactId>integration-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>io.github.git-commit-id</groupId>
-                <artifactId>git-commit-id-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index c8a8d82..bacbe0e 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -62,6 +62,16 @@
                 <artifactId>${subModuleNamePrefix}-facade</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${groupId}</groupId>
+                <artifactId>${subModuleNamePrefix}-web</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${groupId}</groupId>
+                <artifactId>${subModuleNamePrefix}-starter</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
-- 
GitLab