From 2e1ef93aa6a651063f06093b57c60d6409745b52 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 19 Feb 2022 17:12:50 +0800
Subject: [PATCH] 修改登录超时刷新页面跳转登录页面还提示重新登录问题
---
ruoyi-ui/src/permission.js | 3 +++
ruoyi-ui/src/utils/request.js | 15 ++++++---------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index bde5293..a25437c 100644
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -4,6 +4,7 @@
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import { getToken } from '@/utils/auth'
+import { isRelogin } from '@/utils/request'
NProgress.configure({ showSpinner: false })
@@ -19,8 +20,10 @@
NProgress.done()
} else {
if (store.getters.roles.length === 0) {
+ isRelogin.show = true
// 判断当前用户是否已拉取完user_info信息
store.dispatch('GetInfo').then(() => {
+ isRelogin.show = false
store.dispatch('GenerateRoutes').then(accessRoutes => {
// 根据roles权限生成可访问的路由表
router.addRoutes(accessRoutes) // 动态添加可访问路由表
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index 925732f..4030aad 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -9,7 +9,7 @@
let downloadLoadingInstance;
// 是否显示重新登录
-let isReloginShow;
+export let isRelogin = { show: false };
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// 创建axios实例
@@ -76,23 +76,20 @@
return res.data
}
if (code === 401) {
- if (!isReloginShow) {
- isReloginShow = true;
+ if (!isRelogin.show) {
+ isRelogin.show = true;
MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
confirmButtonText: '重新登录',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
- isReloginShow = false;
+ isRelogin.show = false;
store.dispatch('LogOut').then(() => {
- // 如果是登录页面不需要重新加载
- if (window.location.hash.indexOf("#/login") != 0) {
- location.href = '/index';
- }
+ location.href = '/index';
})
}).catch(() => {
- isReloginShow = false;
+ isRelogin.show = false;
});
}
return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
--
Gitblit v1.9.3