diff --git a/.run/oa [clean,spring-boot_run].run.xml b/.run/oa [clean,spring-boot_run].run.xml index febc511..f190190 100644 --- a/.run/oa [clean,spring-boot_run].run.xml +++ b/.run/oa [clean,spring-boot_run].run.xml @@ -8,14 +8,14 @@ - + - + diff --git a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java index 685d9af..71d8db5 100755 --- a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java @@ -209,9 +209,13 @@ public class AuthServiceImpl implements AuthService { public BaseResponse authLogout(HttpServletRequest request) { // 获取用户 UserDO userDO = userMapper.getUserById(Processing.getAuthHeaderToUserId(request)); - // 删除Token - if (tokenRedisUtil.delData(BusinessConstants.BUSINESS_LOGIN, userDO.getId().toString())) { - return ResultUtil.success("登出成功"); + if (userDO != null) { + // 删除Token + if (tokenRedisUtil.delData(BusinessConstants.BUSINESS_LOGIN, userDO.getId().toString())) { + return ResultUtil.success("登出成功"); + } else { + return ResultUtil.error(ErrorCode.TOKEN_NOT_EXIST); + } } else { return ResultUtil.error(ErrorCode.TOKEN_NOT_EXIST); }