From 0e5a905ff935b2031648e3b0a5d1f8a82fb644ea Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Fri, 11 Aug 2023 14:41:34 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.ts              | 3 ++-
 src/utils/http/axios/Axios.ts          | 4 ++--
 src/utils/http/axios/axiosTransform.ts | 2 +-
 src/utils/http/axios/index.ts          | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 81d1aa7..e747e16 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -24,6 +24,7 @@ import { isUrl, isEmpty } from '/@/utils/is';
 import { h } from 'vue';
 import { getAuthClient } from '/@/utils';
 import { merge } from 'lodash-es';
+import { RequestOptions } from '/#/axios';
 
 interface UserState {
   userInfo: Nullable<User>;
@@ -120,7 +121,7 @@ export const useUserStore = defineStore({
             options: {
               clientId: client[0],
               clientSecret: client[1]
-            }
+            } as RequestOptions
           });
         }
         const data = await login(loginParams);
diff --git a/src/utils/http/axios/Axios.ts b/src/utils/http/axios/Axios.ts
index ba38fc8..6a65816 100644
--- a/src/utils/http/axios/Axios.ts
+++ b/src/utils/http/axios/Axios.ts
@@ -6,7 +6,7 @@
  */
 
 import type { AxiosRequestConfig, AxiosInstance, AxiosResponse } from 'axios';
-import type { RequestOptions, R, UploadFileParams } from '../../../../types/axios';
+import type { RequestOptions, R, UploadFileParams } from '/#/axios';
 import type { CreateAxiosOptions } from './axiosTransform';
 import axios from 'axios';
 import qs from 'qs';
@@ -74,7 +74,7 @@ export class VAxios {
     const axiosCanceler = new AxiosCanceler();
 
     // 请求拦截器配置处理
-    this.axiosInstance.interceptors.request.use((config: AxiosRequestConfig) => {
+    this.axiosInstance.interceptors.request.use((config: CreateAxiosOptions) => {
       // 如果开启了取消重复请求，则禁止取消重复请求
       // @ts-ignore
       const { ignoreCancelToken } = config.requestOptions;
diff --git a/src/utils/http/axios/axiosTransform.ts b/src/utils/http/axios/axiosTransform.ts
index 71345d0..16752c7 100644
--- a/src/utils/http/axios/axiosTransform.ts
+++ b/src/utils/http/axios/axiosTransform.ts
@@ -26,7 +26,7 @@ export abstract class AxiosTransform {
   requestCatchHook?: (e: Error, options: RequestOptions) => Promise<any>;
 
   /** 请求之前的拦截器 */
-  requestInterceptors?: (config: AxiosRequestConfig, options: CreateAxiosOptions) => AxiosRequestConfig;
+  requestInterceptors?: (config: CreateAxiosOptions, options: CreateAxiosOptions) => AxiosRequestConfig;
 
   /** 请求之后的拦截器 */
   responseInterceptors?: (res: AxiosResponse) => AxiosResponse;
diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index e1cd129..92c3abe 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -109,7 +109,7 @@ const transform: AxiosTransform = {
     // 请求之前处理config
     const token = getAccessToken();
     const clientId = import.meta.env['VITE_CLIENT_ID'], clientSecret = import.meta.env['VITE_CLIENT_SECRET'];
-    const { clientId: customClientId , clientSecret: customClientSecret } = options?.requestOptions || {};
+    const { clientId: customClientId , clientSecret: customClientSecret } = config.requestOptions || {};
     // 使用token进行请求
     if (token && (config as Recordable)?.requestOptions?.withToken !== false) {
       (config as Recordable).headers.Authorization = options.authenticationScheme