From dbe35dfcb50d2142bc5ecabd1a16c7d78c919d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Fri, 23 Oct 2026 00:59:53 +0800 Subject: [PATCH] =?UTF-8?q?refactor(phase-4):=20=E8=A7=A3=E6=95=A3?= =?UTF-8?q?=E4=B8=87=E8=83=BD=20util=E2=80=94=E2=80=94similarasin/util=20?= =?UTF-8?q?=E4=B8=8E=20common/util=20=E6=8C=89=E5=9F=9F=E5=BD=92=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 仍被根包扫描发现、老包零残留。 --- .../excel}/ExcelCellImageWriter.java | 2 +- .../{util => excel}/ExcelStreamReader.java | 2 +- .../{util => excel}/SxssfWorkbookWriter.java | 2 +- .../excel}/WpsCellImageWriter.java | 2 +- .../exception/GlobalExceptionHandler.java | 2 +- .../service/TaskOwnerForwardService.java | 2 +- .../{util => support}/BoundedLruCache.java | 2 +- .../{util => support}/DownloadHeaderUtil.java | 2 +- .../common/{util => support}/ThreadPools.java | 2 +- .../{util => task}/FailedStatusRowFilter.java | 2 +- .../{util => task}/GroupResultPropagator.java | 2 +- .../{util => task}/LockSkipWitness.java | 2 +- .../{util => task}/PendingDeleteJournal.java | 2 +- .../{util => task}/StaleTaskDeathReason.java | 2 +- .../common/{util => text}/BrandLabel.java | 2 +- .../common/{util => text}/SecretMasking.java | 2 +- .../common/{util => text}/UserMessages.java | 2 +- .../nanri/aiimage/config/HttpClientPool.java | 2 +- .../support/AppearancePatentExcelParser.java | 2 +- .../AppearancePatentHistoryAssembler.java | 2 +- .../AppearancePatentParsePipeline.java | 2 +- .../AppearancePatentResultJobSupport.java | 2 +- .../support/AppearancePatentSheetBuilder.java | 2 +- .../AppearancePatentStaleTaskScanner.java | 4 +- .../service/AsinResultCacheService.java | 2 +- .../brand/service/BrandTaskService.java | 10 +-- .../CollectDataExcelAssemblyService.java | 6 +- .../service/CollectDataService.java | 4 +- .../support/CollectDataStaleTaskScanner.java | 2 +- .../convert/service/ConvertRunService.java | 4 +- .../controller/DedupeTotalDataController.java | 2 +- .../dedupe/service/DedupeRunService.java | 8 +-- .../service/DedupeTotalDataService.java | 4 +- .../controller/DeleteBrandRunController.java | 2 +- .../service/DeleteBrandRunService.java | 4 +- .../service/DeleteBrandStaleTaskService.java | 2 +- .../service/DigitalHumanVersionService.java | 2 +- .../file/service/LocalFileStorageService.java | 2 +- .../object/RustfsDeleteRetryService.java | 2 +- .../ModuleTemplateController.java | 2 +- .../AdminImageVideoTaskController.java | 2 +- .../service/ImageVideoAdminTaskService.java | 2 +- .../service/ImageVideoArchiveService.java | 2 +- .../service/ImageVideoAsyncTaskService.java | 2 +- .../service/ImageVideoCozeService.java | 2 +- .../service/InvalidAsinDataService.java | 2 +- .../PatrolDeleteExcelAssemblyService.java | 4 +- .../service/PatrolDeleteResolveService.java | 2 +- .../PriceTrackExcelAssemblyService.java | 4 +- .../pricetrack/service/PriceTrackService.java | 2 +- .../service/PriceTrackTaskService.java | 4 +- .../controller/ProductCategoryController.java | 2 +- .../ProductRiskExcelAssemblyService.java | 4 +- .../service/ProductRiskResolveService.java | 2 +- .../publish/service/PublishTaskService.java | 2 +- .../service/PublishWorkbookService.java | 6 +- .../support/PublishStaleTaskScanner.java | 2 +- .../QueryAsinExcelAssemblyService.java | 4 +- .../service/QueryAsinResolveService.java | 2 +- .../AdminShopDataCrawlTaskController.java | 2 +- .../AdminShopDataCrawlTasksController.java | 2 +- .../ShopDataCrawlExcelAssemblyService.java | 4 +- .../ShopDataCrawlItemStoreService.java | 2 +- .../service/ShopDataCrawlResolveService.java | 2 +- .../support/ShopDataCrawlRowNormalizer.java | 2 +- .../support/ShopDataCrawlSheetBuilder.java | 2 +- .../shopdatacrawl/util/BoundedImageCache.java | 2 +- ...AdminShopDataDuplicateCheckController.java | 4 +- .../ShopDataDuplicateCheckImportService.java | 4 +- .../ShopDataDuplicateCheckQueryService.java | 2 +- .../ShopDataDuplicateCheckScanService.java | 4 +- .../DuplicateCheckRefreshScheduler.java | 2 +- .../support/DuplicateCheckWorkbookParser.java | 4 +- .../controller/QueryAsinController.java | 2 +- .../controller/SkipPriceAsinController.java | 2 +- .../shopkey/service/QueryAsinService.java | 4 +- .../shopkey/service/SkipPriceAsinService.java | 4 +- .../ShopMatchExcelAssemblyService.java | 4 +- .../service/ShopMatchResolveService.java | 2 +- .../SimilarAsinImagePrefetchService.java | 6 +- .../service/SimilarAsinLlmService.java | 4 +- .../service/SimilarAsinTaskService.java | 10 +-- .../support}/BoundedImageCache.java | 2 +- .../support}/PuzzleImageMerger.java | 2 +- .../support/SimilarAsinChunkMergeSupport.java | 2 +- .../SimilarAsinChunkPayloadSupport.java | 2 +- .../support/SimilarAsinExcelParser.java | 2 +- .../support/SimilarAsinHistoryAssembler.java | 2 +- .../support}/SimilarAsinImageEmbedder.java | 5 +- .../support}/SimilarAsinLogSupport.java | 2 +- .../support/SimilarAsinPipelineSupport.java | 6 +- .../SimilarAsinResultWorkbookAssembler.java | 10 +-- .../support/SimilarAsinSheetBuilder.java | 4 +- .../service/SoftwareVersionService.java | 2 +- .../split/service/SplitRunService.java | 4 +- .../ExpiredAccountTaskStopService.java | 2 +- .../task/service/InspectionSqlReportTask.java | 2 +- .../task/service/TaskResultItemService.java | 2 +- .../TransientPayloadDeleteOrchestrator.java | 2 +- .../service/TaskCenterQueryService.java | 2 +- .../usersecret/client/JikipProxyClient.java | 4 +- .../service/UserApiSecretCheckService.java | 2 +- .../service/WithdrawExcelAssemblyService.java | 4 +- .../service/WithdrawResolveService.java | 2 +- .../ziniao/client/ZiniaoClientImpl.java | 2 +- .../service/ZiniaoShopIndexService.java | 2 +- .../RawExceptionMessageSinkGuardTest.java | 2 +- .../common/MovedComponentScanTest.java | 63 +++++++++++++++++++ .../excel}/ExcelCellImageWriterTest.java | 2 +- .../ExcelStreamReaderParseFailureTest.java | 2 +- .../WpsCellImageWriterProtocolTest.java | 2 +- .../FailedStatusRowFilterTest.java | 2 +- .../GroupResultPropagatorTest.java | 2 +- .../LockSkipSilentExitGuardrailTest.java | 2 +- .../{util => task}/LockSkipWitnessTest.java | 2 +- .../PendingDeleteJournalTest.java | 2 +- .../StaleTaskDeathReasonTest.java | 2 +- .../common/{util => text}/BrandLabelTest.java | 2 +- .../{util => text}/UserMessagesTest.java | 2 +- ...awlExcelAssemblyServiceDelegationTest.java | 2 +- ...ShopDataCrawlExcelAssemblyServiceTest.java | 2 +- .../ShopDataCrawlStreamingWorkbookTest.java | 2 +- ...hopDataCrawlTemplateLargeWorkbookTest.java | 2 +- .../ShopDataCrawlBoundedImageCacheTest.java | 2 +- .../util/ShopDataCrawlImageReleaseTest.java | 2 +- .../util/ShopDataCrawlPrefetchBudgetTest.java | 2 +- ...sinImagePrefetchServiceAsyncTouchTest.java | 2 +- ...ilarAsinImagePrefetchServiceBatchTest.java | 2 +- .../service/SimilarAsinLlmLocalVerify.java | 4 +- .../service/SimilarAsinLlmServiceTest.java | 4 +- ...SimilarAsinMainImageDownloadRetryTest.java | 4 +- ...larAsinTaskServiceChunkMergeLimitTest.java | 2 +- ...ilarAsinTaskServiceChunkReadReuseTest.java | 2 +- ...AsinTaskServiceCleanupAfterCommitTest.java | 2 +- ...SimilarAsinTaskServiceDtoAssemblyTest.java | 2 +- .../SimilarAsinTaskServiceGroupRefTest.java | 2 +- ...imilarAsinTaskServiceHistoryBatchTest.java | 2 +- .../SimilarAsinTaskServiceLightTest.java | 2 +- ...ilarAsinTaskServiceLlmBufferScopeTest.java | 2 +- ...larAsinTaskServiceParseDelegationTest.java | 2 +- ...SimilarAsinTaskServiceParseLimitsTest.java | 2 +- ...imilarAsinTaskServiceParsePreviewTest.java | 2 +- .../SimilarAsinTaskServicePerf500Test.java | 2 +- ...milarAsinTaskServicePreviewConfigTest.java | 2 +- ...imilarAsinTaskServiceRowKeyDedupeTest.java | 2 +- ...SimilarAsinTaskServiceRowKeyIndexTest.java | 2 +- .../SimilarAsinTaskServiceSubmitTest.java | 2 +- .../SimilarAsinTaskServiceTxBoundaryTest.java | 2 +- ...larAsinTaskServiceWorkbookControlTest.java | 2 +- .../SimilarAsinCreateTaskSnapshotTest.java | 2 +- ...larAsinImageEmbedderDecodeQualityTest.java | 6 +- ...arAsinImageEmbedderPrefetchBudgetTest.java | 6 +- ...arAsinImageEmbedderSpoolLifecycleTest.java | 6 +- .../SimilarAsinImageEmbedderTest.java | 3 +- .../support/SimilarAsinSheetBuilderTest.java | 2 +- .../support}/SimilarAsinPerfFixture.java | 2 +- .../SimilarAsinPerfFixtureE2ETest.java | 2 +- .../SimilarAsinPerfFixtureTest.java | 2 +- .../contract/CleanupErrorContractTest.java | 2 +- .../DoneFinalizationContractTest.java | 2 +- .../RollbackSemanticsContractTest.java | 2 +- .../contract/TxDurationBenchmarkTest.java | 2 +- 162 files changed, 282 insertions(+), 217 deletions(-) rename backend-java/src/main/java/com/nanri/aiimage/{modules/similarasin/util => common/excel}/ExcelCellImageWriter.java (99%) rename backend-java/src/main/java/com/nanri/aiimage/common/{util => excel}/ExcelStreamReader.java (99%) rename backend-java/src/main/java/com/nanri/aiimage/common/{util => excel}/SxssfWorkbookWriter.java (99%) rename backend-java/src/main/java/com/nanri/aiimage/{modules/similarasin/util => common/excel}/WpsCellImageWriter.java (99%) rename backend-java/src/main/java/com/nanri/aiimage/common/{util => support}/BoundedLruCache.java (98%) rename backend-java/src/main/java/com/nanri/aiimage/common/{util => support}/DownloadHeaderUtil.java (98%) rename backend-java/src/main/java/com/nanri/aiimage/common/{util => support}/ThreadPools.java (97%) rename backend-java/src/main/java/com/nanri/aiimage/common/{util => task}/FailedStatusRowFilter.java (99%) rename backend-java/src/main/java/com/nanri/aiimage/common/{util => task}/GroupResultPropagator.java (99%) rename backend-java/src/main/java/com/nanri/aiimage/common/{util => task}/LockSkipWitness.java (99%) rename backend-java/src/main/java/com/nanri/aiimage/common/{util => task}/PendingDeleteJournal.java (99%) rename backend-java/src/main/java/com/nanri/aiimage/common/{util => task}/StaleTaskDeathReason.java (98%) rename backend-java/src/main/java/com/nanri/aiimage/common/{util => text}/BrandLabel.java (97%) rename backend-java/src/main/java/com/nanri/aiimage/common/{util => text}/SecretMasking.java (97%) rename backend-java/src/main/java/com/nanri/aiimage/common/{util => text}/UserMessages.java (98%) rename backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/{util => service/support}/BoundedImageCache.java (99%) rename backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/{util => service/support}/PuzzleImageMerger.java (99%) rename backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/{util => service/support}/SimilarAsinImageEmbedder.java (99%) rename backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/{util => service/support}/SimilarAsinLogSupport.java (96%) create mode 100644 backend-java/src/test/java/com/nanri/aiimage/common/MovedComponentScanTest.java rename backend-java/src/test/java/com/nanri/aiimage/{modules/similarasin/util => common/excel}/ExcelCellImageWriterTest.java (99%) rename backend-java/src/test/java/com/nanri/aiimage/common/{util => excel}/ExcelStreamReaderParseFailureTest.java (99%) rename backend-java/src/test/java/com/nanri/aiimage/{modules/similarasin/util => common/excel}/WpsCellImageWriterProtocolTest.java (99%) rename backend-java/src/test/java/com/nanri/aiimage/common/{util => task}/FailedStatusRowFilterTest.java (98%) rename backend-java/src/test/java/com/nanri/aiimage/common/{util => task}/GroupResultPropagatorTest.java (98%) rename backend-java/src/test/java/com/nanri/aiimage/common/{util => task}/LockSkipSilentExitGuardrailTest.java (99%) rename backend-java/src/test/java/com/nanri/aiimage/common/{util => task}/LockSkipWitnessTest.java (99%) rename backend-java/src/test/java/com/nanri/aiimage/common/{util => task}/PendingDeleteJournalTest.java (98%) rename backend-java/src/test/java/com/nanri/aiimage/common/{util => task}/StaleTaskDeathReasonTest.java (98%) rename backend-java/src/test/java/com/nanri/aiimage/common/{util => text}/BrandLabelTest.java (99%) rename backend-java/src/test/java/com/nanri/aiimage/common/{util => text}/UserMessagesTest.java (98%) rename backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/{util => service/support}/SimilarAsinImageEmbedderDecodeQualityTest.java (97%) rename backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/{util => service/support}/SimilarAsinImageEmbedderPrefetchBudgetTest.java (97%) rename backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/{util => service/support}/SimilarAsinImageEmbedderSpoolLifecycleTest.java (97%) rename backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/{util => service/support}/SimilarAsinImageEmbedderTest.java (99%) rename backend-java/src/{main/java/com/nanri/aiimage/modules/similarasin/util => test/java/com/nanri/aiimage/modules/similarasin/support}/SimilarAsinPerfFixture.java (99%) rename backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/{util => support}/SimilarAsinPerfFixtureE2ETest.java (99%) rename backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/{util => support}/SimilarAsinPerfFixtureTest.java (99%) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/ExcelCellImageWriter.java b/backend-java/src/main/java/com/nanri/aiimage/common/excel/ExcelCellImageWriter.java similarity index 99% rename from backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/ExcelCellImageWriter.java rename to backend-java/src/main/java/com/nanri/aiimage/common/excel/ExcelCellImageWriter.java index bb3044248..30d13b36d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/ExcelCellImageWriter.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/excel/ExcelCellImageWriter.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/ExcelStreamReader.java b/backend-java/src/main/java/com/nanri/aiimage/common/excel/ExcelStreamReader.java similarity index 99% rename from backend-java/src/main/java/com/nanri/aiimage/common/util/ExcelStreamReader.java rename to backend-java/src/main/java/com/nanri/aiimage/common/excel/ExcelStreamReader.java index 14cf583cb..48ba73ec0 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/util/ExcelStreamReader.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/excel/ExcelStreamReader.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/SxssfWorkbookWriter.java b/backend-java/src/main/java/com/nanri/aiimage/common/excel/SxssfWorkbookWriter.java similarity index 99% rename from backend-java/src/main/java/com/nanri/aiimage/common/util/SxssfWorkbookWriter.java rename to backend-java/src/main/java/com/nanri/aiimage/common/excel/SxssfWorkbookWriter.java index 6935b96d0..b1880ab2d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/util/SxssfWorkbookWriter.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/excel/SxssfWorkbookWriter.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/WpsCellImageWriter.java b/backend-java/src/main/java/com/nanri/aiimage/common/excel/WpsCellImageWriter.java similarity index 99% rename from backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/WpsCellImageWriter.java rename to backend-java/src/main/java/com/nanri/aiimage/common/excel/WpsCellImageWriter.java index 25b43df7c..9eb7ce19b 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/WpsCellImageWriter.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/excel/WpsCellImageWriter.java @@ -1,4 +1,4 @@ -package com.nanri.aiimage.modules.similarasin.util; +package com.nanri.aiimage.common.excel; import lombok.extern.slf4j.Slf4j; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/exception/GlobalExceptionHandler.java b/backend-java/src/main/java/com/nanri/aiimage/common/exception/GlobalExceptionHandler.java index 5cee1dcea..c3819f88e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/exception/GlobalExceptionHandler.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/exception/GlobalExceptionHandler.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/service/TaskOwnerForwardService.java b/backend-java/src/main/java/com/nanri/aiimage/common/service/TaskOwnerForwardService.java index bed4a57e1..e93bf9098 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/service/TaskOwnerForwardService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/service/TaskOwnerForwardService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/BoundedLruCache.java b/backend-java/src/main/java/com/nanri/aiimage/common/support/BoundedLruCache.java similarity index 98% rename from backend-java/src/main/java/com/nanri/aiimage/common/util/BoundedLruCache.java rename to backend-java/src/main/java/com/nanri/aiimage/common/support/BoundedLruCache.java index 30fed4ff6..154ef29bd 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/util/BoundedLruCache.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/support/BoundedLruCache.java @@ -1,4 +1,4 @@ -package com.nanri.aiimage.common.util; +package com.nanri.aiimage.common.support; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/DownloadHeaderUtil.java b/backend-java/src/main/java/com/nanri/aiimage/common/support/DownloadHeaderUtil.java similarity index 98% rename from backend-java/src/main/java/com/nanri/aiimage/common/util/DownloadHeaderUtil.java rename to backend-java/src/main/java/com/nanri/aiimage/common/support/DownloadHeaderUtil.java index 457e66283..83c864c3d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/util/DownloadHeaderUtil.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/support/DownloadHeaderUtil.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/ThreadPools.java b/backend-java/src/main/java/com/nanri/aiimage/common/support/ThreadPools.java similarity index 97% rename from backend-java/src/main/java/com/nanri/aiimage/common/util/ThreadPools.java rename to backend-java/src/main/java/com/nanri/aiimage/common/support/ThreadPools.java index 279779838..1d1917079 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/util/ThreadPools.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/support/ThreadPools.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/FailedStatusRowFilter.java b/backend-java/src/main/java/com/nanri/aiimage/common/task/FailedStatusRowFilter.java similarity index 99% rename from backend-java/src/main/java/com/nanri/aiimage/common/util/FailedStatusRowFilter.java rename to backend-java/src/main/java/com/nanri/aiimage/common/task/FailedStatusRowFilter.java index 22438327a..7a951de7b 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/util/FailedStatusRowFilter.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/task/FailedStatusRowFilter.java @@ -1,4 +1,4 @@ -package com.nanri.aiimage.common.util; +package com.nanri.aiimage.common.task; import java.util.ArrayList; import java.util.List; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/GroupResultPropagator.java b/backend-java/src/main/java/com/nanri/aiimage/common/task/GroupResultPropagator.java similarity index 99% rename from backend-java/src/main/java/com/nanri/aiimage/common/util/GroupResultPropagator.java rename to backend-java/src/main/java/com/nanri/aiimage/common/task/GroupResultPropagator.java index 5bea7ca89..1639a6734 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/util/GroupResultPropagator.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/task/GroupResultPropagator.java @@ -1,4 +1,4 @@ -package com.nanri.aiimage.common.util; +package com.nanri.aiimage.common.task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/LockSkipWitness.java b/backend-java/src/main/java/com/nanri/aiimage/common/task/LockSkipWitness.java similarity index 99% rename from backend-java/src/main/java/com/nanri/aiimage/common/util/LockSkipWitness.java rename to backend-java/src/main/java/com/nanri/aiimage/common/task/LockSkipWitness.java index 595795fdd..795e5487f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/util/LockSkipWitness.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/task/LockSkipWitness.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/PendingDeleteJournal.java b/backend-java/src/main/java/com/nanri/aiimage/common/task/PendingDeleteJournal.java similarity index 99% rename from backend-java/src/main/java/com/nanri/aiimage/common/util/PendingDeleteJournal.java rename to backend-java/src/main/java/com/nanri/aiimage/common/task/PendingDeleteJournal.java index f1eb9dab2..27899701a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/util/PendingDeleteJournal.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/task/PendingDeleteJournal.java @@ -1,4 +1,4 @@ -package com.nanri.aiimage.common.util; +package com.nanri.aiimage.common.task; import lombok.extern.slf4j.Slf4j; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/StaleTaskDeathReason.java b/backend-java/src/main/java/com/nanri/aiimage/common/task/StaleTaskDeathReason.java similarity index 98% rename from backend-java/src/main/java/com/nanri/aiimage/common/util/StaleTaskDeathReason.java rename to backend-java/src/main/java/com/nanri/aiimage/common/task/StaleTaskDeathReason.java index 96f80c4e3..4fd3227a2 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/util/StaleTaskDeathReason.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/task/StaleTaskDeathReason.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/BrandLabel.java b/backend-java/src/main/java/com/nanri/aiimage/common/text/BrandLabel.java similarity index 97% rename from backend-java/src/main/java/com/nanri/aiimage/common/util/BrandLabel.java rename to backend-java/src/main/java/com/nanri/aiimage/common/text/BrandLabel.java index 602214af5..ea6b9540c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/util/BrandLabel.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/text/BrandLabel.java @@ -1,4 +1,4 @@ -package com.nanri.aiimage.common.util; +package com.nanri.aiimage.common.text; import java.util.regex.Pattern; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/SecretMasking.java b/backend-java/src/main/java/com/nanri/aiimage/common/text/SecretMasking.java similarity index 97% rename from backend-java/src/main/java/com/nanri/aiimage/common/util/SecretMasking.java rename to backend-java/src/main/java/com/nanri/aiimage/common/text/SecretMasking.java index 7faee31db..470e20b92 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/util/SecretMasking.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/text/SecretMasking.java @@ -1,4 +1,4 @@ -package com.nanri.aiimage.common.util; +package com.nanri.aiimage.common.text; import java.net.URI; diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/UserMessages.java b/backend-java/src/main/java/com/nanri/aiimage/common/text/UserMessages.java similarity index 98% rename from backend-java/src/main/java/com/nanri/aiimage/common/util/UserMessages.java rename to backend-java/src/main/java/com/nanri/aiimage/common/text/UserMessages.java index 952533a8d..70925a1d4 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/util/UserMessages.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/text/UserMessages.java @@ -1,4 +1,4 @@ -package com.nanri.aiimage.common.util; +package com.nanri.aiimage.common.text; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/HttpClientPool.java b/backend-java/src/main/java/com/nanri/aiimage/config/HttpClientPool.java index f23fd70ca..9bf47e0cd 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/HttpClientPool.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/HttpClientPool.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentExcelParser.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentExcelParser.java index 533730fdc..d81e98ad4 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentExcelParser.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentExcelParser.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentHistoryAssembler.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentHistoryAssembler.java index 9aa088c5b..4a1a9d911 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentHistoryAssembler.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentHistoryAssembler.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentParsePipeline.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentParsePipeline.java index 77db29489..0da42daa8 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentParsePipeline.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentParsePipeline.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentResultJobSupport.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentResultJobSupport.java index a955f49bb..ef48c6164 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentResultJobSupport.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentResultJobSupport.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentSheetBuilder.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentSheetBuilder.java index f91b98e1a..82b86abfe 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentSheetBuilder.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentSheetBuilder.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentStaleTaskScanner.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentStaleTaskScanner.java index af79c5459..319f16962 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentStaleTaskScanner.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentStaleTaskScanner.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/asincache/service/AsinResultCacheService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/asincache/service/AsinResultCacheService.java index ad55dea32..0e5e3f29d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/asincache/service/AsinResultCacheService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/asincache/service/AsinResultCacheService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java index 4b92fe8db..c01d5e087 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java @@ -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 diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataExcelAssemblyService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataExcelAssemblyService.java index 38d3b94e2..399d98943 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataExcelAssemblyService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataExcelAssemblyService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataService.java index fbb2eece2..84a22fef6 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/support/CollectDataStaleTaskScanner.java b/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/support/CollectDataStaleTaskScanner.java index 728c19040..b204bf811 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/support/CollectDataStaleTaskScanner.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/support/CollectDataStaleTaskScanner.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/convert/service/ConvertRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/convert/service/ConvertRunService.java index da8fcefcf..58fc82d45 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/convert/service/ConvertRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/convert/service/ConvertRunService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/controller/DedupeTotalDataController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/controller/DedupeTotalDataController.java index 021b6a2ff..0c4e3df38 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/controller/DedupeTotalDataController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/controller/DedupeTotalDataController.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeRunService.java index 7ee3ff189..938dac0d9 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeRunService.java @@ -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, diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java index a6e674acf..bbbdfa4a2 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/controller/DeleteBrandRunController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/controller/DeleteBrandRunController.java index 9ac74eb5c..9195739e8 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/controller/DeleteBrandRunController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/controller/DeleteBrandRunController.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java index 0dece025f..535875933 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandStaleTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandStaleTaskService.java index f01b55585..6f5915527 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandStaleTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandStaleTaskService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/digitalhuman/service/DigitalHumanVersionService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/digitalhuman/service/DigitalHumanVersionService.java index 27348b3d3..6bc674d02 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/digitalhuman/service/DigitalHumanVersionService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/digitalhuman/service/DigitalHumanVersionService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/LocalFileStorageService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/LocalFileStorageService.java index 3e0a37488..d654f48d4 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/LocalFileStorageService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/LocalFileStorageService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/object/RustfsDeleteRetryService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/object/RustfsDeleteRetryService.java index 22cca3f1e..5fb62bfb7 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/object/RustfsDeleteRetryService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/object/RustfsDeleteRetryService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/filetemplate/ModuleTemplateController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/filetemplate/ModuleTemplateController.java index 7daeb98c7..bae62fe7a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/filetemplate/ModuleTemplateController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/filetemplate/ModuleTemplateController.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/controller/AdminImageVideoTaskController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/controller/AdminImageVideoTaskController.java index 35dfd2c06..e75e61585 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/controller/AdminImageVideoTaskController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/controller/AdminImageVideoTaskController.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoAdminTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoAdminTaskService.java index e780c315d..26a17d61a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoAdminTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoAdminTaskService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoArchiveService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoArchiveService.java index b5e029ec2..c9439853a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoArchiveService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoArchiveService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoAsyncTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoAsyncTaskService.java index 0ae3ffff0..831a1e6b1 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoAsyncTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoAsyncTaskService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoCozeService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoCozeService.java index ee42a38eb..b377f5dad 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoCozeService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/imagevideo/service/ImageVideoCozeService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/invalidasin/service/InvalidAsinDataService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/invalidasin/service/InvalidAsinDataService.java index 0c3a1e367..e58c377ba 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/invalidasin/service/InvalidAsinDataService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/invalidasin/service/InvalidAsinDataService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/patroldelete/service/PatrolDeleteExcelAssemblyService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/patroldelete/service/PatrolDeleteExcelAssemblyService.java index 717eae29f..a464696f8 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/patroldelete/service/PatrolDeleteExcelAssemblyService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/patroldelete/service/PatrolDeleteExcelAssemblyService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/patroldelete/service/PatrolDeleteResolveService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/patroldelete/service/PatrolDeleteResolveService.java index e29a3b554..cfa20e161 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/patroldelete/service/PatrolDeleteResolveService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/patroldelete/service/PatrolDeleteResolveService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackExcelAssemblyService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackExcelAssemblyService.java index a768bacb8..5c9e7f3a4 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackExcelAssemblyService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackExcelAssemblyService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackService.java index f54bab7d5..fef7df589 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java index 9ac464bc1..863831e47 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/productcategory/controller/ProductCategoryController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/productcategory/controller/ProductCategoryController.java index e79b9dc77..dd1f09c59 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/productcategory/controller/ProductCategoryController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/productcategory/controller/ProductCategoryController.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskExcelAssemblyService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskExcelAssemblyService.java index c253a0657..0b451f8c3 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskExcelAssemblyService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskExcelAssemblyService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskResolveService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskResolveService.java index 80d4bee03..e6abac2f1 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskResolveService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskResolveService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java index 0e09bca54..ea5343cde 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishTaskService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishWorkbookService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishWorkbookService.java index ddc833d2a..40e7283b2 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishWorkbookService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishWorkbookService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/support/PublishStaleTaskScanner.java b/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/support/PublishStaleTaskScanner.java index f8bc35361..850325468 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/support/PublishStaleTaskScanner.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/support/PublishStaleTaskScanner.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinExcelAssemblyService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinExcelAssemblyService.java index 1f20e79d1..d0daed9cb 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinExcelAssemblyService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinExcelAssemblyService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinResolveService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinResolveService.java index 10b46e4df..dd6335f7d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinResolveService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinResolveService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/controller/AdminShopDataCrawlTaskController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/controller/AdminShopDataCrawlTaskController.java index 0d58657b1..9f8a2e7de 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/controller/AdminShopDataCrawlTaskController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/controller/AdminShopDataCrawlTaskController.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/controller/AdminShopDataCrawlTasksController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/controller/AdminShopDataCrawlTasksController.java index 6e3b04955..0f45b2eb0 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/controller/AdminShopDataCrawlTasksController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/controller/AdminShopDataCrawlTasksController.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlExcelAssemblyService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlExcelAssemblyService.java index e35542862..50125e6f8 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlExcelAssemblyService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlExcelAssemblyService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlItemStoreService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlItemStoreService.java index 3b4479eac..e80d10286 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlItemStoreService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlItemStoreService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlResolveService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlResolveService.java index b8108b8ed..eaebe822f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlResolveService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlResolveService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/support/ShopDataCrawlRowNormalizer.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/support/ShopDataCrawlRowNormalizer.java index 0a8e161a5..cb96682b3 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/support/ShopDataCrawlRowNormalizer.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/support/ShopDataCrawlRowNormalizer.java @@ -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; /** diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/support/ShopDataCrawlSheetBuilder.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/support/ShopDataCrawlSheetBuilder.java index 9a39f4b0a..1f77ddba4 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/support/ShopDataCrawlSheetBuilder.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/support/ShopDataCrawlSheetBuilder.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/util/BoundedImageCache.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/util/BoundedImageCache.java index 9ef3b1fa4..255728386 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/util/BoundedImageCache.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/util/BoundedImageCache.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/controller/AdminShopDataDuplicateCheckController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/controller/AdminShopDataDuplicateCheckController.java index ce94bec7a..82ad944dd 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/controller/AdminShopDataDuplicateCheckController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/controller/AdminShopDataDuplicateCheckController.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/ShopDataDuplicateCheckImportService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/ShopDataDuplicateCheckImportService.java index c368b5e0b..283161e8b 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/ShopDataDuplicateCheckImportService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/ShopDataDuplicateCheckImportService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/ShopDataDuplicateCheckQueryService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/ShopDataDuplicateCheckQueryService.java index 3b9f73ead..7a0793cbe 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/ShopDataDuplicateCheckQueryService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/ShopDataDuplicateCheckQueryService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/ShopDataDuplicateCheckScanService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/ShopDataDuplicateCheckScanService.java index 007b00f92..38ea19d55 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/ShopDataDuplicateCheckScanService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/ShopDataDuplicateCheckScanService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/support/DuplicateCheckRefreshScheduler.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/support/DuplicateCheckRefreshScheduler.java index 434926210..c7e304596 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/support/DuplicateCheckRefreshScheduler.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/support/DuplicateCheckRefreshScheduler.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/support/DuplicateCheckWorkbookParser.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/support/DuplicateCheckWorkbookParser.java index 7175e9b4e..4fd276605 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/support/DuplicateCheckWorkbookParser.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopduplicatecheck/service/support/DuplicateCheckWorkbookParser.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/QueryAsinController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/QueryAsinController.java index 5377c11eb..a8173cc93 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/QueryAsinController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/QueryAsinController.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/SkipPriceAsinController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/SkipPriceAsinController.java index 9530ca7ba..e54b43775 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/SkipPriceAsinController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/SkipPriceAsinController.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/QueryAsinService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/QueryAsinService.java index aa58b0efa..f9882f3ac 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/QueryAsinService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/QueryAsinService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/SkipPriceAsinService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/SkipPriceAsinService.java index 7e2020f7a..6c5f39310 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/SkipPriceAsinService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/SkipPriceAsinService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchExcelAssemblyService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchExcelAssemblyService.java index 788786ebf..a49586b1a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchExcelAssemblyService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchExcelAssemblyService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchResolveService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchResolveService.java index 6f73255eb..2eea31c47 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchResolveService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchResolveService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinImagePrefetchService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinImagePrefetchService.java index afc7fb8b5..b93a6c91d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinImagePrefetchService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinImagePrefetchService.java @@ -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); /** diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinLlmService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinLlmService.java index 171fef2a1..7e62f8fd7 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinLlmService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinLlmService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskService.java index 89ed09928..ffc7cecad 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskService.java @@ -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 固定线程池,避免测试进程残留线程。 */ diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/BoundedImageCache.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/BoundedImageCache.java similarity index 99% rename from backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/BoundedImageCache.java rename to backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/BoundedImageCache.java index bbfc9fe6f..be70b7c18 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/BoundedImageCache.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/BoundedImageCache.java @@ -1,4 +1,4 @@ -package com.nanri.aiimage.modules.similarasin.util; +package com.nanri.aiimage.modules.similarasin.service.support; import lombok.extern.slf4j.Slf4j; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/PuzzleImageMerger.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/PuzzleImageMerger.java similarity index 99% rename from backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/PuzzleImageMerger.java rename to backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/PuzzleImageMerger.java index 2e427902c..5cd0d006c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/PuzzleImageMerger.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/PuzzleImageMerger.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinChunkMergeSupport.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinChunkMergeSupport.java index ce74d4fdc..49a5a474c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinChunkMergeSupport.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinChunkMergeSupport.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinChunkPayloadSupport.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinChunkPayloadSupport.java index e7bcea5a0..65b5b982e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinChunkPayloadSupport.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinChunkPayloadSupport.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinExcelParser.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinExcelParser.java index 104b3f183..5dcf3338e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinExcelParser.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinExcelParser.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinHistoryAssembler.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinHistoryAssembler.java index 989438eab..94da135f7 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinHistoryAssembler.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinHistoryAssembler.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/SimilarAsinImageEmbedder.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinImageEmbedder.java similarity index 99% rename from backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/SimilarAsinImageEmbedder.java rename to backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinImageEmbedder.java index 642eb5d8d..ec63b12cf 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/SimilarAsinImageEmbedder.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinImageEmbedder.java @@ -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); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/SimilarAsinLogSupport.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinLogSupport.java similarity index 96% rename from backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/SimilarAsinLogSupport.java rename to backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinLogSupport.java index 112a3cf4b..411f49329 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/util/SimilarAsinLogSupport.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinLogSupport.java @@ -1,4 +1,4 @@ -package com.nanri.aiimage.modules.similarasin.util; +package com.nanri.aiimage.modules.similarasin.service.support; /** * Task 19:LLM 请求/响应及 Python 回传日志的采样与截断工具。 diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinPipelineSupport.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinPipelineSupport.java index 1151d9cc2..10190530f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinPipelineSupport.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinPipelineSupport.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultWorkbookAssembler.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultWorkbookAssembler.java index e93d7e923..7e4edaee8 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultWorkbookAssembler.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultWorkbookAssembler.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinSheetBuilder.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinSheetBuilder.java index 0382a2151..6dccad267 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinSheetBuilder.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinSheetBuilder.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionService.java index 9a3badd59..01a1d063c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/softwareversion/service/SoftwareVersionService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/split/service/SplitRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/split/service/SplitRunService.java index b44d05532..fe4ce436a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/split/service/SplitRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/split/service/SplitRunService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/ExpiredAccountTaskStopService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/ExpiredAccountTaskStopService.java index a893a0272..01bd73923 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/ExpiredAccountTaskStopService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/ExpiredAccountTaskStopService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/InspectionSqlReportTask.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/InspectionSqlReportTask.java index a0509df83..b1dff360d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/InspectionSqlReportTask.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/InspectionSqlReportTask.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskResultItemService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskResultItemService.java index 5e379b069..573516f22 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskResultItemService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskResultItemService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TransientPayloadDeleteOrchestrator.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TransientPayloadDeleteOrchestrator.java index 1c9cd7cfa..fe8fb0b11 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TransientPayloadDeleteOrchestrator.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TransientPayloadDeleteOrchestrator.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryService.java index a895c1964..6cd939e05 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryService.java @@ -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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/client/JikipProxyClient.java b/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/client/JikipProxyClient.java index df4c0768f..4b63e068f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/client/JikipProxyClient.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/client/JikipProxyClient.java @@ -1,9 +1,9 @@ package com.nanri.aiimage.modules.usersecret.client; -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.nanri.aiimage.common.util.SecretMasking; +import com.nanri.aiimage.common.text.SecretMasking; import com.nanri.aiimage.config.HttpClientPool; import com.nanri.aiimage.config.UserSecretProperties; import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretBalanceVo; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretCheckService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretCheckService.java index b217390d9..a51243d99 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretCheckService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretCheckService.java @@ -2,7 +2,7 @@ package com.nanri.aiimage.modules.usersecret.service; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.nanri.aiimage.common.util.SecretMasking; +import com.nanri.aiimage.common.text.SecretMasking; import com.nanri.aiimage.config.AppearancePatentProperties; import com.nanri.aiimage.config.HttpClientPool; import com.nanri.aiimage.config.SimilarAsinProperties; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawExcelAssemblyService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawExcelAssemblyService.java index f8b0c3a10..892867830 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawExcelAssemblyService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawExcelAssemblyService.java @@ -1,8 +1,8 @@ package com.nanri.aiimage.modules.withdraw.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.withdraw.model.dto.WithdrawRowDto; import com.nanri.aiimage.modules.withdraw.model.enums.WithdrawStatus; import com.nanri.aiimage.modules.withdraw.model.vo.WithdrawResultItemVo; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawResolveService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawResolveService.java index 53789b072..479826ada 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawResolveService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawResolveService.java @@ -1,6 +1,6 @@ package com.nanri.aiimage.modules.withdraw.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; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClientImpl.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClientImpl.java index 8b56d0530..16a8f1aef 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClientImpl.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClientImpl.java @@ -3,7 +3,7 @@ package com.nanri.aiimage.modules.ziniao.client; 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.BoundedLruCache; +import com.nanri.aiimage.common.support.BoundedLruCache; import com.nanri.aiimage.config.ZiniaoProperties; import com.nanri.aiimage.modules.ziniao.model.cache.ZiniaoShopCacheDto; import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoStaffItemVo; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoShopIndexService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoShopIndexService.java index a84e45060..2c3da1348 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoShopIndexService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoShopIndexService.java @@ -1,6 +1,6 @@ package com.nanri.aiimage.modules.ziniao.service; -import com.nanri.aiimage.common.util.UserMessages; +import com.nanri.aiimage.common.text.UserMessages; import com.fasterxml.jackson.databind.ObjectMapper; import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.config.ZiniaoProperties; diff --git a/backend-java/src/test/java/com/nanri/aiimage/RawExceptionMessageSinkGuardTest.java b/backend-java/src/test/java/com/nanri/aiimage/RawExceptionMessageSinkGuardTest.java index a5cda67c8..ceb9d0797 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/RawExceptionMessageSinkGuardTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/RawExceptionMessageSinkGuardTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; * ({@code new BusinessException("中文: " + ex.getMessage())}、 * {@code setErrorMessage(ex.getMessage())}、{@code ApiResponse.fail(ex.getMessage())} 这类) * 把 Java 栈名、Coze/MinIO 报错原样交给界面——逐条翻译追不上新增速度,所以把规矩做进代码: - * 出口只接受 {@link com.nanri.aiimage.common.util.UserMessages} 把关后的串。 + * 出口只接受 {@link com.nanri.aiimage.common.text.UserMessages} 把关后的串。 * *
判据按行匹配(与同目录 {@code UserFacingMessageChineseGuardTest} 的括号配平法互补): * 一行里既有文案出口、又出现 {@code getMessage()/messageOf()},却没有 {@code UserMessages.} diff --git a/backend-java/src/test/java/com/nanri/aiimage/common/MovedComponentScanTest.java b/backend-java/src/test/java/com/nanri/aiimage/common/MovedComponentScanTest.java new file mode 100644 index 000000000..42f3f2524 --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/common/MovedComponentScanTest.java @@ -0,0 +1,63 @@ +package com.nanri.aiimage.common; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; +import org.springframework.core.type.filter.AnnotationTypeFilter; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Phase 4 归位的装配面护栏:@Component 换了包,组件扫描必须还能发现它。 + * + *
为什么单立一条:本机没有可起的隔离 MySQL/Redis(Phase 3 已登记同一缺口),
+ * {@code mvn -o spring-boot:run} 只能连线上库,不能为这次判据去碰它。这里改用
+ * Spring 自己的扫描器按应用根包 {@code com.nanri.aiimage} 实扫一遍——
+ * 扫描根没变、Bean 简单名没变,被搬动的三枚组件必须仍然在候选集里;
+ * 同时钉住「解散后的包不得再有组件」这条,防止老包被重新写回。
+ */
+class MovedComponentScanTest {
+
+ private static final Set