From cd5ec0cfd79fafb69100078b916ae8977b3ea4d3 Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Sat, 19 Mar 2022 12:47:16 +0800
Subject: [PATCH] chore: update archetype

---
 pom.xml                                       | 29 ++++++++-----------
 .../__appName__-api-impl/pom.xml              |  7 +++--
 .../__appName__-api/pom.xml                   | 15 ++++++++--
 .../__appName__-common/pom.xml                |  7 +++--
 .../__appName__-dao/pom.xml                   | 11 ++++---
 .../src/main/resources/mapper/.gitkeep        |  0
 .../__appName__-service/pom.xml               |  9 ++++--
 .../__appName__-web/pom.xml                   |  4 +--
 .../src/main/java/Application.java            |  4 +--
 .../src/main/resources/application.yaml       | 14 +--------
 10 files changed, 52 insertions(+), 48 deletions(-)
 create mode 100644 src/main/resources/archetype-resources/__appName__-dao/src/main/resources/mapper/.gitkeep

diff --git a/pom.xml b/pom.xml
index 1d0a75d..f7c6c7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,23 +1,18 @@
 <?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.schbrain.kp</groupId>
-  <artifactId>schbrain-archetype</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <name>schbrain-archetype</name>
-
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-  </properties>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
+    <groupId>com.schbrain.kp</groupId>
+    <artifactId>schbrain-archetype</artifactId>
+    <version>1.0-SNAPSHOT</version>
 
+    <name>schbrain-archetype</name>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__appName__-api-impl/pom.xml b/src/main/resources/archetype-resources/__appName__-api-impl/pom.xml
index a118754..2724787 100644
--- a/src/main/resources/archetype-resources/__appName__-api-impl/pom.xml
+++ b/src/main/resources/archetype-resources/__appName__-api-impl/pom.xml
@@ -1,5 +1,8 @@
 <?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">
+<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>
@@ -21,4 +24,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__appName__-api/pom.xml b/src/main/resources/archetype-resources/__appName__-api/pom.xml
index 9e73e09..896bd52 100644
--- a/src/main/resources/archetype-resources/__appName__-api/pom.xml
+++ b/src/main/resources/archetype-resources/__appName__-api/pom.xml
@@ -1,5 +1,8 @@
 <?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">
+<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>
@@ -11,10 +14,18 @@
     <artifactId>${appName}-api</artifactId>
 
     <dependencies>
+
         <dependency>
             <groupId>com.schbrain.kp</groupId>
             <artifactId>${appName}-common</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
-</project>
+</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/__appName__-common/pom.xml
index 39064f3..c82b89d 100644
--- a/src/main/resources/archetype-resources/__appName__-common/pom.xml
+++ b/src/main/resources/archetype-resources/__appName__-common/pom.xml
@@ -1,5 +1,8 @@
 <?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">
+<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>
@@ -17,4 +20,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__appName__-dao/pom.xml b/src/main/resources/archetype-resources/__appName__-dao/pom.xml
index f78afbd..ee2eef3 100644
--- a/src/main/resources/archetype-resources/__appName__-dao/pom.xml
+++ b/src/main/resources/archetype-resources/__appName__-dao/pom.xml
@@ -1,5 +1,8 @@
 <?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">
+<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>
@@ -25,10 +28,6 @@
             <artifactId>mybatis-spring-boot-starter</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-        </dependency>
     </dependencies>
 
-</project>
+</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/__appName__-dao/src/main/resources/mapper/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/resources/archetype-resources/__appName__-service/pom.xml b/src/main/resources/archetype-resources/__appName__-service/pom.xml
index 38bc690..30f4e7c 100644
--- a/src/main/resources/archetype-resources/__appName__-service/pom.xml
+++ b/src/main/resources/archetype-resources/__appName__-service/pom.xml
@@ -1,5 +1,5 @@
 <?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">
+<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>
@@ -36,6 +36,11 @@
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
     </dependencies>
 
-</project>
+</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/__appName__-web/pom.xml
index 8db85a0..d4519b9 100644
--- a/src/main/resources/archetype-resources/__appName__-web/pom.xml
+++ b/src/main/resources/archetype-resources/__appName__-web/pom.xml
@@ -1,5 +1,5 @@
 <?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">
+<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>
@@ -50,4 +50,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__appName__-web/src/main/java/Application.java b/src/main/resources/archetype-resources/__appName__-web/src/main/java/Application.java
index faba0a6..ef3afba 100644
--- a/src/main/resources/archetype-resources/__appName__-web/src/main/java/Application.java
+++ b/src/main/resources/archetype-resources/__appName__-web/src/main/java/Application.java
@@ -1,4 +1,4 @@
-package ${package};
+package $
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -10,4 +10,4 @@ public class Application {
         SpringApplication.run(Application.class, args);
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__appName__-web/src/main/resources/application.yaml b/src/main/resources/archetype-resources/__appName__-web/src/main/resources/application.yaml
index d777b4c..7d70f27 100644
--- a/src/main/resources/archetype-resources/__appName__-web/src/main/resources/application.yaml
+++ b/src/main/resources/archetype-resources/__appName__-web/src/main/resources/application.yaml
@@ -5,16 +5,4 @@ spring:
     active: dev
 apollo:
   bootstrap:
-    namespaces: kp.common.spring.jdbc
-eureka:
-  client:
-    service-url:
-      defaultZone: http://kp-register-center:18080/eureka/
-  instance:
-    prefer-ip-address: true
-    lease-renewal-interval-in-seconds: 5
-    lease-expiration-duration-in-seconds: 15
-schbrain:
-  logging:
-    file:
-      enable-json-log-write-to-logstash: true
\ No newline at end of file
+    namespaces: application,kp.common.spring.jdbc,kp.common.eureka
\ No newline at end of file
-- 
GitLab