From 2d1b39fae6abed7cda7bd5722fcea23fefdb6e12 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 11 二月 2025 10:56:52 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 383a5b0..f54dad3 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
@@ -12,8 +12,10 @@
import com.vincent.rsf.server.system.controller.result.LoginResult;
import com.vincent.rsf.server.system.controller.result.MenuVo;
import com.vincent.rsf.server.system.entity.Menu;
+import com.vincent.rsf.server.system.entity.Tenant;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.entity.UserLogin;
+import com.vincent.rsf.server.system.enums.StatusType;
import com.vincent.rsf.server.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -32,7 +34,6 @@
* Created by vincent on 1/30/2024
*/
@RestController
-//@RequestMapping("")
public class AuthController extends BaseController {
@Resource
@@ -57,16 +58,17 @@
if (user == null) {
return R.error("Username Does Not Exist");
}
- if (!user.getStatus().equals(1)) {
+ if (!user.getStatus().equals(StatusType.ENABLE.val)) {
return R.error("Account Frozen");
}
if (!userService.comparePassword(user.getPassword(), param.getPassword())) {
- return R.error("Wrong Password");
+ return R.error("Invalid Password");
}
String accessToken = JwtUtil.buildToken(new JwtSubject(username, user.getTenantId()),
configProperties.getTokenExpireTime(), configProperties.getTokenKey());
userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, tenantId, null, request);
- return R.ok("Login Success").add(new LoginResult(accessToken, user));
+ Tenant tenant = tenantService.getById(user.getTenantId());
+ return R.ok("Sign In Success").add(new LoginResult(accessToken, user, tenant.getName()));
}
@GetMapping("/tenant/list")
@@ -76,9 +78,8 @@
@GetMapping("/auth/user")
public R userInfo() {
- User user = userService.getByIdRel(getLoginUserId());
- user.setRoles(userRoleService.listByUserId(user.getId()));
- return R.ok(user);
+ User user = userService.getById(getLoginUserId());
+ return R.ok(userService.setUserAuthInfo(user));
}
@GetMapping("/auth/menu")
@@ -100,15 +101,15 @@
user.setTenantId(null);
user.setStatus(null);
if (userService.updateById(user)) {
- return R.ok("Save Success").add(userService.getByIdRel(user.getId()));
+ return R.ok("Save Success").add(userService.getById(user.getId()));
}
return R.error("Save Fail");
}
@OperationLog("Reset Password")
- @PostMapping("/auth/password")
- public R updatePassword(@RequestBody UpdatePasswordParam param) {
- if (Cools.isEmpty(param.getOldPassword(), param.getPassword())) {
+ @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();
@@ -116,15 +117,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