From ca8dc1ab482ab472a46aed49d82a6b0b39636150 Mon Sep 17 00:00:00 2001 From: xingyu Date: Wed, 8 Nov 2023 10:18:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=EF=BC=8C=E8=8E=B7=E5=BE=97=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/base/login.ts | 5 +++++ src/views/base/login/LoginForm.vue | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/api/base/login.ts b/src/api/base/login.ts index eb663a7..f289f83 100644 --- a/src/api/base/login.ts +++ b/src/api/base/login.ts @@ -23,6 +23,11 @@ export function getTenantIdByName(name: string) { return defHttp.get({ url: Api.GetTenantIdByName + name }) } +// 使用租户域名,获得租户信息 +export function getTenantByWebsite(website: string) { + return defHttp.get({ url: `/system/tenant/get-by-website?website=${website}` }) +} + // 登出 export function loginOut() { return defHttp.delete({ url: Api.LoginOut }) diff --git a/src/views/base/login/LoginForm.vue b/src/views/base/login/LoginForm.vue index 91da71c..aeccb4b 100644 --- a/src/views/base/login/LoginForm.vue +++ b/src/views/base/login/LoginForm.vue @@ -18,7 +18,7 @@ import { useDesign } from '@/hooks/web/useDesign' import * as authUtil from '@/utils/auth' import { Verify } from '@/components/Verifition' -import { getTenantIdByName } from '@/api/base/login' +import { getTenantByWebsite, getTenantIdByName } from '@/api/base/login' const FormItem = Form.Item const InputPassword = Input.Password @@ -67,11 +67,19 @@ async function getCode() { } } -// 获取租户ID +// 根据域名,获得租户信息 && 获取租户ID async function getTenantId() { if (tenantEnable === 'true') { - const res = await getTenantIdByName(formData.tenantName) - authUtil.setTenantId(res) + const website = location.host + const tenant = await getTenantByWebsite(website) + if (tenant) { + formData.tenantName = tenant.name + authUtil.setTenantId(tenant.id) + } + else { + const res = await getTenantIdByName(formData.tenantName) + authUtil.setTenantId(res) + } } }