From d3563f0bdb487124d79cdd20d0f8bfc79db31f24 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 07 Nov 2025 14:18:08 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/AppRun.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/AppRun.java b/oying-system/src/main/java/com/oying/AppRun.java
index 1616dd6..1b96648 100644
--- a/oying-system/src/main/java/com/oying/AppRun.java
+++ b/oying-system/src/main/java/com/oying/AppRun.java
@@ -7,7 +7,9 @@
import com.oying.utils.SpringBeanHolder;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.ApplicationPidFileWriter;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Bean;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.web.bind.annotation.RestController;
@@ -21,7 +23,7 @@
@Api(hidden = true)
@SpringBootApplication
@EnableTransactionManagement
-public class AppRun {
+public class AppRun extends SpringBootServletInitializer {
public static void main(String[] args) {
SpringApplication springApplication = new SpringApplication(AppRun.class);
@@ -35,6 +37,16 @@
log.info("---------------------------------------------");
}
+ /**
+ * 打war包配置
+ *
+ */
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+ // 注意这里要指向原先用main方法执行的Application启动类
+ return builder.sources(AppRun.class);
+ }
+
@Bean
public SpringBeanHolder springContextHolder() {
return new SpringBeanHolder();
--
Gitblit v1.9.3