fix: 全维度审查修复(安全/正确性/性能/稳定性/客户端/前端)
安全 - /api/ziniao/** 五个匿名接口加管理员鉴权(此前可匿名换取任意员工店铺登录令牌) - 删除 Flask 遗留后门:默认密码建超管 + 每次启动写生产 users 表(服务端与客户端各一份) - 进度/详情接口归属过滤:新增 TaskProgressOwnershipSupport,11 模块 progress/light 与 /tasks/batch 接入,DTO 补 userId,前端 13 个查询封装补传(未传时后端不过滤,兼容旧端) - 代理提取链接(含账密)不再明文入日志(新增 common/util/SecretMasking) - 全局异常兜底不再回传原始异常信息;内部令牌比较改常量时间 - 登录加失败计数与锁定(10 次锁 15 分钟);品牌源文件下载加 SSRF 防护 - AdminApiGuardFilter 覆盖前缀从 2 扩到 15(开关默认 false,行为不变,为收紧做准备) - 生产关闭 springdoc/knife4j(/doc.html 匿名可读全部接口定义) 正确性 - 40901/40902 拆分:锁竞争不再被伪装成 success=true(此前客户端停止重试、分片静默丢失) - 假成功收敛:集采明细批量写失败改为抛出、去重 worker 异常标失败、4 个 worker 改判 success 字段、publish 空 ASIN 行参与批次 flush、巡店删除全失败带 error 上报 - 客户端心跳 discard 移入 finally(7 模块,失败路径不再留僵尸 RUNNING 任务) - 状态机条件更新:跟价停止循环、集采 activate/fail、imagevideo 归档回填、店铺匹配提交 性能 - 前端入口包 JS 1.05MB→204KB、CSS 355KB→10.7KB(Element Plus 改按需 + el-config-provider) - 载荷引用计数按指针里的 taskId 收敛(原 JSON 列 IN 全表扫且逐行调用) - 店铺明细多值批量 INSERT;快照 upsert 预载缓存;结果文件列改单条 UPDATE - 新增迁移 V120(补 3 个缺失索引)/V121(删 4 个被覆盖的冗余索引)/V122(URL 前缀索引) 稳定性 - 新增 common/util/ThreadPools 有界线程池替换 5 处无界队列(防堆积 OOM) - Redis 锁释放改 Lua 原子校验(原裸 delete 会误删他人已过期的锁) - imagevideo 加死节点接管;锁续期失败重试;调度池 4→16;openStream 全部加超时 - 事务内远程对象删除移到提交后;启动恢复锁按实例命名 客户端 - 不再 taskkill /f /im chrome.exe(改为按调试端口精准回收,不杀用户自己的浏览器) - 密码检测不再无条件杀紫鸟进程;品牌检测加全局互斥(代理池不再互相覆盖) - base_dir 统一到 exe 目录(原被 os.getcwd() 覆盖,日志/缓存会分裂两个目录) - 缓存加定时清理;图片下载加超时;mkstemp 句柄托管 测试 - 同步更新受影响的契约测试(构造器签名/条件更新/方法改名/新增接口方法等) - 修复 FaultInjectionTest 等 3 处 mock 未 stub 流式 read 导致的读循环 OOM - mvn test 2795 个测试全绿
This commit is contained in:
+7
-2
@@ -42,6 +42,7 @@ import java.nio.charset.StandardCharsets;
|
||||
import java.util.List;
|
||||
import com.nanri.aiimage.modules.task.model.dto.TaskProgressLightRequest;
|
||||
import com.nanri.aiimage.modules.task.model.vo.TaskProgressLightBatchVo;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressOwnershipSupport;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@@ -54,6 +55,7 @@ public class QueryAsinTaskController {
|
||||
|
||||
private final QueryAsinResolveService queryAsinResolveService;
|
||||
private final QueryAsinTaskService queryAsinTaskService;
|
||||
private final TaskProgressOwnershipSupport progressOwnershipSupport;
|
||||
|
||||
@GetMapping("/candidates")
|
||||
@Operation(summary = "查询备选店铺列表", description = "返回当前用户在查询 ASIN 模块中已保存的备选店铺。")
|
||||
@@ -138,7 +140,9 @@ public class QueryAsinTaskController {
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
@Operation(summary = "批量查询查询 ASIN 任务进度", description = "仅返回任务状态和店铺结果摘要,用于前端轮询降载。")
|
||||
public ApiResponse<QueryAsinTaskBatchVo> taskProgressBatch(@Valid @RequestBody QueryAsinTaskBatchRequest request) {
|
||||
return ApiResponse.success(queryAsinTaskService.getTaskProgressBatch(request.getTaskIds()));
|
||||
// 归属过滤:只查询属于该用户的任务(userId 未传时保持原行为,兼容未升级调用方)
|
||||
return ApiResponse.success(queryAsinTaskService.getTaskProgressBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@@ -146,7 +150,8 @@ public class QueryAsinTaskController {
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileError/fileReady/updatedAt),"
|
||||
+ "不查明细/result 行,响应体更小;旧 progress/batch 端点保留不动。")
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request) {
|
||||
return ApiResponse.success(queryAsinTaskService.progressLight(request.getTaskIds()));
|
||||
// 透传 userId:此前传 null = 不过滤归属,匿名遍历 taskId 即可读他人任务状态(2026-09 审查)
|
||||
return ApiResponse.success(queryAsinTaskService.progressLight(request.getTaskIds(), request.getUserId()));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks")
|
||||
|
||||
+3
@@ -11,5 +11,8 @@ public class QueryAsinTaskBatchRequest {
|
||||
|
||||
@NotEmpty(message = "taskIds 不能为空")
|
||||
private List<Long> taskIds = new ArrayList<>();
|
||||
|
||||
/** 当前用户 ID(可省略;传入时仅返回该用户的任务,用于进度接口归属过滤)。 */
|
||||
private Long userId;
|
||||
}
|
||||
|
||||
|
||||
+46
-15
@@ -3,8 +3,10 @@ package com.nanri.aiimage.modules.queryasin.service;
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessCodes;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.config.TaskPressureProperties;
|
||||
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
|
||||
@@ -52,8 +54,8 @@ public class QueryAsinTaskService {
|
||||
|
||||
private static final String MODULE_TYPE = "QUERY_ASIN";
|
||||
|
||||
public TaskProgressLightBatchVo progressLight(List<Long> taskIds) {
|
||||
return taskProgressLightAssembler.assemble(MODULE_TYPE, null, taskIds);
|
||||
public TaskProgressLightBatchVo progressLight(List<Long> taskIds, Long userId) {
|
||||
return taskProgressLightAssembler.assemble(MODULE_TYPE, userId, taskIds);
|
||||
}
|
||||
private static final String CONTENT_TYPE_XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
|
||||
private static final int RESULT_PENDING = -1;
|
||||
@@ -537,6 +539,28 @@ public class QueryAsinTaskService {
|
||||
.orderByAsc(FileResultEntity::getId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 一条 UPDATE 落库结果文件列。
|
||||
*
|
||||
* <p>原先对每个成功行 {@code updateById}:N 行 = N 次网络往返 + N 次提交
|
||||
* (这些方法非事务、各自自动提交),且写 binlog 被同步放大;N=500 时白花约 0.5~1s。
|
||||
* 条件与 {@link #listTaskRows} 的查询口径一致(同任务同模块的成功行)。
|
||||
*/
|
||||
private void updateResultFileColumns(List<Long> rowIds, String filename, String objectKey,
|
||||
long fileSize, int rowCount) {
|
||||
if (rowIds == null || rowIds.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
fileResultMapper.update(null, new LambdaUpdateWrapper<FileResultEntity>()
|
||||
.in(FileResultEntity::getId, rowIds)
|
||||
.eq(FileResultEntity::getSuccess, RESULT_SUCCESS)
|
||||
.set(FileResultEntity::getResultFilename, filename)
|
||||
.set(FileResultEntity::getResultFileUrl, objectKey)
|
||||
.set(FileResultEntity::getResultFileSize, fileSize)
|
||||
.set(FileResultEntity::getResultContentType, CONTENT_TYPE_XLSX)
|
||||
.set(FileResultEntity::getRowCount, rowCount));
|
||||
}
|
||||
|
||||
private Map<String, QueryAsinShopPayloadDto> normalizePayloadByShop(List<QueryAsinShopPayloadDto> shops) {
|
||||
Map<String, QueryAsinShopPayloadDto> payloadByShop = new LinkedHashMap<>();
|
||||
for (QueryAsinShopPayloadDto item : shops) {
|
||||
@@ -920,20 +944,23 @@ public class QueryAsinTaskService {
|
||||
String filename = buildTaskWorkbookFilename(task);
|
||||
int rowCount = excelAssemblyService.countRows(successItems);
|
||||
FileResultEntity firstSuccessRow = null;
|
||||
for (FileResultEntity row : rows) {
|
||||
if (Integer.valueOf(RESULT_SUCCESS).equals(row.getSuccess())) {
|
||||
row.setResultFilename(filename);
|
||||
row.setResultFileUrl(null);
|
||||
row.setResultFileSize(0L);
|
||||
row.setResultContentType(CONTENT_TYPE_XLSX);
|
||||
row.setRowCount(rowCount);
|
||||
fileResultMapper.updateById(row);
|
||||
if (firstSuccessRow == null) {
|
||||
firstSuccessRow = row;
|
||||
}
|
||||
List<Long> successRowIds = new ArrayList<>();
|
||||
for (FileResultEntity row : rows) {
|
||||
if (Integer.valueOf(RESULT_SUCCESS).equals(row.getSuccess())) {
|
||||
// 内存对象同步改:下方 buildSnapshotFromDb 直接读这些对象
|
||||
row.setResultFilename(filename);
|
||||
row.setResultFileUrl(null);
|
||||
row.setResultFileSize(0L);
|
||||
row.setResultContentType(CONTENT_TYPE_XLSX);
|
||||
row.setRowCount(rowCount);
|
||||
successRowIds.add(row.getId());
|
||||
if (firstSuccessRow == null) {
|
||||
firstSuccessRow = row;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (firstSuccessRow != null) {
|
||||
updateResultFileColumns(successRowIds, filename, null, 0L, rowCount);
|
||||
taskFileJobService.enqueueAssembleResult(task.getId(), MODULE_TYPE, firstSuccessRow.getId(), "task:" + task.getId());
|
||||
snapshots = buildSnapshotFromDb(task, rows);
|
||||
}
|
||||
@@ -971,16 +998,19 @@ public class QueryAsinTaskService {
|
||||
String objectKey = ossStorageService.uploadResultFile(xlsx, MODULE_TYPE);
|
||||
long fileSize = xlsx.length();
|
||||
int rowCount = excelAssemblyService.countRows(successItems);
|
||||
List<Long> successRowIds = new ArrayList<>();
|
||||
for (FileResultEntity row : rows) {
|
||||
if (Integer.valueOf(RESULT_SUCCESS).equals(row.getSuccess())) {
|
||||
// 内存对象同步改:紧随其后的 updateTaskStatusFromRows/buildSnapshotFromDb 直接读这些对象
|
||||
row.setResultFilename(filename);
|
||||
row.setResultFileUrl(objectKey);
|
||||
row.setResultFileSize(fileSize);
|
||||
row.setResultContentType(CONTENT_TYPE_XLSX);
|
||||
row.setRowCount(rowCount);
|
||||
fileResultMapper.updateById(row);
|
||||
successRowIds.add(row.getId());
|
||||
}
|
||||
}
|
||||
updateResultFileColumns(successRowIds, filename, objectKey, fileSize, rowCount);
|
||||
updateTaskStatusFromRows(task, rows);
|
||||
persistSnapshotJson(task, buildSnapshotFromDb(task, rows));
|
||||
fileTaskMapper.updateById(task);
|
||||
@@ -1010,7 +1040,8 @@ public class QueryAsinTaskService {
|
||||
private TaskDistributedLockService.LockHandle acquireTaskLockOrThrow(Long taskId) {
|
||||
TaskDistributedLockService.LockHandle lockHandle = acquireTaskLock(taskId);
|
||||
if (lockHandle == null) {
|
||||
throw new BusinessException(40901, "任务正在处理中,请稍后再试");
|
||||
log.warn("[query-asin] 任务锁竞争,拒绝本次提交 taskId={}", taskId);
|
||||
throw new BusinessException(BusinessCodes.TASK_BUSY, "任务正在处理中,请稍后再试");
|
||||
}
|
||||
return lockHandle;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user