From eaeb324c74c12e09c4c7f5b1dfbdf2943905cd89 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 08 一月 2022 18:41:42 +0800
Subject: [PATCH] update 指定 maven 资源过滤为具体文件 防止错误过滤

---
 ruoyi-extend/ruoyi-xxl-job-admin/pom.xml |   13 -------------
 pom.xml                                  |   11 ++++++++++-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7ee55e2..43e8ae6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -317,8 +317,17 @@
         </plugins>
         <resources>
             <resource>
-                <!--鎵撳寘璇ョ洰褰曚笅鐨� application.yml -->
                 <directory>src/main/resources</directory>
+                <!-- 鍏抽棴杩囨护 -->
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <!-- 寮曞叆鎵�鏈� 鍖归厤鏂囦欢杩涜杩囨护 -->
+                <includes>
+                    <include>application*</include>
+                    <include>bootstrap*</include>
+                </includes>
                 <!-- 鍚敤杩囨护 鍗宠璧勬簮涓殑鍙橀噺灏嗕細琚繃婊ゅ櫒涓殑鍊兼浛鎹� -->
                 <filtering>true</filtering>
             </resource>
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
index 640628e..218c1cc 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
@@ -99,19 +99,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
-				<configuration>
-					<nonFilteredFileExtensions>
-						<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
-						<nonFilteredFileExtension>jks</nonFilteredFileExtension>
-						<nonFilteredFileExtension>woff</nonFilteredFileExtension>
-						<nonFilteredFileExtension>woff2</nonFilteredFileExtension>
-					</nonFilteredFileExtensions>
-				</configuration>
-			</plugin>
 			<!-- docker -->
 			<plugin>
 				<groupId>com.spotify</groupId>

--
Gitblit v1.9.3