diff --git a/server/like-admin/src/main/java/com/mdd/admin/config/StpInException.java b/server/like-admin/src/main/java/com/mdd/admin/config/StpInException.java index 7aa045a3..1b66a118 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/config/StpInException.java +++ b/server/like-admin/src/main/java/com/mdd/admin/config/StpInException.java @@ -24,8 +24,11 @@ public class StpInException { @ResponseStatus(HttpStatus.OK) @ExceptionHandler(NotLoginException.class) @ResponseBody - public AjaxResult handleNotLoginException(){ - return AjaxResult.failed(HttpEnum.TOKEN_INVALID.getCode(), HttpEnum.TOKEN_INVALID.getMsg()); + public AjaxResult handleNotLoginException(NotLoginException e){ + String msg = e.getMessage().split(":")[0]; + msg = msg.replaceFirst("Token", "您"); + msg = msg.trim().equals("") ? HttpEnum.TOKEN_INVALID.getMsg() : msg; + return AjaxResult.failed(HttpEnum.TOKEN_INVALID.getCode(), msg); } /** diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthAdminServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthAdminServiceImpl.java index 4dff410c..4ab4a80f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthAdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SystemAuthAdminServiceImpl.java @@ -370,6 +370,8 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { model.setDeleteTime(System.currentTimeMillis() / 1000); systemAuthAdminMapper.updateById(model); this.cacheAdminUserByUid(id); + + StpUtil.kickout(id); } /** @@ -395,6 +397,10 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { systemAuthAdmin.setUpdateTime(TimeUtil.timestamp()); systemAuthAdminMapper.updateById(systemAuthAdmin); this.cacheAdminUserByUid(id); + + if (disable.equals(1)) { + StpUtil.kickout(id); + } } /** @@ -404,7 +410,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { public void cacheAdminUserByUid(Integer id) { SystemAuthAdmin sysAdmin = systemAuthAdminMapper.selectOne( new QueryWrapper() - .select("id,role,username,nickname,is_disable,is_delete") + .select("id,role,username,nickname,is_multipoint,is_disable,is_delete") .eq("id", id) .last("limit 1")); @@ -413,6 +419,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { user.put("roleId", sysAdmin.getRole()); user.put("username", sysAdmin.getUsername()); user.put("nickname", sysAdmin.getNickname()); + user.put("isMultipoint", sysAdmin.getIsMultipoint()); user.put("isDisable", sysAdmin.getIsDisable()); user.put("isDelete", sysAdmin.getIsDelete());