|
@@ -17,6 +17,7 @@ import { setObjToUrlParams } from '@/utils/urlUtils';
|
|
|
import { RequestOptions, Result, CreateAxiosOptions } from './types';
|
|
import { RequestOptions, Result, CreateAxiosOptions } from './types';
|
|
|
|
|
|
|
|
import { useUserStoreWidthOut } from '@/store/modules/user';
|
|
import { useUserStoreWidthOut } from '@/store/modules/user';
|
|
|
|
|
+import urlJoin from 'url-join';
|
|
|
|
|
|
|
|
const globSetting = useGlobSetting();
|
|
const globSetting = useGlobSetting();
|
|
|
const urlPrefix = globSetting.urlPrefix || '';
|
|
const urlPrefix = globSetting.urlPrefix || '';
|
|
@@ -140,7 +141,8 @@ const transform: AxiosTransform = {
|
|
|
const isUrlStr = isUrl(config.url as string);
|
|
const isUrlStr = isUrl(config.url as string);
|
|
|
|
|
|
|
|
if (!isUrlStr && joinPrefix) {
|
|
if (!isUrlStr && joinPrefix) {
|
|
|
- config.url = `${urlPrefix}${config.url}`;
|
|
|
|
|
|
|
+ // 这里做兼容
|
|
|
|
|
+ config.url = urlJoin(urlPrefix || '', config.url as string);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (!isUrlStr && apiUrl && isString(apiUrl)) {
|
|
if (!isUrlStr && apiUrl && isString(apiUrl)) {
|