From eaeb324c74c12e09c4c7f5b1dfbdf2943905cd89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Sat, 8 Jan 2022 18:41:42 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=8C=87=E5=AE=9A=20maven=20=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E8=BF=87=E6=BB=A4=E4=B8=BA=E5=85=B7=E4=BD=93=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20=E9=98=B2=E6=AD=A2=E9=94=99=E8=AF=AF=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pom.xml b/pom.xml
index 7ee55e281..43e8ae610 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 640628e35..218c1cc45 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>