@@ -49,6 +49,7 @@ public class UsernamePasswordAuthFilter extends AbstractAuthenticationProcessing | |||||
} catch (BadCredentialsException | UsernameNotFoundException e) { | } catch (BadCredentialsException | UsernameNotFoundException e) { | ||||
throw e; | throw e; | ||||
} catch (Exception e) { | } catch (Exception e) { | ||||
logger.error("登录失败:", e); | |||||
throw BizException.wrap("登录失败,请联系管理员!"); | throw BizException.wrap("登录失败,请联系管理员!"); | ||||
} | } | ||||
} | } | ||||
@@ -165,6 +165,7 @@ public class UserInfoManage { | |||||
UserListVO res = new UserListVO(); | UserListVO res = new UserListVO(); | ||||
res.setUserId(r.getId()); | res.setUserId(r.getId()); | ||||
res.setRealName(r.getRealName()); | res.setRealName(r.getRealName()); | ||||
res.setUserName(r.getUsername()); | |||||
res.setCreateTime(r.getCreateOn()); | res.setCreateTime(r.getCreateOn()); | ||||
res.setPhoneNo(r.getMobile()); | res.setPhoneNo(r.getMobile()); | ||||
res.setAccountStatus(r.getAccountStatus()); | res.setAccountStatus(r.getAccountStatus()); | ||||
@@ -178,6 +179,7 @@ public class UserInfoManage { | |||||
LoginUserDetailVO result = new LoginUserDetailVO(); | LoginUserDetailVO result = new LoginUserDetailVO(); | ||||
result.setUserId(details.getUserId()); | result.setUserId(details.getUserId()); | ||||
result.setRealName(details.getRealName()); | result.setRealName(details.getRealName()); | ||||
result.setUserName(details.getIdentifier()); | |||||
return result; | return result; | ||||
} | } | ||||
@@ -19,6 +19,9 @@ public class LoginUserDetailVO { | |||||
@ApiModelProperty("用户id") | @ApiModelProperty("用户id") | ||||
private Long userId; | private Long userId; | ||||
@ApiModelProperty("用户名") | |||||
private String userName; | |||||
@ApiModelProperty("用户真实姓名") | @ApiModelProperty("用户真实姓名") | ||||
private String realName; | private String realName; | ||||
@@ -23,6 +23,9 @@ public class UserListVO { | |||||
@ApiModelProperty("用户id") | @ApiModelProperty("用户id") | ||||
private Long userId; | private Long userId; | ||||
@ApiModelProperty("用户名") | |||||
private String userName; | |||||
@ApiModelProperty("用户姓名") | @ApiModelProperty("用户姓名") | ||||
private String realName; | private String realName; | ||||