merge

boot-web/src/main/java/com/xwbing/Application.java

@@ -2,7 +2,6 @@ package com.xwbing;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
 
 /**
  * 项目名称: boot-module-demo
@@ -14,7 +13,7 @@ import org.springframework.boot.web.support.SpringBootServletInitializer;
 //@Configuration 定义为配置类,相当于xml文件中的<beans></beans>
 //@ComponentScan 组件扫描
 //@EnableAutoConfiguration 借助@Import的帮助,将所有符合自动配置条件的bean定义加载到IoC容器
-public class Application extends SpringBootServletInitializer {
+public class Application {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);

boot-web/src/main/java/com/xwbing/ServletInitializer.java

@@ -6,6 +6,7 @@ import org.springframework.boot.web.support.SpringBootServletInitializer;
 public class ServletInitializer extends SpringBootServletInitializer {
     /**
      * 注册启动类Application。外部web应用服务器构建ApplicationContext的时候，会把启动类添加进去。
+     *
      * @param application
      * @return
      */