fix(iam): 单点登录账号信息字段更改
This commit is contained in:
@@ -48,9 +48,15 @@ public class OauthUserInfo {
|
|||||||
/**
|
/**
|
||||||
* 账号名
|
* 账号名
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "账号名")
|
@ApiModelProperty(value = "账号信息(旧的不用了)")
|
||||||
private List<String> spRoleList;
|
private List<String> spRoleList;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 账号名
|
||||||
|
*/
|
||||||
|
@ApiModelProperty(value = "账号信息")
|
||||||
|
private String loginName;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 联系方式
|
* 联系方式
|
||||||
*/
|
*/
|
||||||
|
|||||||
+3
-3
@@ -218,7 +218,7 @@ public class LoginServiceImpl implements ILoginService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 获取用户信息
|
// 获取用户信息
|
||||||
String userName = oauthUserInfo.getSpRoleList().get(0);
|
String userName = oauthUserInfo.getLoginName();
|
||||||
SysUser sysUser = sysUserService.getUserByName(userName);
|
SysUser sysUser = sysUserService.getUserByName(userName);
|
||||||
|
|
||||||
// 校验用户是否有效
|
// 校验用户是否有效
|
||||||
@@ -251,8 +251,8 @@ public class LoginServiceImpl implements ILoginService {
|
|||||||
if (StringUtils.isNotBlank(oauthUserInfo.getErrCode())){
|
if (StringUtils.isNotBlank(oauthUserInfo.getErrCode())){
|
||||||
throw new JeroBootException(oauthUserInfo.getMsg());
|
throw new JeroBootException(oauthUserInfo.getMsg());
|
||||||
}
|
}
|
||||||
if (Objects.isNull(oauthUserInfo.getSpRoleList()) || oauthUserInfo.getSpRoleList().isEmpty()){
|
if (StringUtils.isBlank(oauthUserInfo.getLoginName())){
|
||||||
throw new JeroBootException("spRoleList返回信息为空!");
|
throw new JeroBootException("loginName返回信息为空!");
|
||||||
}
|
}
|
||||||
return oauthUserInfo;
|
return oauthUserInfo;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user