[代码优化](v2.6)：禁用用户后踢出用户Bug修复

elunez · elunez · commit a90bfac2cf33 · 2020-12-24T16:45:08.000+08:00
close elunez#551
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
@@ -179,11 +179,12 @@ public void checkLoginOnUser(String userName, String igoreToken){
      * @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
@@ -114,7 +114,7 @@ public ResponseEntity<Object> create(@Validated @RequestBody User resources){
     @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
@@ -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
@@ -98,7 +98,7 @@ public void create(User resources) {
 
     @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());

Original file line number	Diff line number	Diff line change
`@@ -179,11 +179,12 @@ public void checkLoginOnUser(String userName, String igoreToken){`
`179`	`179`	`* @param username /`
`180`	`180`	`*/`
`181`	`181`	`@Async`
`182`		`- public void kickOutForUsername(String username) {`
	`182`	`+ public void kickOutForUsername(String username) throws Exception {`
`183`	`183`	`List<OnlineUserDto> onlineUsers = getAll(username);`
`184`	`184`	`for (OnlineUserDto onlineUser : onlineUsers) {`
`185`	`185`	`if (onlineUser.getUserName().equals(username)) {`
`186`		`- kickOut(onlineUser.getKey());`
	`186`	`+ String token =EncryptUtils.desDecrypt(onlineUser.getKey());`
	`187`	`+ kickOut(token);`
`187`	`188`	`}`
`188`	`189`	`}`
`189`	`190`	`}`