From c2b2c1634b8119e9d8911d3a047cc4683040f26a Mon Sep 17 00:00:00 2001
From: Nicky <362330721@qq.com>
Date: Sat, 16 Jun 2018 16:48:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=90=AFspringBoot=E7=83=AD=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pom.xml                                   | 14 +++++--
 .../taoshop-common-core/pom.xml               | 38 +------------------
 .../common/core/base/config/WebConfig.java    | 21 ++++++++++
 src/taoshop-portal/pom.xml                    | 14 ++++++-
 .../com/muses/taoshop/portal/Application.java |  2 +-
 5 files changed, 46 insertions(+), 43 deletions(-)
 create mode 100644 src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/base/config/WebConfig.java

diff --git a/src/pom.xml b/src/pom.xml
index 828a9f8..95af58e 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -71,6 +71,15 @@
         </configuration>
       </plugin>
 
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <configuration>
+          <fork>true</fork>
+          <addResources>true</addResources>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>
 
@@ -100,13 +109,10 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-devtools</artifactId>
+      <scope>provided</scope>
       <optional>true</optional>
     </dependency>
 
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-thymeleaf</artifactId>
-    </dependency>
 
     <!--  alibaba druid -->
     <dependency>
diff --git a/src/taoshop-common/taoshop-common-core/pom.xml b/src/taoshop-common/taoshop-common-core/pom.xml
index 32cb127..efd7334 100644
--- a/src/taoshop-common/taoshop-common-core/pom.xml
+++ b/src/taoshop-common/taoshop-common-core/pom.xml
@@ -17,8 +17,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -30,39 +28,5 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
-            <plugins>
-                <plugin>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.0.0</version>
-                </plugin>
-                <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
-                <plugin>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.0.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.7.0</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.20.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.0.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>2.5.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+
 </project>
diff --git a/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/base/config/WebConfig.java b/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/base/config/WebConfig.java
new file mode 100644
index 0000000..1d1108d
--- /dev/null
+++ b/src/taoshop-common/taoshop-common-core/src/main/java/com/muses/taoshop/common/core/base/config/WebConfig.java
@@ -0,0 +1,21 @@
+package com.muses.taoshop.common.core.base.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.ResourceUtils;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@EnableWebMvc
+@Configuration
+public class WebConfig extends WebMvcConfigurerAdapter {
+  
+    @Override  
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+  
+        registry.addResourceHandler("/templates/**").addResourceLocations(ResourceUtils.CLASSPATH_URL_PREFIX+"/templates/");
+        registry.addResourceHandler("/static/**").addResourceLocations(ResourceUtils.CLASSPATH_URL_PREFIX+"/static/");  
+        super.addResourceHandlers(registry);  
+    }  
+  
+}  
\ No newline at end of file
diff --git a/src/taoshop-portal/pom.xml b/src/taoshop-portal/pom.xml
index 9ba4e1c..0729cdd 100644
--- a/src/taoshop-portal/pom.xml
+++ b/src/taoshop-portal/pom.xml
@@ -24,13 +24,23 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>com.muses.taoshop.provider</groupId>
             <artifactId>taoshop-provider-item</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
 
         <!-- poi start-->
         <dependency>
@@ -59,6 +69,7 @@
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
+                    <fork>true</fork>
                     <compilerVersion>1.8</compilerVersion>
                     <encoding>UTF-8</encoding>
                     <skipMain></skipMain>
@@ -77,4 +88,5 @@
 
         </plugins>
     </build>
+
 </project>
diff --git a/src/taoshop-portal/src/main/java/com/muses/taoshop/portal/Application.java b/src/taoshop-portal/src/main/java/com/muses/taoshop/portal/Application.java
index b75df14..36cf576 100644
--- a/src/taoshop-portal/src/main/java/com/muses/taoshop/portal/Application.java
+++ b/src/taoshop-portal/src/main/java/com/muses/taoshop/portal/Application.java
@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.*;
 @EnableTransactionManagement
 //@EnableCaching
 @EnableAsync
-//@EnableAutoConfiguration
+@EnableAutoConfiguration //TODO 修改该注解可以实现自动部署
 @SpringBootApplication(exclude={DataSourceAutoConfiguration.class,
         DataSourceTransactionManagerAutoConfiguration.class,  MybatisAutoConfiguration.class})
 public class Application {
-- 
GitLab