From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:22:45 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java
index 28ee3ac..2f4bc83 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/AuthController.java
@@ -46,22 +46,23 @@
@PostMapping("/login")
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
+// System.out.println(userService.encodePassword("123456"));
String username = param.getUsername();
Long tenantId = param.getTenantId();
User user = userService.getByUsername(username, tenantId);
if (user == null) {
- return R.error("璐﹀彿涓嶅瓨鍦�");
+ return R.error("Username Does Not Exist");
}
if (!user.getStatus().equals(1)) {
- return R.error("璐﹀彿琚喕缁�");
+ return R.error("Account Frozen");
}
if (!userService.comparePassword(user.getPassword(), param.getPassword())) {
- return R.error("瀵嗙爜閿欒");
+ return R.error("Wrong 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("鐧诲綍鎴愬姛").add(new LoginResult(accessToken, user));
+ return R.ok("Login Success").add(new LoginResult(accessToken, user));
}
@GetMapping("/auth/user")
@@ -94,7 +95,7 @@
if (userService.updateById(user)) {
return R.ok().add(userService.getByIdRel(user.getId()));
}
- return R.error("淇濆瓨澶辫触");
+ return R.error("Save Fail");
}
@PreAuthorize("hasAuthority('sys:auth:password')")
@@ -102,22 +103,22 @@
@PutMapping("/auth/password")
public R updatePassword(@RequestBody UpdatePasswordParam param) {
if (Cools.isEmpty(param.getOldPassword(), param.getPassword())) {
- return R.error("鍙傛暟涓嶈兘涓虹┖");
+ return R.error("Parameters Cannot Be Empty");
}
Long userId = getLoginUserId();
if (userId == null) {
- return R.error("鏈櫥褰�");
+ return R.error("Please Login First");
}
if (!userService.comparePassword(userService.getById(userId).getPassword(), param.getOldPassword())) {
- return R.error("鍘熷瘑鐮佽緭鍏ヤ笉姝ｇ‘");
+ return R.error("The Origin Password Was Incorrect");
}
User user = new User();
user.setId(userId);
user.setPassword(userService.encodePassword(param.getPassword()));
if (userService.updateById(user)) {
- return R.ok("淇敼鎴愬姛");
+ return R.ok("Update Success");
}
- return R.error("淇敼澶辫触");
+ return R.error("Update Fail");
}
}
--
Gitblit v1.9.1