super/crawler-plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(boundary): 跨模块循环依赖清零（8 对 → 0），task→业务 依赖归零

Browse Source 
共享内核下沉（跨模块共享的"身份/组织/安全"类型进 common）
- AdminUserEntity/AdminUserMapper、ShopManageGroupEntity/ShopManageGroupMapper → common
- AdminAuthSupport（33 文件 17 模块引用）、JwtService、AuthProperties、DeviceSessionPolicy
  → common/security（原先放在 admin/auth 里，任何模块用一次就多一条跨模块边）

端口化（消费方声明接口、数据方实现）
- task/spi：ResultFileJobHandler 新增 resolveResultFileUrl 钩子（BRAND 特例从 Worker 收回）；
  Worker 改为调用 handler.onSuccess（该钩子历史上从未被调用，withdraw 的收尾靠 Worker 里的
  WITHDRAW 特判硬编码——现两者都归位，task 侧不再 import withdraw/brand）
- admin/spi/UserSecretCleanupPort（删除用户级联清理密钥）、notification/spi/ProxyBalancePort
  （代理余额探测）、shopdatacrawl/spi/ManagedShopNamesPort（可管店铺名）
- shopkey/spi/GroupDeletionGuardPort：分组删除守卫改由各业务模块实现（invalidasin/dedupe 两个实现），
  shopkey 不再直连它们的 Mapper

棘轮与量化（2026-09-14 实测）
- ArchitectureBoundaryTest：task→业务 119 → **0**（基线钉死为 0，新增跨模块动作必须走 task/spi）
- 跨模块 import 行数 650 → 605；双向依赖对 8 → **0**（usersecret/permission/shopkey 三向环、
  task↔withdraw、task↔brand、admin↔permission、admin↔usersecret、dedup↔shopkey、
  invalidasin↔shopkey、notification↔usersecret、shopdatacrawl↔shopduplicatecheck 全部拆解）

