Merge branch 'v1.5' into master

# Conflicts:
#	backend/src/main/java/io/metersphere/xpack

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

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

frontend/src/business/App.vue

@@ -7,7 +7,7 @@
     </el-row>
     <el-row id="header-top" type="flex" justify="space-between" align="middle">
       <el-col :span="12">
-        <img :src="'/display/file/svg/logo'" style="width: 156px;height: 37px;" alt="">
+        <img :src="'/display/file/logo'" style="width: 156px;height: 37px;" alt="">
         <ms-top-menus/>
       </el-col>
 

frontend/src/login/Login.vue

@@ -4,7 +4,7 @@
       <el-col :span="12">
         <el-form :model="form" :rules="rules" ref="form">
           <div class="logo">
-            <img :src="'/display/file/svg/loginLogo'" style="width: 224px;height: 45px;" alt="">
+            <img :src="'/display/file/loginLogo'" style="width: 224px;height: 45px;" alt="">
           </div>
           <div class="title">
             <span id="s1">{{ loginTitle }}</span>
@@ -40,7 +40,7 @@
         </el-form>
       </el-col>
       <el-col :span="12">
-        <img :src="'/display/file/png/loginImage'" style="height: 560px; width: 100%">
+        <img :src="'/display/file/loginImage'" style="height: 560px; width: 100%">
       </el-col>
     </el-row>
   </div>