From 80a82efcb42ba4b6f24768e780b1b3f51e3141f4 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 10 二月 2025 08:01:26 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
index 78b2069..7639897 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
@@ -14,12 +14,12 @@
import com.vincent.rsf.server.system.entity.Menu;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.entity.UserLogin;
-import com.vincent.rsf.server.system.service.RoleMenuService;
-import com.vincent.rsf.server.system.service.TenantService;
-import com.vincent.rsf.server.system.service.UserLoginService;
-import com.vincent.rsf.server.system.service.UserService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import com.vincent.rsf.server.system.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -45,6 +45,8 @@
private RoleMenuService roleMenuService;
@Resource
private TenantService tenantService;
+ @Autowired
+ private UserRoleService userRoleService;
@PostMapping("/login")
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
@@ -74,7 +76,9 @@
@GetMapping("/auth/user")
public R userInfo() {
- return R.ok(userService.getByIdRel(getLoginUserId()));
+ User user = userService.getByIdRel(getLoginUserId());
+ user.setRoles(userRoleService.listByUserId(user.getId()));
+ return R.ok(user);
}
@GetMapping("/auth/menu")
@@ -85,9 +89,8 @@
return R.ok().add(Utils.toTreeData(voList, 0L, MenuVo::getParentId, MenuVo::getId, MenuVo::setChildren));
}
- @PreAuthorize("hasAuthority('sys:auth:user')")
- @OperationLog
- @PutMapping("/auth/user")
+ @OperationLog("Update UserInfo")
+ @PostMapping("/auth/user")
public R updateInfo(@RequestBody User user) {
user.setId(getLoginUserId());
// 涓嶈兘淇敼鐨勫瓧娈�
@@ -97,16 +100,15 @@
user.setTenantId(null);
user.setStatus(null);
if (userService.updateById(user)) {
- return R.ok().add(userService.getByIdRel(user.getId()));
+ return R.ok("Save Success").add(userService.getByIdRel(user.getId()));
}
return R.error("Save Fail");
}
- @PreAuthorize("hasAuthority('sys:auth:password')")
- @OperationLog
- @PutMapping("/auth/password")
- public R updatePassword(@RequestBody UpdatePasswordParam param) {
- if (Cools.isEmpty(param.getOldPassword(), param.getPassword())) {
+ @OperationLog("Reset Password")
+ @PostMapping("/auth/reset/password")
+ public R resetPassword(@RequestBody UpdatePasswordParam param) {
+ if (Cools.isEmpty(param.getOldPassword(), param.getNewPassword())) {
return R.error("Parameters Cannot Be Empty");
}
Long userId = getLoginUserId();
@@ -114,15 +116,15 @@
return R.error("Please Login First");
}
if (!userService.comparePassword(userService.getById(userId).getPassword(), param.getOldPassword())) {
- return R.error("The Origin Password Was Incorrect");
+ return R.parse("408-The Current Password Was Incorrect");
}
User user = new User();
user.setId(userId);
- user.setPassword(userService.encodePassword(param.getPassword()));
+ user.setPassword(userService.encodePassword(param.getNewPassword()));
if (userService.updateById(user)) {
- return R.ok("Update Success");
+ return R.ok("Reset Password Success");
}
- return R.error("Update Fail");
+ return R.error("Reset Password Fail");
}
--
Gitblit v1.9.1