Merge branch 'master' of https://github.com/metersphere/metersphere

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;
     }

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit 57d6f78efa4b0300be188e8b024511ceef0873ed
+Subproject commit bb494fc68a2367359c9048fa7250c7618de4afb6

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/logo'" style="width: 156px;height: 37px;" alt="">
         <ms-top-menus/>
       </el-col>
 

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 71d57ae5d7f8bb5c93a29504ac6f2300dc189ce9
+Subproject commit 8a972a198775b3783ed6e4cef27197e53d1ebdc8

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/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/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"
     }
   },