From fcbe682715f9e45c0a348d85c477ec8ddf4b8a78 Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Sat, 19 Mar 2022 15:09:14 +0800
Subject: [PATCH] chore: update dependency

---
 .../META-INF/maven/archetype-metadata.xml     | 34 +++++---------
 .../pom.xml                                   | 10 ++--
 .../pom.xml                                   |  9 ++--
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   | 12 +++--
 .../src/main/resources/mapper/.gitkeep        |  0
 .../pom.xml                                   | 31 +++++++------
 .../pom.xml                                   | 18 +++++---
 .../src/main/java/Application.java            |  2 +-
 .../src/main/resources/application.yaml       |  0
 .../resources/archetype-resources/pom.xml     | 46 +++++++++----------
 11 files changed, 80 insertions(+), 84 deletions(-)
 rename src/main/resources/archetype-resources/{__appName__-api-impl => __rootArtifactId__-api-impl}/pom.xml (67%)
 rename src/main/resources/archetype-resources/{__appName__-api => __rootArtifactId__-api}/pom.xml (82%)
 rename src/main/resources/archetype-resources/{__appName__-common => __rootArtifactId__-common}/pom.xml (91%)
 rename src/main/resources/archetype-resources/{__appName__-dao => __rootArtifactId__-dao}/pom.xml (72%)
 rename src/main/resources/archetype-resources/{__appName__-dao => __rootArtifactId__-dao}/src/main/resources/mapper/.gitkeep (100%)
 rename src/main/resources/archetype-resources/{__appName__-service => __rootArtifactId__-service}/pom.xml (51%)
 rename src/main/resources/archetype-resources/{__appName__-web => __rootArtifactId__-web}/pom.xml (70%)
 rename src/main/resources/archetype-resources/{__appName__-web => __rootArtifactId__-web}/src/main/java/Application.java (93%)
 rename src/main/resources/archetype-resources/{__appName__-web => __rootArtifactId__-web}/src/main/resources/application.yaml (100%)

diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
index 04a04de..ddeb543 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -1,33 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor name="my-archetype">
+<archetype-descriptor name="schbrain-archetype">
 
     <requiredProperties>
-        <requiredProperty key="groupId">
-            <defaultValue>com.schbrain.kp</defaultValue>
-        </requiredProperty>
-        <requiredProperty key="artifactId">
-            <defaultValue>notice</defaultValue>
-        </requiredProperty>
-        <requiredProperty key="package">
-            <defaultValue>com.schbrain.kp.notice</defaultValue>
-        </requiredProperty>
-        <requiredProperty key="appName">
-            <defaultValue>app</defaultValue>
-        </requiredProperty>
+        <requiredProperty key="groupId"/>
+        <requiredProperty key="artifactId"/>
     </requiredProperties>
 
     <fileSets>
         <fileSet encoding="UTF-8" filtered="true">
-            <directory></directory>
+            <directory/>
             <includes>
                 <include>.gitignore</include>
                 <include>*.xml</include>
                 <include>*.properties</include>
+                <include>.gitkeep</include>
             </includes>
         </fileSet>
     </fileSets>
     <modules>
-        <module id="${appName}-api" dir="__appName__-api" name="${appName}-api">
+        <module id="${rootArtifactId}-api" dir="__rootArtifactId__-api" name="${rootArtifactId}-api">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
@@ -43,7 +34,7 @@
                 </fileSet>
             </fileSets>
         </module>
-        <module id="${appName}-api-impl" dir="__appName__-api-impl" name="${appName}-api-impl">
+        <module id="${rootArtifactId}-api-impl" dir="__rootArtifactId__-api-impl" name="${rootArtifactId}-api-impl">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
@@ -65,7 +56,7 @@
                 </fileSet>
             </fileSets>
         </module>
-        <module id="${appName}-common" dir="__appName__-common" name="${appName}-common">
+        <module id="${rootArtifactId}-common" dir="__rootArtifactId__-common" name="${rootArtifactId}-common">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
@@ -87,7 +78,7 @@
                 </fileSet>
             </fileSets>
         </module>
-        <module id="${appName}-dao" dir="__appName__-dao" name="${appName}-dao">
+        <module id="${rootArtifactId}-dao" dir="__rootArtifactId__-dao" name="${rootArtifactId}-dao">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
@@ -109,7 +100,7 @@
                 </fileSet>
             </fileSets>
         </module>
-        <module id="${appName}-service" dir="__appName__-service" name="${appName}-service">
+        <module id="${rootArtifactId}-service" dir="__rootArtifactId__-service" name="${rootArtifactId}-service">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
@@ -125,7 +116,7 @@
                 </fileSet>
             </fileSets>
         </module>
