From f8f6a92652e832222bf0f8bbeb21fbe7f0e24d31 Mon Sep 17 00:00:00 2001
From: yagol2020 <yhw_yagol@yeah.net>
Date: Mon, 22 Nov 2021 14:55:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B0=86mind=20fusion=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0jar=E5=8C=85=E6=B7=BB=E5=8A=A0=E5=88=B0maven=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assembly.xml | 23 +++++++++++++++++++++++
 pom.xml      |  9 +++++----
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 assembly.xml

diff --git a/assembly.xml b/assembly.xml
new file mode 100644
index 0000000..43e2a83
--- /dev/null
+++ b/assembly.xml
@@ -0,0 +1,23 @@
+<assembly>
+    <id>jar-with-dependencies</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <!-- 默认的配置 -->
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useProjectArtifact>true</useProjectArtifact>
+            <unpack>true</unpack>
+            <scope>runtime</scope>
+        </dependencySet>
+        <!-- 增加scope类型为system的配置 -->
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useProjectArtifact>true</useProjectArtifact>
+            <unpack>true</unpack>
+            <scope>system</scope>
+        </dependencySet>
+    </dependencySets>
+</assembly>
diff --git a/pom.xml b/pom.xml
index 54b723d..32386a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,12 +154,12 @@
                             <mainClass>gui.view.MainGui</mainClass>
                         </manifest>
                     </archive>
-                    <descriptorRefs>
-                        <!-- 这个jar-with-dependencies是assembly预先写好的一个，组装描述引用 -->
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
                     <!--工程名-->
                     <finalName>${project.name}</finalName>
+                    <!-- assembly.xml文件路径 -->
+                    <descriptors>
+                        <descriptor>assembly.xml</descriptor>
+                    </descriptors>
                 </configuration>
                 <executions>
                     <execution>
@@ -168,6 +168,7 @@
                         <goals>
                             <goal>single</goal>
                         </goals>
+
                     </execution>
                 </executions>
             </plugin>