ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-09 20:57:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 禁止密码过期用户访问业务接口

Browse Source
This commit is contained in:
kils
2024-06-14 14:55:50 +08:00
parent b2ccec9126
commit 3fbe688f17
7 changed files with 66 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
continew-admin-webapi/src/main/java/top/continew/admin/webapi/auth/AuthController.java
View File

@@ -123,12 +123,12 @@ public class AuthController {
@Operation(summary = "获取用户信息", description = "获取登录用户信息")
@GetMapping("/user/info")
public R<UserInfoResp> getUserInfo() {
LoginUser loginUser = LoginHelper.getLoginUser();
LoginUser loginUser = LoginHelper.getLoginUser(false);
UserDetailResp userDetailResp = userService.get(loginUser.getId());
UserInfoResp userInfoResp = BeanUtil.copyProperties(userDetailResp, UserInfoResp.class);
userInfoResp.setPermissions(loginUser.getPermissions());
userInfoResp.setRoles(loginUser.getRoleCodes());
userInfoResp.setPwdExpired(userService.isPasswordExpired(userDetailResp.getPwdResetTime()));
userInfoResp.setPwdExpired(LoginHelper.isPasswordExpired(loginUser));
return R.ok(userInfoResp);
}
@@ -136,6 +136,6 @@ public class AuthController {
@Operation(summary = "获取路由信息", description = "获取登录用户的路由信息")
@GetMapping("/route")
public R<List<RouteResp>> listRoute() {
return R.ok(loginService.buildRouteTree(LoginHelper.getUserId()));
return R.ok(loginService.buildRouteTree(LoginHelper.getUserId(false)));
}
}

2
continew-admin-webapi/src/main/java/top/continew/admin/webapi/system/UserCenterController.java
View File

@@ -94,7 +94,7 @@ public class UserCenterController {
String rawNewPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(updateReq
.getNewPassword()));
ValidationUtils.throwIfNull(rawNewPassword, "新密码解密失败");
userService.updatePassword(rawOldPassword, rawNewPassword, LoginHelper.getUserId());
userService.updatePassword(rawOldPassword, rawNewPassword, LoginHelper.getUserId(false));
return R.ok("修改成功，请牢记你的新密码");
}