From aedb32099179d45dd1ac27f92abb8cebd18033f9 Mon Sep 17 00:00:00 2001
From: "udf_admin@163.com" <udf_admin@163.com>
Date: Mon, 27 Apr 2020 21:46:13 +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

---
 .../java/org/itkk/udf/api/common/CommonUtil.java   | 14 ++++++++++++++
 .../org/itkk/udf/api/rbac/service/UserService.java | 14 ++++++++++++++
 .../org/itkk/udf/api/rbac/web/UserController.java  | 11 +++++++++++
 3 files changed, 39 insertions(+)

diff --git a/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/CommonUtil.java b/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/CommonUtil.java
index 2564d49..20f5814 100644
--- a/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/CommonUtil.java
+++ b/udf-api/udf-api-common/src/main/java/org/itkk/udf/api/common/CommonUtil.java
@@ -26,6 +26,20 @@ public class CommonUtil {
         return (UserDto) tokenInfoDtoObj;
     }
 
+    /**
+     * 获得token
+     *
+     * @param request request
+     * @return String
+     */
+    public static String getToken(HttpServletRequest request) {
+        Object tokenObj = request.getAttribute(CommonConstant.PARAMETER_NAME_TOKEN);
+        if (tokenObj != null) {
+            return (String) tokenObj;
+        }
+        return null;
+    }
+
     /**
      * 私有化构造函数
      */
diff --git a/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/service/UserService.java b/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/service/UserService.java
index ca91f4e..2b449c6 100644
--- a/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/service/UserService.java
+++ b/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/service/UserService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.google.common.cache.Cache;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.itkk.udf.api.common.CommonConstant;
 import org.itkk.udf.api.common.dto.UserDto;
 import org.itkk.udf.api.common.service.IUserService;
@@ -125,6 +126,19 @@ public class UserService implements IUserService {
         return this.login(new LoginDto().setUserId(registeredDto.getUserId()).setPswd(registeredDto.getPswd()));
     }
 
+    /**
+     * 登出
+     *
+     * @param token token
+     */
+    public void logout(String token) {
+        //判空
+        if (StringUtils.isNotBlank(token)) {
+            //删除缓存
+            dbCacheService.delete(token);
+        }
+    }
+
     /**
      * 更新用户密码
      *
diff --git a/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/web/UserController.java b/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/web/UserController.java
index ef6c32f..53184eb 100644
--- a/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/web/UserController.java
+++ b/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/web/UserController.java
@@ -29,6 +29,17 @@ public class UserController {
     @Autowired
     private UserService userService;
 
+    /**
+     * 登出
+     *
+     * @return RestResponse<String>
+     */
+    @DeleteMapping("logout")
+    public RestResponse<String> logout() {
+        userService.logout(CommonUtil.getToken(httpServletRequest));
+        return RestResponse.success();
+    }
+
     /**
      * 更改密码
      *