From 8480f98f2823ac235af2cea0839e73df3438d782 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 17 Nov 2022 16:09:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mdd/admin/config/StpInException.java | 7 +++++-- .../admin/service/impl/SystemAuthAdminServiceImpl.java | 9 ++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) 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()); From edc5357b8c1c595d34f6627ee3f0c3a0381e2598 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 17 Nov 2022 16:14:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=B4=A0=E6=9D=90?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mdd/admin/controller/AlbumsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/AlbumsController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/AlbumsController.java index 6c92b08e..e83410d6 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/AlbumsController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/AlbumsController.java @@ -22,7 +22,7 @@ import javax.annotation.Resource; * 相册管理 */ @RestController -@RequestMapping("api/common/album") +@RequestMapping("api/albums") public class AlbumsController { @Resource