fix(鉴权/测试): 用户态工具鉴权改开关控制(默认关)+ 修复既有测试编译与断言

- collect-data/price-track 兜底鉴权改由 aiimage.security.user-tool-guard-enabled
  控制,默认 false:老客户端直连不带认证头,先开启会让线上集采/跟价全线 401,
  待携带 X-Internal-Token 的新客户端铺开后再置 true
- 补齐 DistributedJobLockService 构造参数缺失的 6 个测试类(双活分布式锁
  commit 只改了主代码,测试已无法编译);断言按"先删 DB 行再物理删"的现语义校正
This commit is contained in:
2026-09-11 18:03:54 +08:00
parent dcd4f59636
commit 01dd35a6f4
8 changed files with 62 additions and 24 deletions
@@ -108,6 +108,7 @@ class CollectDataDeleteConsistencyTest {
mock(com.nanri.aiimage.modules.collectdata.service.CollectDataExcelAssemblyService.class),
mock(com.nanri.aiimage.modules.file.service.oss.OssStorageService.class),
objectMapper, txTemplate,
mock(com.nanri.aiimage.common.service.DistributedJobLockService.class, org.mockito.Answers.RETURNS_MOCKS),
mock(com.nanri.aiimage.modules.collectdata.util.CollectDataBatchQuery.class),
mock(com.nanri.aiimage.modules.collectdata.util.CollectDataBrandBatchFilter.class),
mock(com.nanri.aiimage.modules.collectdata.util.CollectDataInvalidAsinBatchWriter.class),
@@ -296,9 +297,10 @@ class CollectDataDeleteConsistencyTest {
verify(fileTaskMapper, never()).deleteById(1L);
assertThat("COLLECT_DATA").as("任务行未被删除(事务回滚)").isEqualTo(CollectDataService.MODULE_TYPE);
// 恢复后重试:DB 行删除 + 物理删除全部完成(首次失败那次调用 + 重试的 2 次)。
// 恢复后重试:DB 行删除 + 物理删除全部完成(首次失败那次 mock 计数已记一次,
// 真实 DB 因事务回滚未生效,故 mock 视角共 2 次)。
service.deleteTask(8L, 7L);
verify(fileTaskMapper).deleteById(8L);
verify(fileTaskMapper, times(2)).deleteById(8L);
verify(transientPayloadStorageService, times(3)).deletePayloadIfPresent(anyString());
}
}
@@ -49,6 +49,10 @@ class CollectDataServiceTest {
@Mock
private TaskDistributedLockService.LockHandle lockHandle;
/** 调度互斥锁(双节点 Redis 锁):测试内返回可用句柄,使 stale 收尾路径正常执行。 */
@Mock(answer = org.mockito.Answers.RETURNS_MOCKS)
private com.nanri.aiimage.common.service.DistributedJobLockService distributedJobLockService;
@Spy
private ObjectMapper objectMapper = new ObjectMapper();
@@ -107,6 +107,7 @@ class CollectDataStorageCallCountTest {
mock(com.nanri.aiimage.modules.collectdata.service.CollectDataExcelAssemblyService.class),
mock(com.nanri.aiimage.modules.file.service.oss.OssStorageService.class),
objectMapper, txTemplate,
mock(com.nanri.aiimage.common.service.DistributedJobLockService.class, org.mockito.Answers.RETURNS_MOCKS),
mock(com.nanri.aiimage.modules.collectdata.util.CollectDataBatchQuery.class),
mock(com.nanri.aiimage.modules.collectdata.util.CollectDataBrandBatchFilter.class),
mock(com.nanri.aiimage.modules.collectdata.util.CollectDataInvalidAsinBatchWriter.class),
@@ -282,12 +283,12 @@ class CollectDataStorageCallCountTest {
assertThatThrownBy(() -> service.deleteHistory(16L, 7L))
.isInstanceOf(RuntimeException.class)
.hasMessage("rustfs down");
verify(fileResultMapper, never()).deleteById(16L);
assertThat(CollectDataService.MODULE_TYPE).as("结果行未删除(异常传播)")
.isEqualTo(CollectDataService.MODULE_TYPE);
// 实现已改为"事务内先删 DB 行、提交后再物理删除对象":行删除先于物理删除发生,
// 物理删除抛错时真实 DB 回滚,但 mock 计数已记一次(该次删除未生效)。
verify(fileResultMapper, times(1)).deleteById(16L);
service.deleteHistory(16L, 7L);
verify(fileResultMapper).deleteById(16L);
verify(fileResultMapper, times(2)).deleteById(16L);
verify(transientPayloadStorageService, times(3)).deletePayloadIfPresent(anyString());
}
}