From 05dec914aabe2fa361ac27e2f4139a91c5bc1d60 Mon Sep 17 00:00:00 2001
From: afcfzf <9301462@qq.com>
Date: Thu, 15 Feb 2024 01:03:27 +0800
Subject: [PATCH] fix: base url

---
 server_demo/pom.xml                                       | 8 ++++++++
 server_demo/src/main/java/com/demo/app/App.java           | 2 +-
 server_demo/src/main/java/com/demo/app/data/Data.java     | 2 +-
 .../main/{java => }/resources/application-dev.properties  | 0
 .../main/{java => }/resources/application-prod.properties | 0
 .../main/{java => }/resources/application-test.properties | 0
 .../src/main/{java => }/resources/application.properties  | 0
 server_demo/src/test/java/com/wecom/app/AppTest.java      | 2 +-
 8 files changed, 11 insertions(+), 3 deletions(-)
 rename server_demo/src/main/{java => }/resources/application-dev.properties (100%)
 rename server_demo/src/main/{java => }/resources/application-prod.properties (100%)
 rename server_demo/src/main/{java => }/resources/application-test.properties (100%)
 rename server_demo/src/main/{java => }/resources/application.properties (100%)

diff --git a/server_demo/pom.xml b/server_demo/pom.xml
index 58f865f..6d3bd21 100644
--- a/server_demo/pom.xml
+++ b/server_demo/pom.xml
@@ -95,5 +95,13 @@
           <version>${project.parent.version}</version>
         </plugin>
       </plugins>
+      <!-- <resources>
+        <resource>
+            <directory>src/main/resources</directory>
+            <includes>
+                <include>**/*.properties</include>
+            </includes>
+        </resource>
+    </resources> -->
   </build>
 </project>
\ No newline at end of file
diff --git a/server_demo/src/main/java/com/demo/app/App.java b/server_demo/src/main/java/com/demo/app/App.java
index abce06c..7645973 100644
--- a/server_demo/src/main/java/com/demo/app/App.java
+++ b/server_demo/src/main/java/com/demo/app/App.java
@@ -4,7 +4,7 @@
  * @author markJia(markjia@tencent.com)
  */
 
-package server_demo.src.main.java.com.demo.app;
+package com.demo.app;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/server_demo/src/main/java/com/demo/app/data/Data.java b/server_demo/src/main/java/com/demo/app/data/Data.java
index 0804ab6..7e370c1 100644
--- a/server_demo/src/main/java/com/demo/app/data/Data.java
+++ b/server_demo/src/main/java/com/demo/app/data/Data.java
@@ -3,7 +3,7 @@
  * @author markJia(markjia@tencent.com)
  */
 
-package server_demo.src.main.java.com.demo.app.data;
+package com.demo.app.data;
 
 public class Data {
   private String name;
diff --git a/server_demo/src/main/java/resources/application-dev.properties b/server_demo/src/main/resources/application-dev.properties
similarity index 100%
rename from server_demo/src/main/java/resources/application-dev.properties
rename to server_demo/src/main/resources/application-dev.properties
diff --git a/server_demo/src/main/java/resources/application-prod.properties b/server_demo/src/main/resources/application-prod.properties
similarity index 100%
rename from server_demo/src/main/java/resources/application-prod.properties
rename to server_demo/src/main/resources/application-prod.properties
diff --git a/server_demo/src/main/java/resources/application-test.properties b/server_demo/src/main/resources/application-test.properties
similarity index 100%
rename from server_demo/src/main/java/resources/application-test.properties
rename to server_demo/src/main/resources/application-test.properties
diff --git a/server_demo/src/main/java/resources/application.properties b/server_demo/src/main/resources/application.properties
similarity index 100%
rename from server_demo/src/main/java/resources/application.properties
rename to server_demo/src/main/resources/application.properties
diff --git a/server_demo/src/test/java/com/wecom/app/AppTest.java b/server_demo/src/test/java/com/wecom/app/AppTest.java
index c5748e0..969e7b1 100644
--- a/server_demo/src/test/java/com/wecom/app/AppTest.java
+++ b/server_demo/src/test/java/com/wecom/app/AppTest.java
@@ -1,4 +1,4 @@
-package server_demo.src.test.java.com.wecom.app;
+package com.wecom.app;
 
 import static org.junit.Assert.assertTrue;