From d4be41ccac01b155c7a067c73f2045f9ea0aa805 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 十月 2024 15:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/api/system/SystemController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemController.java
index 7572835..638c2a7 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemController.java
@@ -42,6 +42,7 @@
@ApiOperation("鐧诲綍")
@PostMapping("/login")
public ApiResponse<String> login (@Validated @RequestBody LoginDTO dto, HttpServletRequest request) {
+ dto.setCheckCode(true);
return ApiResponse.success(systemLoginService.loginByPassword(dto, request));
}
@@ -57,7 +58,7 @@
@ApiOperation("淇敼褰撳墠鐢ㄦ埛瀵嗙爜")
@PostMapping("/updatePwd")
public ApiResponse updatePwd (@Validated @RequestBody UpdatePwdDto dto) {
- dto.setUserId(this.getLoginUser().getId());
+ dto.setUserId(this.getLoginUser(null).getId());
systemUserBiz.updatePwd(dto);
return ApiResponse.success(null);
}
@@ -65,6 +66,6 @@
@ApiOperation("鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�")
@GetMapping("/getUserInfo")
public ApiResponse<LoginUserInfo> getUserInfo () {
- return ApiResponse.success(this.getLoginUser());
+ return ApiResponse.success(this.getLoginUser(null));
}
}
--
Gitblit v1.9.3