From a36a12c2bc4a5348c7eb7b890608822c448b62c4 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 10 二月 2025 10:12:22 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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..47c1739 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,6 +12,7 @@
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.service.*;
@@ -66,7 +67,8 @@
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("Login Success").add(new LoginResult(accessToken, user, tenant.getName()));
}
@GetMapping("/tenant/list")
@@ -106,9 +108,9 @@
}
@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 +118,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