test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.5' into master 

# Conflicts:
#	frontend/src/business/components/xpack
This commit is contained in:
Captain.B 2020-11-25 16:39:14 +08:00
parent 4122a81100 17142dc4b3
commit 756c8d3fff
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/config/ShiroConfig.java
View File

@ -44,7 +44,7 @@ public class ShiroConfig implements EnvironmentAware {
Map<String, String> filterChainDefinitionMap = shiroFilterFactoryBean.getFilterChainDefinitionMap(); Map<String, String> filterChainDefinitionMap = shiroFilterFactoryBean.getFilterChainDefinitionMap();
ShiroUtils.loadBaseFilterChain(filterChainDefinitionMap); ShiroUtils.loadBaseFilterChain(filterChainDefinitionMap);
filterChainDefinitionMap.put("/display/info", "anon"); filterChainDefinitionMap.put("/display/info", "anon");
filterChainDefinitionMap.put("/display/file/*", "anon"); filterChainDefinitionMap.put("/display/file/**", "anon");
filterChainDefinitionMap.put("/**", "apikey, authc"); filterChainDefinitionMap.put("/**", "apikey, authc");
return shiroFilterFactoryBean; return shiroFilterFactoryBean;
} }

3
frontend/src/business/App.vue
View File

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

2
frontend/src/business/components/xpack

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

8
frontend/src/login/Login.vue
View File

@ -4,8 +4,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form :model="form" :rules="rules" ref="form"> <el-form :model="form" :rules="rules" ref="form">
<div class="logo"> <div class="logo">
<img v-if="loginLogoId" :src="'/display/file/' + loginLogoId" style="width: 224px;height: 45px;" alt=""> <img :src="'/display/file/svg/loginLogo'" style="width: 224px;height: 45px;" alt="">
<img v-else src="../assets/logo-dark-MeterSphere.svg" style="width: 224px; " alt="">
</div> </div>
<div class="title"> <div class="title">
<span id="s1">{{ loginTitle }}</span> <span id="s1">{{ loginTitle }}</span>
@ -41,8 +40,7 @@
</el-form> </el-form>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<img v-if="loginImageId" :src="'/display/file/' + loginImageId" style="height: 560px; width: 100%"> <img :src="'/display/file/png/loginImage'" style="height: 560px; width: 100%">
<img v-else src="../assets/info.png" style="height: 560px; width: 100%">
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -86,8 +84,6 @@ export default {
msg: '', msg: '',
ready: false, ready: false,
openLdap: false, openLdap: false,
loginLogoId: '_blank',
loginImageId: '_blank',
loginTitle: this.$t("commons.login") + " MeterSphere" loginTitle: this.$t("commons.login") + " MeterSphere"
} }
}, },