From 8a65c867f8f0ebf3f88483e7c46fb7a54d424ecc Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Mon, 12 Mar 2018 10:17:37 +0800 Subject: [PATCH] merge --- .../src/main/java/com/xwbing/Application.java | 8 +++----- .../main/java/com/xwbing/ServletInitializer.java | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 boot-web/src/main/java/com/xwbing/ServletInitializer.java diff --git a/boot-web/src/main/java/com/xwbing/Application.java b/boot-web/src/main/java/com/xwbing/Application.java index c42a3ad..798d206 100644 --- a/boot-web/src/main/java/com/xwbing/Application.java +++ b/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.builder.SpringApplicationBuilder; import org.springframework.boot.web.support.SpringBootServletInitializer; /** @@ -12,11 +11,10 @@ import org.springframework.boot.web.support.SpringBootServletInitializer; * 说明: 启动类 */ @SpringBootApplication +//@Configuration 定义为配置类,相当于xml文件中的 +//@ComponentScan 组件扫描 +//@EnableAutoConfiguration 借助@Import的帮助,将所有符合自动配置条件的bean定义加载到IoC容器 public class Application extends SpringBootServletInitializer { - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(Application.class); - } public static void main(String[] args) { SpringApplication.run(Application.class, args); diff --git a/boot-web/src/main/java/com/xwbing/ServletInitializer.java b/boot-web/src/main/java/com/xwbing/ServletInitializer.java new file mode 100644 index 0000000..e3ec3b3 --- /dev/null +++ b/boot-web/src/main/java/com/xwbing/ServletInitializer.java @@ -0,0 +1,16 @@ +package com.xwbing; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.support.SpringBootServletInitializer; + +public class ServletInitializer extends SpringBootServletInitializer { + /** + * 注册启动类Application。外部web应用服务器构建ApplicationContext的时候，会把启动类添加进去。 + * @param application + * @return + */ + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(Application.class); + } +}