gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java
View File

@ -80,10 +80,10 @@ public class LoginUser implements Serializable {
private Long currentPositionId; private Long currentPositionId;
/** /**
* 当前登录租户编码 * 当前登录租户id
*/ */
@ChineseDescription("当前登录租户编码") @ChineseDescription("当前登录租户id")
private String tenantCode; private Long tenantId;
/** /**
* 当前用户语种的标识，例如：chinese，english * 当前用户语种的标识，例如：chinese，english

8
kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/payload/DefaultJwtPayload.java
View File

@ -70,11 +70,6 @@ public class DefaultJwtPayload {
*/ */
private String caToken; private String caToken;
/**
* 多租户编码
*/
private String tenantCode;
/** /**
* 其他载体信息 * 其他载体信息
*/ */
@ -83,13 +78,12 @@ public class DefaultJwtPayload {
public 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.userId = userId;
this.account = account; this.account = account;
this.uuid = IdUtil.fastUUID(); this.uuid = IdUtil.fastUUID();
this.rememberMe = rememberMe; this.rememberMe = rememberMe;
this.caToken = caToken; this.caToken = caToken;
this.tenantCode = tenantCode;
} }
} }

2
kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginService.java
View File

@ -138,7 +138,7 @@ public class LoginService {
// 8. 生成用户的token // 8. 生成用户的token
DefaultJwtPayload defaultJwtPayload = new DefaultJwtPayload(userValidateInfo.getUserId(), loginRequest.getAccount(), DefaultJwtPayload defaultJwtPayload = new DefaultJwtPayload(userValidateInfo.getUserId(), loginRequest.getAccount(),
loginRequest.getRememberMe(), caToken, loginRequest.getTenantCode()); loginRequest.getRememberMe(), caToken);
String userLoginToken = AuthJwtContext.me().generateTokenDefaultPayload(defaultJwtPayload); String userLoginToken = AuthJwtContext.me().generateTokenDefaultPayload(defaultJwtPayload);
// 9. 创建loginUser对象 // 9. 创建loginUser对象