diff --git a/ui/src/utils/request.js b/ui/src/utils/request.js index 0abd0905c27..ffc62eb7ac9 100644 --- a/ui/src/utils/request.js +++ b/ui/src/utils/request.js @@ -18,11 +18,11 @@ import Vue from 'vue' import axios from 'axios' import router from '@/router' -import store from '@/store' import { VueAxios } from './axios' import notification from 'ant-design-vue/es/notification' import { CURRENT_PROJECT } from '@/store/mutation-types' import i18n from '@/locales' +import store from '@/store' const service = axios.create({ timeout: 600000 @@ -46,9 +46,7 @@ const err = (error) => { key: 'http-401' }) store.dispatch('Logout').then(() => { - setTimeout(() => { - window.location.reload() - }, 1500) + router.go(0) }) } if (response.status === 404) { diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue index d96833a15b3..c2013ee7975 100644 --- a/ui/src/views/AutogenView.vue +++ b/ui/src/views/AutogenView.vue @@ -653,9 +653,16 @@ export default { return } + if ([401].includes(error.response.status)) { + store.dispatch('Logout').then(() => { + this.$router.push({ path: '/user/login', query: { redirect: this.$route.fullPath } }) + }) + return + } + this.$notifyError(error) - if ([401, 405].includes(error.response.status)) { + if ([405].includes(error.response.status)) { this.$router.push({ path: '/exception/403' }) } diff --git a/ui/src/views/iam/DomainView.vue b/ui/src/views/iam/DomainView.vue index bb4efadcbc5..287ca56d5e6 100644 --- a/ui/src/views/iam/DomainView.vue +++ b/ui/src/views/iam/DomainView.vue @@ -181,7 +181,14 @@ export default { duration: 0 }) - if ([401, 405].includes(error.response.status)) { + if ([401].includes(error.response.status)) { + store.dispatch('Logout').then(() => { + this.$router.push({ path: '/user/login', query: { redirect: this.$route.fullPath } }) + }) + return + } + + if ([405].includes(error.response.status)) { this.$router.push({ path: '/exception/403' }) }