From 01199a7ac943928bc5e3af716fc1ab29377a3887 Mon Sep 17 00:00:00 2001
From: msgroup <dev@mingsoft.net>
Date: Wed, 2 Mar 2022 10:03:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=965.2.7=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/scripts/assembly.xml => assembly.xml |  1 +
 doc/mcms-5.2.7.sql                            |  2 +-
 pom.xml                                       | 24 ++++++++++++-------
 3 files changed, 18 insertions(+), 9 deletions(-)
 rename src/main/scripts/assembly.xml => assembly.xml (97%)

diff --git a/src/main/scripts/assembly.xml b/assembly.xml
similarity index 97%
rename from src/main/scripts/assembly.xml
rename to assembly.xml
index d9a71c40..55dbd44b 100644
--- a/src/main/scripts/assembly.xml
+++ b/assembly.xml
@@ -2,6 +2,7 @@
           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.0.0.xsd">
     <id>assembly</id>
 
+    <!--打包zip格式，需要解压并上传-->
     <formats>
         <format>zip</format>
     </formats>
diff --git a/doc/mcms-5.2.7.sql b/doc/mcms-5.2.7.sql
index 6108297a..8606be11 100644
--- a/doc/mcms-5.2.7.sql
+++ b/doc/mcms-5.2.7.sql
@@ -32,7 +32,7 @@ CREATE TABLE `app` (
 -- Records of app
 -- ----------------------------
 BEGIN;
-INSERT INTO `app` VALUES (1, '铭飞MCms(5.2.6)', 'http://localhost:8080/', '[{\"url\":\"/upload/1/appLogo/1609397756549.png\",\"name\":\"1593834123492.png\",\"path\":\"/upload/1/appLogo/1609397756549.png\",\"uid\":1609397756411,\"status\":\"success\"}]', '铭飞MCMS', '版权所有 ©铭飞科技有限公司2012-2019 保留一切权利。', 'default', '铭飞MCMS', '', 0, NULL, '2019-11-17 00:00:00', 'web', '2022-02-28 10:28:55', '57', NULL, '', 0);
+INSERT INTO `app` VALUES (1, '铭飞MCms(5.2.7)', 'http://localhost:8080/', '[{\"url\":\"/upload/1/appLogo/1609397756549.png\",\"name\":\"1593834123492.png\",\"path\":\"/upload/1/appLogo/1609397756549.png\",\"uid\":1609397756411,\"status\":\"success\"}]', '铭飞MCMS', '版权所有 ©铭飞科技有限公司2012-2019 保留一切权利。', 'default', '铭飞MCMS', '', 0, NULL, '2019-11-17 00:00:00', 'web', '2022-02-28 10:28:55', '57', NULL, '', 0);
 COMMIT;
 
 -- ----------------------------
diff --git a/pom.xml b/pom.xml
index a03c0f54..15e337ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,9 +11,9 @@
     <groupId>net.mingsoft</groupId>
     <artifactId>ms-mcms</artifactId>
     <version>5.2.7</version>
-    <name>ms-mcms</name>
-    <!-- 打包war包 -->
-    <!--    <packaging>war</packaging>-->
+    <name>${project.groupId}:${project.artifactId}</name>
+    <!-- 打包war包，注意不启用(resources》resource》excludes的配置并注释掉maven-assembly-plugin 插件配置 -->
+    <!--<packaging>war</packaging>-->
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -114,19 +114,24 @@
     </dependencies>
 
     <build>
-        <finalName>ms-mcms</finalName>
+        <finalName>${project.artifactId}</finalName>
         <resources>
             <resource>
                 <directory>src/main/webapp</directory>
+
+                <!--打包生产jar包推荐启用下面配置-->
+                <!--打包生产war包不启用下面配置-->
                 <excludes>
-                    <!-- 打包生产并手动将static、html、upload、template复制到生产 -->
+                    <!-- 可以避免将静态资源打入jar包中，方便生产实时修改静态资源文件-->
+                    <!-- 打包生产建议并手动将static、html、upload、template复制到生产 -->
                     <!--<exclude>static/</exclude>
                     <exclude>html/</exclude>
                     <exclude>upload/</exclude>
                     <exclude>template/</exclude>-->
+
                     <!-- 如果生产需要实时修改WEB-INF/下的页面可，启用这行并手动将项目中的WEB-INF目录复制到运行环境 -->
                     <!--<exclude>WEB-INF/</exclude>-->
-             </excludes>
+                </excludes>
          </resource>
          <resource>
              <directory>src/main/resources</directory>
@@ -172,6 +177,9 @@
              </dependencies>
          </plugin>
 
+         <!-- 结合(resources》resource》excludes的配置使用 -->
+         <!-- 打包出的结构 http://doc.mingsoft.net/server/huan-jing-pei-zhi/jarbu-shu.html#%E7%9B%AE%E5%BD%95%E7%BB%93%E6%9E%84-->
+         <!-- 打包war包时，注释掉此插件-->
          <plugin>
              <artifactId>maven-assembly-plugin</artifactId>
              <version>3.1.1</version>
@@ -183,9 +191,9 @@
                          <goal>single</goal>
                      </goals>
                      <configuration>
-                         <finalName>ms-mcms</finalName>
+                         <finalName>${project.artifactId}</finalName>
                          <descriptors>
-                             <descriptor>src/main/scripts/assembly.xml</descriptor>
+                             <descriptor>assembly.xml</descriptor>
                          </descriptors>
                      </configuration>
                  </execution>