From 220f02a479f7dfc75295877402d1263a284bee1a Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Mon, 11 Mar 2024 22:02:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=BE=AA=E7=8E=AF?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                        |  6 ++++--
 sky-common/pom.xml                             | 18 +++++++++---------
 sky-pojo/pom.xml                               |  6 +++---
 sky-server/pom.xml                             | 14 +++-----------
 .../src/main/java/com/sky/SkyApplication.java  |  1 -
 sky-server/src/main/resources/application.yml  |  3 +++
 6 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index 59ca7f3..f76aadb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,14 +9,16 @@
         <version>2.7.3</version>
     </parent>
     <groupId>com.sky</groupId>
-    <artifactId>sky-take-out</artifactId>
+    <artifactId>dev-sky-serve-v1</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
+    
     <modules>
         <module>sky-common</module>
         <module>sky-pojo</module>
         <module>sky-server</module>
     </modules>
+
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
@@ -133,5 +135,5 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-   
+
 </project>
diff --git a/sky-common/pom.xml b/sky-common/pom.xml
index 087ec5c..2a79755 100644
--- a/sky-common/pom.xml
+++ b/sky-common/pom.xml
@@ -1,11 +1,11 @@
 <?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.sky</groupId>
-        <artifactId>sky-take-out</artifactId>
+        <artifactId>dev-sky-serve-v1</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
@@ -16,7 +16,13 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
     <dependencies>
+        <dependency>
+            <groupId>com.sky</groupId>
+            <artifactId>sky-server</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -61,11 +67,5 @@
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.sky</groupId>
-            <artifactId>sky-server</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/sky-pojo/pom.xml b/sky-pojo/pom.xml
index 733491c..ded29c2 100644
--- a/sky-pojo/pom.xml
+++ b/sky-pojo/pom.xml
@@ -1,11 +1,11 @@
 <?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.sky</groupId>
-        <artifactId>sky-take-out</artifactId>
+        <artifactId>dev-sky-serve-v1</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/sky-server/pom.xml b/sky-server/pom.xml
index 5d67038..7329552 100644
--- a/sky-server/pom.xml
+++ b/sky-server/pom.xml
@@ -1,11 +1,11 @@
 <?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.sky</groupId>
-        <artifactId>sky-take-out</artifactId>
+        <artifactId>dev-sky-serve-v1</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
@@ -17,19 +17,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
-
-        <dependency>
-            <groupId>com.sky</groupId>
-            <artifactId>sky-common</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>com.sky</groupId>
             <artifactId>sky-pojo</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
diff --git a/sky-server/src/main/java/com/sky/SkyApplication.java b/sky-server/src/main/java/com/sky/SkyApplication.java
index 792cb51..b2dbf88 100644
--- a/sky-server/src/main/java/com/sky/SkyApplication.java
+++ b/sky-server/src/main/java/com/sky/SkyApplication.java
@@ -15,6 +15,5 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 public class SkyApplication {
     public static void main(String[] args) {
         SpringApplication.run(SkyApplication.class, args);
-        log.info("server started");
     }
 }
diff --git a/sky-server/src/main/resources/application.yml b/sky-server/src/main/resources/application.yml
index 4dc57cb..b289b19 100644
--- a/sky-server/src/main/resources/application.yml
+++ b/sky-server/src/main/resources/application.yml
@@ -4,6 +4,9 @@ server:
 spring:
   profiles:
     active: dev
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher #没有写MVC配置会报错
   main:
     allow-circular-references: true
   datasource: