ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-08 12:57:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复租户登陆时的权限问题，租户套餐更新时租户菜单权限同步更新

Browse Source
This commit is contained in:
小熊
2025-07-20 12:54:37 +08:00
parent ca1c64f57f
commit 382c87f8bd
11 changed files with 56 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
continew-system/src/main/java/top/continew/admin/auth/handler/AccountLoginHandler.java
View File

@@ -72,7 +72,10 @@ public class AccountLoginHandler extends AbstractLoginHandler<AccountLoginReq> {
super.checkUserStatus(user);
// 执行认证
String token = this.authenticate(user, client);
return LoginResp.builder().token(token).tenantId(TenantContextHolder.isTenantEnabled()? TenantContextHolder.getTenantId():null).build();
return LoginResp.builder()
.token(token)
.tenantId(TenantContextHolder.isTenantEnabled() ? TenantContextHolder.getTenantId() : null)
.build();
}
@Override

6
continew-system/src/main/java/top/continew/admin/auth/handler/EmailLoginHandler.java
View File

@@ -48,7 +48,11 @@ public class EmailLoginHandler extends AbstractLoginHandler<EmailLoginReq> {
super.checkUserStatus(user);
// 执行认证
String token = super.authenticate(user, client);
return LoginResp.builder().token(token).tenantId(TenantContextHolder.isTenantEnabled()? TenantContextHolder.getTenantId():null).build(); }
return LoginResp.builder()
.token(token)
.tenantId(TenantContextHolder.isTenantEnabled() ? TenantContextHolder.getTenantId() : null)
.build();
}
@Override
public void preLogin(EmailLoginReq req, ClientResp client, HttpServletRequest request) {

6
continew-system/src/main/java/top/continew/admin/auth/handler/PhoneLoginHandler.java
View File

@@ -48,7 +48,11 @@ public class PhoneLoginHandler extends AbstractLoginHandler<PhoneLoginReq> {
super.checkUserStatus(user);
// 执行认证
String token = super.authenticate(user, client);
return LoginResp.builder().token(token).tenantId(TenantContextHolder.isTenantEnabled()? TenantContextHolder.getTenantId():null).build(); }
return LoginResp.builder()
.token(token)
.tenantId(TenantContextHolder.isTenantEnabled() ? TenantContextHolder.getTenantId() : null)
.build();
}
@Override
public void preLogin(PhoneLoginReq req, ClientResp client, HttpServletRequest request) {

5
continew-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java
View File

@@ -128,7 +128,10 @@ public class SocialLoginHandler extends AbstractLoginHandler<SocialLoginReq> {
userSocialService.saveOrUpdate(userSocial);
// 执行认证
String token = super.authenticate(user, client);
return LoginResp.builder().token(token).tenantId(TenantContextHolder.isTenantEnabled()? TenantContextHolder.getTenantId():null).build();
return LoginResp.builder()
.token(token)
.tenantId(TenantContextHolder.isTenantEnabled() ? TenantContextHolder.getTenantId() : null)
.build();
}
@Override

4
continew-system/src/main/java/top/continew/admin/system/controller/CommonController.java
View File

@@ -130,10 +130,10 @@ public class CommonController {
@TenantIgnore
@SaIgnore
@Operation(summary = "查询租户开启状态",description = "查询租户开启状态")
@Operation(summary = "查询租户开启状态", description = "查询租户开启状态")
@GetMapping("/dict/option/tenant")
@Cached(key = "'TENANT'", name = CacheConstants.OPTION_KEY_PREFIX)
public Boolean tenantEnabled(){
public Boolean tenantEnabled() {
return TenantContextHolder.isTenantEnabled();
}
}