From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/ScreenApiBootstrap.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/ScreenApiBootstrap.java b/screen-api/src/main/java/com/moral/ScreenApiBootstrap.java
index 26351cd..de445b6 100644
--- a/screen-api/src/main/java/com/moral/ScreenApiBootstrap.java
+++ b/screen-api/src/main/java/com/moral/ScreenApiBootstrap.java
@@ -4,6 +4,7 @@
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
@@ -19,7 +20,12 @@
@EnableTransactionManagement
public class ScreenApiBootstrap {
public static void main(String[] args) {
- ApplicationContext applicationContext = SpringApplication.run(ScreenApiBootstrap.class, args);
+ /*SpringApplicationBuilder builder = new SpringApplicationBuilder(ScreenApiBootstrap.class);
+ builder.headless(false)
+ // .web(WebApplicationType.NONE)
+ // .bannerMode(Banner.Mode.OFF)
+ .run(args);*/
+ ApplicationContext applicationContext = SpringApplication.run(ScreenApiBootstrap.class, args);
SpringContextUtils.setApplicationContext(applicationContext);
}
@Bean
--
Gitblit v1.8.0