mirror of
https://github.com/chillzhuang/Saber.git
synced 2025-01-05 12:35:37 +08:00
🎉 2.7.3.RELEASE 增强多租户功能
This commit is contained in:
parent
7ae3dc4e3f
commit
2ed50e820d
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "saber-admin",
|
||||
"version": "2.7.2",
|
||||
"version": "2.7.3",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"serve": "vue-cli-service serve",
|
||||
|
@ -36,3 +36,13 @@ export const update = (row) => {
|
||||
data: row
|
||||
})
|
||||
}
|
||||
|
||||
export const info = (domain) => {
|
||||
return request({
|
||||
url: '/api/blade-system/tenant/info',
|
||||
method: 'get',
|
||||
params: {
|
||||
domain
|
||||
}
|
||||
})
|
||||
}
|
||||
|
@ -72,6 +72,8 @@
|
||||
import {mapGetters} from "vuex";
|
||||
import website from '@/config/website';
|
||||
import {getCaptcha} from "@/api/user";
|
||||
import {getTopUrl} from "@/util/util";
|
||||
import {info} from "@/api/system/tenant";
|
||||
|
||||
export default {
|
||||
name: "userlogin",
|
||||
@ -111,6 +113,7 @@
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getTenant();
|
||||
this.refreshCode();
|
||||
},
|
||||
mounted() {
|
||||
@ -148,6 +151,18 @@
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
getTenant() {
|
||||
let domain = getTopUrl();
|
||||
// 临时指定域名,方便测试
|
||||
//domain = "https://bladex.vip";
|
||||
info(domain).then(res => {
|
||||
const data = res.data;
|
||||
if (data.success && data.data.tenantId) {
|
||||
this.tenantMode = false;
|
||||
this.loginForm.tenantId = data.data.tenantId;
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
};
|
||||
|
@ -102,6 +102,11 @@
|
||||
span: 24,
|
||||
minRows: 6,
|
||||
type: "textarea",
|
||||
},
|
||||
{
|
||||
label: "域名地址",
|
||||
prop: "domain",
|
||||
span: 24,
|
||||
}
|
||||
]
|
||||
},
|
||||
|
@ -3,9 +3,9 @@
|
||||
<basic-container>
|
||||
<third-register></third-register>
|
||||
<p style="text-align: center;">
|
||||
<img src="https://img.shields.io/badge/Release-V2.7.2-green.svg" alt="Downloads"/>
|
||||
<img src="https://img.shields.io/badge/Release-V2.7.3-green.svg" alt="Downloads"/>
|
||||
<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" alt="Build Status"/>
|
||||
<img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR7-blue.svg" alt="Coverage Status"/>
|
||||
<img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR8-blue.svg" alt="Coverage Status"/>
|
||||
<img src="https://img.shields.io/badge/Spring%20Boot-2.2.9.RELEASE-blue.svg" alt="Downloads"/>
|
||||
<a target="_blank" href="https://bladex.vip">
|
||||
<img src="https://img.shields.io/badge/Saber%20Author-Small%20Chill-ff69b4.svg" alt="Downloads"/>
|
||||
@ -125,6 +125,15 @@
|
||||
<el-row>
|
||||
<basic-container>
|
||||
<el-collapse v-model="logActiveNames" @change="handleChange">
|
||||
<el-collapse-item title="2.7.3发布 增强多租户功能" name="20">
|
||||
<div>1.升级至 SpringCloud Hoxton.SR8</div>
|
||||
<div>2.升级至 Mybatis-Plus 3.4.0</div>
|
||||
<div>3.重构Mybatis-Plus封装适配最新版</div>
|
||||
<div>4.多租户增加域名绑定功能</div>
|
||||
<div>5.创建多租户的同时创建对应的管理用户</div>
|
||||
<div>6.优化日志模块分页排序</div>
|
||||
<div>7.关闭日志模块外置api放行</div>
|
||||
</el-collapse-item>
|
||||
<el-collapse-item title="2.7.2发布 集成JustAuth支持第三方登录" name="19">
|
||||
<div>1.升级至 SpringCloud Hoxton.SR7</div>
|
||||
<div>2.升级至 SpringBoot 2.2.9.RELEASE</div>
|
||||
@ -318,7 +327,7 @@
|
||||
data() {
|
||||
return {
|
||||
activeNames: ['1', '2', '3', '5'],
|
||||
logActiveNames: ['19']
|
||||
logActiveNames: ['20']
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
|
Loading…
Reference in New Issue
Block a user