From 17142dc4b309c666515a22b2669984760c36e7b9 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 25 Nov 2020 16:38:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8A=A0=E8=BD=BD=E5=9B=BE=E7=89=87=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/metersphere/config/ShiroConfig.java  | 2 +-
 frontend/src/business/App.vue                             | 3 +--
 frontend/src/business/components/xpack                    | 2 +-
 frontend/src/login/Login.vue                              | 8 ++------
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/config/ShiroConfig.java b/backend/src/main/java/io/metersphere/config/ShiroConfig.java
index 54505fc49b..ddc9ad8e2c 100644
--- a/backend/src/main/java/io/metersphere/config/ShiroConfig.java
+++ b/backend/src/main/java/io/metersphere/config/ShiroConfig.java
@@ -44,7 +44,7 @@ public class ShiroConfig implements EnvironmentAware {
         Map<String, String> filterChainDefinitionMap = shiroFilterFactoryBean.getFilterChainDefinitionMap();
         ShiroUtils.loadBaseFilterChain(filterChainDefinitionMap);
         filterChainDefinitionMap.put("/display/info", "anon");
-        filterChainDefinitionMap.put("/display/file/*", "anon");
+        filterChainDefinitionMap.put("/display/file/**", "anon");
         filterChainDefinitionMap.put("/**", "apikey, authc");
         return shiroFilterFactoryBean;
     }
diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue
index 41cb26562f..aff282cd88 100644
--- a/frontend/src/business/App.vue
+++ b/frontend/src/business/App.vue
@@ -7,8 +7,7 @@
     </el-row>
     <el-row id="header-top" type="flex" justify="space-between" align="middle">
       <el-col :span="12">
-        <img v-if="logoId" :src="'/display/file/' + logoId" style="width: 156px;height: 37px;" alt="">
-        <a v-else class="logo"/>
+        <img :src="'/display/file/svg/logo'" style="width: 156px;height: 37px;" alt="">
         <ms-top-menus/>
       </el-col>
 
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 13907bd5ff..8a972a1987 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 13907bd5ff621214ae81e42098df382916c503ce
+Subproject commit 8a972a198775b3783ed6e4cef27197e53d1ebdc8
diff --git a/frontend/src/login/Login.vue b/frontend/src/login/Login.vue
index 02f61856a8..78a418c1b7 100644
--- a/frontend/src/login/Login.vue
+++ b/frontend/src/login/Login.vue
@@ -4,8 +4,7 @@
       <el-col :span="12">
         <el-form :model="form" :rules="rules" ref="form">
           <div class="logo">
-            <img v-if="loginLogoId" :src="'/display/file/' + loginLogoId" style="width: 224px;height: 45px;" alt="">
-            <img v-else src="../assets/logo-dark-MeterSphere.svg" style="width: 224px; " alt="">
+            <img :src="'/display/file/svg/loginLogo'" style="width: 224px;height: 45px;" alt="">
           </div>
           <div class="title">
             <span id="s1">{{ loginTitle }}</span>
@@ -41,8 +40,7 @@
         </el-form>
       </el-col>
       <el-col :span="12">
-        <img v-if="loginImageId" :src="'/display/file/' + loginImageId" style="height: 560px; width: 100%">
-        <img v-else src="../assets/info.png" style="height: 560px; width: 100%">
+        <img :src="'/display/file/png/loginImage'" style="height: 560px; width: 100%">
       </el-col>
     </el-row>
   </div>
@@ -86,8 +84,6 @@ export default {
       msg: '',
       ready: false,
       openLdap: false,
-      loginLogoId: '_blank',
-      loginImageId: '_blank',
       loginTitle: this.$t("commons.login") + " MeterSphere"
     }
   },