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) + } } }