diff --git a/src/api/base/login.ts b/src/api/base/login.ts index 89af784..eb663a7 100644 --- a/src/api/base/login.ts +++ b/src/api/base/login.ts @@ -14,7 +14,7 @@ enum Api { // 刷新访问令牌 export function refreshToken() { - const refreshToken = getRefreshToken() + const refreshToken: string = getRefreshToken() return defHttp.post({ url: Api.RefreshToken + refreshToken }) } diff --git a/src/settings/designSetting.ts b/src/settings/designSetting.ts index e75716d..4818763 100644 --- a/src/settings/designSetting.ts +++ b/src/settings/designSetting.ts @@ -1,6 +1,6 @@ import { ThemeEnum } from '../enums/appEnum' -export const prefixCls = 'vben' +export const prefixCls = 'xingyuv' export const darkMode = ThemeEnum.LIGHT diff --git a/src/utils/auth/index.ts b/src/utils/auth/index.ts index 85457af..99c63ae 100644 --- a/src/utils/auth/index.ts +++ b/src/utils/auth/index.ts @@ -6,19 +6,19 @@ import projectSetting from '@/settings/projectSetting' const { permissionCacheType } = projectSetting const isLocal = permissionCacheType === CacheTypeEnum.LOCAL -export function getAccessToken() { +export function getAccessToken(): string { return getAuthCache(ACCESS_TOKEN_KEY) } -export function setAccessToken(value) { +export function setAccessToken(value: string) { return setAuthCache(ACCESS_TOKEN_KEY, value) } -export function getRefreshToken() { +export function getRefreshToken(): string { return getAuthCache(REFRESH_TOKEN_KEY) } -export function setRefreshToken(value) { +export function setRefreshToken(value: string) { return setAuthCache(REFRESH_TOKEN_KEY, value) } diff --git a/src/utils/http/axios/Axios.ts b/src/utils/http/axios/Axios.ts index 018407d..843ad60 100644 --- a/src/utils/http/axios/Axios.ts +++ b/src/utils/http/axios/Axios.ts @@ -49,7 +49,7 @@ export class VAxios { refreshToken() { axios.defaults.headers.common['tenant-id'] = getTenantId() as number - const refreshToken = getRefreshToken() as string + const refreshToken = getRefreshToken() return axios.post(`${globSetting.apiUrl}/system/auth/refresh-token?refreshToken=${refreshToken}`) } @@ -119,7 +119,7 @@ export class VAxios { try { const refreshTokenRes = await this.refreshToken() // 2.1 刷新成功,则回放队列的请求 + 当前请求 - const refreshToken = getRefreshToken() as string + const refreshToken = getRefreshToken() setAccessToken(refreshTokenRes.data.data.accessToken) ;(config as Recordable).headers.Authorization = `Bearer ${refreshToken}` requestList.forEach((cb: any) => { @@ -145,7 +145,7 @@ export class VAxios { else { // 添加到队列,等待刷新获取到新的令牌 return new Promise((resolve) => { - const refreshToken = getRefreshToken() as string + const refreshToken = getRefreshToken() requestList.push(() => { ;(config as Recordable).headers.Authorization = `Bearer ${refreshToken}` // 让每个请求携带自定义token 请根据实际情况自行修改 resolve(this.axiosInstance(config)) diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts index f4a78c5..42ce83c 100644 --- a/src/utils/http/axios/index.ts +++ b/src/utils/http/axios/index.ts @@ -174,7 +174,7 @@ const transform: AxiosTransform = { */ requestInterceptors: (config, options) => { // 是否需要设置 token - let isToken = (config as Recordable)?.requestOptions?.withToken == false + let isToken = (config as Recordable)?.requestOptions?.withToken === false whiteList.some((v) => { if (config.url) { config.url.includes(v)