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

fix: 修复登录后系统参数配置-显示设置和认证设置不显示

This commit is contained in:
Captain.B 2021-01-28 14:23:47 +08:00
parent 4102e2e667
commit 05f543cb51
2 changed files with 125 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java
View File

@ -28,6 +28,7 @@ public class ShiroUtils {
filterChainDefinitionMap.put("/authsource/list/allenable", "anon"); filterChainDefinitionMap.put("/authsource/list/allenable", "anon");
filterChainDefinitionMap.put("/sso/signin", "anon"); filterChainDefinitionMap.put("/sso/signin", "anon");
filterChainDefinitionMap.put("/sso/callback", "anon"); filterChainDefinitionMap.put("/sso/callback", "anon");
filterChainDefinitionMap.put("/license/valid", "anon");
// for swagger // for swagger
filterChainDefinitionMap.put("/swagger-ui.html", "anon"); filterChainDefinitionMap.put("/swagger-ui.html", "anon");

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

@ -3,45 +3,45 @@
<el-row type="flex"> <el-row type="flex">
<el-col :span="12"> <el-col :span="12">
<div class="title"> <div class="title">
<div class="title-img"> <div class="title-img">
<img :src="'/display/file/loginLogo'" alt=""> <img :src="'/display/file/loginLogo'" alt="">
</div>
<div class="welcome">
<span>Metersphere</span>
<span>{{ $t('commons.welcome') }}</span>
</div>
</div> </div>
<div class="welcome">
<span>Metersphere</span>
<span>{{ $t('commons.welcome') }}</span>
</div>
</div>
<div class="content"> <div class="content">
<div class="form"> <div class="form">
<el-form :model="form" :rules="rules" ref="form"> <el-form :model="form" :rules="rules" ref="form">
<el-form-item v-slot:default> <el-form-item v-slot:default>
<el-radio-group v-model="form.authenticate" @change="redirectAuth(form.authenticate)"> <el-radio-group v-model="form.authenticate" @change="redirectAuth(form.authenticate)">
<el-radio label="LDAP" size="mini" v-if="openLdap">LDAP</el-radio> <el-radio label="LDAP" size="mini" v-if="openLdap">LDAP</el-radio>
<el-radio label="LOCAL" size="mini" v-if="openLdap">普通登录</el-radio> <el-radio label="LOCAL" size="mini" v-if="openLdap">普通登录</el-radio>
<el-radio :label="auth.id" size="mini" v-for="auth in authSources" :key="auth.id">{{ auth.type }} {{ auth.name }}</el-radio> <el-radio :label="auth.id" size="mini" v-for="auth in authSources" :key="auth.id">{{ auth.type }} {{ auth.name }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input v-model="form.username" :placeholder="$t('commons.login_username')" autofocus <el-input v-model="form.username" :placeholder="$t('commons.login_username')" autofocus
autocomplete="off"/> autocomplete="off"/>
</el-form-item> </el-form-item>
<el-form-item prop="password"> <el-form-item prop="password">
<el-input v-model="form.password" :placeholder="$t('commons.password')" show-password autocomplete="off" <el-input v-model="form.password" :placeholder="$t('commons.password')" show-password autocomplete="off"
maxlength="30" show-word-limit/> maxlength="30" show-word-limit/>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div>
<div class="btn">
<el-button type="primary" class="submit" @click="submit('form')">
{{ $t('commons.login') }}
</el-button>
</div>
<div class="msg">
{{ msg }}
</div>
</div> </div>
<div class="btn">
<el-button type="primary" class="submit" @click="submit('form')">
{{ $t('commons.login') }}
</el-button>
</div>
<div class="msg">
{{ msg }}
</div>
</div>
</el-col> </el-col>
<div class="divider"/> <div class="divider"/>
@ -62,6 +62,7 @@ import {DEFAULT_LANGUAGE} from "@/common/js/constants";
const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/); const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
const display = requireComponent.keys().length > 0 ? requireComponent("./display/Display.vue") : {}; const display = requireComponent.keys().length > 0 ? requireComponent("./display/Display.vue") : {};
const auth = requireComponent.keys().length > 0 ? requireComponent("./auth/Auth.vue") : {}; const auth = requireComponent.keys().length > 0 ? requireComponent("./auth/Auth.vue") : {};
const license = requireComponent.keys().length > 0 ? requireComponent("./license/LicenseMessage.vue") : null;
export default { export default {
name: "Login", name: "Login",
@ -117,6 +118,10 @@ export default {
created: function () { created: function () {
// 主页添加键盘事件,注意,不能直接在焦点事件上添加回车 // 主页添加键盘事件,注意,不能直接在焦点事件上添加回车
document.addEventListener("keydown", this.watchEnter); document.addEventListener("keydown", this.watchEnter);
//
if (license.default) {
license.default.valid(this)
}
}, },
destroyed() { destroyed() {
@ -182,106 +187,106 @@ export default {
</script> </script>
<style scoped> <style scoped>
.container { .container {
width: 1440px; width: 1440px;
height: 810px; height: 810px;
margin: calc((100vh - 810px) / 2) auto 0; margin: calc((100vh - 810px) / 2) auto 0;
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.el-col:nth-child(3) { .el-col:nth-child(3) {
align-items: center; align-items: center;
display: flex; display: flex;
} }
.title img { .title img {
width: 293px; width: 293px;
margin-top: 165px; margin-top: 165px;
} }
.title-img { .title-img {
letter-spacing: 0; letter-spacing: 0;
text-align: center; text-align: center;
} }
.login-image { .login-image {
height: 365px; height: 365px;
width: 567px; width: 567px;
margin: auto; margin: auto;
display: block; display: block;
} }
.welcome { .welcome {
margin-top: 12px; margin-top: 12px;
margin-bottom: 75px; margin-bottom: 75px;
font-size: 14px; font-size: 14px;
color: #843697; color: #843697;
line-height: 14px; line-height: 14px;
text-align: center; text-align: center;
} }
.form,.btn { .form, .btn {
padding: 0; padding: 0;
width: 443px; width: 443px;
margin: auto; margin: auto;
} }
.btn > .submit { .btn > .submit {
border-radius: 70px; border-radius: 70px;
border-color: #8B479B; border-color: #8B479B;
background-color: #8B479B; background-color: #8B479B;
} }
.btn > .submit:hover { .btn > .submit:hover {
border-color: rgba(139, 71, 155, 0.9); border-color: rgba(139, 71, 155, 0.9);
background-color: rgba(139, 71, 155, 0.9); background-color: rgba(139, 71, 155, 0.9);
} }
.btn > .submit:active { .btn > .submit:active {
border-color: rgba(139, 71, 155, 0.8); border-color: rgba(139, 71, 155, 0.8);
background-color: rgba(139, 71, 155, 0.8); background-color: rgba(139, 71, 155, 0.8);
} }
.el-form-item:first-child { .el-form-item:first-child {
margin-top: 60px; margin-top: 60px;
} }
/deep/ .el-radio__input.is-checked .el-radio__inner { /deep/ .el-radio__input.is-checked .el-radio__inner {
background-color: #783887; background-color: #783887;
background: #783887; background: #783887;
border-color: #783887; border-color: #783887;
} }
/deep/ .el-radio__input.is-checked+.el-radio__label { /deep/ .el-radio__input.is-checked + .el-radio__label {
color: #783887; color: #783887;
} }
/deep/ .el-input__inner { /deep/ .el-input__inner {
border-radius: 70px !important; border-radius: 70px !important;
background: #f6f3f8 !important; background: #f6f3f8 !important;
border-color: #f6f3f8 !important; border-color: #f6f3f8 !important;
/*谷歌浏览器默认填充的颜色无法替换，使用下列样式填充*/ /*谷歌浏览器默认填充的颜色无法替换，使用下列样式填充*/
box-shadow: inset 0 0 0 1000px #f6f3f8 !important; box-shadow: inset 0 0 0 1000px #f6f3f8 !important;
} }
.el-input,.el-button { .el-input, .el-button {
width: 443px; width: 443px;
} }
/deep/ .el-input__inner:focus { /deep/ .el-input__inner:focus {
border: 1px solid #783887 !important; border: 1px solid #783887 !important;
} }
.divider { .divider {
border: 1px solid #f6f3f8; border: 1px solid #f6f3f8;
height: 480px; height: 480px;
margin: 165px 0px; margin: 165px 0px;
} }
.welcome span:first-child { .welcome span:first-child {
font-weight: bold; font-weight: bold;
margin-right: 3px; margin-right: 3px;
} }
</style> </style>