diff --git a/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/utils/AuthUtils.java b/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/utils/AuthUtils.java index 96b02cd..42d9521 100644 --- a/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/utils/AuthUtils.java +++ b/xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/utils/AuthUtils.java @@ -153,9 +153,22 @@ public class AuthUtils implements BaseParams { * @return LoginUser */ public static LoginUserDto get() { + LoginUserDto dto = getDefNull(); + if (Objects.isNull(dto)) { + throw new UnauthorizedError(); + } + return dto; + } + + /** + * 获取 LoginUser + * + * @return LoginUser + */ + public static LoginUserDto getDefNull() { Map map = CommonHolder.get(); if (CollectionUtils.isEmpty(map)) { - throw new UnauthorizedError(); + return null; } if (map.get(BootCommonConstant.AUTH) instanceof LoginUserDto loginUserDto) { return loginUserDto; @@ -163,7 +176,7 @@ public class AuthUtils implements BaseParams { if (map.get(BootCommonConstant.AUTHORIZATION) instanceof String accessToken) { return get(accessToken); } - throw new UnauthorizedError(); + return null; } /** diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysParamServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysParamServiceImpl.java index c00bec6..c75eb15 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysParamServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysParamServiceImpl.java @@ -180,11 +180,9 @@ public class SysParamServiceImpl implements SysParamService, BaseParams { throw new BizWarning("数据不存在"); } entity.setId(oldEntity.getId()); - try { - LoginUserDto loginUser = AuthUtils.get(); + LoginUserDto loginUser = AuthUtils.getDefNull(); + if (Objects.nonNull(loginUser)) { entity.setUpdateBy(loginUser.getId()); - } catch (Exception e) { - log.debug("job更新"); } boolean updated = sysParamBaseService.updateById(entity); if (!updated) { diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserServiceImpl.java index 874f802..080a8bc 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysUserServiceImpl.java @@ -390,11 +390,11 @@ public class SysUserServiceImpl implements SysUserService, BaseParams { private String cleanSysUser() { SysUserPasswdRule rule = sysUserPasswdRuleService.getByCode(null); if (Objects.isNull(rule)) { - return "安全规则不存在"; + return "执行完成,安全规则不存在,无法清理禁用账号"; } Integer lockCancelDays = rule.getLockCancelDays(); if (lockCancelDays <= CP_NUM0) { - return "清理时间为0,则不清理禁用账号"; + return "执行完成,安全规则设置[清理时间:0],不清理禁用账号"; } Instant time = Instant.now().plus(-lockCancelDays, ChronoUnit.DAYS); // 创建查询条件 @@ -402,7 +402,7 @@ public class SysUserServiceImpl implements SysUserService, BaseParams { query.eq(SysUser::getStatus, CP_NUM0); query.le(SysUser::getAccountDisabledTime, time); sysUserBaseService.remove(query); - return "清理成功"; + return "执行完成,清理禁用账号成功,安全规则设置[清理时间:" + lockCancelDays + "]"; } }