From f4e8d6832f05c9643bf31148d4156f2af680a373 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 1 Jun 2022 11:14:59 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=93=E5=8C=85=E6=A8=A1=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAwar=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 26 ++++++++++++++++++-
 .../com/glxp/udidl/admin/Application.java     |  9 ++++++-
 src/main/resources/application.yml            |  2 +-
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7dbc2ff..5f6da07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <artifactId>udidl</artifactId>
     <version>1.0-SNAPSHOT</version>
 
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
 
     <properties>
         <java.version>1.8</java.version>
@@ -47,6 +47,21 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <!--  移除嵌入式tomcat插件-->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <!--打包的时候可以不用包进去，别的设施会提供。事实上该依赖理论上可以参与编译，测试，运行等周期。
+                相当于compile，但是打包阶段做了exclude操作-->
+            <scope>provided</scope>
         </dependency>
 
         <!--AOP拦截-->
@@ -152,10 +167,19 @@
             <version>5.5.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+
     </dependencies>
 
 
     <build>
+        <finalName>UDI_DL_Server</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/com/glxp/udidl/admin/Application.java b/src/main/java/com/glxp/udidl/admin/Application.java
index 8480bb0..1c46a72 100644
--- a/src/main/java/com/glxp/udidl/admin/Application.java
+++ b/src/main/java/com/glxp/udidl/admin/Application.java
@@ -3,16 +3,23 @@ package com.glxp.udidl.admin;
 import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 @EnableTransactionManagement
 @EnableSwagger2WebMvc
 @SpringBootApplication(exclude = PageHelperAutoConfiguration.class)
-public class Application {
+public class Application extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
 
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+        return builder.sources(Application.class);
+    }
+
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 469a057..e1efc28 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,7 +2,7 @@ server:
   port: 9994
 spring:
   profiles:
-    active: dev
+    active: pro
   jmx:
     enabled: false