From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001 From: JinPengYong <812110275@qq.com> Date: Sun, 26 Apr 2020 16:18:30 +0800 Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts. --- src/main/java/com/moral/ScreenApiApplication.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/moral/ScreenApiApplication.java b/src/main/java/com/moral/ScreenApiApplication.java index fd6ee33..1c276ba 100644 --- a/src/main/java/com/moral/ScreenApiApplication.java +++ b/src/main/java/com/moral/ScreenApiApplication.java @@ -2,11 +2,18 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.support.SpringBootServletInitializer; import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication @EnableTransactionManagement -public class ScreenApiApplication { +public class ScreenApiApplication extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(ScreenApiApplication.class); + } public static void main(String[] args) { SpringApplication.run(ScreenApiApplication.class, args); -- Gitblit v1.8.0