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

build: continew-starter 2.13.0 => 2.13.1

Browse Source 
1.DataPermissionUserContextProvider 相关命名调整，以避免和 Admin 内类名冲突
DataPermissionUserContextProvider => DataPermissionUserDataProvider
UserContext => UserData
RoleContext => RoleData
2.引入 crane4j 依赖及填充处理（Starter 为了扩展性，移除了此依赖及相关处理）
3.API 替换
3.1SpringUtil.getBean(TenantHandler.class) => TenantUtils
3.2JakartaServletUtil.write => ServletUtils.writeJSON
3.3tenantExtensionProperties.isEnabled() => TenantContextHolder.isTenantEnabled()
4.Starter 内部修复
4.1FastExcel POI 版本冲突导致的导出报错
4.2EnumValue 校验支持了 BaseEnum
This commit is contained in:
Charles7c
2025-07-17 22:29:09 +08:00
parent 7e9a950694
commit 6136797588
16 changed files with 72 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
continew-system/src/main/java/top/continew/admin/auth/AbstractLoginHandler.java
View File

@@ -19,7 +19,6 @@ package top.continew.admin.auth;
import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.stp.parameter.SaLoginParameter;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.extra.spring.SpringUtil;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -40,8 +39,8 @@ import top.continew.admin.system.service.UserService;
import top.continew.starter.core.util.ServletUtils;
import top.continew.starter.core.util.validation.CheckUtils;
import top.continew.starter.core.util.validation.Validator;
import top.continew.starter.extension.tenant.TenantHandler;
import top.continew.starter.extension.tenant.context.TenantContextHolder;
import top.continew.starter.extension.tenant.util.TenantUtils;
import java.util.HashSet;
import java.util.Set;
@@ -97,14 +96,14 @@ public abstract class AbstractLoginHandler<T extends LoginReq> implements LoginH
Long tenantId = TenantContextHolder.getTenantId();
CompletableFuture<Set<String>> permissionFuture = CompletableFuture.supplyAsync(() -> {
Set<String> permissions = new HashSet<>();
SpringUtil.getBean(TenantHandler.class).execute(tenantId, () -> {
TenantUtils.execute(tenantId, () -> {
permissions.addAll(roleService.listPermissionByUserId(userId));
});
return permissions;
}, threadPoolTaskExecutor);
CompletableFuture<Set<RoleContext>> roleFuture = CompletableFuture.supplyAsync(() -> {
Set<RoleContext> roles = new HashSet<>();
SpringUtil.getBean(TenantHandler.class).execute(tenantId, () -> {
TenantUtils.execute(tenantId, () -> {
roles.addAll(roleService.listByUserId(userId));
});
return roles;

2
continew-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java
View File

@@ -93,7 +93,7 @@ public class OnlineUserServiceImpl implements OnlineUserService {
continue;
}
// 只显示本租户数据
if (tenantExtensionProperties.isEnabled()) {
if (TenantContextHolder.isTenantEnabled()) {
if (!TenantContextHolder.getTenantId().equals(userContext.getTenantId())) {
continue;
}