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
-6
@@ -15,6 +15,7 @@ import com.nanri.aiimage.modules.publish.service.PublishTaskService;
|
||||
import com.nanri.aiimage.modules.similarasin.controller.SimilarAsinController;
|
||||
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinSubmitResultRequest;
|
||||
import com.nanri.aiimage.modules.similarasin.service.SimilarAsinTaskService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressOwnershipSupport;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
@@ -64,7 +65,7 @@ class ResultSuccessTimingContractTest {
|
||||
return null;
|
||||
}).when(similarAsinTaskService).submitResult(eq(TASK_ID), any(SimilarAsinSubmitResultRequest.class));
|
||||
|
||||
ApiResponse<Void> response = new SimilarAsinController(similarAsinTaskService)
|
||||
ApiResponse<Void> response = new SimilarAsinController(similarAsinTaskService, new TaskProgressOwnershipSupport(null))
|
||||
.result(TASK_ID, new SimilarAsinSubmitResultRequest(), mock(HttpServletResponse.class));
|
||||
|
||||
responseAfterService.set(response != null);
|
||||
@@ -79,7 +80,7 @@ class ResultSuccessTimingContractTest {
|
||||
doAnswer(invocation -> null)
|
||||
.when(appearancePatentTaskService).submitResult(eq(TASK_ID), any(AppearancePatentSubmitResultRequest.class));
|
||||
|
||||
ApiResponse<Void> response = new AppearancePatentController(appearancePatentTaskService)
|
||||
ApiResponse<Void> response = new AppearancePatentController(appearancePatentTaskService, new TaskProgressOwnershipSupport(null))
|
||||
.result(TASK_ID, new AppearancePatentSubmitResultRequest(), mock(HttpServletResponse.class));
|
||||
|
||||
assertTrue(response.isSuccess(), "success=true");
|
||||
@@ -93,7 +94,7 @@ class ResultSuccessTimingContractTest {
|
||||
vo.setChunkIndex(1);
|
||||
when(collectDataService.submitResult(eq(TASK_ID), any(CollectDataSubmitResultRequest.class))).thenReturn(vo);
|
||||
|
||||
ApiResponse<CollectDataSubmitResultVo> response = new CollectDataController(collectDataService)
|
||||
ApiResponse<CollectDataSubmitResultVo> response = new CollectDataController(collectDataService, new TaskProgressOwnershipSupport(null))
|
||||
.submitResult(TASK_ID, new CollectDataSubmitResultRequest());
|
||||
|
||||
assertTrue(response.isSuccess(), "success=true");
|
||||
@@ -118,7 +119,7 @@ class ResultSuccessTimingContractTest {
|
||||
org.mockito.Mockito.doThrow(new BusinessException("落库失败"))
|
||||
.when(similarAsinTaskService).submitResult(eq(TASK_ID), any(SimilarAsinSubmitResultRequest.class));
|
||||
|
||||
assertThrows(BusinessException.class, () -> new SimilarAsinController(similarAsinTaskService)
|
||||
assertThrows(BusinessException.class, () -> new SimilarAsinController(similarAsinTaskService, new TaskProgressOwnershipSupport(null))
|
||||
.result(TASK_ID, new SimilarAsinSubmitResultRequest(), mock(HttpServletResponse.class)));
|
||||
}
|
||||
|
||||
@@ -131,7 +132,7 @@ class ResultSuccessTimingContractTest {
|
||||
}
|
||||
return null;
|
||||
}).when(similarAsinTaskService).submitResult(eq(TASK_ID), any(SimilarAsinSubmitResultRequest.class));
|
||||
SimilarAsinController controller = new SimilarAsinController(similarAsinTaskService);
|
||||
SimilarAsinController controller = new SimilarAsinController(similarAsinTaskService, new TaskProgressOwnershipSupport(null));
|
||||
|
||||
assertThrows(BusinessException.class, () -> controller
|
||||
.result(TASK_ID, new SimilarAsinSubmitResultRequest(), mock(HttpServletResponse.class)));
|
||||
@@ -149,7 +150,7 @@ class ResultSuccessTimingContractTest {
|
||||
order.add("service-submit");
|
||||
return null;
|
||||
}).when(appearancePatentTaskService).submitResult(eq(TASK_ID), any(AppearancePatentSubmitResultRequest.class));
|
||||
AppearancePatentController controller = new AppearancePatentController(appearancePatentTaskService);
|
||||
AppearancePatentController controller = new AppearancePatentController(appearancePatentTaskService, new TaskProgressOwnershipSupport(null));
|
||||
|
||||
ApiResponse<Void> response = controller.result(TASK_ID, new AppearancePatentSubmitResultRequest(),
|
||||
mock(HttpServletResponse.class));
|
||||
|
||||
+6
-2
@@ -224,13 +224,17 @@ class RollbackSemanticsContractTest {
|
||||
verify(taskCacheService).touchTaskHeartbeat(TASK_ID);
|
||||
}
|
||||
|
||||
private Object pipeline() {
|
||||
return ReflectionTestUtils.invokeMethod(service, "pipelineSupport");
|
||||
}
|
||||
|
||||
@Test
|
||||
void computePhaseIsSideEffectFreeAndIdempotent() throws Exception {
|
||||
FileTaskEntity task = runningTask();
|
||||
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task);
|
||||
|
||||
Object first = ReflectionTestUtils.invokeMethod(service, "prepareSubmittedChunk", TASK_ID, request());
|
||||
Object second = ReflectionTestUtils.invokeMethod(service, "prepareSubmittedChunk", TASK_ID, request());
|
||||
Object first = ReflectionTestUtils.invokeMethod(pipeline(), "prepareSubmittedChunk", TASK_ID, request());
|
||||
Object second = ReflectionTestUtils.invokeMethod(pipeline(), "prepareSubmittedChunk", TASK_ID, request());
|
||||
|
||||
assertEquals(DigestUtil.sha256Hex(storedPayloadJson.get()),
|
||||
ReflectionTestUtils.getField(first, "payloadHash"));
|
||||
|
||||
+24
-13
@@ -1,6 +1,7 @@
|
||||
package com.nanri.aiimage.modules.task.contract;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.modules.collectdata.mapper.CollectDataCountryPrefMapper;
|
||||
@@ -46,6 +47,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.ArgumentMatchers.isNull;
|
||||
import static org.mockito.Mockito.doThrow;
|
||||
import static org.mockito.Mockito.inOrder;
|
||||
import static org.mockito.Mockito.lenient;
|
||||
@@ -125,20 +127,24 @@ class SuccessTimingContractTest {
|
||||
var order = inOrder(ossStorageService, fileResultMapper, fileTaskMapper);
|
||||
order.verify(ossStorageService).uploadResultFile(any(), eq("COLLECT_DATA"));
|
||||
order.verify(fileResultMapper).updateById(any(FileResultEntity.class));
|
||||
order.verify(fileTaskMapper).updateById(any(FileTaskEntity.class));
|
||||
// 2026-09:终态写入改为条件更新(where status != FAILED),不再走 updateById(实体)
|
||||
order.verify(fileTaskMapper).update(isNull(), any(LambdaUpdateWrapper.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void taskStatusBecomesSuccessWithFileFields() {
|
||||
service.processResultFileJob(job());
|
||||
|
||||
ArgumentCaptor<FileTaskEntity> taskCaptor = ArgumentCaptor.forClass(FileTaskEntity.class);
|
||||
verify(fileTaskMapper).updateById(taskCaptor.capture());
|
||||
FileTaskEntity updated = taskCaptor.getValue();
|
||||
assertEquals("SUCCESS", updated.getStatus(), "任务状态成功时机 = 结果文件生成后");
|
||||
assertEquals(1, updated.getSuccessFileCount());
|
||||
assertEquals(0, updated.getFailedFileCount());
|
||||
assertNotNull(updated.getFinishedAt());
|
||||
// 2026-09:终态写入改为条件更新(LambdaUpdateWrapper,where status != FAILED),
|
||||
// 不再有实体可捕获 —— 改为捕获 wrapper 并断言其 set 片段包含契约要求的字段。
|
||||
ArgumentCaptor<LambdaUpdateWrapper<FileTaskEntity>> wrapperCaptor =
|
||||
ArgumentCaptor.forClass(LambdaUpdateWrapper.class);
|
||||
verify(fileTaskMapper).update(isNull(), wrapperCaptor.capture());
|
||||
String setSql = String.valueOf(wrapperCaptor.getValue().getSqlSet());
|
||||
assertTrue(setSql.contains("status"), "任务状态成功时机 = 结果文件生成后,set 片段应含 status: " + setSql);
|
||||
assertTrue(setSql.contains("success_file_count"), "set 片段应含 success_file_count: " + setSql);
|
||||
assertTrue(setSql.contains("failed_file_count"), "set 片段应含 failed_file_count: " + setSql);
|
||||
assertTrue(setSql.contains("finished_at"), "set 片段应含 finished_at: " + setSql);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -162,13 +168,16 @@ class SuccessTimingContractTest {
|
||||
|
||||
// fileReady 由 url 推导(TaskProgressLightAssembler 语义),成功时机与 url 落库绑定
|
||||
verify(fileResultMapper).updateById(any(FileResultEntity.class));
|
||||
verify(fileTaskMapper).updateById(any(FileTaskEntity.class));
|
||||
// 2026-09:任务终态改为条件更新(见 taskStatusBecomesSuccessWithFileFields)
|
||||
verify(fileTaskMapper).update(isNull(), any(LambdaUpdateWrapper.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void noFileGeneratedNoSuccess() {
|
||||
// 方法名同步:实现已由 writeWorkbookSegmented 改为 writeWorkbookStreaming(流式分页读,
|
||||
// 避免几十万行结果集整体驻留堆),测试原先仍在 mock 旧方法名,导致"没抛异常"的假失败。
|
||||
doThrow(new IllegalStateException("工作簿生成失败"))
|
||||
.when(excelAssemblyService).writeWorkbookSegmented(any(), any(), any(), any());
|
||||
.when(excelAssemblyService).writeWorkbookStreaming(any(), any(), any(), any());
|
||||
|
||||
assertThrows(IllegalStateException.class, () -> service.processResultFileJob(job()));
|
||||
|
||||
@@ -202,11 +211,13 @@ class SuccessTimingContractTest {
|
||||
void successContractFrozen() {
|
||||
service.processResultFileJob(job());
|
||||
|
||||
// 契约快照:文件生成+上传 → result 落库 → 任务 SUCCESS(一次 updateById 各一)
|
||||
// 契约快照:文件生成+上传 → result 落库 → 任务 SUCCESS(各一次写入)
|
||||
verify(ossStorageService).uploadResultFile(any(), eq("COLLECT_DATA"));
|
||||
verify(fileResultMapper).updateById(any(FileResultEntity.class));
|
||||
verify(fileTaskMapper).updateById(any(FileTaskEntity.class));
|
||||
verify(fileTaskMapper, org.mockito.Mockito.times(1)).updateById(any(FileTaskEntity.class));
|
||||
// 2026-09:任务终态写入由 updateById(实体) 改为条件更新(where status != FAILED,
|
||||
// 避免覆盖客户端 /fail 并发上报的失败态)
|
||||
verify(fileTaskMapper).update(isNull(), any(LambdaUpdateWrapper.class));
|
||||
verify(fileTaskMapper, org.mockito.Mockito.times(1)).update(isNull(), any(LambdaUpdateWrapper.class));
|
||||
}
|
||||
|
||||
private FileTaskEntity runningTask() {
|
||||
|
||||
+5
-2
@@ -38,8 +38,11 @@ class ResultFileJobHandlerTest {
|
||||
|
||||
@Test
|
||||
void interfaceMethodsPresent() throws Exception {
|
||||
assertEquals(7, ResultFileJobHandler.class.getDeclaredMethods().length,
|
||||
"接口方法数量为 7(moduleType/process/onSuccess/cleanup/onFailure/supportsAsyncOffload/isOwnerScoped)");
|
||||
// 2026-09:新增 fallbackAssembleOnFailure(job 重试耗尽时用部分数据兜底生成结果文件),
|
||||
// 接口方法从 7 个增到 8 个,同步更新契约断言。
|
||||
assertEquals(8, ResultFileJobHandler.class.getDeclaredMethods().length,
|
||||
"接口方法数量为 8(moduleType/process/onSuccess/cleanup/onFailure/"
|
||||
+ "fallbackAssembleOnFailure/supportsAsyncOffload/isOwnerScoped)");
|
||||
assertNotNull(methodOf(ResultFileJobHandler.class, "moduleType"));
|
||||
assertNotNull(methodOf(ResultFileJobHandler.class, "process", TaskFileJobEntity.class));
|
||||
assertNotNull(methodOf(ResultFileJobHandler.class, "onSuccess", TaskFileJobEntity.class));
|
||||
|
||||
+5
-2
@@ -117,8 +117,11 @@ class TransientPayloadDeleteOrchestratorTest {
|
||||
assertEquals(2, orchestrator.flushPendingDeletes(), "两个对象提交物理删除");
|
||||
assertTrue(done.await(2, TimeUnit.SECONDS), "异步删除完成");
|
||||
verify(rustfs, times(2)).deleteObject(anyString());
|
||||
verify(chunkMapper).selectList(any(LambdaQueryWrapper.class));
|
||||
verify(scopeStateMapper).selectList(any(LambdaQueryWrapper.class));
|
||||
// 2026-09 修订:批量反查按指针里的 taskId 分组后各查一次(用 task_id 索引收敛,
|
||||
// 避免 payload_json 这类 JSON 列的 IN 比较全表扫描)——本用例的 payload 来自 2 个 task,
|
||||
// 故两张表各被查询 2 次(替换了原「合并成一次 IN 查询」的实现)。
|
||||
verify(chunkMapper, times(2)).selectList(any(LambdaQueryWrapper.class));
|
||||
verify(scopeStateMapper, times(2)).selectList(any(LambdaQueryWrapper.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user