feat(collect-routing): 专利/货源本地采集开关与 Linux 兜底窗口
外观专利与相似ASIN默认「本地采集」,由页面推本机客户端;本地推了没人领时
PENDING 超过 linux-fallback-minutes(默认 30 分钟)才允许 Linux 内部认领接管,
避免本地机全关时任务无限排队(PENDING 已不再按时间判死)。
- 新增 aiimage.collect-routing.local-enabled 与 GET /api/collect-routing
- 客户端兜底拉取只认本地模块;内部认领对本地模块按兜底窗口二次过滤
- 外观专利 activate 在本地模式下恢复 PENDING→RUNNING 条件更新(与认领互斥),
关闭时保留后台拒绝语义;相似ASIN 关闭时明确拒绝「点启动」
- 恢复 GET /api/appearance-patent/tasks/{id}/queue-payload(本地推送取载荷用)
- /api/collect-routing 进用户态守卫名单,两处前缀计数基线 15→16 / 23→24
This commit is contained in:
@@ -112,6 +112,9 @@ public class AdminApiGuardFilter extends OncePerRequestFilter {
|
||||
// items 与 result(app_client/amazon/add_product.py:973,1048),所以带 JWT 的
|
||||
// 请求一旦被解析出身份就得按会话归属对齐,匿名执行器路径行为不变。
|
||||
"/api/publish",
|
||||
// 2026-10-29 采集路由开关读取口(GET /api/collect-routing):用户工具端点,
|
||||
// 新建即入名单,没有历史匿名调用方(前端两个工具页登录后读取)。
|
||||
"/api/collect-routing",
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.nanri.aiimage.config;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 采集执行方路由:哪些模块优先交给本地客户端、多久没人领才由 Linux 兜底。
|
||||
*
|
||||
* <p>2026-10-29 产品口径:外观专利(APPEARANCE_PATENT)与相似ASIN(SIMILAR_ASIN)默认
|
||||
* 「本地采集」。本地优先不等于只认本地——页面推了没人领时,PENDING 超过
|
||||
* {@code linux-fallback-minutes} 就交 Linux 后台认领,否则本地机器全关时任务会无限排队
|
||||
* (PENDING 已不再按时间判死)。
|
||||
*
|
||||
* <p><b>未登记在 {@code local-enabled} 里的模块一律按「非本地」处理</b>,保持它们原有的
|
||||
* 内部认领等待窗口({@code internal-min-pending-minutes})。默认值刻意不是 true:
|
||||
* 开关只对点名的模块生效,新模块不会被悄悄卷进本地优先。
|
||||
*/
|
||||
@Data
|
||||
@ConfigurationProperties(prefix = "aiimage.collect-routing")
|
||||
public class CollectRoutingProperties {
|
||||
|
||||
/** 外观专利模块名(与 biz_file_task.module_type 同口径)。 */
|
||||
public static final String MODULE_APPEARANCE_PATENT = "APPEARANCE_PATENT";
|
||||
|
||||
/** 相似ASIN(货源查询)模块名。 */
|
||||
public static final String MODULE_SIMILAR_ASIN = "SIMILAR_ASIN";
|
||||
|
||||
/** 模块 → 是否本地采集;键为大写模块名。 */
|
||||
private Map<String, Boolean> localEnabled = new LinkedHashMap<>();
|
||||
|
||||
/** 本地采集模块在 PENDING 超过多少分钟后允许 Linux 兜底认领。 */
|
||||
private long linuxFallbackMinutes = 30L;
|
||||
|
||||
public boolean isLocal(String moduleType) {
|
||||
if (moduleType == null || moduleType.isBlank()) {
|
||||
return false;
|
||||
}
|
||||
return Boolean.TRUE.equals(localEnabled.get(moduleType.trim().toUpperCase(Locale.ROOT)));
|
||||
}
|
||||
|
||||
/** 兜底窗口下限 1 分钟:配 0/负数等于关掉本地优先,不允许静默变成「Linux 立刻抢」。 */
|
||||
public long safeLinuxFallbackMinutes() {
|
||||
return Math.max(1L, linuxFallbackMinutes);
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
@Configuration
|
||||
@EnableConfigurationProperties({OssProperties.class, TransientStorageProperties.class, StorageProperties.class, BrandProgressProperties.class, DeleteBrandProgressProperties.class, BrandCheckProperties.class, ZiniaoProperties.class, ModuleCleanupProperties.class, TaskPressureProperties.class, TaskImageCacheCleanupProperties.class, AppearancePatentProperties.class, SimilarAsinProperties.class, ImageVideoProperties.class, InstanceRoutingProperties.class, CapacityPlanProperties.class, UserSecretProperties.class, NotificationProperties.class, DeviceLogOssProperties.class, CollectDataBrandRecheckProperties.class, ClientCredentialProperties.class, CostGuardProperties.class, KeywordShareSyncProperties.class})
|
||||
@EnableConfigurationProperties({OssProperties.class, TransientStorageProperties.class, StorageProperties.class, BrandProgressProperties.class, DeleteBrandProgressProperties.class, BrandCheckProperties.class, ZiniaoProperties.class, ModuleCleanupProperties.class, TaskPressureProperties.class, TaskImageCacheCleanupProperties.class, AppearancePatentProperties.class, SimilarAsinProperties.class, ImageVideoProperties.class, InstanceRoutingProperties.class, CapacityPlanProperties.class, UserSecretProperties.class, NotificationProperties.class, DeviceLogOssProperties.class, CollectDataBrandRecheckProperties.class, ClientCredentialProperties.class, CostGuardProperties.class, KeywordShareSyncProperties.class, CollectRoutingProperties.class})
|
||||
public class PropertiesConfig {
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user