From a90bfac2cf3324ca47f155e6a90a02280fc7fcd9 Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Thu, 24 Dec 2020 16:45:08 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6)?=
 =?UTF-8?q?=EF=BC=9A=E7=A6=81=E7=94=A8=E7=94=A8=E6=88=B7=E5=90=8E=E8=B8=A2?=
 =?UTF-8?q?=E5=87=BA=E7=94=A8=E6=88=B7Bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close https://github.com/elunez/eladmin/issues/551
---
 .../zhengjie/modules/security/service/OnlineUserService.java | 5 +++--
 .../java/me/zhengjie/modules/system/rest/UserController.java | 2 +-
 .../java/me/zhengjie/modules/system/service/UserService.java | 2 +-
 .../modules/system/service/impl/UserServiceImpl.java         | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

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 e9eeb8be..af8d2986 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
@@ -179,11 +179,12 @@ public class OnlineUserService {
      * @param username /
      */
     @Async
-    public void kickOutForUsername(String username) {
+    public void kickOutForUsername(String username) throws Exception {
         List<OnlineUserDto> onlineUsers = getAll(username);
         for (OnlineUserDto onlineUser : onlineUsers) {
             if (onlineUser.getUserName().equals(username)) {
-                kickOut(onlineUser.getKey());
+                String token =EncryptUtils.desDecrypt(onlineUser.getKey());
+                kickOut(token);
             }
         }
     }
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
index df326f90..2e885a71 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
@@ -114,7 +114,7 @@ public class UserController {
     @ApiOperation("修改用户")
     @PutMapping
     @PreAuthorize("@el.check('user:edit')")
-    public ResponseEntity<Object> update(@Validated(User.Update.class) @RequestBody User resources){
+    public ResponseEntity<Object> update(@Validated(User.Update.class) @RequestBody User resources) throws Exception {
         checkLevel(resources);
         userService.update(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java
index dfe1bd4a..814af925 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java
@@ -49,7 +49,7 @@ public interface UserService {
      * 编辑用户
      * @param resources /
      */
-    void update(User resources);
+    void update(User resources) throws Exception;
 
     /**
      * 删除用户
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
index c206f67f..145b8af7 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
@@ -98,7 +98,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(User resources) {
+    public void update(User resources) throws Exception {
         User user = userRepository.findById(resources.getId()).orElseGet(User::new);
         ValidationUtil.isNull(user.getId(), "User", "id", resources.getId());
         User user1 = userRepository.findByUsername(resources.getUsername());