From c5d3c76b39a5c89d03fb1e8b1e901efeea65f6ed Mon Sep 17 00:00:00 2001
From: "Yangkai.Shen" <237497819@qq.com>
Date: Tue, 23 Aug 2022 15:01:21 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=89=93=E5=8C=85=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=B9=8B=20war=20=E6=A1=88=E4=BE=8B=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo-package/demo-package-war/README.md            | 44 ++++++++++
 .../demo-package-war}/pom.xml                      | 22 +++--
 .../main/java/com/xkcoding/war/WarApplication.java |  8 +-
 .../src/main/resources/application.yml             |  0
 .../java/com/xkcoding/war/WarApplicationTests.java | 13 +++
 demo-package/pom.xml                               |  1 +
 demo-war/.gitignore                                | 25 ------
 demo-war/README.md                                 | 97 ----------------------
 .../war/SpringBootDemoWarApplicationTests.java     | 16 ----
 pom.xml                                            |  1 -
 10 files changed, 72 insertions(+), 155 deletions(-)
 create mode 100644 demo-package/demo-package-war/README.md
 rename {demo-war => demo-package/demo-package-war}/pom.xml (83%)
 rename demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java => demo-package/demo-package-war/src/main/java/com/xkcoding/war/WarApplication.java (73%)
 rename {demo-war => demo-package/demo-package-war}/src/main/resources/application.yml (100%)
 create mode 100644 demo-package/demo-package-war/src/test/java/com/xkcoding/war/WarApplicationTests.java
 delete mode 100644 demo-war/.gitignore
 delete mode 100644 demo-war/README.md
 delete mode 100644 demo-war/src/test/java/com/xkcoding/war/SpringBootDemoWarApplicationTests.java

diff --git a/demo-package/demo-package-war/README.md b/demo-package/demo-package-war/README.md
new file mode 100644
index 0000000..6e38f07
--- /dev/null
+++ b/demo-package/demo-package-war/README.md
@@ -0,0 +1,44 @@
+## spring-boot-demo-war
+
+> 本 demo 主要演示了如何将 Spring Boot 项目打包成传统的 war 包程序。
+
+### 1.开发步骤
+#### 1.1.修改启动类
+
+```java
+@SpringBootApplication
+public class WarApplication extends SpringBootServletInitializer {
+
+    public static void main(String[] args) {
+        SpringApplication.run(WarApplication.class, args);
+    }
+
+    /**
+     * 若需要打成 war 包，则需要写一个类继承 {@link SpringBootServletInitializer} 并重写 {@link SpringBootServletInitializer#configure(SpringApplicationBuilder)}
+     */
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(WarApplication.class);
+    }
+}
+```
+
+#### 1.2.修改 pom.xml
+
+```xml
+<!-- 若需要打成 war 包，则需要将打包方式改成 war -->
+<packaging>war</packaging>
+
+<dependencies>
+  <!-- 若需要打成 war 包，则需要将 tomcat 引入，scope 设置为 provided -->
+  <dependency>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-tomcat</artifactId>
+    <scope>provided</scope>
+  </dependency>
+</dependencies>
+```
+
+### 2.参考
+
+- Spring Boot 官方文档：https://docs.spring.io/spring-boot/docs/3.0.0-M4/reference/htmlsingle/#howto.traditional-deployment.war
diff --git a/demo-war/pom.xml b/demo-package/demo-package-war/pom.xml
similarity index 83%
rename from demo-war/pom.xml
rename to demo-package/demo-package-war/pom.xml
index e778242..1a734fb 100644
--- a/demo-war/pom.xml
+++ b/demo-package/demo-package-war/pom.xml
@@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>com.xkcoding</groupId>
+    <artifactId>demo-package</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>demo-war</artifactId>
+  <artifactId>demo-package-war</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <!-- 若需要打成 war 包，则需要将打包方式改成 war -->
   <packaging>war</packaging>
 
-    <name>demo-war</name>
+  <name>demo-package-war</name>
   <description>Demo project for Spring Boot</description>
 
-  <parent>
-    <groupId>com.xkcoding</groupId>
-    <artifactId>spring-boot-demo</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-  </parent>
-
   <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <java.version>1.8</java.version>
+    <java.version>17</java.version>
   </properties>
 
   <dependencies>
@@ -44,7 +42,7 @@
   </dependencies>
 
   <build>
-      <finalName>demo-war</finalName>
+    <finalName>demo-package-war</finalName>
     <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>
diff --git a/demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java b/demo-package/demo-package-war/src/main/java/com/xkcoding/war/WarApplication.java
similarity index 73%
rename from demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java
rename to demo-package/demo-package-war/src/main/java/com/xkcoding/war/WarApplication.java
index f1da4cd..1297d75 100644
--- a/demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java
+++ b/demo-package/demo-package-war/src/main/java/com/xkcoding/war/WarApplication.java
@@ -11,13 +11,13 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
  * </p>
  *
  * @author yangkai.shen
