From a68a354720969971a8d292236e3736b78fe6287a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 16 Oct 2024 10:47:11 +0800
Subject: [PATCH] 'commit'

---
 dsBase/pom.xml                        | 18 +++++--
 dsBase/src/main/resources/package.xml | 67 ---------------------------
 2 files changed, 15 insertions(+), 70 deletions(-)
 delete mode 100644 dsBase/src/main/resources/package.xml

diff --git a/dsBase/pom.xml b/dsBase/pom.xml
index fbe2d67b..541e4679 100644
--- a/dsBase/pom.xml
+++ b/dsBase/pom.xml
@@ -264,9 +264,9 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.3.0</version>
                 <configuration>
-                    <descriptors>
-                        <descriptor>src/main/resources/package.xml</descriptor>   <!-- 配置文件路径 -->
-                    </descriptors>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
                     <archive>
                         <manifest>
                             <mainClass>com.dsideal.base.BaseApplication</mainClass>
@@ -283,6 +283,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- 禁用默认的 jar 打包插件，防止生成额外的 jar 文件 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/dsBase/src/main/resources/package.xml b/dsBase/src/main/resources/package.xml
deleted file mode 100644
index b759bd85..00000000
--- a/dsBase/src/main/resources/package.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-    <!-- 最终打包文件的后缀，格式为 ${fileName}-bin -->
-    <id>bin</id>
-    <!-- 最终打包成一个用于发布的zip文件 -->
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <!-- 把依赖的jar包打包进zip的lib目录下-->
-    <dependencySets>
-        <dependencySet>
-            <!-- 不使用项目的artifact -->
-            <useProjectArtifact>false</useProjectArtifact>
-            <!-- 打包进zip文件下的lib目录中  -->
-            <outputDirectory>lib</outputDirectory>
-            <!-- 第三方jar不要解压 -->
-            <unpack>false</unpack>
-        </dependencySet>
-    </dependencySets>
-
-    <!-- 文件配置 -->
-    <fileSets>
-        <!-- 把项目的配置文件，打包进zip包的config目录下    -->
-        <fileSet>
-            <!-- 配置项目中需要被打包的文件的存储路径 -->
-            <directory>${project.basedir}/src/main/resources/${env}</directory>
-            <outputDirectory>/config</outputDirectory>
-            <includes>
-                <!-- 可以指定单个文件 -->
-                <!--<include>project.config</include>-->
-                <!-- 可以直接指定所有文件 -->
-                <include>*.*</include>
-            </includes>
-        </fileSet>
-
-        <!-- 把项目的配置文件，打包进zip包的根目录下    -->
-        <fileSet>
-            <directory>${project.basedir}/src/main/resources/${env}</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>scf*.xml</include>
-            </includes>
-        </fileSet>
-
-        <!-- 把项目自己编译出来根目录下的jar文件，打包进zip文件的根目录 -->
-        <fileSet>
-            <directory>${project.build.directory}</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-
-        <!-- 把项目自己编译出来的jar文件夹下的jar文件，去除第三方jar，打包进zip文件的根目录 -->
-        <fileSet>
-            <directory>${project.build.directory}/jar</directory>
-            <outputDirectory></outputDirectory>
-            <excludes>
-                <exclude>lib/*.jar</exclude>
-            </excludes>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file