From 8c94c48ab53a85b394b6c12250f6512144f22b4a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 19 二月 2022 17:18:19 +0800
Subject: [PATCH] 修改登录超时刷新页面跳转登录页面还提示重新登录问题
---
src/utils/request.js | 15 ++++++---------
src/permission.js | 3 +++
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 11c27ed..82a8a59 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,6 +5,7 @@
import 'nprogress/nprogress.css'
import { getToken } from '@/utils/auth'
import { isHttp } from '@/utils/validate'
+import { isRelogin } from '@/utils/request'
NProgress.configure({ showSpinner: false });
@@ -20,8 +21,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鏉冮檺鐢熸垚鍙闂殑璺敱琛�
accessRoutes.forEach(route => {
diff --git a/src/utils/request.js b/src/utils/request.js
index 46b55b2..e82383a 100644
--- a/src/utils/request.js
+++ b/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;
ElMessageBox.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