Browse Source

chore: cleanup

main
刘凯 1 year ago
parent
commit
0df428f594
  1. 5
      src/api/base/login.ts
  2. 15
      src/views/base/login/LoginForm.vue

5
src/api/base/login.ts

@ -23,11 +23,6 @@ export function getTenantIdByName(name: string) {
return defHttp.get<TentantNameVO>({ url: Api.GetTenantIdByName + name }) return defHttp.get<TentantNameVO>({ url: Api.GetTenantIdByName + name })
} }
// 使用租户域名,获得租户信息
export function getTenantByWebsite(website: string) {
return defHttp.get({ url: `/system/tenant/get-by-website?website=${website}` }, { errorMessageMode: 'none' })
}
// 登出 // 登出
export function loginOut() { export function loginOut() {
return defHttp.delete({ url: Api.LoginOut }) return defHttp.delete({ url: Api.LoginOut })

15
src/views/base/login/LoginForm.vue

@ -18,8 +18,7 @@ import { useDesign } from '@/hooks/web/useDesign'
import * as authUtil from '@/utils/auth' import * as authUtil from '@/utils/auth'
import { Verify } from '@/components/Verifition' import { Verify } from '@/components/Verifition'
import { getTenantByWebsite, getTenantIdByName } from '@/api/base/login' import { getTenantIdByName } from '@/api/base/login'
import { noop } from '@/utils'
const FormItem = Form.Item const FormItem = Form.Item
const InputPassword = Input.Password const InputPassword = Input.Password
@ -71,16 +70,8 @@ async function getCode() {
// && ID // && ID
async function getTenantId() { async function getTenantId() {
if (tenantEnable === 'true') { if (tenantEnable === 'true') {
const website = location.host const res = await getTenantIdByName(formData.tenantName)
const tenant = await getTenantByWebsite(website).catch(noop) authUtil.setTenantId(res)
if (tenant) {
formData.tenantName = tenant.name
authUtil.setTenantId(tenant.id)
}
else {
const res = await getTenantIdByName(formData.tenantName)
authUtil.setTenantId(res)
}
} }
} }