From bc5187a7ad3b1c9cad2f6b3e124726189ac0255b Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Mon, 10 Feb 2020 14:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhengjie/modules/security/rest/OnlineController.java  | 3 +++
 .../modules/security/service/OnlineUserService.java       | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java
index 34d599f8..aa8d60fd 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import me.zhengjie.aop.log.Log;
 import me.zhengjie.modules.security.service.OnlineUserService;
+import me.zhengjie.utils.EncryptUtils;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -48,6 +49,8 @@ public class OnlineController {
     @PreAuthorize("@el.check()")
     public ResponseEntity<Object> delete(@RequestBody Set<String> keys) throws Exception {
         for (String key : keys) {
+            // 解密Key
+            key = EncryptUtils.desDecrypt(key);
             onlineUserService.kickOut(key);
         }
         return new ResponseEntity<>(HttpStatus.OK);
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java
index cc568f00..b91dd98b 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java
@@ -90,8 +90,8 @@ public class OnlineUserService {
      * @param key /
      * @throws Exception /
      */
-    public void kickOut(String key) throws Exception {
-        key = properties.getOnlineKey() + EncryptUtils.desDecrypt(key);
+    public void kickOut(String key){
+        key = properties.getOnlineKey() + key;
         redisUtils.del(key);
     }
 
@@ -148,9 +148,9 @@ public class OnlineUserService {
                 try {
                     String token =EncryptUtils.desDecrypt(onlineUser.getKey());
                     if(StringUtils.isNotBlank(igoreToken)&&!igoreToken.equals(token)){
-                        this.kickOut(onlineUser.getKey());
+                        this.kickOut(token);
                     }else if(StringUtils.isBlank(igoreToken)){
-                        this.kickOut(onlineUser.getKey());
+                        this.kickOut(token);
                     }
                 } catch (Exception e) {
                     log.error("checkUser is error",e);