-        <module id="${appName}-web" dir="__appName__-web" name="${appName}-web">
+        <module id="${rootArtifactId}-web" dir="__rootArtifactId__-web" name="${rootArtifactId}-web">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
@@ -134,15 +125,12 @@
                         <include>**/*.txt</include>
                     </includes>
                 </fileSet>
-
-
                 <fileSet filtered="true" encoding="UTF-8" packaged="false">
                     <directory>src/main/resources</directory>
                     <includes>
                         <include>**/*.*</include>
                     </includes>
                 </fileSet>
-
                 <fileSet filtered="true" encoding="UTF-8">
                     <directory/>
                     <includes>
diff --git a/src/main/resources/archetype-resources/__appName__-api-impl/pom.xml b/src/main/resources/archetype-resources/__rootArtifactId__-api-impl/pom.xml
similarity index 67%
rename from src/main/resources/archetype-resources/__appName__-api-impl/pom.xml
rename to src/main/resources/archetype-resources/__rootArtifactId__-api-impl/pom.xml
index 2724787..5db6c64 100644
--- a/src/main/resources/archetype-resources/__appName__-api-impl/pom.xml
+++ b/src/main/resources/archetype-resources/__rootArtifactId__-api-impl/pom.xml
@@ -11,7 +11,7 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>${appName}-api-impl</artifactId>
+    <artifactId>${artifactId}</artifactId>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
@@ -19,8 +19,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.schbrain.kp</groupId>
-            <artifactId>${appName}-service</artifactId>
+            <groupId>${groupId}</groupId>
+            <artifactId>${rootArtifactId}-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>${rootArtifactId}-service</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/src/main/resources/archetype-resources/__appName__-api/pom.xml b/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml
similarity index 82%
rename from src/main/resources/archetype-resources/__appName__-api/pom.xml
rename to src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml
index 896bd52..b3850a2 100644
--- a/src/main/resources/archetype-resources/__appName__-api/pom.xml
+++ b/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml
@@ -11,21 +11,18 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>${appName}-api</artifactId>
+    <artifactId>${artifactId}</artifactId>
 
     <dependencies>
-
         <dependency>
-            <groupId>com.schbrain.kp</groupId>
-            <artifactId>${appName}-common</artifactId>
+            <groupId>${groupId}</groupId>
+            <artifactId>${rootArtifactId}-common</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__appName__-common/pom.xml b/src/main/resources/archetype-resources/__rootArtifactId__-common/pom.xml
similarity index 91%
rename from src/main/resources/archetype-resources/__appName__-common/pom.xml
rename to src/main/resources/archetype-resources/__rootArtifactId__-common/pom.xml
index c82b89d..7dc9ef3 100644
--- a/src/main/resources/archetype-resources/__appName__-common/pom.xml
+++ b/src/main/resources/archetype-resources/__rootArtifactId__-common/pom.xml
@@ -11,7 +11,7 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>${appName}-common</artifactId>
+    <artifactId>${artifactId}</artifactId>
 
     <dependencies>
         <dependency>
diff --git a/src/main/resources/archetype-resources/__appName__-dao/pom.xml b/src/main/resources/archetype-resources/__rootArtifactId__-dao/pom.xml
similarity index 72%
rename from src/main/resources/archetype-resources/__appName__-dao/pom.xml
rename to src/main/resources/archetype-resources/__rootArtifactId__-dao/pom.xml
index ee2eef3..ff6f9bf 100644
--- a/src/main/resources/archetype-resources/__appName__-dao/pom.xml
+++ b/src/main/resources/archetype-resources/__rootArtifactId__-dao/pom.xml
@@ -11,7 +11,7 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>${appName}-dao</artifactId>
+    <artifactId>${artifactId}</artifactId>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
@@ -19,15 +19,17 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.schbrain.kp</groupId>
-            <artifactId>${appName}-common</artifactId>
+            <groupId>${groupId}</groupId>
+            <artifactId>${rootArtifactId}-common</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.schbrain.framework</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__appName__-dao/src/main/resources/mapper/.gitkeep b/src/main/resources/archetype-resources/__rootArtifactId__-dao/src/main/resources/mapper/.gitkeep
similarity index 100%
rename from src/main/resources/archetype-resources/__appName__-dao/src/main/resources/mapper/.gitkeep
rename to src/main/resources/archetype-resources/__rootArtifactId__-dao/src/main/resources/mapper/.gitkeep
diff --git a/src/main/resources/archetype-resources/__appName__-service/pom.xml b/src/main/resources/archetype-resources/__rootArtifactId__-service/pom.xml
similarity index 51%
rename from src/main/resources/archetype-resources/__appName__-service/pom.xml
rename to src/main/resources/archetype-resources/__rootArtifactId__-service/pom.xml
index 30f4e7c..073b427 100644
--- a/src/main/resources/archetype-resources/__appName__-service/pom.xml
+++ b/src/main/resources/archetype-resources/__rootArtifactId__-service/pom.xml
@@ -1,5 +1,8 @@
 <?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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 
     <parent>
