diff --git a/src/apis/auth/auth.js b/src/apis/auth/auth.js index 7854b21..92919f1 100644 --- a/src/apis/auth/auth.js +++ b/src/apis/auth/auth.js @@ -36,12 +36,12 @@ export function logout() { return service.post(`${BASE_URL}/logout`) } -/** @desc 获取用户信息 */ +/** @desc 获取用户信息(/login/validateToken 同时返回用户信息,与 currentUser 内容一致) */ export const getUserInfo = () => { - return service.get(`/sysUser/currentUser -`) -} - -export const checkUsertoken = () => { return service.post('/login/validateToken') } + +/** @desc 验证 token 有效性 */ +export const checkUsertoken = (token) => { + return service.get(`/auth/check/token/${token}`) +} diff --git a/src/stores/user.js b/src/stores/user.js index 8cd82ea..e8904e3 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -42,7 +42,7 @@ const storeSetup = () => { // 检查token有效性 const checkTokenValid = async () => { - const res = await checkUsertokenApi() + const res = await checkUsertokenApi(token.value) console.log('checkTokenValid:', res) if (res.code === '401' || res.status === '401' || res.success === false) { console.error('Token is invalid:', res.message) diff --git a/src/utils/request.js b/src/utils/request.js index 852659d..3b0fe37 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -58,7 +58,7 @@ service.interceptors.response.use( if (success || code === 0 || status === 0) { console.log('msg: \n', msg) return response.data - } else if (code === 401 && response.config.url !== '/login/validateToken`') { // 判断code=401时进行页面刷新,但是不对检验token这个路由的请求判断,防止出现死循环 + } else if (code === 401 && !(response.config.url || '').includes('/auth/check/token/') && response.config.url !== '/login/validateToken') { // token 校验和获取用户信息接口返回 401 时不触发刷新,防止死循环 userError() } console.log('CodeMessage: \n', StatusCodeMessage[code])