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

- 管理后台:店铺数据记录改为列表分页展示(去任务号/文件列/累计标题,'最新'改'更新时间'),新增'重复 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 152ea6eec0
commit 417a2bf831
20 changed files with 1883 additions and 475 deletions
+43 -7
View File
@@ -3,11 +3,12 @@ import assert from 'node:assert/strict'
import { http } from '../src/shared/api/http.ts'
import {
runDedupe,
getDedupeRunProgress,
getDedupeHistory,
deleteDedupeHistory,
getDedupeResultDownloadUrl,
type DedupeRunRequest,
type DedupeRunVo,
type DedupeRunProgressVo,
} from '../src/shared/api/types/modules/dedupe.ts'
function setupWindow() {
@@ -26,12 +27,22 @@ function mockRequest(
const okResponse = (data: unknown) => Promise.resolve({ data: { success: true, message: 'ok', data } })
const runningProgress = (runId: string): DedupeRunProgressVo => ({
runId,
status: 'running',
total: 2,
processedCount: 1,
successCount: 1,
failedCount: 0,
finished: false,
})
test('test_dedupe_run_url', async (t) => {
setupWindow()
let captured: { url?: string } = {}
mockRequest(t, (config) => {
captured = config
return okResponse({ total: 1, successCount: 1, failedCount: 0, items: [] })
return okResponse(runningProgress('run-1'))
})
await runDedupe({ files: [{ fileKey: 'k1' }], selectedColumns: ['a'], keepIntegerIds: false, keepUnderscoreIds: false, keepIntegerMainIdsWhenNoSubIds: true })
assert.equal(captured.url, '/newApi/api/dedupe/run')
@@ -42,7 +53,7 @@ test('test_dedupe_run_method_payload', async (t) => {
let captured: { method?: string; data?: unknown } = {}
mockRequest(t, (config) => {
captured = config
return okResponse({ total: 0, successCount: 0, failedCount: 0, items: [] })
return okResponse(runningProgress('run-1'))
})
await runDedupe({ files: [{ fileKey: 'k1' }], selectedColumns: ['a'], keepIntegerIds: true, keepUnderscoreIds: true, keepIntegerMainIdsWhenNoSubIds: false })
assert.equal(captured.method, 'POST')
@@ -56,6 +67,30 @@ test('test_dedupe_run_method_payload', async (t) => {
})
})
test('test_dedupe_run_returns_progress', async (t) => {
setupWindow()
mockRequest(t, () => okResponse(runningProgress('run-1')))
const progress = await runDedupe({ files: [{ fileKey: 'k1' }], selectedColumns: ['a'], keepIntegerIds: false, keepUnderscoreIds: false, keepIntegerMainIdsWhenNoSubIds: true })
assert.equal(progress.runId, 'run-1', 'run 应立即返回 runId')
assert.equal(progress.status, 'running')
assert.equal(progress.finished, false)
assert.equal(progress.result, undefined, '运行中不应携带最终结果')
})
test('test_dedupe_progress_url', async (t) => {
setupWindow()
let captured: { url?: string; method?: string } = {}
mockRequest(t, (config) => {
captured = config
return okResponse({ runId: 'run-1', status: 'success', total: 2, processedCount: 2, successCount: 2, failedCount: 0, finished: true, result: { total: 2, successCount: 2, failedCount: 0, items: [] } })
})
const progress = await getDedupeRunProgress('run-1')
assert.equal(captured.url, '/newApi/api/dedupe/run/run-1/progress')
assert.equal(captured.method, 'GET')
assert.equal(progress.status, 'success')
assert.ok(progress.result, '完成后应返回结果')
})
test('test_dedupe_history_url', async (t) => {
setupWindow()
let captured: { url?: string; method?: string; params?: Record<string, unknown> } = {}
@@ -90,6 +125,7 @@ test('test_dedupe_download_url', async (t) => {
test('test_dedupe_signature_unchanged', async (t) => {
setupWindow()
assert.equal(runDedupe.length, 1, 'runDedupe 应保持单参数')
assert.equal(getDedupeRunProgress.length, 1, 'getDedupeRunProgress 应保持单参数')
assert.equal(getDedupeHistory.length, 0, 'getDedupeHistory 应保持无参')
assert.equal(deleteDedupeHistory.length, 1, 'deleteDedupeHistory 应保持单参数')
assert.equal(getDedupeResultDownloadUrl.length, 1, 'getDedupeResultDownloadUrl 应保持单参数')
@@ -114,9 +150,9 @@ test('test_dedupe_export_compat', async (t) => {
assert.equal(fromJavaModules.getDedupeResultDownloadUrl, fromDedupe.getDedupeResultDownloadUrl)
})
test('test_dedupe_unwrap', async (t) => {
test('test_dedupe_unwrap_progress', async (t) => {
setupWindow()
mockRequest(t, () => okResponse({ total: 2, successCount: 1, failedCount: 1, items: [{ success: true }] }))
const result = await runDedupe<DedupeRunVo>({ files: [{ fileKey: 'k' }], selectedColumns: [], keepIntegerIds: false, keepUnderscoreIds: false, keepIntegerMainIdsWhenNoSubIds: false })
assert.deepEqual(result, { total: 2, successCount: 1, failedCount: 1, items: [{ success: true }] }, '应返回解包后的 data')
mockRequest(t, () => okResponse(runningProgress('run-1')))
const progress = await runDedupe<DedupeRunProgressVo>({ files: [{ fileKey: 'k' }], selectedColumns: [], keepIntegerIds: false, keepUnderscoreIds: false, keepIntegerMainIdsWhenNoSubIds: false })
assert.deepEqual(progress, runningProgress('run-1'), '应返回解包后的 data')
})