@@ -8,39 +11,41 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>${appName}-service</artifactId>
+    <artifactId>${artifactId}</artifactId>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
     <dependencies>
-
         <dependency>
-            <groupId>com.schbrain.kp</groupId>
-            <artifactId>${appName}-dao</artifactId>
+            <groupId>${groupId}</groupId>
+            <artifactId>${rootArtifactId}-dao</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>com.schbrain.kp</groupId>
-            <artifactId>${appName}-api</artifactId>
+            <groupId>${groupId}</groupId>
+            <artifactId>${rootArtifactId}-api</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.schbrain.framework</groupId>
-            <artifactId>logger-spring-boot-starter</artifactId>
+            <artifactId>oss-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.schbrain.framework</groupId>
+            <artifactId>dubbo-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__appName__-web/pom.xml b/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
similarity index 70%
rename from src/main/resources/archetype-resources/__appName__-web/pom.xml
rename to src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
index d4519b9..a09cdb1 100644
--- a/src/main/resources/archetype-resources/__appName__-web/pom.xml
+++ b/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
@@ -1,5 +1,8 @@
 <?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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 
     <parent>
@@ -8,24 +11,25 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>${appName}-web</artifactId>
+    <artifactId>${rootArtifactId}-web</artifactId>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
     <dependencies>
-
         <dependency>
-            <groupId>com.schbrain.kp</groupId>
-            <artifactId>${appName}-api-impl</artifactId>
+            <groupId>${groupId}</groupId>
+            <artifactId>${rootArtifactId}-api-impl</artifactId>
         </dependency>
-
         <dependency>
             <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>
diff --git a/src/main/resources/archetype-resources/__appName__-web/src/main/java/Application.java b/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/Application.java
similarity index 93%
rename from src/main/resources/archetype-resources/__appName__-web/src/main/java/Application.java
rename to src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/Application.java
index ef3afba..5bcd631 100644
--- a/src/main/resources/archetype-resources/__appName__-web/src/main/java/Application.java
+++ b/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/Application.java
@@ -1,4 +1,4 @@
-package $
+package ${package};
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/main/resources/archetype-resources/__appName__-web/src/main/resources/application.yaml b/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/resources/application.yaml
similarity index 100%
rename from src/main/resources/archetype-resources/__appName__-web/src/main/resources/application.yaml
rename to src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/resources/application.yaml
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index c4c19c4..fbab78e 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -1,6 +1,8 @@
 <?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: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>
 
     <parent>
@@ -15,52 +17,46 @@
     <version>${revision}</version>
 
     <properties>
-        <revision>1.0.0-SNAPSHOT</revision>
+        <revision>${version}</revision>
     </properties>
 
     <modules>
-        <module>${appName}-api</module>
-        <module>${appName}-api-impl</module>
-        <module>${appName}-common</module>
-        <module>${appName}-dao</module>
-        <module>${appName}-service</module>
-        <module>${appName}-web</module>
+        <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>
     </modules>
 
     <dependencyManagement>
         <dependencies>
-            <!--一方库-->
-            <dependency>
-                <groupId>com.schbrain.kp</groupId>
-                <artifactId>${appName}-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
-                <groupId>com.schbrain.kp</groupId>
-                <artifactId>${appName}-api-impl</artifactId>
+                <groupId>${groupId}</groupId>
+                <artifactId>${rootArtifactId}-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.schbrain.kp</groupId>
-                <artifactId>${appName}-common</artifactId>
+                <groupId>${groupId}</groupId>
+                <artifactId>${rootArtifactId}-api-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.schbrain.kp</groupId>
-                <artifactId>${appName}-dao</artifactId>
+                <groupId>${groupId}</groupId>
+                <artifactId>${rootArtifactId}-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.schbrain.kp</groupId>
-                <artifactId>${appName}-service</artifactId>
+                <groupId>${groupId}</groupId>
+                <artifactId>${rootArtifactId}-dao</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.schbrain.kp</groupId>
-                <artifactId>${appName}-web</artifactId>
+                <groupId>${groupId}</groupId>
+                <artifactId>${rootArtifactId}-service</artifactId>
                 <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
-</project>
+</project>
\ No newline at end of file
-- 
GitLab