测试环境允许泛域名访问,方便根据域名进入租户系统
This commit is contained in:
parent
1407059688
commit
8ed93030a4
@ -1,5 +1,7 @@
|
|||||||
import request from '/@/utils/request';
|
import request from '/@/utils/request';
|
||||||
|
enum Api {
|
||||||
|
GetTenantIdByHostname = '/api/sysAuth/tenantIdByHostname',
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* (不建议写成 request.post(xxx),因为这样 post 时,无法 params 与 data 同时传参)
|
* (不建议写成 request.post(xxx),因为这样 post 时,无法 params 与 data 同时传参)
|
||||||
*
|
*
|
||||||
@ -25,3 +27,9 @@ export function useLoginApi() {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const getTenantIdByHostname = (hostname: string) =>
|
||||||
|
request({
|
||||||
|
url: `${Api.GetTenantIdByHostname}/${hostname}`,
|
||||||
|
method: 'get',
|
||||||
|
});
|
||||||
|
|||||||
@ -229,7 +229,8 @@ const onSignIn = async () => {
|
|||||||
const publicKey = window.__env__.VITE_SM_PUBLIC_KEY;
|
const publicKey = window.__env__.VITE_SM_PUBLIC_KEY;
|
||||||
const password = sm2.doEncrypt(state.ruleForm.password, publicKey, 1);
|
const password = sm2.doEncrypt(state.ruleForm.password, publicKey, 1);
|
||||||
|
|
||||||
const tenantid = route.query.tid ?? 0;
|
//const tenantid = route.query.tid ?? 0;
|
||||||
|
const tenantid = Local.get('tid') ?? 0;
|
||||||
const [err, res] = await feature(getAPI(SysAuthApi).apiSysAuthLoginPost({ ...state.ruleForm, password: password, tenantId: Number(tenantid) }));
|
const [err, res] = await feature(getAPI(SysAuthApi).apiSysAuthLoginPost({ ...state.ruleForm, password: password, tenantId: Number(tenantid) }));
|
||||||
if (err) {
|
if (err) {
|
||||||
getCaptcha(); // 重新获取验证码
|
getCaptcha(); // 重新获取验证码
|
||||||
|
|||||||
@ -102,7 +102,7 @@ import { Local } from '/@/utils/storage';
|
|||||||
// 引入多语言
|
// 引入多语言
|
||||||
import { languageList, getCountryCode } from '/@/i18n';
|
import { languageList, getCountryCode } from '/@/i18n';
|
||||||
import '/node_modules/flag-icons/css/flag-icons.min.css';
|
import '/node_modules/flag-icons/css/flag-icons.min.css';
|
||||||
|
import { getTenantIdByHostname } from '/@/api/login/index';
|
||||||
// 引入组件
|
// 引入组件
|
||||||
const Account = defineAsyncComponent(() => import('/@/views/login/component/account.vue'));
|
const Account = defineAsyncComponent(() => import('/@/views/login/component/account.vue'));
|
||||||
const Mobile = defineAsyncComponent(() => import('/@/views/login/component/mobile.vue'));
|
const Mobile = defineAsyncComponent(() => import('/@/views/login/component/mobile.vue'));
|
||||||
@ -129,7 +129,13 @@ onMounted(async () => {
|
|||||||
if (!route.query.tid) Local.remove('tid');
|
if (!route.query.tid) Local.remove('tid');
|
||||||
var tenantid = Number(route.query.tid);
|
var tenantid = Number(route.query.tid);
|
||||||
if (isNaN(tenantid)) {
|
if (isNaN(tenantid)) {
|
||||||
tenantid = 0;
|
// 确保hostname不包含端口号
|
||||||
|
const hostnameWithoutPort = window.location.hostname;
|
||||||
|
const data = await getTenantIdByHostname(hostnameWithoutPort);
|
||||||
|
console.log('tenantid', data.data.result);
|
||||||
|
tenantid = data.data.result;
|
||||||
|
if (tenantid > 99999)
|
||||||
|
Local.set('tid', tenantid);
|
||||||
} else if (tenantid > 99999) {
|
} else if (tenantid > 99999) {
|
||||||
Local.set('tid', tenantid);
|
Local.set('tid', tenantid);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -101,6 +101,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
|
|||||||
port: env.VITE_PORT as unknown as number,
|
port: env.VITE_PORT as unknown as number,
|
||||||
open: JSON.parse(env.VITE_OPEN),
|
open: JSON.parse(env.VITE_OPEN),
|
||||||
hmr: true,
|
hmr: true,
|
||||||
|
allowedHosts:true,
|
||||||
proxy: {
|
proxy: {
|
||||||
'^/[Uu]pload': {
|
'^/[Uu]pload': {
|
||||||
target: env.VITE_API_URL,
|
target: env.VITE_API_URL,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user