diff --git a/src/api/user.ts b/src/api/user.ts index 509fd99..096b565 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -142,7 +142,7 @@ export const GetUserStatisticService = (Data) => { for (let key in Data) { params.append(key, Data[key]) } - return request2.post('/user/statistic', params,{ + return request2.post('/tool/statistic', params,{ headers: { 'token': Data.token, } diff --git a/src/utils/request2.ts b/src/utils/request2.ts index fc8a7f5..efbbe3e 100644 --- a/src/utils/request2.ts +++ b/src/utils/request2.ts @@ -91,6 +91,12 @@ request.interceptors.response.use( 'Authorization': `Bearer ${localStorage.getItem("refresh_token")}` } }).then(res => { + if (res.data.code !== 0) { + ElMessage.error('登录已过期,请重新登录!'); + localStorage.removeItem("token"); + localStorage.removeItem("refresh_token"); + router.push("/login"); + } const { token, refresh_token } = res.data; localStorage.setItem("token", token); localStorage.setItem("refresh_token", refresh_token); diff --git a/src/utils/user_center_request.ts b/src/utils/user_center_request.ts index cc3ed3a..9a22193 100644 --- a/src/utils/user_center_request.ts +++ b/src/utils/user_center_request.ts @@ -38,13 +38,21 @@ request.interceptors.response.use( 'Authorization': `Bearer ${localStorage.getItem("refresh_token")}` } }).then(res => { + + if (res.data.code !== 0 || res.data.data === null) { + + ElMessage.error('登录已过期,请重新登录!'); + localStorage.removeItem("token"); + localStorage.removeItem("refresh_token"); + router.push("/login"); + } const token = res.data["data"]["access_token"]; localStorage.setItem("token", token); // 重试所有挂起的请求 requests.forEach(cb => cb(token)); requests = []; - isRefreshing = false; + //isRefreshing = false; // 重试当前请求 const config = result.config; @@ -56,7 +64,7 @@ request.interceptors.response.use( router.push("/login"); return Promise.reject(err); }); - } else if (isRefreshing) { + } else{ // 正在刷新token,将请求放入队列 return new Promise(resolve => { requests.push(token => {