Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/application.properties

src/main/java/com/example/afrishop_v3/AfrishopV3Application.java

 package com.example.afrishop_v3;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class AfrishopV3Application {
-
+    private static Logger logger = LoggerFactory.getLogger(AfrishopV3Application.class);
     public static void main(String[] args) {
+
         SpringApplication.run(AfrishopV3Application.class, args);
+        System.out.println("        __      _     _\n" +
+                "  __ _ / _|_ __(_)___| |__   ___  _ __\n" +
+                " / _` | |_| '__| / __| '_ \\ / _ \\| '_ \\\n" +
+                "| (_| |  _| |  | \\__ \\ | | | (_) | |_) |\n" +
+                " \\__,_|_| |_|  |_|___/_| |_|\\___/| .__/ \n" +
+                "                                 |_|\n");
+        logger.info("afrishop项目启动成功!");
     }
 
 }

src/test/java/com/example/afrishop_v3/AfrishopV3ApplicationTests.java

@@ -8,6 +8,8 @@ class AfrishopV3ApplicationTests {
 
     @Test
     void contextLoads() {
+
+
     }
 
 }