diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/LoginBo.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/LoginBo.java index bd4e763..714f982 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/LoginBo.java +++ b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/LoginBo.java @@ -52,6 +52,11 @@ public class LoginBo extends BaseBo { @ApiModelProperty("姓名") private String name; + /** + * 用户ID + */ + private String userId; + public UserInfoBo() { } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java index 2f8bfdc..27146ef 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java +++ b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java @@ -470,7 +470,7 @@ public class AuthController extends DefaultBaseController { String token = userTokenResolver.getToken(); ApplicationUtil.publishEvent(new LoginEvent(this, SecurityUtil.getCurrentUser(), token)); - LoginDto dto = new LoginDto(token, user.getName(), user.getPermissions()); + LoginDto dto = new LoginDto(token, user.getName(), user.getPermissions(), user.getId()); return dto; } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/LoginDto.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/LoginDto.java index 09a1a28..b69f867 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/LoginDto.java +++ b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/LoginDto.java @@ -40,6 +40,17 @@ public class LoginDto implements BaseDto, Serializable { this.setUser(userInfo); } + public LoginDto(String token, String name, Set roles, String userId) { + + this.token = token; + this.setRoles(roles); + + UserInfoDto userInfo = new UserInfoDto(); + userInfo.setName(name); + userInfo.setUserId(userId); + this.setUser(userInfo); + } + @Data public static class UserInfoDto implements BaseDto, Serializable { @@ -49,5 +60,10 @@ public class LoginDto implements BaseDto, Serializable { * 姓名 */ private String name; + + /** + * 用户ID + */ + private String userId; } }