【8.0】【auth】loginUser改为租户id,payload去掉租户标识

pull/57/head
fengshuonan 2023-08-30 10:52:48 +08:00
parent 84c5540be2
commit d503d1a172
3 changed files with 5 additions and 11 deletions

View File

@ -80,10 +80,10 @@ public class LoginUser implements Serializable {
private Long currentPositionId;
/**
*
* id
*/
@ChineseDescription("当前登录租户编码")
private String tenantCode;
@ChineseDescription("当前登录租户id")
private Long tenantId;
/**
* chineseenglish

View File

@ -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;
}
}

View File

@ -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对象