From 302f23572bd65aac3a3852ea669ae2654df1b340 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 31 May 2021 17:06:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=90=8E=E7=9A=84=E9=A1=B5=E9=9D=A2=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/.gitignore                                | 2 +-
 backend/pom.xml                                   | 4 ++--
 backend/src/main/resources/application.properties | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/backend/.gitignore b/backend/.gitignore
index a5a2b0c056..c8d5907dfc 100644
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -25,7 +25,7 @@ yarn-error.log*
 
 
 src/main/resources/static
-src/main/resources/templates
+src/main/resources/public
 src/test/
 target
 .settings
diff --git a/backend/pom.xml b/backend/pom.xml
index 624a7cd13a..05342f1bad 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -488,7 +488,7 @@
                             <followSymlinks>false</followSymlinks>
                         </fileset>
                         <fileset>
-                            <directory>src/main/resources/templates</directory>
+                            <directory>src/main/resources/public</directory>
                             <includes>
                                 <include>**</include>
                             </includes>
@@ -537,7 +537,7 @@
                                         <exclude name="*.html"/>
                                     </fileset>
                                 </move>
-                                <move todir="src/main/resources/templates">
+                                <move todir="src/main/resources/public">
                                     <fileset dir="../frontend/dist">
                                         <include name="*.html"/>
                                     </fileset>
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 9c91f80616..8db6c07c47 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -27,8 +27,6 @@ mybatis.configuration.map-underscore-to-camel-case=true
 logging.file.path=/opt/metersphere/logs/${spring.application.name}
 # view
 spring.mvc.throw-exception-if-no-handler-found=true
-spring.web.resources.add-mappings=false
-spring.resources.static-locations=classpath:/templates/,classpath:/static/
 # flyway enable
 spring.flyway.enabled=true
 spring.flyway.baseline-on-migrate=true