refactor(ziniao/shopkey)+fix(stale): 打破模块循环依赖 + 采集陈旧判死全局化
模块边界(消除 ziniao ↔ shopkey 真实循环依赖):
- 新增 ziniao/service/port/{ShopKeyCatalogPort,ManagedShopNamePort}:消费方声明契约
- shopkey 侧新增 ShopKeyCatalogAdapter(读 shop_key + 白名单状态回写)、
ManagedShopNameAdapter(店铺名校验),实现上述端口
- ZiniaoApiKeyProvider 改经端口取数,不再 import shopkey 的 Mapper/Entity;
ZiniaoShopSwitchService 改依赖 ManagedShopNamePort
- 结果:ziniao → shopkey 的 import 归零,依赖单向(shopkey → ziniao)
陈旧判死(G1 全局判死 + D9 条件更新,替代此前的 owner 过滤/旧实体覆盖):
- ShopDataCrawlTaskService.finalizeOwnedStaleTasks → finalizeStaleTasks:去掉 owner 过滤,
并入 DeleteBrandStaleTaskService 的 stale-check 巡检线(job 锁保证单实例扫描)
- 判死前必须持有任务锁(非阻塞获取,锁被占本轮跳过),FAILED 写入改 status CAS,
仅在确实由 RUNNING 翻转为 FAILED 时才删缓存与分片(原实现会用扫描期旧实体覆盖在途任务)
- tryFinalizeTask 增加 allowOwnerTakeover 重载:判死场景允许跨实例接管(P1-8 盲区)
- 测试同步:owner 契约用例改为全局判死口径;mock 的 CAS 需先渲染 SQL 片段
(MyBatis-Plus 的 where 参数延迟填充)才读参数表;新增锁被占跳过的用例
mvn test 2796 全绿
This commit is contained in:
+26
-35
@@ -1,20 +1,22 @@
|
||||
package com.nanri.aiimage.modules.ziniao.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.shopkey.mapper.ShopKeyMapper;
|
||||
import com.nanri.aiimage.modules.shopkey.model.entity.ShopKeyEntity;
|
||||
import com.nanri.aiimage.modules.ziniao.client.ZiniaoProxyResolver;
|
||||
import com.nanri.aiimage.modules.ziniao.service.port.ShopKeyCatalogPort;
|
||||
import com.nanri.aiimage.modules.ziniao.service.port.ShopKeyCatalogPort.ShopKeyRecord;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* 紫鸟令牌(shop_key 表)的门面:负责按令牌聚合账号信息、缓存代理地址、维护白名单检测状态。
|
||||
* 表数据读写经 {@link ShopKeyCatalogPort} 由 shopkey 模块提供,避免 ziniao 反向依赖 shopkey。
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class ZiniaoApiKeyProvider implements ZiniaoProxyResolver {
|
||||
@@ -29,29 +31,27 @@ public class ZiniaoApiKeyProvider implements ZiniaoProxyResolver {
|
||||
*/
|
||||
public static final int IP_WHITELIST_MAX_FAIL_COUNT = 3;
|
||||
|
||||
private final ShopKeyMapper shopKeyMapper;
|
||||
|
||||
private static final long PROXY_URL_CACHE_MILLIS = 60_000L;
|
||||
|
||||
private final ShopKeyCatalogPort shopKeyCatalogPort;
|
||||
|
||||
private volatile Map<String, String> cachedProxyUrls;
|
||||
private volatile long proxyUrlCacheLoadedAt;
|
||||
|
||||
public List<ApiKeyAccount> listApiKeyAccounts() {
|
||||
List<ShopKeyEntity> entities = shopKeyMapper.selectList(new LambdaQueryWrapper<ShopKeyEntity>()
|
||||
.orderByDesc(ShopKeyEntity::getId));
|
||||
Map<String, List<ShopKeyEntity>> entitiesByApiKey = new LinkedHashMap<>();
|
||||
for (ShopKeyEntity entity : entities) {
|
||||
String apiKey = normalizeApiKey(entity == null ? null : entity.getZiniaoToken());
|
||||
Map<String, List<ShopKeyRecord>> recordsByApiKey = new LinkedHashMap<>();
|
||||
for (ShopKeyRecord record : shopKeyCatalogPort.listAllOrderByIdDesc()) {
|
||||
String apiKey = normalizeApiKey(record == null ? null : record.ziniaoToken());
|
||||
if (apiKey == null) {
|
||||
continue;
|
||||
}
|
||||
entitiesByApiKey.computeIfAbsent(apiKey, ignored -> new ArrayList<>()).add(entity);
|
||||
recordsByApiKey.computeIfAbsent(apiKey, ignored -> new ArrayList<>()).add(record);
|
||||
}
|
||||
return entitiesByApiKey.entrySet().stream()
|
||||
return recordsByApiKey.entrySet().stream()
|
||||
.map(entry -> new ApiKeyAccount(
|
||||
entry.getKey(),
|
||||
resolveAccountName(entry.getValue()),
|
||||
entry.getValue().stream().map(ShopKeyEntity::getId).filter(java.util.Objects::nonNull).toList(),
|
||||
entry.getValue().stream().map(ShopKeyRecord::id).filter(Objects::nonNull).toList(),
|
||||
resolveProxyUrl(entry.getValue()),
|
||||
resolveIpWhitelistFailCount(entry.getValue())
|
||||
))
|
||||
@@ -96,18 +96,18 @@ public class ZiniaoApiKeyProvider implements ZiniaoProxyResolver {
|
||||
}
|
||||
}
|
||||
|
||||
private String resolveProxyUrl(List<ShopKeyEntity> entities) {
|
||||
return entities.stream()
|
||||
.map(ShopKeyEntity::getProxyUrl)
|
||||
private String resolveProxyUrl(List<ShopKeyRecord> records) {
|
||||
return records.stream()
|
||||
.map(ShopKeyRecord::proxyUrl)
|
||||
.filter(proxy -> proxy != null && !proxy.isBlank())
|
||||
.map(String::trim)
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
}
|
||||
|
||||
private Integer resolveIpWhitelistFailCount(List<ShopKeyEntity> entities) {
|
||||
return entities.stream()
|
||||
.map(ShopKeyEntity::getIpWhitelistFailCount)
|
||||
private Integer resolveIpWhitelistFailCount(List<ShopKeyRecord> records) {
|
||||
return records.stream()
|
||||
.map(ShopKeyRecord::ipWhitelistFailCount)
|
||||
.filter(count -> count != null)
|
||||
.max(Integer::compareTo)
|
||||
.orElse(0);
|
||||
@@ -128,8 +128,7 @@ public class ZiniaoApiKeyProvider implements ZiniaoProxyResolver {
|
||||
}
|
||||
|
||||
public boolean hasApiKey() {
|
||||
Long total = shopKeyMapper.selectCount(new LambdaQueryWrapper<ShopKeyEntity>());
|
||||
return total != null && total > 0;
|
||||
return shopKeyCatalogPort.count() > 0;
|
||||
}
|
||||
|
||||
public void markIpWhitelistAllowed(ApiKeyAccount account) {
|
||||
@@ -168,20 +167,12 @@ public class ZiniaoApiKeyProvider implements ZiniaoProxyResolver {
|
||||
if (account == null || account.shopKeyIds().isEmpty()) {
|
||||
return;
|
||||
}
|
||||
LambdaUpdateWrapper<ShopKeyEntity> update = new LambdaUpdateWrapper<ShopKeyEntity>()
|
||||
.in(ShopKeyEntity::getId, account.shopKeyIds())
|
||||
.set(ShopKeyEntity::getIpWhitelistStatus, status)
|
||||
.set(ShopKeyEntity::getIpWhitelistCheckedAt, LocalDateTime.now())
|
||||
.set(ShopKeyEntity::getIpWhitelistMessage, truncateMessage(message));
|
||||
if (failCount != null) {
|
||||
update.set(ShopKeyEntity::getIpWhitelistFailCount, failCount);
|
||||
}
|
||||
shopKeyMapper.update(null, update);
|
||||
shopKeyCatalogPort.updateIpWhitelist(account.shopKeyIds(), status, truncateMessage(message), failCount);
|
||||
}
|
||||
|
||||
private String resolveAccountName(List<ShopKeyEntity> entities) {
|
||||
return entities.stream()
|
||||
.map(ShopKeyEntity::getZiniaoAccountName)
|
||||
private String resolveAccountName(List<ShopKeyRecord> records) {
|
||||
return records.stream()
|
||||
.map(ShopKeyRecord::ziniaoAccountName)
|
||||
.filter(name -> name != null && !name.isBlank())
|
||||
.map(String::trim)
|
||||
.findFirst()
|
||||
|
||||
+3
-3
@@ -1,8 +1,8 @@
|
||||
package com.nanri.aiimage.modules.ziniao.service;
|
||||
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.shopkey.service.ShopManageService;
|
||||
import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoShopMatchResultVo;
|
||||
import com.nanri.aiimage.modules.ziniao.service.port.ManagedShopNamePort;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@@ -12,7 +12,7 @@ public class ZiniaoShopSwitchService {
|
||||
|
||||
private final ZiniaoAuthService ziniaoAuthService;
|
||||
private final ZiniaoShopIndexService ziniaoShopIndexService;
|
||||
private final ShopManageService shopManageService;
|
||||
private final ManagedShopNamePort managedShopNamePort;
|
||||
|
||||
public ZiniaoShopMatchResultVo matchStoreByNameAcrossStaff(String targetShopName, Long preferUserId) {
|
||||
String normalizedShopName = requireManagedShopName(targetShopName);
|
||||
@@ -62,7 +62,7 @@ public class ZiniaoShopSwitchService {
|
||||
private String requireManagedShopName(String targetShopName) {
|
||||
String normalizedShopName = normalizeShopName(targetShopName);
|
||||
if (!normalizedShopName.isBlank()) {
|
||||
shopManageService.requireShopByName(normalizedShopName);
|
||||
managedShopNamePort.requireShopByName(normalizedShopName);
|
||||
}
|
||||
return normalizedShopName;
|
||||
}
|
||||
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
package com.nanri.aiimage.modules.ziniao.service.port;
|
||||
|
||||
/**
|
||||
* 后台店铺管理数据(shop_manage 表)的只读校验端口。
|
||||
*
|
||||
* 由 shopkey 模块实现,用于替代 ziniao → shopkey 的直接类依赖,避免模块循环依赖。
|
||||
*/
|
||||
public interface ManagedShopNamePort {
|
||||
|
||||
/** 校验店铺名在后台店铺管理中已维护,未找到则抛出 BusinessException。 */
|
||||
void requireShopByName(String shopName);
|
||||
}
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package com.nanri.aiimage.modules.ziniao.service.port;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 紫鸟令牌数据来源端口。
|
||||
*
|
||||
* 数据实际存放在 shop_key 表(shopkey 模块),这里只声明紫鸟侧需要的最小读取/回写契约,
|
||||
* 由 shopkey 模块提供实现;这样 ziniao 不再直接依赖 shopkey 的 Mapper/Entity,
|
||||
* 模块间保持单向依赖(shopkey → ziniao)。
|
||||
*/
|
||||
public interface ShopKeyCatalogPort {
|
||||
|
||||
/** 全量紫鸟令牌记录,按 id 倒序(最新维护的排前面)。 */
|
||||
List<ShopKeyRecord> listAllOrderByIdDesc();
|
||||
|
||||
/** 令牌记录总行数。 */
|
||||
long count();
|
||||
|
||||
/** 按 id 批量回写白名单检测结果;failCount 为 null 表示不改动该字段。 */
|
||||
void updateIpWhitelist(List<Long> ids, String status, String message, Integer failCount);
|
||||
|
||||
/** shop_key 中与紫鸟令牌相关的字段子集。 */
|
||||
record ShopKeyRecord(Long id, String ziniaoToken, String ziniaoAccountName,
|
||||
String proxyUrl, Integer ipWhitelistFailCount) {
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user