github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

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

close https://github.com/elunez/eladmin/issues/551
pull/572/head
zhengjie 2020-12-24 16:45:08 +08:00
parent 1556f13379
commit a90bfac2cf
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java
View File

@ -179,11 +179,12 @@ public class OnlineUserService {
* @param username / * @param username /
*/ */
@Async @Async
public void kickOutForUsername(String username) { public void kickOutForUsername(String username) throws Exception {
List<OnlineUserDto> onlineUsers = getAll(username); List<OnlineUserDto> onlineUsers = getAll(username);
for (OnlineUserDto onlineUser : onlineUsers) { for (OnlineUserDto onlineUser : onlineUsers) {
if (onlineUser.getUserName().equals(username)) { if (onlineUser.getUserName().equals(username)) {
kickOut(onlineUser.getKey()); String token =EncryptUtils.desDecrypt(onlineUser.getKey());
kickOut(token);
} }
} }
} }

2
eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
View File

@ -114,7 +114,7 @@ public class UserController {
@ApiOperation("修改用户") @ApiOperation("修改用户")
@PutMapping @PutMapping
@PreAuthorize("@el.check('user:edit')") @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); checkLevel(resources);
userService.update(resources); userService.update(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT); return new ResponseEntity<>(HttpStatus.NO_CONTENT);

2
eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java
View File

@ -49,7 +49,7 @@ public interface UserService {
* 编辑用户 * 编辑用户
* @param resources / * @param resources /
*/ */
void update(User resources); void update(User resources) throws Exception;
/** /**
* 删除用户 * 删除用户

2
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
View File

@ -98,7 +98,7 @@ public class UserServiceImpl implements UserService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @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); User user = userRepository.findById(resources.getId()).orElseGet(User::new);
ValidationUtil.isNull(user.getId(), "User", "id", resources.getId()); ValidationUtil.isNull(user.getId(), "User", "id", resources.getId());
User user1 = userRepository.findByUsername(resources.getUsername()); User user1 = userRepository.findByUsername(resources.getUsername());