测试同步：接口契约 8→9、品牌 Handler 钩子契约、worker 的 10 个测试构造实参、通知/管理测试端口化。
mvn test 2881 全绿。
This commit is contained in:
黄自达
2026-09-14 10:05:04 +08:00
parent 1b480f915f
commit 7643094f1d
99 changed files with 417 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend-java/src/main/java/com/nanri/aiimage/modules/permission/mapper/AdminUserMapper.java → backend-java/src/main/java/com/nanri/aiimage/common/mapper/AdminUserMapper.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.permission.mapper;
package com.nanri.aiimage.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/mapper/ShopManageGroupMapper.java → backend-java/src/main/java/com/nanri/aiimage/common/mapper/ShopManageGroupMapper.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.shopkey.mapper;
package com.nanri.aiimage.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/AdminUserEntity.java → backend-java/src/main/java/com/nanri/aiimage/common/model/entity/AdminUserEntity.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.nanri.aiimage.modules.permission.model.entity;
package com.nanri.aiimage.common.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/ShopManageGroupEntity.java → backend-java/src/main/java/com/nanri/aiimage/common/model/entity/ShopManageGroupEntity.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.nanri.aiimage.modules.shopkey.model.entity;
package com.nanri.aiimage.common.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
backend-java/src/main/java/com/nanri/aiimage/modules/admin/support/AdminAuthSupport.java → backend-java/src/main/java/com/nanri/aiimage/common/security/AdminAuthSupport.java
+6 -6
View File
@@ -1,10 +1,10 @@
package com.nanri.aiimage.modules.admin.support;
package com.nanri.aiimage.common.security;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.auth.service.JwtService;
import com.nanri.aiimage.modules.auth.support.DeviceSessionPolicy;
import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.JwtService;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import io.jsonwebtoken.Claims;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
@@ -12,7 +12,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Component;
import com.nanri.aiimage.modules.auth.config.AuthProperties;
import com.nanri.aiimage.common.security.AuthProperties;
import org.springframework.beans.factory.annotation.Value;
import java.nio.charset.StandardCharsets;
backend-java/src/main/java/com/nanri/aiimage/modules/auth/config/AuthProperties.java → backend-java/src/main/java/com/nanri/aiimage/common/security/AuthProperties.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.nanri.aiimage.modules.auth.config;
package com.nanri.aiimage.common.security;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
backend-java/src/main/java/com/nanri/aiimage/modules/auth/support/DeviceSessionPolicy.java → backend-java/src/main/java/com/nanri/aiimage/common/security/DeviceSessionPolicy.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.nanri.aiimage.modules.auth.support;
package com.nanri.aiimage.common.security;
import com.nanri.aiimage.common.exception.BusinessException;
import io.jsonwebtoken.Claims;
backend-java/src/main/java/com/nanri/aiimage/modules/auth/service/JwtService.java → backend-java/src/main/java/com/nanri/aiimage/common/security/JwtService.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.auth.service;
package com.nanri.aiimage.common.security;
import com.nanri.aiimage.modules.auth.config.AuthProperties;
import com.nanri.aiimage.common.security.AuthProperties;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.JwtException;
import io.jsonwebtoken.Jwts;
backend-java/src/main/java/com/nanri/aiimage/config/AdminApiGuardFilter.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.nanri.aiimage.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
backend-java/src/main/java/com/nanri/aiimage/modules/admin/controller/AdminConsoleController.java
+2 -2
View File
@@ -1,8 +1,8 @@
package com.nanri.aiimage.modules.admin.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.model.vo.PermissionMenuItemVo;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import com.nanri.aiimage.modules.permission.service.support.AdminMenuTreeBuilder;
backend-java/src/main/java/com/nanri/aiimage/modules/admin/controller/AdminUserController.java
+2 -2
View File
@@ -5,8 +5,8 @@ import com.nanri.aiimage.modules.admin.model.dto.AdminUserCreateRequest;
import com.nanri.aiimage.modules.admin.model.dto.AdminUserUpdateRequest;
import com.nanri.aiimage.modules.admin.model.vo.AdminUserListVo;
import com.nanri.aiimage.modules.admin.service.AdminUserService;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
backend-java/src/main/java/com/nanri/aiimage/modules/admin/service/AdminUserService.java
+6 -6
View File
@@ -8,14 +8,14 @@ import com.nanri.aiimage.modules.admin.model.dto.AdminUserUpdateRequest;
import com.nanri.aiimage.modules.admin.model.vo.AdminBriefVo;
import com.nanri.aiimage.modules.admin.model.vo.AdminUserItemVo;
import com.nanri.aiimage.modules.admin.model.vo.AdminUserListVo;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.admin.util.PinyinAbbrUtil;
import com.nanri.aiimage.modules.auth.util.WerkzeugPasswordEncoder;
import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.modules.permission.model.dto.UserColumnPermissionUpdateRequest;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService;
import com.nanri.aiimage.modules.admin.spi.UserSecretCleanupPort;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.dao.DuplicateKeyException;
@@ -43,7 +43,7 @@ public class AdminUserService {
private final WerkzeugPasswordEncoder passwordEncoder;
private final AdminAuthSupport adminAuthSupport;
private final PermissionMenuService permissionMenuService;
private final UserApiSecretService userApiSecretService;
private final UserSecretCleanupPort userSecretCleanupPort;
public AdminUserListVo listUsers(AdminUserEntity currentUser, Integer page, Integer pageSize,
String username, Long createdById, String roleFilter) {
@@ -303,7 +303,7 @@ public class AdminUserService {
if (affected == 0) {
throw new BusinessException("用户不存在");
}
int secretRows = userApiSecretService.adminClearByUser(uid);
int secretRows = userSecretCleanupPort.adminClearByUser(uid);
log.info("[admin-user] 用户已删除 uid={} 级联清理密钥行={}", uid, secretRows);
}
backend-java/src/main/java/com/nanri/aiimage/modules/admin/spi/UserSecretCleanupPort.java
+12
View File
@@ -0,0 +1,12 @@
package com.nanri.aiimage.modules.admin.spi;
/**
* 删除用户时级联清理其密钥数据（2026-09 边界收敛：admin → usersecret 的类依赖改为端口）。
*
* <p>实现方在 usersecret 模块；返回清理的行数用于日志。
*/
public interface UserSecretCleanupPort {
/** 清理该用户的全部密钥相关行，返回受影响行数。 */
int adminClearByUser(Long userId);
}
backend-java/src/main/java/com/nanri/aiimage/modules/auth/service/AuthService.java
+3 -2
View File
@@ -3,12 +3,12 @@ package com.nanri.aiimage.modules.auth.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.auth.config.AuthProperties;
import com.nanri.aiimage.common.security.AuthProperties;
import com.nanri.aiimage.modules.auth.mapper.LoginUserMapper;
import com.nanri.aiimage.modules.auth.model.dto.LoginRequest;
import com.nanri.aiimage.modules.auth.model.entity.LoginUserEntity;
import com.nanri.aiimage.modules.auth.model.vo.LoginResultVo;
import com.nanri.aiimage.modules.auth.support.DeviceSessionPolicy;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.modules.auth.util.WerkzeugPasswordEncoder;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import io.jsonwebtoken.Claims;
@@ -21,6 +21,7 @@ import java.time.Duration;
import java.time.Instant;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.nanri.aiimage.common.security.JwtService;
@Service
@RequiredArgsConstructor
backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandResultFileJobHandler.java
+10 -2
View File
@@ -7,8 +7,8 @@ import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
/**
* BRAND 结果文件 Job Handler（04 注册表）。
* 注意：resultFileUrl 解析特例（resolveResultObjectKey，无 resultId 也走）
* 保留在 Worker 公共路径 resolveResultFileUrl，Handler 不接管 URL 解析；
* resultFileUrl 解析特例（resolveResultObjectKey，无 resultId 也走）由本 Handler 的
* resolveResultFileUrl 钩子承担（2026-09：原实现在 Worker 内直接 import 本模块，构成 task → 业务依赖）；
* cleanup 为空（原 cleanupAfterSuccess 无 BRAND 分支）。
*/
public class BrandResultFileJobHandler implements ResultFileJobHandler {
@@ -32,4 +32,12 @@ public class BrandResultFileJobHandler implements ResultFileJobHandler {
brandTaskService.processResultFileJob(job);
return true;
}
@Override
public String resolveResultFileUrl(TaskFileJobEntity job) {
if (job == null || job.getTaskId() == null) {
return null;
}
return brandTaskService.resolveResultObjectKey(job.getTaskId());
}
}
backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/controller/DedupeTotalDataController.java
+2 -2
View File
@@ -2,7 +2,7 @@ package com.nanri.aiimage.modules.dedupe.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.modules.dedupe.model.dto.DedupeTotalDataCreateRequest;
import com.nanri.aiimage.modules.dedupe.model.dto.DedupeTotalDataUpdateRequest;
@@ -12,7 +12,7 @@ import com.nanri.aiimage.modules.dedupe.model.vo.DedupeTotalDataImportVo;
import com.nanri.aiimage.modules.dedupe.model.vo.DedupeTotalDataItemVo;
import com.nanri.aiimage.modules.dedupe.model.vo.DedupeTotalDataPageVo;
import com.nanri.aiimage.modules.dedupe.service.DedupeTotalDataService;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java
+4 -4
View File
@@ -15,10 +15,10 @@ import com.nanri.aiimage.modules.dedupe.model.vo.DedupeTotalDataImportStartVo;
import com.nanri.aiimage.modules.dedupe.model.vo.DedupeTotalDataImportVo;
import com.nanri.aiimage.modules.dedupe.model.vo.DedupeTotalDataItemVo;
import com.nanri.aiimage.modules.dedupe.model.vo.DedupeTotalDataPageVo;
import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.shopkey.mapper.ShopManageGroupMapper;
import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Cell;
backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/GroupDeletionGuard.java
+28
View File
@@ -0,0 +1,28 @@
package com.nanri.aiimage.modules.dedupe.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.dedupe.mapper.DedupeTotalDataMapper;
import com.nanri.aiimage.modules.dedupe.model.entity.DedupeTotalDataEntity;
import com.nanri.aiimage.modules.shopkey.spi.GroupDeletionGuardPort;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
* 分组删除守卫：去重总数据（2026-09 从 shopkey 收回本模块，文案保持不变）。
*/
@Service
@RequiredArgsConstructor
public class GroupDeletionGuard implements GroupDeletionGuardPort {
private final DedupeTotalDataMapper dedupeTotalDataMapper;
@Override
public void ensureNoGroupData(Long groupId) {
Long count = dedupeTotalDataMapper.selectCount(new LambdaQueryWrapper<DedupeTotalDataEntity>()
.eq(DedupeTotalDataEntity::getGroupId, groupId));
if (count != null && count > 0) {
throw new BusinessException("该分组下存在数据去重总数据，无法删除");
}
}
}
backend-java/src/main/java/com/nanri/aiimage/modules/digitalhuman/controller/DigitalHumanVersionController.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.digitalhuman.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.digitalhuman.model.dto.UploadVersionRequest;
import com.nanri.aiimage.modules.digitalhuman.model.vo.DigitalHumanVersionVo;
import com.nanri.aiimage.modules.digitalhuman.service.DigitalHumanVersionService;
backend-java/src/main/java/com/nanri/aiimage/modules/imagehistory/controller/ImageHistoryController.java
+2 -2
View File
@@ -2,10 +2,10 @@ package com.nanri.aiimage.modules.imagehistory.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.imagehistory.model.vo.ImageHistoryListVo;
import com.nanri.aiimage.modules.imagehistory.service.ImageHistoryService;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
backend-java/src/main/java/com/nanri/aiimage/modules/imagehistory/service/ImageHistoryService.java
+2 -2
View File
@@ -8,8 +8,8 @@ import com.nanri.aiimage.modules.imagehistory.mapper.ImageHistoryMapper;
import com.nanri.aiimage.modules.imagehistory.model.entity.ImageHistoryEntity;
import com.nanri.aiimage.modules.imagehistory.model.vo.ImageHistoryItemVo;
import com.nanri.aiimage.modules.imagehistory.model.vo.ImageHistoryListVo;
import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/controller/AdminImageVideoTaskController.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.nanri.aiimage.modules.imagevideo.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.imagevideo.service.ImageVideoAdminTaskService;
import com.nanri.aiimage.modules.imagevideo.service.ImageVideoAdminTaskService.VideoSelection;
import com.nanri.aiimage.modules.imagevideo.service.ImageVideoAdminTaskService.ZipBundle;
backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/controller/ImageVideoController.java
+2 -2
View File
@@ -2,8 +2,8 @@ package com.nanri.aiimage.modules.imagevideo.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.imagevideo.model.dto.DouyinCopyRequest;
import com.nanri.aiimage.modules.imagevideo.model.dto.ImageVideoSecretSaveRequest;
import com.nanri.aiimage.modules.imagevideo.model.dto.ImageVideoVoiceCloneRequest;
backend-java/src/main/java/com/nanri/aiimage/modules/invalidasin/controller/InvalidAsinDataController.java
+2 -2
View File
@@ -2,13 +2,13 @@ package com.nanri.aiimage.modules.invalidasin.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.invalidasin.model.dto.InvalidAsinDataCreateRequest;
import com.nanri.aiimage.modules.invalidasin.model.dto.InvalidAsinDataUpdateRequest;
import com.nanri.aiimage.modules.invalidasin.model.vo.InvalidAsinDataItemVo;
import com.nanri.aiimage.modules.invalidasin.model.vo.InvalidAsinDataPageVo;
import com.nanri.aiimage.modules.invalidasin.service.InvalidAsinDataService;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
backend-java/src/main/java/com/nanri/aiimage/modules/invalidasin/service/GroupDeletionGuard.java
+28
View File
@@ -0,0 +1,28 @@
package com.nanri.aiimage.modules.invalidasin.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.invalidasin.mapper.InvalidAsinDataMapper;
import com.nanri.aiimage.modules.invalidasin.model.entity.InvalidAsinDataEntity;
import com.nanri.aiimage.modules.shopkey.spi.GroupDeletionGuardPort;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
* 分组删除守卫：品牌数据库（不符合 ASIN）数据（2026-09 从 shopkey 收回本模块，文案保持不变）。
*/
@Service
@RequiredArgsConstructor
public class GroupDeletionGuard implements GroupDeletionGuardPort {
private final InvalidAsinDataMapper invalidAsinDataMapper;
@Override
public void ensureNoGroupData(Long groupId) {
Long count = invalidAsinDataMapper.selectCount(new LambdaQueryWrapper<InvalidAsinDataEntity>()
.eq(InvalidAsinDataEntity::getGroupId, groupId));
if (count != null && count > 0) {
throw new BusinessException("该分组下存在品牌数据库数据，无法删除");
}
}
}
backend-java/src/main/java/com/nanri/aiimage/modules/invalidasin/service/InvalidAsinDataService.java
+1 -1
View File
@@ -8,7 +8,7 @@ import com.nanri.aiimage.modules.invalidasin.model.dto.InvalidAsinDataUpdateRequ
import com.nanri.aiimage.modules.invalidasin.model.entity.InvalidAsinDataEntity;
import com.nanri.aiimage.modules.invalidasin.model.vo.InvalidAsinDataItemVo;
import com.nanri.aiimage.modules.invalidasin.model.vo.InvalidAsinDataPageVo;
import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.modules.shopkey.service.ShopManageGroupService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
backend-java/src/main/java/com/nanri/aiimage/modules/notification/controller/AdminNotificationController.java
+2 -2
View File
@@ -1,12 +1,12 @@
package com.nanri.aiimage.modules.notification.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.notification.model.dto.NotificationPageQuery;
import com.nanri.aiimage.modules.notification.model.vo.NotificationPageVo;
import com.nanri.aiimage.modules.notification.model.vo.NotificationSummaryVo;
import com.nanri.aiimage.modules.notification.service.NotificationService;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
backend-java/src/main/java/com/nanri/aiimage/modules/notification/controller/NotificationController.java
+2 -2
View File
@@ -1,12 +1,12 @@
package com.nanri.aiimage.modules.notification.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.notification.model.dto.NotificationPageQuery;
import com.nanri.aiimage.modules.notification.model.vo.NotificationPageVo;
import com.nanri.aiimage.modules.notification.model.vo.NotificationSummaryVo;
import com.nanri.aiimage.modules.notification.service.NotificationService;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
backend-java/src/main/java/com/nanri/aiimage/modules/notification/service/NotificationDispatchService.java
+3 -3
View File
@@ -1,9 +1,9 @@
package com.nanri.aiimage.modules.notification.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.support.UserDataScopeSupport;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
backend-java/src/main/java/com/nanri/aiimage/modules/notification/service/NotificationScanScheduler.java
+7 -8
View File
@@ -9,8 +9,7 @@ import com.nanri.aiimage.modules.brand.mapper.BrandCrawlTaskMapper;
import com.nanri.aiimage.modules.brand.model.entity.BrandCrawlTaskEntity;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import com.nanri.aiimage.modules.usersecret.client.JikipProxyClient;
import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretBalanceVo;
import com.nanri.aiimage.modules.notification.spi.ProxyBalancePort;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
@@ -67,7 +66,7 @@ public class NotificationScanScheduler {
private final NotificationDispatchService notificationDispatchService;
private final DistributedJobLockService distributedJobLockService;
private final NotificationProperties properties;
private final JikipProxyClient jikipProxyClient;
private final ProxyBalancePort proxyBalancePort;
/** 上次清理日期（每天最多清理一次；双节点由分布式锁保证只有一个实例执行）。 */
private volatile LocalDate lastCleanupDate;
@@ -234,12 +233,12 @@ public class NotificationScanScheduler {
/** jikip 探测：复用余额查询接口；未配置套餐信息时跳过（返回 null 不告警）。 */
private ProbeOutcome probeJikip() {
try {
UserApiSecretBalanceVo balance = jikipProxyClient.fetchBalance();
if (Boolean.TRUE.equals(balance.getAvailable())) {
return new ProbeOutcome(true, "余额接口可用 surplus=" + balance.getSurplus()
+ " balance=" + balance.getBalance());
ProxyBalancePort.ProxyBalanceSnapshot balance = proxyBalancePort.fetchBalance();
if (balance.available()) {
return new ProbeOutcome(true, "余额接口可用 surplus=" + balance.surplus()
+ " balance=" + balance.balance());
}
String message = balance.getMessage() == null ? "" : balance.getMessage();
String message = balance.message() == null ? "" : balance.message();
if (message.contains("未配置")) {
log.info("[notification-scan] jikip 探测跳过：{}", message);
return null;
backend-java/src/main/java/com/nanri/aiimage/modules/notification/spi/ProxyBalancePort.java
+26
View File
@@ -0,0 +1,26 @@
package com.nanri.aiimage.modules.notification.spi;
/**
* 代理余额探测（2026-09 边界收敛：notification → usersecret 的类依赖改为端口）。
*
* <p>实现方在 usersecret 模块（复用其 jikip 客户端）；通知巡检只做"能不能告警"的判断，
* 不关心上游返回结构，因此这里只暴露最小快照。
*/
public interface ProxyBalancePort {
/**
* 查询代理服务商余额。
*
* @return 余额快照；调用异常由实现方抛出（调用方负责降级）
*/
ProxyBalanceSnapshot fetchBalance();
/**
* @param available 余额接口是否可用
* @param surplus 剩余额度（上游口径，可能为 null）
* @param balance 账户余额（上游口径，可能为 null）
* @param message 上游提示信息（未配置套餐时含"未配置"字样，调用方据此跳过告警）
*/
record ProxyBalanceSnapshot(boolean available, String surplus, String balance, String message) {
}
}
backend-java/src/main/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuController.java
+2 -2
View File
@@ -1,12 +1,12 @@
package com.nanri.aiimage.modules.permission.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.dto.PermissionMenuCreateRequest;
import com.nanri.aiimage.modules.permission.model.dto.PermissionMenuUpdateRequest;
import com.nanri.aiimage.modules.permission.model.dto.ImageVideoDataPermissionUpdateRequest;
import com.nanri.aiimage.modules.permission.model.dto.UserColumnPermissionUpdateRequest;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.model.vo.PermissionMenuItemVo;
import com.nanri.aiimage.modules.permission.model.vo.UserColumnIdsVo;
import com.nanri.aiimage.modules.permission.model.vo.ImageVideoDataPermissionUserVo;
backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuService.java
+2 -2
View File
@@ -3,13 +3,13 @@ package com.nanri.aiimage.modules.permission.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.permission.mapper.AdminUserMapper;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.modules.permission.mapper.PermissionMenuMapper;
import com.nanri.aiimage.modules.permission.mapper.UserColumnPermissionMapper;
import com.nanri.aiimage.modules.permission.model.dto.PermissionMenuCreateRequest;
import com.nanri.aiimage.modules.permission.model.dto.PermissionMenuUpdateRequest;
import com.nanri.aiimage.modules.permission.model.dto.UserColumnPermissionUpdateRequest;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.model.entity.PermissionMenuEntity;
import com.nanri.aiimage.modules.permission.model.entity.UserColumnPermissionEntity;
import com.nanri.aiimage.modules.permission.model.vo.ImageVideoDataPermissionUserVo;
backend-java/src/main/java/com/nanri/aiimage/modules/permission/support/UserDataScopeSupport.java
+4 -4
View File
@@ -1,10 +1,10 @@
package com.nanri.aiimage.modules.permission.support;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.shopkey.mapper.ShopManageGroupMapper;
import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
backend-java/src/main/java/com/nanri/aiimage/modules/productcategory/controller/ProductCategoryController.java
+1 -1
View File
@@ -2,7 +2,7 @@ package com.nanri.aiimage.modules.productcategory.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.productcategory.model.dto.ProductCategorySaveRequest;
import com.nanri.aiimage.modules.productcategory.model.vo.ProductCategoryItemVo;
import com.nanri.aiimage.modules.productcategory.model.vo.ProductCategoryListVo;
backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/controller/AdminShopDataCrawlTaskController.java
+2 -2
View File
@@ -4,8 +4,8 @@ import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.config.HttpClientPool;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import com.nanri.aiimage.modules.shopdatacrawl.service.ShopDataCrawlTaskService;
import io.swagger.v3.oas.annotations.Operation;
backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/controller/AdminShopDataCrawlTasksController.java
+2 -2
View File
@@ -4,8 +4,8 @@ import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.config.HttpClientPool;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import com.nanri.aiimage.modules.shopdatacrawl.model.dto.ShopDataCrawlDownloadRowDto;
import com.nanri.aiimage.modules.shopdatacrawl.service.ShopDataCrawlAdminTasksService;
backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlAdminTasksService.java
+3 -3
View File
@@ -12,7 +12,7 @@ import com.nanri.aiimage.modules.shopdatacrawl.model.dto.ShopDataCrawlAdminRow;
import com.nanri.aiimage.modules.shopdatacrawl.model.dto.ShopDataCrawlDownloadRowDto;
import com.nanri.aiimage.modules.shopdatacrawl.model.entity.ShopDataCrawlDailyFileEntity;
import com.nanri.aiimage.modules.shopdatacrawl.model.entity.ShopDataCrawlDailyMemberEntity;
import com.nanri.aiimage.modules.shopduplicatecheck.mapper.ShopDuplicateCheckSourceMapper;
import com.nanri.aiimage.modules.shopdatacrawl.spi.ManagedShopNamesPort;
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
@@ -47,7 +47,7 @@ public class ShopDataCrawlAdminTasksService {
private static final Set<String> SUPPORTED_COUNTRIES = Set.of("DE", "UK", "FR", "IT", "ES");
private final ShopDataCrawlAdminTasksMapper adminTasksMapper;
private final ShopDuplicateCheckSourceMapper duplicateCheckSourceMapper;
private final ManagedShopNamesPort managedShopNamesPort;
private final ShopDataCrawlItemMapper itemMapper;
private final FileResultMapper fileResultMapper;
private final ShopDataCrawlDailyFileService dailyFileService;
@@ -215,7 +215,7 @@ public class ShopDataCrawlAdminTasksService {
/** 非超管可管店铺名（trim+小写去重，与撞款可见口径一致）；超管调用方传 null 表示全量。 */
public List<String> resolveVisibleShopNameKeys(Long operatorId) {
List<String> names = duplicateCheckSourceMapper.selectManagedShopNames(operatorId);
List<String> names = managedShopNamesPort.selectManagedShopNames(operatorId);
if (names == null || names.isEmpty()) {
return List.of();
}
backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/spi/ManagedShopNamesPort.java
+14
View File
@@ -0,0 +1,14 @@
package com.nanri.aiimage.modules.shopdatacrawl.spi;
import java.util.List;
/**
* 可管店铺名查询（2026-09 边界收敛：shopdatacrawl → shopduplicatecheck 的 Mapper 直连改为端口）。
*
* <p>实现方在 shopduplicatecheck 模块（口径与撞款可见范围一致）。
*/
public interface ManagedShopNamesPort {
/** 该操作人可管的店铺名；传 null 表示全量（超管调用方）。 */
List<String> selectManagedShopNames(Long operatorId);
}
backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/controller/AdminShopDataDuplicateCheckController.java
+2 -2
View File
@@ -3,8 +3,8 @@ package com.nanri.aiimage.modules.shopduplicatecheck.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import com.nanri.aiimage.modules.shopduplicatecheck.service.ShopDataDuplicateCheckImportService;
import com.nanri.aiimage.modules.shopduplicatecheck.service.ShopDataDuplicateCheckQueryService;
backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/ManagedShopNamesPortAdapter.java
+23
View File
@@ -0,0 +1,23 @@
package com.nanri.aiimage.modules.shopduplicatecheck.service;
import com.nanri.aiimage.modules.shopdatacrawl.spi.ManagedShopNamesPort;
import com.nanri.aiimage.modules.shopduplicatecheck.mapper.ShopDuplicateCheckSourceMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 可管店铺名端口实现（2026-09 边界收敛）：Mapper 与口径留在 shopduplicatecheck 模块内。
*/
@Service
@RequiredArgsConstructor
public class ManagedShopNamesPortAdapter implements ManagedShopNamesPort {
private final ShopDuplicateCheckSourceMapper sourceMapper;
@Override
public List<String> selectManagedShopNames(Long operatorId) {
return sourceMapper.selectManagedShopNames(operatorId);
}
}
backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/QueryAsinController.java
+2 -2
View File
@@ -2,8 +2,8 @@ package com.nanri.aiimage.modules.shopkey.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.shopkey.model.dto.QueryAsinCountryUpdateRequest;
import com.nanri.aiimage.modules.shopkey.model.dto.QueryAsinCreateRequest;
import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinImportProgressVo;
backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/ShopKeyController.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.shopkey.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.shopkey.model.dto.ShopKeyCreateRequest;
import com.nanri.aiimage.modules.shopkey.model.dto.ShopKeyUpdateRequest;
import com.nanri.aiimage.modules.shopkey.model.vo.ShopKeyItemVo;
backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/ShopManageController.java
+2 -2
View File
@@ -1,8 +1,8 @@
package com.nanri.aiimage.modules.shopkey.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.shopkey.model.dto.ShopManageCreateRequest;
import com.nanri.aiimage.modules.shopkey.model.dto.ShopManageGroupCreateRequest;
import com.nanri.aiimage.modules.shopkey.model.dto.ShopManageGroupUpdateRequest;
backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/SkipPriceAsinController.java
+2 -2
View File
@@ -2,8 +2,8 @@ package com.nanri.aiimage.modules.shopkey.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.shopkey.model.dto.SkipPriceAsinCountryUpdateRequest;
import com.nanri.aiimage.modules.shopkey.model.dto.SkipPriceAsinCreateRequest;
import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinImportProgressVo;
backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/QueryAsinService.java
+1 -1
View File
@@ -11,7 +11,7 @@ import com.nanri.aiimage.config.TaskPressureProperties;
import com.nanri.aiimage.modules.shopkey.mapper.QueryAsinMapper;
import com.nanri.aiimage.modules.shopkey.model.dto.QueryAsinCreateRequest;
import com.nanri.aiimage.modules.shopkey.model.entity.QueryAsinEntity;
import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinImportProgressVo;
import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinImportStartVo;
import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinItemVo;
backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupService.java
+10 -19
View File
@@ -2,24 +2,21 @@ package com.nanri.aiimage.modules.shopkey.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.shopkey.mapper.QueryAsinMapper;
import com.nanri.aiimage.modules.shopkey.mapper.ShopManageGroupMapper;
import com.nanri.aiimage.modules.shopkey.spi.GroupDeletionGuardPort;
import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
import com.nanri.aiimage.modules.shopkey.mapper.ShopManageGroupMemberMapper;
import com.nanri.aiimage.modules.shopkey.mapper.ShopManageMapper;
import com.nanri.aiimage.modules.shopkey.mapper.SkipPriceAsinMapper;
import com.nanri.aiimage.modules.invalidasin.mapper.InvalidAsinDataMapper;
import com.nanri.aiimage.modules.dedupe.mapper.DedupeTotalDataMapper;
import com.nanri.aiimage.modules.shopkey.model.dto.ShopManageGroupCreateRequest;
import com.nanri.aiimage.modules.shopkey.model.dto.ShopManageGroupUpdateRequest;
import com.nanri.aiimage.modules.shopkey.model.entity.QueryAsinEntity;
import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageEntity;
import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupMemberEntity;
import com.nanri.aiimage.modules.shopkey.model.entity.SkipPriceAsinEntity;
import com.nanri.aiimage.modules.invalidasin.model.entity.InvalidAsinDataEntity;
import com.nanri.aiimage.modules.dedupe.model.entity.DedupeTotalDataEntity;
import com.nanri.aiimage.modules.shopkey.model.vo.ShopManageGroupItemVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -40,11 +37,11 @@ public class ShopManageGroupService {
private final ShopManageGroupMapper groupMapper;
private final ShopManageGroupMemberMapper groupMemberMapper;
/** 各业务模块的分组删除守卫（Spring 注入全部实现） */
private final java.util.List<GroupDeletionGuardPort> groupDeletionGuards;
private final ShopManageMapper shopManageMapper;
private final QueryAsinMapper queryAsinMapper;
private final SkipPriceAsinMapper skipPriceAsinMapper;
private final InvalidAsinDataMapper invalidAsinDataMapper;
private final DedupeTotalDataMapper dedupeTotalDataMapper;
private final AdminUserMapper adminUserMapper;
public List<ShopManageGroupItemVo> list() {
@@ -166,15 +163,9 @@ public class ShopManageGroupService {
if (queryAsinCount != null && queryAsinCount > 0) {
throw new BusinessException("该分组下存在查询 ASIN，无法删除");
}
Long invalidAsinDataCount = invalidAsinDataMapper.selectCount(new LambdaQueryWrapper<InvalidAsinDataEntity>()
.eq(InvalidAsinDataEntity::getGroupId, entity.getId()));
if (invalidAsinDataCount != null && invalidAsinDataCount > 0) {
throw new BusinessException("该分组下存在品牌数据库数据，无法删除");
}
Long dedupeTotalDataCount = dedupeTotalDataMapper.selectCount(new LambdaQueryWrapper<DedupeTotalDataEntity>()
.eq(DedupeTotalDataEntity::getGroupId, entity.getId()));
if (dedupeTotalDataCount != null && dedupeTotalDataCount > 0) {
throw new BusinessException("该分组下存在数据去重总数据，无法删除");
// 其它模块的数据残留由各模块自己实现的守卫校验（2026-09 边界收敛：shopkey 不再直连它们的表）
for (GroupDeletionGuardPort guard : groupDeletionGuards) {
guard.ensureNoGroupData(entity.getId());
}
groupMemberMapper.delete(new LambdaQueryWrapper<ShopManageGroupMemberEntity>()
.eq(ShopManageGroupMemberEntity::getGroupId, entity.getId()));
backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/ShopManageService.java
+1 -1
View File
@@ -7,7 +7,7 @@ import com.nanri.aiimage.modules.shopkey.mapper.ShopManageMapper;
import com.nanri.aiimage.modules.shopkey.model.dto.ShopManageCreateRequest;
import com.nanri.aiimage.modules.shopkey.model.dto.ShopManageUpdateRequest;
import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageEntity;
import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.modules.shopkey.model.vo.ShopManageCredentialVo;
import com.nanri.aiimage.modules.shopkey.model.vo.ShopManageItemVo;
import com.nanri.aiimage.modules.shopkey.model.vo.ShopManagePageVo;
backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/SkipPriceAsinService.java
+1 -1
View File
@@ -13,7 +13,7 @@ import com.nanri.aiimage.modules.shopkey.mapper.ShopManageMapper;
import com.nanri.aiimage.modules.shopkey.model.dto.SkipPriceAsinCreateRequest;
import com.nanri.aiimage.modules.shopkey.model.dto.SkipPriceAsinDetailDto;
import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageEntity;
import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.modules.shopkey.model.entity.SkipPriceAsinEntity;
import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinImportProgressVo;
import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinImportStartVo;
backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/spi/GroupDeletionGuardPort.java
+15
View File
@@ -0,0 +1,15 @@
package com.nanri.aiimage.modules.shopkey.spi;
/**
* 分组删除守卫（2026-09 边界收敛）：分组下若仍存在某模块的业务数据，拒绝删除该分组。
*
* <p>原实现由 shopkey 直接 count 其它模块的表（invalidasin / dedupe），构成 shopkey → 业务 的反向依赖；
* 现改为各业务模块自己实现本端口（Spring 注入 List 后逐个校验），新增模块只需加一个实现 Bean。
*
* <p>实现应在"存在数据"时抛出 {@code BusinessException}，文案自带模块名（沿用历史文案，前端无需改）。
*/
public interface GroupDeletionGuardPort {
/** 校验该分组下本模块无残留数据；有则抛业务异常。 */
void ensureNoGroupData(Long groupId);
}
backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/controller/SoftwareVersionAdminController.java
+2 -2
View File
@@ -1,8 +1,8 @@
package com.nanri.aiimage.modules.softwareversion.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.softwareversion.service.SoftwareVersionService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
backend-java/src/main/java/com/nanri/aiimage/modules/task/service/ResultFileJobHandler.java
+9
View File
@@ -37,6 +37,15 @@ public interface ResultFileJobHandler {
return false;
}
/**
* 模块自定义的结果对象 key 解析：返回非空时覆盖默认路径（按 resultId 查 biz_file_result）。
* BRAND 的结果文件 job 上没有 resultId，需要用任务 id 反查品牌侧存放的对象 key。
* 实现应自吞异常（解析失败按 null 处理，走默认路径）。
*/
default String resolveResultFileUrl(TaskFileJobEntity job) {
return null;
}
default boolean supportsAsyncOffload() {
return false;
}
backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskResultFileJobWorker.java
+11 -10
View File
@@ -3,11 +3,9 @@ package com.nanri.aiimage.modules.task.service;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.exception.TaskOwnerMismatchException;
import com.nanri.aiimage.config.InstanceMetadata;
import com.nanri.aiimage.modules.brand.service.BrandTaskService;
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
import com.nanri.aiimage.modules.withdraw.service.WithdrawTaskService;
import jakarta.annotation.PreDestroy;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -34,8 +32,6 @@ public class TaskResultFileJobWorker {
private final FileResultMapper fileResultMapper;
private final TaskFileJobLocalDispatcher taskFileJobLocalDispatcher;
private final InstanceMetadata instanceMetadata;
private final WithdrawTaskService withdrawTaskService;
private final BrandTaskService brandTaskService;
private final ResultFileJobHandlerRegistry handlerRegistry;
@Autowired
@Qualifier("taskQueueExecutor")
@@ -178,7 +174,6 @@ public class TaskResultFileJobWorker {
private void processInternal(TaskFileJobEntity job) {
long startedAt = System.currentTimeMillis();
boolean finalizeWithdraw = false;
try {
TaskFileJobEntity latest = taskFileJobService.findById(job.getId());
if (latest != null && "SUCCESS".equals(latest.getStatus())) {
@@ -219,13 +214,15 @@ public class TaskResultFileJobWorker {
String resultFileUrl = resolveResultFileUrl(job);
taskFileJobService.markSuccess(job, resultFileUrl);
cleanupAfterSuccess(job);
finalizeWithdraw = "WITHDRAW".equals(job.getModuleType());
log.info("[task-file-job] process success jobId={} taskId={} moduleType={} resultId={} elapsedMs={} resultFileUrl={} stage=SUCCESS",
job.getId(), job.getTaskId(), job.getModuleType(), job.getResultId(),
System.currentTimeMillis() - startedAt, resultFileUrl);
}
if (finalizeWithdraw) {
withdrawTaskService.tryFinalizeTask(job.getTaskId(), false);
// 成功后回调解耦（原 WITHDRAW 特判）：时机与历史一致——锁已释放、markSuccess 之后；
// 各模块需要"任务收尾"时实现 ResultFileJobHandler.onSuccess，task 侧不再 import 业务模块
ResultFileJobHandler successHandler = handlerRegistry.asMap().get(job.getModuleType());
if (successHandler != null) {
successHandler.onSuccess(job);
}
} catch (TaskOwnerMismatchException ex) {
// 归属校验失败不是"生成失败"：不能计入 retryCount，否则任务会在归属机
@@ -308,8 +305,12 @@ public class TaskResultFileJobWorker {
}
private String resolveResultFileUrl(TaskFileJobEntity job) {
if ("BRAND".equals(job.getModuleType())) {
return brandTaskService.resolveResultObjectKey(job.getTaskId());
ResultFileJobHandler handler = handlerRegistry.asMap().get(job.getModuleType());
if (handler != null) {
String custom = handler.resolveResultFileUrl(job);
if (custom != null && !custom.isBlank()) {
return custom;
}
}
if (job.getResultId() == null) {
return null;
backend-java/src/main/java/com/nanri/aiimage/modules/tutorial/controller/TutorialAdminController.java
+2 -2
View File
@@ -1,8 +1,8 @@
package com.nanri.aiimage.modules.tutorial.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.tutorial.service.TutorialPackageService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/controller/AdminUserApiSecretController.java
+2 -2
View File
@@ -2,8 +2,8 @@ package com.nanri.aiimage.modules.usersecret.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.config.UserSecretProperties;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.usersecret.model.dto.AdminUserSecretQuery;
import com.nanri.aiimage.modules.usersecret.model.vo.AdminUserSecretPageVo;
import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretCheckResultVo;
backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/controller/AdminUserSecretUsageController.java
+2 -2
View File
@@ -1,8 +1,8 @@
package com.nanri.aiimage.modules.usersecret.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.usersecret.model.dto.AdminUserSecretUsageQuery;
import com.nanri.aiimage.modules.usersecret.model.vo.AdminUserSecretUsagePageVo;
import com.nanri.aiimage.modules.usersecret.service.UserSecretUsageService;
backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/controller/InternalUserProxyController.java
+1 -1
View File
@@ -2,7 +2,7 @@ package com.nanri.aiimage.modules.usersecret.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService;
import com.nanri.aiimage.modules.usersecret.support.UserSecretModule;
import io.swagger.v3.oas.annotations.Operation;
backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/controller/InternalUserSecretUsageController.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.usersecret.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.usersecret.model.dto.UserSecretUsageReportRequest;
import com.nanri.aiimage.modules.usersecret.service.UserSecretUsageService;
import io.swagger.v3.oas.annotations.Operation;
backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/controller/UserApiSecretController.java
+2 -2
View File
@@ -1,8 +1,8 @@
package com.nanri.aiimage.modules.usersecret.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.usersecret.model.dto.UserApiSecretCheckRequest;
import com.nanri.aiimage.modules.usersecret.model.dto.UserApiSecretMigrateRequest;
import com.nanri.aiimage.modules.usersecret.model.dto.UserApiSecretSaveRequest;
backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/ProxyBalancePortAdapter.java
+30
View File
@@ -0,0 +1,30 @@
package com.nanri.aiimage.modules.usersecret.service;
import com.nanri.aiimage.modules.notification.spi.ProxyBalancePort;
import com.nanri.aiimage.modules.usersecret.client.JikipProxyClient;
import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretBalanceVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
* 代理余额探测端口实现（2026-09 边界收敛）：把 jikip 客户端与余额 VO 收敛在 usersecret 模块内。
*/
@Service
@RequiredArgsConstructor
public class ProxyBalancePortAdapter implements ProxyBalancePort {
private final JikipProxyClient jikipProxyClient;
@Override
public ProxyBalanceSnapshot fetchBalance() {
UserApiSecretBalanceVo balance = jikipProxyClient.fetchBalance();
if (balance == null) {
return new ProxyBalanceSnapshot(false, null, null, "余额接口返回空");
}
return new ProxyBalanceSnapshot(
Boolean.TRUE.equals(balance.getAvailable()),
balance.getSurplus(),
balance.getBalance(),
balance.getMessage());
}
}
backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretService.java
+8 -6
View File
@@ -2,17 +2,18 @@ package com.nanri.aiimage.modules.usersecret.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.admin.spi.UserSecretCleanupPort;
import com.nanri.aiimage.common.security.ShopCredentialCryptoService;
import com.nanri.aiimage.config.UserSecretProperties;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.notification.service.NotificationDispatchService;
import com.nanri.aiimage.modules.notification.service.NotificationService;
import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.support.UserDataScopeSupport;
import com.nanri.aiimage.modules.shopkey.mapper.ShopManageGroupMapper;
import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
import com.nanri.aiimage.modules.shopkey.model.dto.UserGroupRef;
import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.modules.usersecret.client.JikipProxyClient;import com.nanri.aiimage.modules.usersecret.mapper.UserApiSecretMapper;
import com.nanri.aiimage.modules.usersecret.model.dto.AdminUserSecretQuery;
import com.nanri.aiimage.modules.usersecret.model.dto.UserApiSecretMigrateRequest;
@@ -53,7 +54,7 @@ import java.util.Set;
@Service
@RequiredArgsConstructor
@Slf4j
public class UserApiSecretService {
public class UserApiSecretService implements UserSecretCleanupPort {
public static final String SOURCE_CLIENT = "client";
public static final String SOURCE_ADMIN = "admin";
@@ -412,6 +413,7 @@ public class UserApiSecretService {
/** 后台：清空该用户全部密钥与代理配置。 */
@Transactional
@Override
public int adminClearByUser(Long userId) {
requireUserId(userId);
int deleted = userApiSecretMapper.delete(new LambdaQueryWrapper<UserApiSecretEntity>()
backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserSecretUsageService.java
+5 -5
View File
@@ -1,13 +1,13 @@
package com.nanri.aiimage.modules.usersecret.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.mapper.AdminUserMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.support.UserDataScopeSupport;
import com.nanri.aiimage.modules.shopkey.mapper.ShopManageGroupMapper;
import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
import com.nanri.aiimage.modules.shopkey.model.dto.UserGroupRef;
import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.common.model.entity.ShopManageGroupEntity;
import com.nanri.aiimage.modules.usersecret.mapper.UserSecretUsageMapper;
import com.nanri.aiimage.modules.usersecret.model.dto.AdminUserSecretUsageQuery;
import com.nanri.aiimage.modules.usersecret.model.entity.UserSecretUsageEntity;
backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/controller/ZiniaoAuthController.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.ziniao.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.ziniao.model.cache.ZiniaoShopIndexRefreshCursorDto;
import com.nanri.aiimage.modules.ziniao.model.dto.ZiniaoOpenShopRequest;
import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoOpenShopVo;