|
@@ -9,11 +9,11 @@
|
|
*/
|
|
*/
|
|
// 引入axios
|
|
// 引入axios
|
|
|
|
|
|
|
|
+import { clearClientInfo } from '@/utils/auth/auth.ts'
|
|
import { ElMessage } from 'element-plus'
|
|
import { ElMessage } from 'element-plus'
|
|
import { useRequest } from '@/hooks/useRequest'
|
|
import { useRequest } from '@/hooks/useRequest'
|
|
import { MessageType } from '@/types/res'
|
|
import { MessageType } from '@/types/res'
|
|
-import { getToken, refreshToken, removeAllToken, setToken } from '../token/token'
|
|
|
|
-import { setLoginState } from '../localStorage/localStorage'
|
|
|
|
|
|
+import { getToken, refreshToken, setToken } from '../token/token'
|
|
|
|
|
|
import axios from 'axios'
|
|
import axios from 'axios'
|
|
import router from '@/router'
|
|
import router from '@/router'
|
|
@@ -37,20 +37,19 @@ const axiosInstance = axios.create({
|
|
let isRefreshing = false // 是否正在刷新token
|
|
let isRefreshing = false // 是否正在刷新token
|
|
let requestQueue: any[] = [] // 存储请求队列
|
|
let requestQueue: any[] = [] // 存储请求队列
|
|
|
|
|
|
-/**
|
|
|
|
- * @description: 未登录的情况下展示的信息
|
|
|
|
- * @param msg 提示信息
|
|
|
|
- */
|
|
|
|
-const showUncloggingInfo = (msg: string = '请先登录') => {
|
|
|
|
- ElMessage({
|
|
|
|
- type: MessageType.Warning,
|
|
|
|
- message: msg,
|
|
|
|
- duration: 1500
|
|
|
|
- })
|
|
|
|
- removeAllToken()
|
|
|
|
- setLoginState(false)
|
|
|
|
- void router.push('/login')
|
|
|
|
-}
|
|
|
|
|
|
+// /**
|
|
|
|
+// * @description: 登出
|
|
|
|
+// * @param msg 提示信息
|
|
|
|
+// */
|
|
|
|
+// const clearClientInfo = (msg: string = '请先登录') => {
|
|
|
|
+// ElMessage({
|
|
|
|
+// type: MessageType.Warning,
|
|
|
|
+// message: msg,
|
|
|
|
+// duration: 1500
|
|
|
|
+// })
|
|
|
|
+// clearClientInfo()
|
|
|
|
+// void router.push('/login')
|
|
|
|
+// }
|
|
|
|
|
|
// 添加响应拦截器
|
|
// 添加响应拦截器
|
|
axiosInstance.interceptors.response.use(
|
|
axiosInstance.interceptors.response.use(
|
|
@@ -59,7 +58,8 @@ axiosInstance.interceptors.response.use(
|
|
|
|
|
|
// -2是token为空的情况
|
|
// -2是token为空的情况
|
|
if (code === -2) {
|
|
if (code === -2) {
|
|
- showUncloggingInfo()
|
|
|
|
|
|
+ clearClientInfo()
|
|
|
|
+ void router.push('/login')
|
|
}
|
|
}
|
|
// -1是token过期的情况
|
|
// -1是token过期的情况
|
|
if (code === -1) {
|
|
if (code === -1) {
|
|
@@ -77,12 +77,12 @@ axiosInstance.interceptors.response.use(
|
|
requestQueue = []
|
|
requestQueue = []
|
|
return axiosInstance(config)
|
|
return axiosInstance(config)
|
|
} else {
|
|
} else {
|
|
- showUncloggingInfo('登录已过期,请重新登陆')
|
|
|
|
|
|
+ clearClientInfo('登录已过期,请重新登陆')
|
|
}
|
|
}
|
|
})
|
|
})
|
|
.catch((err) => {
|
|
.catch((err) => {
|
|
console.log(err)
|
|
console.log(err)
|
|
- showUncloggingInfo('登录已过期,请重新登陆')
|
|
|
|
|
|
+ clearClientInfo('登录已过期,请重新登陆')
|
|
})
|
|
})
|
|
.finally(() => {
|
|
.finally(() => {
|
|
isRefreshing = false
|
|
isRefreshing = false
|