From f1198c433aa7ebc85d7cf8330d9d8097cf033d46 Mon Sep 17 00:00:00 2001
From: "udf_admin@163.com" <udf_admin@163.com>
Date: Fri, 1 May 2020 22:56:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/App.vue                                  |  8 +++++++-
 admin/src/assets/js/glob.js                        | 14 ++------------
 .../udf/api/rbac/auth/WebHandlerInterceptor.java   |  1 +
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/admin/src/App.vue b/admin/src/App.vue
index 3619d30..dfaca1b 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -55,7 +55,8 @@
                   <el-col :span="24">
                     <span><el-button type="text" :style="userDtoBtnStyle">基本资料</el-button></span>
                     <el-divider direction="vertical"></el-divider>
-                    <span><el-button type="text" :style="logoutBtnStyle">退出登录</el-button></span>
+                    <span><el-button type="text" :style="logoutBtnStyle"
+                                     @click="logoutBtnClick">退出登录</el-button></span>
                   </el-col>
                 </el-row>
               </div>
@@ -192,6 +193,11 @@
       //搜索输入框显示和隐藏
       searchInputDivShowHidden() {
         this.showSearchInput = !this.showSearchInput;
+      },
+      //退出登录按钮事件
+      logoutBtnClick() {
+        const loading = this.$loading({lock: true, text: '操作中'});
+        api_user.logout().then(response => window.location.href = '/').finally(() => loading.close());
       }
     }
   }
diff --git a/admin/src/assets/js/glob.js b/admin/src/assets/js/glob.js
index 8a7f082..e1d5e27 100644
--- a/admin/src/assets/js/glob.js
+++ b/admin/src/assets/js/glob.js
@@ -26,18 +26,8 @@ const glob = {
   },
   //跳转到登陆页
   jumpLoginPage() {
-    //弹出提示
-    Message({
-      dangerouslyUseHTMLString: false,
-      showClose: true,
-      duration: 2000,
-      type: 'info',
-      message: '认证过期,请重新登陆,正在跳转',
-      onClose: () => {
-        const redirectUrl = escape(window.location.href);
-        window.location = process.env.VUE_APP_BASE_URL + 'login.html?redirectUrl=' + redirectUrl;
-      }
-    });
+    const redirectUrl = escape(window.location.href);
+    window.location = process.env.VUE_APP_BASE_URL + 'login.html?redirectUrl=' + redirectUrl;
   },
   //初始化NProgress
   initNProgress() {
diff --git a/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/auth/WebHandlerInterceptor.java b/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/auth/WebHandlerInterceptor.java
index fa1a287..6fb53cd 100644
--- a/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/auth/WebHandlerInterceptor.java
+++ b/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/auth/WebHandlerInterceptor.java
@@ -52,6 +52,7 @@ public class WebHandlerInterceptor implements HandlerInterceptor {
             }
             //放入请求作用域
             request.setAttribute(CommonConstant.PARAMETER_NAME_TOKEN_INFO, userDto);
+            request.setAttribute(CommonConstant.PARAMETER_NAME_TOKEN, token);
             //刷新token ttl
             dbCacheService.setTtl(token, CommonConstant.TOKEN_CACHE_TTL);
         }