diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 45f5508e6..a52059488 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -47,7 +47,7 @@ "highlight.js": "9.18.5", "js-beautify": "1.13.0", "js-cookie": "2.2.1", - "jsencrypt": "3.0.0-rc.1", + "jsencrypt": "3.2.1", "nprogress": "0.2.0", "quill": "1.3.7", "screenfull": "5.0.2", diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js index 78a20a2f1..1acd94168 100644 --- a/ruoyi-ui/src/utils/request.js +++ b/ruoyi-ui/src/utils/request.js @@ -48,19 +48,16 @@ service.interceptors.response.use(res => { return res.data } if (code === 401) { - let doms = document.getElementsByClassName('el-message-box')[0] - if(doms === undefined){ - MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { + MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' } - ).then(() => { - store.dispatch('LogOut').then(() => { - location.href = '/index'; - }) - }).catch(() => {}); - } + ).then(() => { + store.dispatch('LogOut').then(() => { + location.href = '/index'; + }) + }).catch(() => {}); return Promise.reject('无效的会话,或者会话已过期,请重新登录。') } else if (code === 500) { Message({