From 8a590d5c39f0f8bb1a4bfab427deb9483f780f4b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 30 三月 2023 09:01:36 +0800
Subject: [PATCH] Merge pull request #800 from yjkhtddx/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
index 826dd51..157a3a8 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
@@ -27,7 +27,6 @@
import java.util.List;
@Tag(name = "鐢ㄦ埛绠＄悊")
-
@RestController
@RequestMapping("/api/user")
public class UserController {
@@ -43,11 +42,13 @@
@GetMapping("/login")
@PostMapping("/login")
- @Operation(summary = "鐧诲綍")
+ @Operation(summary = "鐧诲綍", description = "鐧诲綍鎴愬姛鍚庤繑鍥濧ccessToken锛� 鍙互浠庤繑鍥炲�艰幏鍙栧埌涔熷彲浠ヤ粠鍝嶅簲澶翠腑鑾峰彇鍒帮紝" +
+ "鍚庣画鐨勮姹傞渶瑕佹坊鍔犺姹傚ご 'access-token'鎴栬�呮斁鍦ㄥ弬鏁伴噷")
+
@Parameter(name = "username", description = "鐢ㄦ埛鍚�", required = true)
@Parameter(name = "password", description = "瀵嗙爜锛�32浣峬d5鍔犲瘑锛�", required = true)
public LoginUser login(HttpServletRequest request, HttpServletResponse response, @RequestParam String username, @RequestParam String password){
- LoginUser user = null;
+ LoginUser user;
try {
user = SecurityUtils.login(username, password, authenticationManager);
} catch (AuthenticationException e) {
@@ -58,9 +59,11 @@
}else {
String jwt = JwtUtils.createToken(username, password);
response.setHeader(JwtUtils.getHeader(), jwt);
+ user.setAccessToken(jwt);
}
return user;
}
+
@PostMapping("/changePassword")
@Operation(summary = "淇敼瀵嗙爜")
@@ -80,8 +83,8 @@
if (user == null) {
throw new ControllerException(ErrorCode.ERROR100);
}
- int userId = SecurityUtils.getUserId();
- boolean result = userService.changePassword(userId, DigestUtils.md5DigestAsHex(password.getBytes()));
+ //int userId = SecurityUtils.getUserId();
+ boolean result = userService.changePassword(user.getId(), DigestUtils.md5DigestAsHex(password.getBytes()));
if (!result) {
throw new ControllerException(ErrorCode.ERROR100);
}
--
Gitblit v1.8.0