diff --git a/core/core-frontend/src/config/axios/refresh.ts b/core/core-frontend/src/config/axios/refresh.ts index 62c68a1..bfa2386 100644 --- a/core/core-frontend/src/config/axios/refresh.ts +++ b/core/core-frontend/src/config/axios/refresh.ts @@ -55,16 +55,20 @@ export const configHandler = config => { if (wsCache.get('user.token')) { config.headers['X-DE-TOKEN'] = wsCache.get('user.token') const expired = isExpired() - if (expired && config.url !== refreshUrl) { + if (expired && !config.url.includes(refreshUrl)) { if (!getRefreshStatus()) { setRefreshStatus(true) - refreshApi() + refreshApi(Date.now()) .then(res => { - userStore.setToken(res.data.token) - userStore.setExp(res.data.exp) - userStore.setTime(Date.now()) - config.headers['X-DE-TOKEN'] = res.data.token - delayExecute(res.data.token) + if (res?.data?.token) { + userStore.setToken(res.data.token) + userStore.setExp(res.data.exp) + userStore.setTime(Date.now()) + config.headers['X-DE-TOKEN'] = res.data.token + delayExecute(res.data.token) + } else { + delayExecute(null) + } }) .catch(e => { console.error(e) diff --git a/core/core-frontend/src/config/axios/service.ts b/core/core-frontend/src/config/axios/service.ts index 3b10e60..830ac04 100644 --- a/core/core-frontend/src/config/axios/service.ts +++ b/core/core-frontend/src/config/axios/service.ts @@ -257,6 +257,9 @@ service.interceptors.response.use( if (header.has('DE-FORBIDDEN-FLAG')) { showMsg('当前用户权限配置已变更,请刷新页面', '-changed-') } + if (error?.response.status === 400) { + return Promise.reject(error) + } return Promise.resolve() } )