refactor(phase-4): 解散万能 util——similarasin/util 与 common/util 按域归位

similarasin/util 7 支:
- 域内件(SimilarAsinImageEmbedder/PuzzleImageMerger/SimilarAsinLogSupport/
  BoundedImageCache)并入既有 service/support 先例;
- 通用 Excel 件(ExcelCellImageWriter/WpsCellImageWriter)归 common/excel;
- 仅测试用的 SimilarAsinPerfFixture 移出生产源到 src/test。

common/util 13 支解散为四个关注点包:excel(读/写/单元格图片)、
text(BrandLabel/SecretMasking/UserMessages)、task(行过滤/分组传播/判死文案/
删除台账/锁跳过留痕)、support(LRU/下载头/线程池)。老 util 目录不再存在。

纯粹的包搬迁与 import 重写(diff 219 增 / 217 删),零行为改动:
搬迁前后由 SimilarAsinCreateTaskSnapshotTest 的建单入口 golden 对撞相等;
新增 MovedComponentScanTest 钉住三枚 @Component 仍被根包扫描发现、老包零残留。
This commit is contained in:
2026-10-23 00:59:53 +08:00
parent 8f6913fb4a
commit dbe35dfcb5
162 changed files with 282 additions and 217 deletions
@@ -1,4 +1,4 @@
package com.nanri.aiimage.modules.similarasin.util;
package com.nanri.aiimage.common.excel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.excel;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.context.AnalysisContext;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.excel;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.Font;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.modules.similarasin.util;
package com.nanri.aiimage.common.excel;
import lombok.extern.slf4j.Slf4j;
@@ -3,7 +3,7 @@ package com.nanri.aiimage.common.exception;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.service.TaskOwnerForwardService;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.config.TaskOperationLockConfig;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.ConstraintViolationException;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.common.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.exception.TaskOwnerMismatchException;
import com.nanri.aiimage.config.InstanceRoutingProperties;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.support;
import java.util.Collections;
import java.util.LinkedHashMap;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.support;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.http.HttpHeaders;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.support;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.task;
import java.util.ArrayList;
import java.util.List;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.task;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.task;
import io.micrometer.core.instrument.Gauge;
import io.micrometer.core.instrument.MeterRegistry;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.task;
import lombok.extern.slf4j.Slf4j;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.task;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.text;
import java.util.regex.Pattern;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.text;
import java.net.URI;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.common.util;
package com.nanri.aiimage.common.text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.config;
import com.nanri.aiimage.common.util.BoundedLruCache;
import com.nanri.aiimage.common.support.BoundedLruCache;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.http.client.JdkClientHttpRequestFactory;
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.appearancepatent.service.support;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import lombok.extern.slf4j.Slf4j;
import java.io.BufferedInputStream;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.appearancepatent.service.support;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentHistoryItemVo;
import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService;
import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
@@ -2,7 +2,7 @@ package com.nanri.aiimage.modules.appearancepatent.service.support;
import cn.hutool.crypto.digest.DigestUtil;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.FailedStatusRowFilter;
import com.nanri.aiimage.common.task.FailedStatusRowFilter;
import com.nanri.aiimage.config.AppearancePatentProperties;
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentParseRequest;
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentSourceFileDto;
@@ -3,7 +3,7 @@ package com.nanri.aiimage.modules.appearancepatent.service.support;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.task.TaskStatuses;
import com.nanri.aiimage.common.util.GroupResultPropagator;
import com.nanri.aiimage.common.task.GroupResultPropagator;
import com.nanri.aiimage.config.AppearancePatentProperties;
import com.nanri.aiimage.config.StorageProperties;
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentParsedPayloadDto;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.appearancepatent.service.support;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentResultRowDto;
import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentParsedRowVo;
import org.apache.poi.ss.usermodel.Cell;
@@ -1,9 +1,9 @@
package com.nanri.aiimage.modules.appearancepatent.service.support;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.common.task.LockSkipWitness;
import com.nanri.aiimage.common.task.TaskStatuses;
import com.nanri.aiimage.common.util.StaleTaskDeathReason;
import com.nanri.aiimage.common.task.StaleTaskDeathReason;
import com.nanri.aiimage.config.AppearancePatentProperties;
import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskCacheService;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.asincache.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.modules.asincache.mapper.AsinResultCacheMapper;
import com.nanri.aiimage.modules.asincache.model.dto.AsinCacheWriteRowDto;
import com.nanri.aiimage.modules.asincache.model.entity.AsinResultCacheEntity;
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.brand.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.common.task.LockSkipWitness;
import cn.hutool.core.io.FileUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -11,8 +11,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import com.nanri.aiimage.config.BrandProgressProperties;
import com.nanri.aiimage.config.HttpClientPool;
import com.nanri.aiimage.config.StorageProperties;
@@ -118,7 +118,7 @@ public class BrandTaskService {
private static final int RESULT_UPLOAD_CONCURRENCY = 3;
// 有界队列线程池:newFixedThreadPool 用的是无界队列,任务堆积时不会拒绝、会把内存吃满
private final ExecutorService resultUploadExecutor = com.nanri.aiimage.common.util.ThreadPools
private final ExecutorService resultUploadExecutor = com.nanri.aiimage.common.support.ThreadPools
.boundedFixed("brand-result-upload", RESULT_UPLOAD_CONCURRENCY);
@PreDestroy
@@ -1,9 +1,9 @@
package com.nanri.aiimage.modules.collectdata.service;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.SxssfWorkbookWriter;
import com.nanri.aiimage.common.excel.SxssfWorkbookWriter;
import com.nanri.aiimage.modules.collectdata.model.dto.CollectDataSummaryRowDto;
import com.nanri.aiimage.modules.collectdata.model.vo.CollectDataResultRowVo;
import lombok.extern.slf4j.Slf4j;
@@ -9,8 +9,8 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessCodes;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import com.nanri.aiimage.modules.asincache.service.AsinResultCacheService;
import com.nanri.aiimage.modules.collectdata.mapper.CollectDataCountryPrefMapper;
import com.nanri.aiimage.modules.collectdata.mapper.CollectDataItemMapper;
@@ -3,7 +3,7 @@ package com.nanri.aiimage.modules.collectdata.service.support;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.task.TaskStatuses;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.common.task.LockSkipWitness;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
import com.nanri.aiimage.modules.task.model.dto.TaskScopeLastChunkDto;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.convert.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.json.JSONUtil;
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import com.nanri.aiimage.config.StorageProperties;
import com.nanri.aiimage.modules.convert.model.dto.ConvertRunRequest;
import com.nanri.aiimage.modules.convert.model.dto.UploadedSourceFileDto;
@@ -6,7 +6,7 @@ import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.service.DataReadScope;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.common.support.DownloadHeaderUtil;
import com.nanri.aiimage.modules.dedupe.model.dto.DedupeTotalDataCreateRequest;
import com.nanri.aiimage.modules.dedupe.model.dto.DedupeTotalDataUpdateRequest;
import com.nanri.aiimage.modules.dedupe.model.vo.DedupeTotalDataImportProgressVo;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.dedupe.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.json.JSONUtil;
@@ -10,8 +10,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.service.CompanyScopeSupport;
import com.nanri.aiimage.common.service.NodeSharedStore;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import com.nanri.aiimage.config.InstanceMetadata;
import com.nanri.aiimage.config.StorageProperties;
import com.nanri.aiimage.modules.dedupe.model.dto.DedupeRunRequest;
@@ -99,7 +99,7 @@ public class DedupeRunService {
private final Semaphore fileParallelSemaphore = new Semaphore(MAX_PARALLEL_FILES);
/** 共享有界文件执行器;不再为请求中的每个文件创建虚拟线程。 */
// 队列改为有界:newFixedThreadPool 的无界队列在文件堆积时不会拒绝、会把内存吃满
private final ExecutorService fileExecutor = com.nanri.aiimage.common.util.ThreadPools
private final ExecutorService fileExecutor = com.nanri.aiimage.common.support.ThreadPools
.boundedFixed("dedupe-file-worker", MAX_PARALLEL_FILES);
public DedupeRunService(FileTaskMapper fileTaskMapper,
@@ -1,13 +1,13 @@
package com.nanri.aiimage.modules.dedupe.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.service.NodeSharedStore;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import com.nanri.aiimage.modules.dedupe.mapper.DedupeTotalDataMapper;
import com.nanri.aiimage.modules.dedupe.model.dto.DedupeTotalDataCreateRequest;
import com.nanri.aiimage.modules.dedupe.model.dto.DedupeTotalDataUpdateRequest;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.deletebrand.controller;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
@@ -1,13 +1,13 @@
package com.nanri.aiimage.modules.deletebrand.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import cn.hutool.core.io.FileUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import com.nanri.aiimage.config.DeleteBrandProgressProperties;
import com.nanri.aiimage.config.TaskPressureProperties;
import com.nanri.aiimage.modules.deletebrand.model.cache.DeleteBrandParsedFileCacheDto;
@@ -3,7 +3,7 @@ package com.nanri.aiimage.modules.deletebrand.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.common.task.LockSkipWitness;
import com.nanri.aiimage.config.DeleteBrandProgressProperties;
import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService;
import com.nanri.aiimage.modules.brand.service.BrandTaskService;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.digitalhuman.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
@@ -3,7 +3,7 @@ package com.nanri.aiimage.modules.file.service;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.IdUtil;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import com.nanri.aiimage.config.StorageProperties;
import com.nanri.aiimage.modules.file.model.vo.ExcelInfoVo;
import com.nanri.aiimage.modules.file.model.vo.UploadFileVo;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.file.service.object;
import com.nanri.aiimage.common.util.PendingDeleteJournal;
import com.nanri.aiimage.common.task.PendingDeleteJournal;
import com.nanri.aiimage.config.TransientStorageProperties;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.filetemplate;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.common.support.DownloadHeaderUtil;
import com.nanri.aiimage.modules.filetemplate.ModuleTemplateService.TemplateDownload;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -5,7 +5,7 @@ import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.service.DataReadScope;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.common.support.DownloadHeaderUtil;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.imagevideo.service.ImageVideoAdminTaskService;
import com.nanri.aiimage.modules.imagevideo.service.ImageVideoAdminTaskService.VideoSelection;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.imagevideo.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.common.task.LockSkipWitness;
import com.nanri.aiimage.config.ImageVideoProperties;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.common.task.LockSkipWitness;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.exception.TaskOwnerMismatchException;
import com.nanri.aiimage.config.InstanceMetadata;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.imagevideo.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -2,7 +2,7 @@ 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.common.util.BrandLabel;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.modules.invalidasin.mapper.InvalidAsinDataMapper;
import com.nanri.aiimage.modules.invalidasin.model.dto.InvalidAsinDataCreateRequest;
import com.nanri.aiimage.modules.invalidasin.model.dto.InvalidAsinDataUpdateRequest;
@@ -1,8 +1,8 @@
package com.nanri.aiimage.modules.patroldelete.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.SxssfWorkbookWriter;
import com.nanri.aiimage.common.excel.SxssfWorkbookWriter;
import com.nanri.aiimage.modules.patroldelete.model.dto.PatrolDeleteCartRatioDto;
import com.nanri.aiimage.modules.patroldelete.model.dto.PatrolDeleteCountryMetricRowDto;
import com.nanri.aiimage.modules.patroldelete.model.dto.PatrolDeleteCountrySectionDto;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.patroldelete.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.patroldelete.mapper.PatrolDeleteConditionMapper;
@@ -1,8 +1,8 @@
package com.nanri.aiimage.modules.pricetrack.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.SxssfWorkbookWriter;
import com.nanri.aiimage.common.excel.SxssfWorkbookWriter;
import com.nanri.aiimage.modules.pricetrack.model.dto.PriceTrackSubmitResultRequest;
import com.nanri.aiimage.modules.productrisk.model.enums.ProductRiskCountryCode;
import lombok.extern.slf4j.Slf4j;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.pricetrack.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -1,11 +1,11 @@
package com.nanri.aiimage.modules.pricetrack.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import com.nanri.aiimage.config.TaskPressureProperties;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
import com.nanri.aiimage.modules.productrisk.model.enums.ProductRiskCountryCode;
@@ -3,7 +3,7 @@ package com.nanri.aiimage.modules.productcategory.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.common.support.DownloadHeaderUtil;
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;
@@ -1,8 +1,8 @@
package com.nanri.aiimage.modules.productrisk.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.SxssfWorkbookWriter;
import com.nanri.aiimage.common.excel.SxssfWorkbookWriter;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskRowDto;
import com.nanri.aiimage.modules.productrisk.model.enums.ProductRiskCountryCode;
import lombok.extern.slf4j.Slf4j;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.productrisk.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -10,7 +10,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.exception.TaskOwnerMismatchException;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.config.InstanceMetadata;
import com.nanri.aiimage.modules.file.service.LocalFileStorageService;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
@@ -1,9 +1,9 @@
package com.nanri.aiimage.modules.publish.service;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.util.SxssfWorkbookWriter;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import com.nanri.aiimage.common.excel.SxssfWorkbookWriter;
import com.nanri.aiimage.modules.publish.model.dto.PublishRowDto;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
@@ -3,7 +3,7 @@ package com.nanri.aiimage.modules.publish.service.support;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.task.TaskStatuses;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.common.task.LockSkipWitness;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
import com.nanri.aiimage.modules.task.model.dto.TaskScopeLastChunkDto;
@@ -1,8 +1,8 @@
package com.nanri.aiimage.modules.queryasin.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.SxssfWorkbookWriter;
import com.nanri.aiimage.common.excel.SxssfWorkbookWriter;
import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinAsinStatusDto;
import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinCountryAsinsDto;
import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinCountryResultDto;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.queryasin.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCandidateAddRequest;
@@ -2,7 +2,7 @@ package com.nanri.aiimage.modules.shopdatacrawl.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.common.support.DownloadHeaderUtil;
import com.nanri.aiimage.config.HttpClientPool;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
@@ -2,7 +2,7 @@ package com.nanri.aiimage.modules.shopdatacrawl.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.common.support.DownloadHeaderUtil;
import com.nanri.aiimage.config.HttpClientPool;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
@@ -1,13 +1,13 @@
package com.nanri.aiimage.modules.shopdatacrawl.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.shopdatacrawl.model.dto.ShopDataCrawlRowDto;
import com.nanri.aiimage.modules.shopdatacrawl.model.vo.ShopDataCrawlResultItemVo;
import com.nanri.aiimage.modules.shopdatacrawl.util.BoundedImageCache;
import com.nanri.aiimage.modules.shopdatacrawl.util.ShopDataCrawlPrefetchBudget;
import com.nanri.aiimage.modules.shopdatacrawl.service.support.ShopDataCrawlSheetBuilder;
import com.nanri.aiimage.modules.similarasin.util.SimilarAsinImageEmbedder;
import com.nanri.aiimage.modules.similarasin.service.support.SimilarAsinImageEmbedder;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.ClientAnchor;
@@ -2,7 +2,7 @@ package com.nanri.aiimage.modules.shopdatacrawl.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.modules.shopdatacrawl.mapper.ShopDataCrawlItemMapper;
import com.nanri.aiimage.modules.shopdatacrawl.model.dto.ShopDataCrawlCountryResultDto;
import com.nanri.aiimage.modules.shopdatacrawl.model.dto.ShopDataCrawlRowDto;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.shopdatacrawl.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.shopdatacrawl.service.support;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.modules.shopdatacrawl.model.dto.ShopDataCrawlRowDto;
/**
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.shopdatacrawl.service.support;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.modules.shopdatacrawl.model.dto.ShopDataCrawlCountryResultDto;
import com.nanri.aiimage.modules.shopdatacrawl.model.dto.ShopDataCrawlRowDto;
import com.nanri.aiimage.modules.shopdatacrawl.model.vo.ShopDataCrawlResultItemVo;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.shopdatacrawl.util;
import com.nanri.aiimage.modules.similarasin.util.SimilarAsinImageEmbedder;
import com.nanri.aiimage.modules.similarasin.service.support.SimilarAsinImageEmbedder;
import lombok.extern.slf4j.Slf4j;
import java.util.LinkedHashMap;
@@ -1,9 +1,9 @@
package com.nanri.aiimage.modules.shopduplicatecheck.controller;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
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.common.support.DownloadHeaderUtil;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.shopduplicatecheck.service;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.common.text.UserMessages;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.service.DistributedJobLockService;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.shopduplicatecheck.service;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.modules.shopduplicatecheck.mapper.ShopDuplicateCheckSourceMapper;
import com.nanri.aiimage.modules.shopduplicatecheck.model.payload.DuplicateItem;
import com.nanri.aiimage.modules.shopduplicatecheck.model.payload.DuplicateOccurrence;
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.shopduplicatecheck.service;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.common.text.UserMessages;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.shopduplicatecheck.service.support;
import com.nanri.aiimage.common.util.ThreadPools;
import com.nanri.aiimage.common.support.ThreadPools;
import lombok.extern.slf4j.Slf4j;
import java.util.concurrent.ExecutorService;
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.shopduplicatecheck.service.support;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
@@ -2,7 +2,7 @@ package com.nanri.aiimage.modules.shopkey.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.common.support.DownloadHeaderUtil;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
@@ -2,7 +2,7 @@ package com.nanri.aiimage.modules.shopkey.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.api.PageDefaults;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.common.support.DownloadHeaderUtil;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
@@ -1,13 +1,13 @@
package com.nanri.aiimage.modules.shopkey.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import cn.hutool.core.util.IdUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.service.NodeSharedStore;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import com.nanri.aiimage.config.TaskPressureProperties;
import com.nanri.aiimage.modules.shopkey.mapper.QueryAsinMapper;
import com.nanri.aiimage.modules.shopkey.model.dto.QueryAsinCreateRequest;
@@ -1,13 +1,13 @@
package com.nanri.aiimage.modules.shopkey.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import cn.hutool.core.util.IdUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.service.NodeSharedStore;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import com.nanri.aiimage.modules.shopkey.mapper.SkipPriceAsinMapper;
import com.nanri.aiimage.modules.shopkey.mapper.ShopManageMapper;
import com.nanri.aiimage.modules.shopkey.model.dto.SkipPriceAsinCreateRequest;
@@ -1,8 +1,8 @@
package com.nanri.aiimage.modules.shopmatch.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.SxssfWorkbookWriter;
import com.nanri.aiimage.common.excel.SxssfWorkbookWriter;
import com.nanri.aiimage.modules.productrisk.model.enums.ProductRiskCountryCode;
import com.nanri.aiimage.modules.shopmatch.model.dto.ShopMatchRowDto;
import lombok.extern.slf4j.Slf4j;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.shopmatch.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -1,8 +1,8 @@
package com.nanri.aiimage.modules.similarasin.service;
import com.nanri.aiimage.config.SimilarAsinProperties;
import com.nanri.aiimage.modules.similarasin.util.SimilarAsinImageEmbedder;
import com.nanri.aiimage.modules.similarasin.util.SimilarAsinImageEmbedder.ResizedImage;
import com.nanri.aiimage.modules.similarasin.service.support.SimilarAsinImageEmbedder;
import com.nanri.aiimage.modules.similarasin.service.support.SimilarAsinImageEmbedder.ResizedImage;
import com.nanri.aiimage.modules.task.mapper.TaskImageCacheMapper;
import com.nanri.aiimage.modules.task.model.entity.TaskImageCacheEntity;
import jakarta.annotation.PostConstruct;
@@ -75,7 +75,7 @@ public class SimilarAsinImagePrefetchService {
private final Object inflightMonitor = new Object();
// 有界队列线程池:newFixedThreadPool 用的是无界队列,预取任务堆积时不会拒绝、会把内存吃满
private final ExecutorService prefetchPool = com.nanri.aiimage.common.util.ThreadPools
private final ExecutorService prefetchPool = com.nanri.aiimage.common.support.ThreadPools
.boundedFixed("similar-asin-prefetch", PREFETCH_POOL_SIZE);
/**
@@ -9,8 +9,8 @@ import com.nanri.aiimage.modules.productcategory.model.vo.ProductCategoryListVo;
import com.nanri.aiimage.modules.productcategory.service.ProductCategoryService;
import com.nanri.aiimage.modules.similarasin.client.SimilarAsinLlmClient;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinResultRowDto;
import com.nanri.aiimage.modules.similarasin.util.PuzzleImageMerger;
import com.nanri.aiimage.modules.similarasin.util.SimilarAsinImageEmbedder;
import com.nanri.aiimage.modules.similarasin.service.support.PuzzleImageMerger;
import com.nanri.aiimage.modules.similarasin.service.support.SimilarAsinImageEmbedder;
import com.nanri.aiimage.modules.usersecret.support.SecretUsageContext;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -9,10 +9,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.common.task.TaskStatuses;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.common.task.LockSkipWitness;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.util.FailedStatusRowFilter;
import com.nanri.aiimage.common.util.StaleTaskDeathReason;
import com.nanri.aiimage.common.task.FailedStatusRowFilter;
import com.nanri.aiimage.common.task.StaleTaskDeathReason;
import com.nanri.aiimage.config.InstanceMetadata;
import com.nanri.aiimage.config.SimilarAsinProperties;
import com.nanri.aiimage.config.StorageProperties;
@@ -53,7 +53,7 @@ import com.nanri.aiimage.modules.similarasin.service.support.SimilarAsinResultWo
import com.nanri.aiimage.modules.similarasin.service.support.SimilarAsinStaleReopenSupport;
import com.nanri.aiimage.modules.similarasin.service.support.SimilarAsinTaskProgressSupport;
import com.nanri.aiimage.modules.similarasin.service.support.SimilarAsinTaskOwnershipSupport;
import com.nanri.aiimage.modules.similarasin.util.SimilarAsinImageEmbedder;
import com.nanri.aiimage.modules.similarasin.service.support.SimilarAsinImageEmbedder;
import com.nanri.aiimage.modules.file.service.LocalFileStorageService;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
@@ -294,7 +294,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
* multiply the peak even though the task itself is a single job.
*/
// 有界队列线程池:newFixedThreadPool 用的是无界队列,组装任务堆积时不会拒绝、会把内存吃满
private final ExecutorService assembleExecutor = com.nanri.aiimage.common.util.ThreadPools
private final ExecutorService assembleExecutor = com.nanri.aiimage.common.support.ThreadPools
.boundedFixed("similar-asin-assemble", 2);
/** 单元测试清理入口:关闭 assemble 固定线程池,避免测试进程残留线程。 */
@@ -1,4 +1,4 @@
package com.nanri.aiimage.modules.similarasin.util;
package com.nanri.aiimage.modules.similarasin.service.support;
import lombok.extern.slf4j.Slf4j;
@@ -1,4 +1,4 @@
package com.nanri.aiimage.modules.similarasin.util;
package com.nanri.aiimage.modules.similarasin.service.support;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinResultRowDto;
import lombok.extern.slf4j.Slf4j;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.similarasin.service.support;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinResultRowDto;
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.similarasin.service.support;
import java.util.ArrayList;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import cn.hutool.crypto.digest.DigestUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.similarasin.service.support;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.DataFormatter;
import org.apache.poi.ss.usermodel.Row;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.similarasin.service.support;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.databind.JsonNode;
@@ -1,5 +1,6 @@
package com.nanri.aiimage.modules.similarasin.util;
package com.nanri.aiimage.modules.similarasin.service.support;
import com.nanri.aiimage.common.excel.WpsCellImageWriter;
import com.nanri.aiimage.config.SimilarAsinProperties;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
import jakarta.annotation.PreDestroy;
@@ -180,7 +181,7 @@ public class SimilarAsinImageEmbedder {
.followSslRedirects(true)
.dns(new SafeDns(Dns.SYSTEM))
.build();
this.downloadPool = com.nanri.aiimage.common.util.ThreadPools
this.downloadPool = com.nanri.aiimage.common.support.ThreadPools
.boundedFixed("similar-asin-image-dl", downloadPoolSize);
}
@@ -1,4 +1,4 @@
package com.nanri.aiimage.modules.similarasin.util;
package com.nanri.aiimage.modules.similarasin.service.support;
/**
* Task 19:LLM 请求/响应及 Python 回传日志的采样与截断工具。
@@ -1,12 +1,12 @@
package com.nanri.aiimage.modules.similarasin.service.support;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.common.task.LockSkipWitness;
import cn.hutool.crypto.digest.DigestUtil;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinParsedPayloadDto;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinResultGroupDto;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinSourceFileDto;
import com.nanri.aiimage.modules.similarasin.util.SimilarAsinLogSupport;
import com.nanri.aiimage.modules.similarasin.service.support.SimilarAsinLogSupport;
import com.nanri.aiimage.modules.similarasin.service.SimilarAsinImagePrefetchService;
import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
import com.nanri.aiimage.modules.usersecret.support.SecretUsageContext;
@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.util.GroupResultPropagator;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.common.task.GroupResultPropagator;
import com.nanri.aiimage.config.SimilarAsinProperties;
import com.nanri.aiimage.config.StorageProperties;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
@@ -14,9 +14,9 @@ import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinResultRowDto;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinSourceFileDto;
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinParsedRowVo;
import com.nanri.aiimage.modules.similarasin.service.SimilarAsinImagePrefetchService;
import com.nanri.aiimage.modules.similarasin.util.BoundedImageCache;
import com.nanri.aiimage.modules.similarasin.util.SimilarAsinImageEmbedder;
import com.nanri.aiimage.modules.similarasin.util.WpsCellImageWriter;
import com.nanri.aiimage.modules.similarasin.service.support.BoundedImageCache;
import com.nanri.aiimage.modules.similarasin.service.support.SimilarAsinImageEmbedder;
import com.nanri.aiimage.common.excel.WpsCellImageWriter;
import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper;
import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
@@ -1,8 +1,8 @@
package com.nanri.aiimage.modules.similarasin.service.support;
import com.nanri.aiimage.common.util.BrandLabel;
import com.nanri.aiimage.common.text.BrandLabel;
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinParsedRowVo;
import com.nanri.aiimage.modules.similarasin.util.SimilarAsinImageEmbedder;
import com.nanri.aiimage.modules.similarasin.service.support.SimilarAsinImageEmbedder;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.Font;
@@ -1,6 +1,6 @@
package com.nanri.aiimage.modules.softwareversion.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
@@ -1,12 +1,12 @@
package com.nanri.aiimage.modules.split.service;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.util.ExcelStreamReader;
import com.nanri.aiimage.common.excel.ExcelStreamReader;
import com.nanri.aiimage.config.StorageProperties;
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
import com.nanri.aiimage.modules.split.model.dto.SplitRunRequest;
@@ -7,7 +7,7 @@ import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.service.CompanyScopeSupport;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.common.task.LockSkipWitness;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import com.nanri.aiimage.modules.task.spi.ExpiredAccountTaskStopSpi;
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.task.service;
import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.common.util.LockSkipWitness;
import com.nanri.aiimage.common.task.LockSkipWitness;
import com.nanri.aiimage.config.InspectionProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.ObjectProvider;
@@ -34,7 +34,7 @@ public class TaskResultItemService {
* 串行读取会让结果文件生成多花数十秒。有界队列 + daemon 线程,随进程退出。
*/
private final ExecutorService snapshotReadPool =
com.nanri.aiimage.common.util.ThreadPools.boundedFixed("task-result-read", 8);
com.nanri.aiimage.common.support.ThreadPools.boundedFixed("task-result-read", 8);
private final ObjectMapper objectMapper;
private final TransientPayloadStorageService transientPayloadStorageService;
@@ -2,7 +2,7 @@ package com.nanri.aiimage.modules.task.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.common.util.PendingDeleteJournal;
import com.nanri.aiimage.common.task.PendingDeleteJournal;
import com.nanri.aiimage.modules.file.service.object.RustfsObjectStorageService;
import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper;
import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
@@ -1,7 +1,7 @@
package com.nanri.aiimage.modules.taskcenter.service;
import com.nanri.aiimage.common.task.TaskStatuses;
import com.nanri.aiimage.common.util.UserMessages;
import com.nanri.aiimage.common.text.UserMessages;
import com.nanri.aiimage.common.module.TaskModuleRegistry;
import com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService;
import com.nanri.aiimage.modules.taskcenter.mapper.TaskCenterQueryMapper;

Some files were not shown because too many files have changed in this diff Show More