b2894lxlx/guofu-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

251229

Browse Source
This commit is contained in:
b2894lxlx
2025-12-29 10:45:01 +08:00
parent dc1af138e2
commit a6cd0c3d52
158 changed files with 22599 additions and 859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/utils/request.ts
View File

@@ -10,8 +10,6 @@ import { API_BASE_URL, TOKEN_HEADER_NAME, LAYOUT_PATH } from '@/config/setting';
import { getToken, setToken } from './token-util';
import { logout } from './page-tab-util';
import type { ApiResult } from '@/api';
import { getHostname, getTenantId } from '@/utils/domain';
import { getMerchantId } from "@/utils/merchant";
const service = axios.create({
baseURL: API_BASE_URL
@@ -22,7 +20,7 @@ const service = axios.create({
*/
service.interceptors.request.use(
(config) => {
const TENANT_ID = localStorage.getItem('TenantId');
// const TENANT_ID = localStorage.getItem('TenantId');
const token = getToken();
// 添加 token 到 header
if (token && config.headers) {
@@ -30,28 +28,29 @@ service.interceptors.request.use(
}
// 获取租户ID
if (config.headers) {
config.headers.common['TenantId'] = 10559;
// 附加企业ID
const companyId = localStorage.getItem('CompanyId');
if (companyId) {
config.headers.common['CompanyId'] = companyId;
}
// 附加商户ID
if (getMerchantId()) {
config.headers.common['MerchantId'] = getMerchantId();
}
// 通过网站域名获取租户ID
if (getHostname()) {
config.headers.common['Domain'] = getHostname();
}
// 解析二级域名获取租户ID
if (getTenantId()) {
config.headers.common['TenantId'] = getTenantId();
return config;
}
if (TENANT_ID) {
config.headers.common['TenantId'] = TENANT_ID;
return config;
}
// const companyId = localStorage.getItem('CompanyId');
// if (companyId) {
// config.headers.common['CompanyId'] = companyId;
// }
// // 附加商户ID
// if (getMerchantId()) {
// config.headers.common['MerchantId'] = getMerchantId();
// }
// // 通过网站域名获取租户ID
// if (getHostname()) {
// config.headers.common['Domain'] = getHostname();
// }
// // 解析二级域名获取租户ID
// if (getTenantId()) {
// config.headers.common['TenantId'] = getTenantId();
// return config;
// }
// if (TENANT_ID) {
// config.headers.common['TenantId'] = TENANT_ID;
// return config;
// }
}
return config;
},