feat: 登录接口返回新增用户角色
This commit is contained in:
parent
98d938976b
commit
89335ea55b
@ -1,6 +1,7 @@
|
|||||||
package github.benjamin.equipreservebackend.controller;
|
package github.benjamin.equipreservebackend.controller;
|
||||||
|
|
||||||
import github.benjamin.equipreservebackend.dto.LoginRequest;
|
import github.benjamin.equipreservebackend.dto.LoginRequest;
|
||||||
|
import github.benjamin.equipreservebackend.entity.Role;
|
||||||
import github.benjamin.equipreservebackend.vo.LoginResponse;
|
import github.benjamin.equipreservebackend.vo.LoginResponse;
|
||||||
import github.benjamin.equipreservebackend.response.ResponseResult;
|
import github.benjamin.equipreservebackend.response.ResponseResult;
|
||||||
import github.benjamin.equipreservebackend.entity.User;
|
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.RequestBody;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class UserController {
|
public class UserController {
|
||||||
@ -25,6 +28,7 @@ public class UserController {
|
|||||||
User user = userService.login(request.getUsername(), request.getPassword());
|
User user = userService.login(request.getUsername(), request.getPassword());
|
||||||
SecurityUser securityUser = userService.loadSecurityUserById(user.getId());
|
SecurityUser securityUser = userService.loadSecurityUserById(user.getId());
|
||||||
String token = jwtUtil.generateToken(securityUser);
|
String token = jwtUtil.generateToken(securityUser);
|
||||||
return ResponseResult.success(new LoginResponse(user.getId(), user.getName(), token));
|
List<String> roles = securityUser.getRoles().stream().map(Role::getCode).toList();
|
||||||
|
return ResponseResult.success(new LoginResponse(user.getId(), user.getName(), roles, token));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,14 +1,18 @@
|
|||||||
package github.benjamin.equipreservebackend.vo;
|
package github.benjamin.equipreservebackend.vo;
|
||||||
|
|
||||||
|
import github.benjamin.equipreservebackend.entity.Role;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class LoginResponse {
|
public class LoginResponse {
|
||||||
|
|
||||||
private Long userId;
|
private Long userId;
|
||||||
private String name;
|
private String name;
|
||||||
|
private List<String> roles;
|
||||||
private String token;
|
private String token;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user