From 1dfc502479a4cb9f86f8952cabec0febf987c97f Mon Sep 17 00:00:00 2001
From: "Yangkai.Shen" <237497819@qq.com>
Date: Thu, 18 Aug 2022 00:44:44 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=9F=BA=E7=A1=80=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=B9=8B=20properties=20=E6=A1=88=E4=BE=8B=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {demo-properties => demo-base/demo-base-properties}/README.md     | 0
 {demo-properties => demo-base/demo-base-properties}/pom.xml       | 8 ++++----
 .../main/java/com/xkcoding/properties/PropertiesApplication.java  | 0
 .../java/com/xkcoding/properties/config/ApplicationProperty.java  | 0
 .../java/com/xkcoding/properties/config/DeveloperProperty.java    | 0
 .../com/xkcoding/properties/controller/PropertyController.java    | 0
 .../META-INF/additional-spring-configuration-metadata.json        | 0
 .../demo-base-properties}/src/main/resources/application-dev.yml  | 0
 .../demo-base-properties}/src/main/resources/application-prod.yml | 0
 .../demo-base-properties}/src/main/resources/application.yml      | 0
 .../java/com/xkcoding/properties/PropertiesApplicationTests.java  | 0
 demo-base/pom.xml                                                 | 1 +
 pom.xml                                                           | 1 -
 13 files changed, 5 insertions(+), 5 deletions(-)
 rename {demo-properties => demo-base/demo-base-properties}/README.md (100%)
 rename {demo-properties => demo-base/demo-base-properties}/pom.xml (91%)
 rename {demo-properties => demo-base/demo-base-properties}/src/main/java/com/xkcoding/properties/PropertiesApplication.java (100%)
 rename {demo-properties => demo-base/demo-base-properties}/src/main/java/com/xkcoding/properties/config/ApplicationProperty.java (100%)
 rename {demo-properties => demo-base/demo-base-properties}/src/main/java/com/xkcoding/properties/config/DeveloperProperty.java (100%)
 rename {demo-properties => demo-base/demo-base-properties}/src/main/java/com/xkcoding/properties/controller/PropertyController.java (100%)
 rename {demo-properties => demo-base/demo-base-properties}/src/main/resources/META-INF/additional-spring-configuration-metadata.json (100%)
 rename {demo-properties => demo-base/demo-base-properties}/src/main/resources/application-dev.yml (100%)
 rename {demo-properties => demo-base/demo-base-properties}/src/main/resources/application-prod.yml (100%)
 rename {demo-properties => demo-base/demo-base-properties}/src/main/resources/application.yml (100%)
 rename {demo-properties => demo-base/demo-base-properties}/src/test/java/com/xkcoding/properties/PropertiesApplicationTests.java (100%)

diff --git a/demo-properties/README.md b/demo-base/demo-base-properties/README.md
similarity index 100%
rename from demo-properties/README.md
rename to demo-base/demo-base-properties/README.md
diff --git a/demo-properties/pom.xml b/demo-base/demo-base-properties/pom.xml
similarity index 91%
rename from demo-properties/pom.xml
rename to demo-base/demo-base-properties/pom.xml
index f7a6ec2..be94422 100644
--- a/demo-properties/pom.xml
+++ b/demo-base/demo-base-properties/pom.xml
@@ -3,17 +3,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>com.xkcoding</groupId>
-    <artifactId>spring-boot-demo</artifactId>
+    <artifactId>demo-base</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>demo-properties</artifactId>
+  <artifactId>demo-base-properties</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>demo-properties</name>
+  <name>demo-base-properties</name>
   <description>Demo project for Spring Boot</description>
 
   <properties>
@@ -56,7 +56,7 @@
   </dependencies>
 
   <build>
-    <finalName>demo-properties</finalName>
+    <finalName>demo-base-properties</finalName>
     <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>
diff --git a/demo-properties/src/main/java/com/xkcoding/properties/PropertiesApplication.java b/demo-base/demo-base-properties/src/main/java/com/xkcoding/properties/PropertiesApplication.java
similarity index 100%
rename from demo-properties/src/main/java/com/xkcoding/properties/PropertiesApplication.java
rename to demo-base/demo-base-properties/src/main/java/com/xkcoding/properties/PropertiesApplication.java
diff --git a/demo-properties/src/main/java/com/xkcoding/properties/config/ApplicationProperty.java b/demo-base/demo-base-properties/src/main/java/com/xkcoding/properties/config/ApplicationProperty.java
similarity index 100%
rename from demo-properties/src/main/java/com/xkcoding/properties/config/ApplicationProperty.java
rename to demo-base/demo-base-properties/src/main/java/com/xkcoding/properties/config/ApplicationProperty.java
diff --git a/demo-properties/src/main/java/com/xkcoding/properties/config/DeveloperProperty.java b/demo-base/demo-base-properties/src/main/java/com/xkcoding/properties/config/DeveloperProperty.java
similarity index 100%
rename from demo-properties/src/main/java/com/xkcoding/properties/config/DeveloperProperty.java
rename to demo-base/demo-base-properties/src/main/java/com/xkcoding/properties/config/DeveloperProperty.java
diff --git a/demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java b/demo-base/demo-base-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java
similarity index 100%
rename from demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java
rename to demo-base/demo-base-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java
diff --git a/demo-properties/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/demo-base/demo-base-properties/src/main/resources/META-INF/additional-spring-configuration-metadata.json
similarity index 100%
rename from demo-properties/src/main/resources/META-INF/additional-spring-configuration-metadata.json
rename to demo-base/demo-base-properties/src/main/resources/META-INF/additional-spring-configuration-metadata.json
diff --git a/demo-properties/src/main/resources/application-dev.yml b/demo-base/demo-base-properties/src/main/resources/application-dev.yml
similarity index 100%
rename from demo-properties/src/main/resources/application-dev.yml
rename to demo-base/demo-base-properties/src/main/resources/application-dev.yml
diff --git a/demo-properties/src/main/resources/application-prod.yml b/demo-base/demo-base-properties/src/main/resources/application-prod.yml
similarity index 100%
rename from demo-properties/src/main/resources/application-prod.yml
rename to demo-base/demo-base-properties/src/main/resources/application-prod.yml
diff --git a/demo-properties/src/main/resources/application.yml b/demo-base/demo-base-properties/src/main/resources/application.yml
similarity index 100%
rename from demo-properties/src/main/resources/application.yml
rename to demo-base/demo-base-properties/src/main/resources/application.yml
diff --git a/demo-properties/src/test/java/com/xkcoding/properties/PropertiesApplicationTests.java b/demo-base/demo-base-properties/src/test/java/com/xkcoding/properties/PropertiesApplicationTests.java
similarity index 100%
rename from demo-properties/src/test/java/com/xkcoding/properties/PropertiesApplicationTests.java
rename to demo-base/demo-base-properties/src/test/java/com/xkcoding/properties/PropertiesApplicationTests.java
diff --git a/demo-base/pom.xml b/demo-base/pom.xml
index 8bd9a2a..bebc08f 100644
--- a/demo-base/pom.xml
+++ b/demo-base/pom.xml
@@ -20,6 +20,7 @@
 
   <modules>
     <module>demo-base-helloworld</module>
+    <module>demo-base-properties</module>
   </modules>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 5ac5d36..ade9b48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,6 @@
   <modules>
     <module>common-tools</module>
     <module>demo-base</module>
-    <module>demo-properties</module>
     <module>demo-actuator</module>
     <module>demo-admin</module>
     <!--    <module>demo-logback</module>-->