mirror of https://gitee.com/stylefeng/roses
【8.0】【auth】loginUser改为租户id,payload去掉租户标识
parent
84c5540be2
commit
d503d1a172
|
@ -80,10 +80,10 @@ public class LoginUser implements Serializable {
|
|||
private Long currentPositionId;
|
||||
|
||||
/**
|
||||
* 当前登录租户编码
|
||||
* 当前登录租户id
|
||||
*/
|
||||
@ChineseDescription("当前登录租户编码")
|
||||
private String tenantCode;
|
||||
@ChineseDescription("当前登录租户id")
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
* 当前用户语种的标识,例如:chinese,english
|
||||
|
|
|
@ -70,11 +70,6 @@ public class DefaultJwtPayload {
|
|||
*/
|
||||
private String caToken;
|
||||
|
||||
/**
|
||||
* 多租户编码
|
||||
*/
|
||||
private String tenantCode;
|
||||
|
||||
/**
|
||||
* 其他载体信息
|
||||
*/
|
||||
|
@ -83,13 +78,12 @@ public class DefaultJwtPayload {
|
|||
public DefaultJwtPayload() {
|
||||
}
|
||||
|
||||
public DefaultJwtPayload(Long userId, String account, boolean rememberMe, String caToken, String tenantCode) {
|
||||
public DefaultJwtPayload(Long userId, String account, boolean rememberMe, String caToken) {
|
||||
this.userId = userId;
|
||||
this.account = account;
|
||||
this.uuid = IdUtil.fastUUID();
|
||||
this.rememberMe = rememberMe;
|
||||
this.caToken = caToken;
|
||||
this.tenantCode = tenantCode;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -138,7 +138,7 @@ public class LoginService {
|
|||
|
||||
// 8. 生成用户的token
|
||||
DefaultJwtPayload defaultJwtPayload = new DefaultJwtPayload(userValidateInfo.getUserId(), loginRequest.getAccount(),
|
||||
loginRequest.getRememberMe(), caToken, loginRequest.getTenantCode());
|
||||
loginRequest.getRememberMe(), caToken);
|
||||
String userLoginToken = AuthJwtContext.me().generateTokenDefaultPayload(defaultJwtPayload);
|
||||
|
||||
// 9. 创建loginUser对象
|
||||
|
|
Loading…
Reference in New Issue