From f4495e2587c0ba7c2085d3db0cbaca0d3fa30489 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 10 十一月 2023 15:27:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/pom.xml |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 1294940..b12c35a 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -71,12 +71,45 @@
 
     <build>
         <plugins>
+            <!-- ==================== 渚濊禆jar 浼樺寲start ========================== -->
+            <!-- lib鍖咃紝鎵撳畬涓�娆″悗鍙互娉ㄩ噴鎺変篃鍙互涓嶇锛屽鏋滄湁鏂板紩鍏ョ殑jar鍖呴渶瑕佹妸lib鍖呬笅鐨刯ar鏇存柊鍒版湇鍔″櫒涓嬶紝
+            //  鍘嬬缉鍚巎ar鍖呯殑鍚姩鎸囦护   java -Dloader.path="lib/" -jar xxx.jar
+            //  鏈帇缂﹋ar鍖呯殑鍚姩鎸囦护   java -jar xxx.jar"
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>copy-dependencies</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>copy-dependencies</goal>-->
+<!--                        </goals>-->
+<!--                        <configuration>-->
+<!--                            &lt;!&ndash; 渚濊禆鍖呰緭鍑虹洰褰曪紝灏嗘潵涓嶆墦杩沯ar鍖呴噷 &ndash;&gt;-->
+<!--                            <outputDirectory>${project.build.directory}/jarLib</outputDirectory>-->
+<!--                            <excludeTransitive>false</excludeTransitive>-->
+<!--                            <stripVersion>false</stripVersion>-->
+<!--                            <includeScope>runtime</includeScope>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>2.1.1.RELEASE</version>
                 <configuration>
                     <fork>true</fork> <!-- 濡傛灉娌℃湁璇ラ厤缃紝devtools涓嶄細鐢熸晥 -->
+<!--                    <mainClass>com.ruoyi.RuoYiApplication</mainClass>-->
+<!--                    <layout>ZIP</layout>-->
+<!--                    <includes>-->
+<!--                        <include>-->
+<!--                            <groupId>nothing</groupId>-->
+<!--                            <artifactId>nothing</artifactId>-->
+<!--                        </include>-->
+<!--                    </includes>-->
                 </configuration>
                 <executions>
                     <execution>
@@ -105,10 +138,6 @@
                         <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                     </buildArgs>
                 </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>

--
Gitblit v1.9.3