From d5051b0c4b3044002fa030753866a5a63cf740b7 Mon Sep 17 00:00:00 2001
From: infin_caishuxiao <caishuxiao@infincash.com>
Date: Tue, 27 Feb 2018 17:33:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E7=94=A8=E6=9C=8D=E5=8A=A1=E5=8C=96?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE,=20=E6=8F=90=E4=BE=9Bbin,=20lib,=20lib/confi?=
 =?UTF-8?q?g=E5=92=8Clogs=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assembly.xml                              | 58 +++++++++----------
 .../executor-collection-dispatcher/pom.xml    | 10 ++++
 2 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/infintech-executors/executor-collection-dispatcher/assembly.xml b/infintech-executors/executor-collection-dispatcher/assembly.xml
index 1282e177..055f2ba6 100644
--- a/infintech-executors/executor-collection-dispatcher/assembly.xml
+++ b/infintech-executors/executor-collection-dispatcher/assembly.xml
@@ -10,51 +10,51 @@
   <id>${env}</id>
   
   <!-- =====================================================================
-       * 默认为 TRUE, 设为 FALSE, 防止将 ${project.finalName} 作为根目录打进 WAR 包
+       * 默认为 TRUE
        TRUE  结构: ${project.finalName}.war/${project.finalName}/WEB-INF
        FALSE 结构: ${project.finalName}.war/WEB-INF 
        ===================================================================== -->
-  <includeBaseDirectory>false</includeBaseDirectory>
+  <includeBaseDirectory>true</includeBaseDirectory>
   
   <!-- 设置为 WAR 包格式 -->
   <formats>
-    <format>jar</format>
+    <format>tar.gz</format>
   </formats>
   
   <fileSets>
     <!-- =================================================
-         target/classes 下的文件输出到 WEB-INF/classes
+         target/xxx.jar 下的文件输出到 tar.gz中的jar包
          ================================================= -->
     <fileSet>
-        <directory>${project.build.outputDirectory}</directory> 
-        <outputDirectory>BOOT-INF/classes</outputDirectory>
-        <!-- =================================================
-             target/classes/conf/*.properties 排除
-             ================================================= -->
-        <excludes>
-            <exclude>conf/**</exclude>
-            <exclude>code-generator/**</exclude>
-        </excludes> 
+        <directory>target</directory> 
+        <outputDirectory>lib</outputDirectory>
+        <includes>
+            <include>*.jar</include>
+        </includes>
     </fileSet>
     <fileSet>
-      <directory>${project.build.outputDirectory}/conf/${env}</directory>
-      <outputDirectory>BOOT-INF/classes/</outputDirectory>
+        <directory>src/main/resources/bin</directory>
+        <outputDirectory>bin</outputDirectory>
+        <fileMode>0755</fileMode>
     </fileSet>
-    <!-- 将 webapp 下的文件输出到 WAR 包 
+    <!-- =================================================
+         jar包同级的config
+         ================================================= -->
+    <fileSet>
+      <directory>src/main/resources/conf/${env}</directory>
+      <outputDirectory>lib/config</outputDirectory>
+      <fileMode>0644</fileMode>
+    </fileSet>
+    <!-- =================================================
+         * 生成logs目录, 并配置读写权限
+         =================================================-->
     <fileSet>
-      <directory>${project.basedir}/src/main/webapp</directory>
-      <outputDirectory>/</outputDirectory>
+      <directory>src/main/resources</directory>
+      <outputDirectory>logs</outputDirectory>
+      <fileMode>0755</fileMode>
+      <excludes>
+        <exclude>**/*</exclude>
+      </excludes>
     </fileSet>
-    -->
   </fileSets>
-  <!-- 将项目依赖的JAR包输出到 WEB-INF/lib -->
-  <dependencySets>
-    <dependencySet>
-        <!-- ==========================================================================
-             true是默认值，本次构建出来的jar包属于当前这个dependencySet，一起打进最终的jar包 
-             ========================================================================== -->
-        <useProjectArtifact>false</useProjectArtifact>
-        <outputDirectory>BOOT-INF/lib</outputDirectory>
-    </dependencySet>
-  </dependencySets>
 </assembly>
\ No newline at end of file
diff --git a/infintech-executors/executor-collection-dispatcher/pom.xml b/infintech-executors/executor-collection-dispatcher/pom.xml
index 9f23dca7..e18f693a 100644
--- a/infintech-executors/executor-collection-dispatcher/pom.xml
+++ b/infintech-executors/executor-collection-dispatcher/pom.xml
@@ -9,6 +9,7 @@
         <version>1.9.1-SNAPSHOT</version>
     </parent>
     <artifactId>executor-collection-dispatcher</artifactId>
+    <version>1.0.0</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -124,6 +125,15 @@
     </profiles>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>mapping/**</include>
+                </includes>
+            </resource>
+        </resources>
         <plugins>
             <!-- spring-boot-maven-plugin (提供了直接运行项目的插件：如果是通过parent方式继承spring-boot-starter-parent则不用此插件) -->
             <plugin>