后台店铺数据记录页新增 Tab 切换与重复 ASIN 分析;task-169/170 HTTP 客户端配置接入;dedupe/brand 相关改造

- 管理后台:店铺数据记录改为列表分页展示(去任务号/文件列/累计标题,'最新'改'更新时间'),新增'重复 ASIN' Tab 按跨店聚合展示 ASIN/店铺/分组/国家/日期/价格;修复失败/进行中任务被过滤不显示的问题
- task-169: BrandCheckHttpConfigResolver 从 aiimage.http-client.* 读取品牌检查超时/重试(默认同现状、钳制),附 8 条测试
- task-170: surefire 内存调整为 1536m
- dedupe: DedupeRunService 重构(事务边界/进度)、新增 DedupeRunProgressVo、Controller 与结果 VO 调整,PermissionMenuService 相应适配
- brand/dedupe 前端:BrandDedupeTab/BrandPatrolDeleteTab 改造、新增 CountrySelector 组件与 country-options、类型与接口端对齐、测试更新
- 移除无引用文件:backend/static/logo.jpg、prompts/
This commit is contained in:
2026-09-03 01:57:41 +08:00
parent 04db60a837
commit d1368ed00e
20 changed files with 1883 additions and 475 deletions
@@ -378,7 +378,7 @@ public class PermissionMenuService {
.filter(id -> !protectedIds.contains(id))
.toList();
}
Set<Long> operatorEffectiveIds = ensureGrantable(operator, grantIds);
ensureGrantable(operator, grantIds);
LinkedHashSet<Long> finalGrantIds = new LinkedHashSet<>(grantIds);
if (!protectedIds.isEmpty()) {
@@ -389,12 +389,6 @@ public class PermissionMenuService {
}
}
}
if (operatorEffectiveIds != null) {
loadDirectColumnIds(userId).stream()
.filter(id -> normalizedType == null || scopedMenuIds.contains(id))
.filter(id -> !operatorEffectiveIds.contains(id))
.forEach(finalGrantIds::add);
}
if (normalizedType == null) {
userColumnPermissionMapper.deleteByUserId(userId);
@@ -541,9 +535,10 @@ public class PermissionMenuService {
}
}
private Set<Long> ensureGrantable(AdminUserEntity operator, List<Long> requestedIds) {
/** Throws 403 when a non-super admin requests grants outside their own effective set. */
private void ensureGrantable(AdminUserEntity operator, List<Long> requestedIds) {
if (operator == null || isSuperAdmin(operator)) {
return null;
return;
}
List<PermissionMenuEntity> menus = loadMenus(null);
Set<Long> effective = expandDescendantIds(new LinkedHashSet<>(loadDirectColumnIds(operator.getId())), menus);
@@ -553,7 +548,6 @@ public class PermissionMenuService {
if (!denied.isEmpty()) {
throw new BusinessException(403, "普通管理员只能分配自己已有的菜单权限");
}
return effective;
}
private boolean isAdmin(AdminUserEntity user) {