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:
+8
-2
@@ -15,6 +15,7 @@ import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinTaskBatchVo;
|
||||
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinTaskLightBatchVo;
|
||||
import com.nanri.aiimage.modules.similarasin.service.SimilarAsinTaskService;
|
||||
import com.nanri.aiimage.modules.similarasin.service.SimilarAsinTaskService.ResultDownloadInfo;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressOwnershipSupport;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -48,6 +49,7 @@ import java.util.List;
|
||||
public class SimilarAsinController {
|
||||
|
||||
private final SimilarAsinTaskService service;
|
||||
private final TaskProgressOwnershipSupport progressOwnershipSupport;
|
||||
|
||||
@GetMapping("/filter-conditions")
|
||||
@Operation(summary = "查询货源查询筛选条件")
|
||||
@@ -118,7 +120,9 @@ public class SimilarAsinController {
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
@Operation(summary = "批量查询任务进度", description = "前端仅对活跃任务轮询该接口,返回轻量任务状态。")
|
||||
public ApiResponse<SimilarAsinTaskBatchVo> progress(@Valid @RequestBody SimilarAsinTaskBatchRequest request) {
|
||||
return ApiResponse.success(service.progressBatch(request.getTaskIds()));
|
||||
// 归属过滤:只查询属于该用户的任务(userId 未传时保持原行为,兼容未升级调用方)
|
||||
return ApiResponse.success(service.progressBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@@ -126,7 +130,9 @@ public class SimilarAsinController {
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileReady/updatedAt),"
|
||||
+ "不查明细/result 行,响应体更小;旧 progress/batch 端点保留不动。")
|
||||
public ApiResponse<SimilarAsinTaskLightBatchVo> progressLight(@Valid @RequestBody SimilarAsinTaskLightRequest request) {
|
||||
return ApiResponse.success(service.progressLight(request.getTaskIds()));
|
||||
// 归属过滤:只查询属于该用户的任务(userId 未传时保持原行为,兼容未升级调用方)
|
||||
return ApiResponse.success(service.progressLight(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/{taskId}/activate")
|
||||
|
||||
+4
@@ -12,4 +12,8 @@ public class SimilarAsinTaskBatchRequest {
|
||||
@NotEmpty
|
||||
@Schema(description = "需要查询进度的任务 ID 列表。前端只传正在轮询的活跃任务;后端会批量查询,避免每个任务单独请求。", example = "[3938,3939]", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private List<Long> taskIds;
|
||||
|
||||
/** 当前用户 ID(可省略;传入时仅返回该用户的任务,用于进度接口归属过滤)。 */
|
||||
@Schema(description = "当前用户 ID(可省略;传入时仅返回该用户的任务)", example = "1")
|
||||
private Long userId;
|
||||
}
|
||||
|
||||
+4
@@ -16,4 +16,8 @@ public class SimilarAsinTaskLightRequest {
|
||||
@NotNull
|
||||
@Schema(description = "需要查询进度的任务 ID 列表。前端只传正在轮询的活跃任务;后端会批量查询。", example = "[3938,3939]", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private List<Long> taskIds;
|
||||
|
||||
/** 当前用户 ID(可省略;传入时仅返回该用户的任务,用于进度接口归属过滤)。 */
|
||||
@Schema(description = "当前用户 ID(可省略;传入时仅返回该用户的任务)", example = "1")
|
||||
private Long userId;
|
||||
}
|
||||
|
||||
+15
-3
@@ -72,8 +72,9 @@ public class SimilarAsinImagePrefetchService {
|
||||
private final ConcurrentHashMap<Long, Set<String>> pendingUrlsByTask = new ConcurrentHashMap<>();
|
||||
private final Object inflightMonitor = new Object();
|
||||
|
||||
private final ExecutorService prefetchPool = Executors.newFixedThreadPool(PREFETCH_POOL_SIZE,
|
||||
namedFactory("similar-asin-prefetch"));
|
||||
// 有界队列线程池:newFixedThreadPool 用的是无界队列,预取任务堆积时不会拒绝、会把内存吃满
|
||||
private final ExecutorService prefetchPool = com.nanri.aiimage.common.util.ThreadPools
|
||||
.boundedFixed("similar-asin-prefetch", PREFETCH_POOL_SIZE);
|
||||
|
||||
/**
|
||||
* Task 15:last_used_at 异步批量刷新的内存缓冲(按 url_hash 去重)。
|
||||
@@ -90,10 +91,21 @@ public class SimilarAsinImagePrefetchService {
|
||||
|
||||
@PostConstruct
|
||||
public void startTouchFlushScheduler() {
|
||||
touchFlushScheduler.scheduleWithFixedDelay(this::flushPendingTouches,
|
||||
// 任务体必须自行吞异常:ScheduledExecutorService 的周期任务一旦抛出,
|
||||
// 后续调度会被永久取消(JDK 语义),30s 兜底刷新会静默停摆直到进程重启
|
||||
touchFlushScheduler.scheduleWithFixedDelay(this::flushPendingTouchesSafely,
|
||||
TOUCH_FLUSH_INTERVAL_SECONDS, TOUCH_FLUSH_INTERVAL_SECONDS, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
/** 定时刷新的安全包装:任何异常只记日志,保证下一轮仍会调度。 */
|
||||
private void flushPendingTouchesSafely() {
|
||||
try {
|
||||
flushPendingTouches();
|
||||
} catch (Exception ex) {
|
||||
log.warn("[similar-asin] 定时刷新图片缓存 last_used_at 失败,下一轮重试: {}", ex.getMessage(), ex);
|
||||
}
|
||||
}
|
||||
|
||||
@PreDestroy
|
||||
public void shutdown() {
|
||||
prefetchPool.shutdownNow();
|
||||
|
||||
+3
-1
@@ -296,7 +296,9 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
|
||||
* workbook has its own SXSSF structures and image spool, so four workers
|
||||
* multiply the peak even though the task itself is a single job.
|
||||
*/
|
||||
private final ExecutorService assembleExecutor = Executors.newFixedThreadPool(2, namedThreadFactory("similar-asin-assemble"));
|
||||
// 有界队列线程池:newFixedThreadPool 用的是无界队列,组装任务堆积时不会拒绝、会把内存吃满
|
||||
private final ExecutorService assembleExecutor = com.nanri.aiimage.common.util.ThreadPools
|
||||
.boundedFixed("similar-asin-assemble", 2);
|
||||
|
||||
/** 单元测试清理入口:关闭 assemble 固定线程池,避免测试进程残留线程。 */
|
||||
public void shutdownAssembleExecutor() {
|
||||
|
||||
+2
-1
@@ -175,7 +175,8 @@ public class SimilarAsinImageEmbedder {
|
||||
.followSslRedirects(true)
|
||||
.dns(new SafeDns(Dns.SYSTEM))
|
||||
.build();
|
||||
this.downloadPool = Executors.newFixedThreadPool(downloadPoolSize, namedFactory("similar-asin-image-dl"));
|
||||
this.downloadPool = com.nanri.aiimage.common.util.ThreadPools
|
||||
.boundedFixed("similar-asin-image-dl", downloadPoolSize);
|
||||
}
|
||||
|
||||
@PreDestroy
|
||||
|
||||
Reference in New Issue
Block a user