diff --git a/package.json b/package.json index b3beea7..4db56db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "saber-admin", - "version": "2.7.2", + "version": "2.7.3", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js index 1ce915b..8ef67e8 100644 --- a/src/api/system/tenant.js +++ b/src/api/system/tenant.js @@ -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 + } + }) +} diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index d132996..abc99fc 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -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; + } + }) } } }; diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue index 26f5968..59ed1da 100644 --- a/src/views/system/tenant.vue +++ b/src/views/system/tenant.vue @@ -102,6 +102,11 @@ span: 24, minRows: 6, type: "textarea", + }, + { + label: "域名地址", + prop: "domain", + span: 24, } ] }, diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue index 2e78ea5..9566eaf 100644 --- a/src/views/wel/index.vue +++ b/src/views/wel/index.vue @@ -3,9 +3,9 @@

- Downloads + Downloads Build Status - Coverage Status + Coverage Status Downloads Downloads @@ -125,6 +125,15 @@ + +

1.升级至 SpringCloud Hoxton.SR8
+
2.升级至 Mybatis-Plus 3.4.0
+
3.重构Mybatis-Plus封装适配最新版
+
4.多租户增加域名绑定功能
+
5.创建多租户的同时创建对应的管理用户
+
6.优化日志模块分页排序
+
7.关闭日志模块外置api放行
+
1.升级至 SpringCloud Hoxton.SR7
2.升级至 SpringBoot 2.2.9.RELEASE
@@ -318,7 +327,7 @@ data() { return { activeNames: ['1', '2', '3', '5'], - logActiveNames: ['19'] + logActiveNames: ['20'] }; }, computed: {