From fddb871ae0a6de3490efcc00c84650d5345a7d57 Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Mon, 20 Mar 2023 18:32:58 +0800
Subject: [PATCH] Update archetype struct

---
 .../META-INF/maven/archetype-metadata.xml     | 40 ++++++++++---------
 .../{.gitignore => __gitignore__}             |  0
 .../__subModuleNamePrefix__-api-impl/.gitkeep |  1 -
 .../__subModuleNamePrefix__-api-impl/pom.xml  |  4 +-
 .../__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    | 12 +++++-
 .../__subModuleNamePrefix__-service/.gitkeep  |  1 -
 .../__subModuleNamePrefix__-service/pom.xml   | 20 +---------
 .../__subModuleNamePrefix__-starter/.gitkeep  |  1 -
 .../__subModuleNamePrefix__-starter/pom.xml   |  4 +-
 .../__subModuleNamePrefix__-web/.gitkeep      |  1 -
 .../__subModuleNamePrefix__-web/pom.xml       |  4 +-
 .../resources/archetype-resources/pom.xml     | 11 ++---
 19 files changed, 51 insertions(+), 64 deletions(-)
 rename src/main/resources/archetype-resources/{.gitignore => __gitignore__} (100%)
 delete mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/.gitkeep
 delete mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-api/.gitkeep
 delete mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-common/.gitkeep
 delete mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-dal/.gitkeep
 delete mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-facade/.gitkeep
 delete mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-service/.gitkeep
 delete mode 100644 src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/.gitkeep
 delete 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 90e2c9d..45dd6a4 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -5,16 +5,18 @@
         <requiredProperty key="groupId"/>
         <requiredProperty key="artifactId"/>
         <requiredProperty key="subModuleNamePrefix"/>
+        <requiredProperty key="gitignore">
+            <defaultValue>.gitignore</defaultValue>
+        </requiredProperty>
     </requiredProperties>
 
     <fileSets>
         <fileSet encoding="UTF-8" filtered="true">
             <directory/>
             <includes>
-                <include>.gitignore</include>
+                <include>__gitignore__</include>
                 <include>*.xml</include>
                 <include>*.properties</include>
-                <include>.gitkeep</include>
             </includes>
         </fileSet>
     </fileSets>
@@ -89,22 +91,6 @@
                 </fileSet>
             </fileSets>
         </module>
-        <module id="${subModuleNamePrefix}-service" dir="__subModuleNamePrefix__-service" name="${subModuleNamePrefix}-service">
-            <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}-facade" dir="__subModuleNamePrefix__-facade" name="${subModuleNamePrefix}-facade">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
@@ -121,7 +107,7 @@
                 </fileSet>
             </fileSets>
         </module>
-        <module id="${subModuleNamePrefix}-web" dir="__subModuleNamePrefix__-web" name="${subModuleNamePrefix}-web">
+        <module id="${subModuleNamePrefix}-service" dir="__subModuleNamePrefix__-service" name="${subModuleNamePrefix}-service">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
@@ -171,5 +157,21 @@
                 </fileSet>
             </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>
     </modules>
 </archetype-descriptor>
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/.gitignore b/src/main/resources/archetype-resources/__gitignore__
similarity index 100%
rename from src/main/resources/archetype-resources/.gitignore
rename to src/main/resources/archetype-resources/__gitignore__
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/.gitkeep b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/.gitkeep
deleted file mode 100644
index ae3a4cb..0000000
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-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 3239cd3..891201f 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="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          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__-api/.gitkeep b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api/.gitkeep
deleted file mode 100644
index ae3a4cb..0000000
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-api/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-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 d0511a9..16a4310 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="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          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
deleted file mode 100644
index ae3a4cb..0000000
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-common/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-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 07dcf7f..1a7e22a 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="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          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
deleted file mode 100644
index ae3a4cb..0000000
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-dal/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-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 2e4f63d..f995b0c 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="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          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
deleted file mode 100644
index ae3a4cb..0000000
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-facade/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-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 245647c..e8c85e2 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="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          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>
@@ -22,6 +22,14 @@
             <groupId>${groupId}</groupId>
             <artifactId>${subModuleNamePrefix}-service</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.schbrain.framework</groupId>
+            <artifactId>cache-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.schbrain.framework</groupId>
+            <artifactId>dubbo-spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-service/.gitkeep b/src/main/resources/archetype-resources/__subModuleNamePrefix__-service/.gitkeep
deleted file mode 100644
index ae3a4cb..0000000
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-service/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-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 f149822..7d6eb89 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="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          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>
@@ -18,26 +18,10 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.schbrain.common</groupId>
-            <artifactId>common-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>${groupId}</groupId>
             <artifactId>${subModuleNamePrefix}-dal</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.schbrain.framework</groupId>
-            <artifactId>cache-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.schbrain.framework</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.schbrain.framework</groupId>
-            <artifactId>oss-spring-boot-starter</artifactId>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/.gitkeep b/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/.gitkeep
deleted file mode 100644
index ae3a4cb..0000000
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-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
index 4b51345..4f87e49 100644
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/pom.xml
@@ -1,6 +1,6 @@
 <?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"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          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__-web/.gitkeep b/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/.gitkeep
deleted file mode 100644
index ae3a4cb..0000000
--- a/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-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 449582c..198990b 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="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          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/pom.xml b/src/main/resources/archetype-resources/pom.xml
index bacbe0e..d44b87d 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -27,6 +27,7 @@
         <module>${subModuleNamePrefix}-dal</module>
         <module>${subModuleNamePrefix}-facade</module>
         <module>${subModuleNamePrefix}-service</module>
+        <module>${subModuleNamePrefix}-starter</module>
         <module>${subModuleNamePrefix}-web</module>
     </modules>
 
@@ -54,25 +55,25 @@
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>${subModuleNamePrefix}-service</artifactId>
+                <artifactId>${subModuleNamePrefix}-facade</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>${subModuleNamePrefix}-facade</artifactId>
+                <artifactId>${subModuleNamePrefix}-service</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>${subModuleNamePrefix}-web</artifactId>
+                <artifactId>${subModuleNamePrefix}-starter</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>${subModuleNamePrefix}-starter</artifactId>
+                <artifactId>${subModuleNamePrefix}-web</artifactId>
                 <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
-</project>
\ No newline at end of file
+</project>
-- 
GitLab