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

!128 【轻量PR】： 修复前端请求配置与自定义配置合并逻辑

Browse Source 
Merge pull request !128 from lorenzo/develop_v2
This commit is contained in:
dvadmin
2025-08-07 05:45:06 +00:00
committed by Gitee
parent b72fb5238f 95bf503529
commit 3db048e650
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/utils/service.ts
View File

@@ -172,20 +172,20 @@ function createRequestFunction(service: any) {
return function (config: any) { return function (config: any) {
const configDefault = { const configDefault = {
headers: { headers: {
'Content-Type': get(config, 'headers.Content-Type', 'application/json'), 'Content-Type': 'application/json',
}, },
timeout: 5000, timeout: 5000,
baseURL: getBaseURL(), baseURL: getBaseURL(),
data: {}, data: {},
}; };
Object.assign(configDefault, config);
// const token = userStore.getToken; // const token = userStore.getToken;
const token = Session.get('token'); const token = Session.get('token');
if (token != null) { if (token != null) {
// @ts-ignore // @ts-ignore
configDefault.headers.Authorization = 'JWT ' + token; configDefault.headers.Authorization = 'JWT ' + token;
} }
return service(Object.assign(configDefault, config)); return service(configDefault);
}; };
} }