Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

 Conflicts:

	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

	ruoyi-ui/package.json

	ruoyi-ui/src/utils/request.js

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",

ruoyi-ui/src/utils/request.js

@@ -50,8 +50,6 @@ service.interceptors.response.use(res => {
       return res.data
     }
     if (code === 401) {
-      let doms = document.getElementsByClassName('el-message-box')[0]
-      if(doms === undefined){
       MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
           confirmButtonText: '重新登录',
           cancelButtonText: '取消',
@@ -62,7 +60,6 @@ service.interceptors.response.use(res => {
           location.href = process.env.VUE_APP_CONTEXT_PATH + "index";
         })
       }).catch(() => {});
-      }
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
     } else if (code === 500) {
       Message({