From 89335ea55bcfa6f2344d4f613417561a08b35b10 Mon Sep 17 00:00:00 2001 From: BenjaminNH <1249376374@qq.com> Date: Sat, 21 Jun 2025 23:23:12 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E8=A7=92?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipreservebackend/controller/UserController.java | 6 +++++- .../benjamin/equipreservebackend/vo/LoginResponse.java | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/github/benjamin/equipreservebackend/controller/UserController.java b/src/main/java/github/benjamin/equipreservebackend/controller/UserController.java index f188f0e..97b1ef2 100644 --- a/src/main/java/github/benjamin/equipreservebackend/controller/UserController.java +++ b/src/main/java/github/benjamin/equipreservebackend/controller/UserController.java @@ -1,6 +1,7 @@ package github.benjamin.equipreservebackend.controller; import github.benjamin.equipreservebackend.dto.LoginRequest; +import github.benjamin.equipreservebackend.entity.Role; import github.benjamin.equipreservebackend.vo.LoginResponse; import github.benjamin.equipreservebackend.response.ResponseResult; import github.benjamin.equipreservebackend.entity.User; @@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequiredArgsConstructor public class UserController { @@ -25,6 +28,7 @@ public class UserController { User user = userService.login(request.getUsername(), request.getPassword()); SecurityUser securityUser = userService.loadSecurityUserById(user.getId()); String token = jwtUtil.generateToken(securityUser); - return ResponseResult.success(new LoginResponse(user.getId(), user.getName(), token)); + List roles = securityUser.getRoles().stream().map(Role::getCode).toList(); + return ResponseResult.success(new LoginResponse(user.getId(), user.getName(), roles, token)); } } diff --git a/src/main/java/github/benjamin/equipreservebackend/vo/LoginResponse.java b/src/main/java/github/benjamin/equipreservebackend/vo/LoginResponse.java index 2a10c4b..81aaccf 100644 --- a/src/main/java/github/benjamin/equipreservebackend/vo/LoginResponse.java +++ b/src/main/java/github/benjamin/equipreservebackend/vo/LoginResponse.java @@ -1,14 +1,18 @@ package github.benjamin.equipreservebackend.vo; +import github.benjamin.equipreservebackend.entity.Role; import lombok.AllArgsConstructor; import lombok.Data; +import java.util.List; + @Data @AllArgsConstructor public class LoginResponse { private Long userId; private String name; + private List roles; private String token; }