- * @date Created in 2018-10-30 19:37
+ * @date Created in 2022-08-23 14:50
  */
 @SpringBootApplication
-public class SpringBootDemoWarApplication extends SpringBootServletInitializer {
+public class WarApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
-        SpringApplication.run(SpringBootDemoWarApplication.class, args);
+        SpringApplication.run(WarApplication.class, args);
     }
 
     /**
@@ -25,6 +25,6 @@ public class SpringBootDemoWarApplication extends SpringBootServletInitializer {
      */
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(SpringBootDemoWarApplication.class);
+        return application.sources(WarApplication.class);
     }
 }
diff --git a/demo-war/src/main/resources/application.yml b/demo-package/demo-package-war/src/main/resources/application.yml
similarity index 100%
rename from demo-war/src/main/resources/application.yml
rename to demo-package/demo-package-war/src/main/resources/application.yml
diff --git a/demo-package/demo-package-war/src/test/java/com/xkcoding/war/WarApplicationTests.java b/demo-package/demo-package-war/src/test/java/com/xkcoding/war/WarApplicationTests.java
new file mode 100644
index 0000000..1a586f0
--- /dev/null
+++ b/demo-package/demo-package-war/src/test/java/com/xkcoding/war/WarApplicationTests.java
@@ -0,0 +1,13 @@
+package com.xkcoding.war;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class WarApplicationTests {
+
+    @Test
+    void contextLoads() {
+    }
+
+}
diff --git a/demo-package/pom.xml b/demo-package/pom.xml
index d63ca2a..bf71f0a 100644
--- a/demo-package/pom.xml
+++ b/demo-package/pom.xml
@@ -20,6 +20,7 @@
 
   <modules>
     <module>demo-package-docker</module>
+    <module>demo-package-war</module>
   </modules>
 
 </project>
diff --git a/demo-war/.gitignore b/demo-war/.gitignore
deleted file mode 100644
index 82eca33..0000000
--- a/demo-war/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-/target/
-!.mvn/wrapper/maven-wrapper.jar
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/build/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
\ No newline at end of file
diff --git a/demo-war/README.md b/demo-war/README.md
deleted file mode 100644
index 6f1f182..0000000
--- a/demo-war/README.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# spring-boot-demo-war
-
-> 本 demo 主要演示了如何将 Spring Boot 项目打包成传统的 war 包程序。
-
-## pom.xml
-
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>spring-boot-demo-war</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <!-- 若需要打成 war 包，则需要将打包方式改成 war -->
-    <packaging>war</packaging>
-
-    <name>spring-boot-demo-war</name>
-    <description>Demo project for Spring Boot</description>
-
-    <parent>
-        <groupId>com.xkcoding</groupId>
-        <artifactId>spring-boot-demo</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- 若需要打成 war 包，则需要将 tomcat 引入，scope 设置为 provided -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>spring-boot-demo-war</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
-```
-
-## SpringBootDemoWarApplication.java
-
-```java
-/**
- * <p>
- * 启动器
- * </p>
- *
- * @author yangkai.shen
- * @date Created in 2018-10-30 19:37
- */
-@SpringBootApplication
-public class SpringBootDemoWarApplication extends SpringBootServletInitializer {
-
-    public static void main(String[] args) {
-        SpringApplication.run(SpringBootDemoWarApplication.class, args);
-    }
-
-    /**
-     * 若需要打成 war 包，则需要写一个类继承 {@link SpringBootServletInitializer} 并重写 {@link SpringBootServletInitializer#configure(SpringApplicationBuilder)}
-     */
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(SpringBootDemoWarApplication.class);
-    }
-}
-```
-
-## 参考
-
-https://docs.spring.io/spring-boot/docs/2.1.0.RELEASE/reference/htmlsingle/#howto-create-a-deployable-war-file
-
diff --git a/demo-war/src/test/java/com/xkcoding/war/SpringBootDemoWarApplicationTests.java b/demo-war/src/test/java/com/xkcoding/war/SpringBootDemoWarApplicationTests.java
deleted file mode 100644
index 300b377..0000000
--- a/demo-war/src/test/java/com/xkcoding/war/SpringBootDemoWarApplicationTests.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.xkcoding.war;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class SpringBootDemoWarApplicationTests {
-
-    @Test
-    public void contextLoads() {
-    }
-
-}
diff --git a/pom.xml b/pom.xml
index 76edc3d..5011f9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,6 @@
     <!--    <module>demo-urule</module>-->
     <!--    <module>demo-activiti</module>-->
     <!--    <module>demo-dubbo</module>-->
-    <!--    <module>demo-war</module>-->
     <!--    <module>demo-elasticsearch</module>-->
     <!--    <module>demo-mongodb</module>-->
     <!--    <module>demo-neo4j</module>-->