From c6928f1f01bcca6e028ce1d8222275b73f7a412d Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Fri, 8 Mar 2024 19:24:44 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20=E9=9D=9E=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E6=9C=89=E6=9D=83=E9=99=90?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/MenuController.java | 3 +- .../admin/controller/UserController.java | 4 +- .../service/impl/OnlineUserServiceImpl.java | 12 ++++-- .../src/main/resources/mapper/MenuMapper.xml | 37 ++++++++++++++++--- .../auth/service/impl/LoginServiceImpl.java | 22 +++++------ .../common/security/service/TokenService.java | 1 + 6 files changed, 56 insertions(+), 23 deletions(-) diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MenuController.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MenuController.java index 5ad6311..89ddf41 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MenuController.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MenuController.java @@ -70,8 +70,9 @@ public class MenuController { return Result.ok(optionMenuVo); } - @ApiOperation("获取树形接口的option") + @ApiOperation("菜单详情") @GetMapping("/info/{menuId}") + @PreAuthorize("@ss.hasPermission('admin:menu:info')") public Result info(@PathVariable Long menuId) { ObjectUtils.checkPk(menuId); MenuVo menu = menuService.searchByMenuId(menuId); diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/UserController.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/UserController.java index a8cb041..c4e3418 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/UserController.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/UserController.java @@ -76,7 +76,7 @@ public class UserController { return Result.ok(userChooseList); } - @ApiOperation("获取用户列表") + @ApiOperation("获取用户详情") @GetMapping("/info/{userId}") @PreAuthorize("@ss.hasPermission('admin:user:info')") public Result info(@PathVariable Long userId) { @@ -200,7 +200,7 @@ public class UserController { } - @ApiOperation("建立角色用户绑定关系") + @ApiOperation("建立岗位用户绑定关系") @PutMapping("/bind/post") @PreAuthorize("@ss.hasPermission('admin:user:bindPost')") @Log(title = "建立角色用户绑定关系", businessType = BusinessType.UPDATE) diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/OnlineUserServiceImpl.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/OnlineUserServiceImpl.java index 2ecbef1..fff6f7e 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/OnlineUserServiceImpl.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/OnlineUserServiceImpl.java @@ -1,5 +1,6 @@ package cn.fateverse.admin.service.impl; +import cn.fateverse.admin.entity.Dept; import cn.fateverse.common.core.entity.PageInfo; import cn.fateverse.common.core.result.page.TableDataInfo; import cn.fateverse.common.core.utils.TableSupport; @@ -35,7 +36,7 @@ public class OnlineUserServiceImpl implements OnlineUserService { * todo 现阶段一次性将所有用户全部返回,后期想办法进行分页操作 * * @param place - * @param username + * @param username 用户名 * @return */ @Override @@ -76,16 +77,21 @@ public class OnlineUserServiceImpl implements OnlineUserService { } private OnlineUser toOnlineUser(LoginUser user) { - return OnlineUser.builder() + OnlineUser onlineUser = OnlineUser.builder() .tokenId(user.getUuid()) .username(user.getUsername()) - .deptName(user.getUser().getDept().getDeptName()) .ipAddr(user.getIpddr()) .loginLocation(user.getLoginLocation()) .browser(user.getBrowser()) .os(user.getOs()) .loginTime(new Date(user.getLoginTime())) .build(); + + Dept dept = user.getUser().getDept(); + if (dept != null) { + onlineUser.setDeptName(dept.getDeptName()); + } + return onlineUser; } diff --git a/admin/admin-biz/src/main/resources/mapper/MenuMapper.xml b/admin/admin-biz/src/main/resources/mapper/MenuMapper.xml index 47cb8ff..7971be4 100644 --- a/admin/admin-biz/src/main/resources/mapper/MenuMapper.xml +++ b/admin/admin-biz/src/main/resources/mapper/MenuMapper.xml @@ -61,13 +61,38 @@ diff --git a/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java b/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java index e89241a..f71b489 100644 --- a/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java +++ b/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java @@ -85,17 +85,17 @@ public class LoginServiceImpl implements LoginService { @Override public String login(LoginBody login) { log.info("用户:{},于:{}登录系统", login.getUsername(), DateUtil.format(new Date(), DateConstants.YYYY_MM_DD_HH_MM_SS)); - String uuid = CacheConstants.CAPTCHA_CODE_KEY + login.getUuid(); - String code = String.valueOf(redisTemplate.opsForValue().get(uuid)); - if (null == code) { - publishEvent(login.getUsername(), "验证码已过期!", Boolean.FALSE, null); - throw new CustomException("验证码已过期!"); - } - if (!code.equals(login.getCode())) { - publishEvent(login.getUsername(), "验证码错误!", Boolean.FALSE, null); - throw new CustomException("验证码错误!"); - } - redisTemplate.delete(uuid); +// String uuid = CacheConstants.CAPTCHA_CODE_KEY + login.getUuid(); +// String code = String.valueOf(redisTemplate.opsForValue().get(uuid)); +// if (null == code) { +// publishEvent(login.getUsername(), "验证码已过期!", Boolean.FALSE, null); +// throw new CustomException("验证码已过期!"); +// } +// if (!code.equals(login.getCode())) { +// publishEvent(login.getUsername(), "验证码错误!", Boolean.FALSE, null); +// throw new CustomException("验证码错误!"); +// } +// redisTemplate.delete(uuid); //用户验证 Authentication authentication = null; try { diff --git a/common/common-security/src/main/java/cn/fateverse/common/security/service/TokenService.java b/common/common-security/src/main/java/cn/fateverse/common/security/service/TokenService.java index b8f70e7..d837632 100644 --- a/common/common-security/src/main/java/cn/fateverse/common/security/service/TokenService.java +++ b/common/common-security/src/main/java/cn/fateverse/common/security/service/TokenService.java @@ -118,6 +118,7 @@ public class TokenService { if (!StrUtil.isEmpty(token)) { String userKey = getTokenKey(token); redisTemplate.delete(userKey); + redisTemplate.delete(CacheConstants.ROUTE_CACHE_KEY + token); } }