From 6abfb4aa37df6ce6bb7dda6d094f2c78dbb35d84 Mon Sep 17 00:00:00 2001 From: vladp Date: Tue, 17 Feb 2026 13:15:35 +0700 Subject: [PATCH] dev delete config --- .../nocopy/service/FileSimilarityService.java | 4 +++- src/main/java/ru/soune/nocopy/util/FileUtil.java | 14 -------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java b/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java index a8be0cb..53262e1 100644 --- a/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java +++ b/src/main/java/ru/soune/nocopy/service/FileSimilarityService.java @@ -47,6 +47,8 @@ public class FileSimilarityService { private final FileEntityRepository fileEntityRepository; + private final NoCopyFileService noCopyFileService; + @Value("${server.baseurl}") private String baseUrl; @@ -224,7 +226,7 @@ public class FileSimilarityService { FileProtector.Type fileType = file.getMimeType().equals("document") ? FileProtector.Type.DOC: FileProtector.Type.AUDIO; - NoCopyCheckResult noCopyCheckResult = fileUtil.checkResult(path, fileType); + NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(path.toFile(), fileType); switch (noCopyCheckResult) { case DocumentCheckResult.Success success -> { diff --git a/src/main/java/ru/soune/nocopy/util/FileUtil.java b/src/main/java/ru/soune/nocopy/util/FileUtil.java index 6c3d064..5e7b2bd 100644 --- a/src/main/java/ru/soune/nocopy/util/FileUtil.java +++ b/src/main/java/ru/soune/nocopy/util/FileUtil.java @@ -1,25 +1,15 @@ package ru.soune.nocopy.util; -import com.vrt.NoCopyFileService; import com.vrt.fileprotection.FileProtector; -import com.vrt.fileprotection.NoCopyCheckResult; import com.vrt.fileprotection.image.ImageLocalSearch; import com.vrt.fileprotection.image.ImageScore; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import ru.soune.nocopy.dto.file.SimilarFileDTO; import ru.soune.nocopy.entity.file.FileEntity; -import java.nio.file.Path; - @Service public class FileUtil { - @Autowired - @Lazy - private NoCopyFileService noCopyFileService; - public ImageLocalSearch.Result convertToResult(SimilarFileDTO response) { FileProtector.FileInfo fileInfo = new FileProtector.FileInfo(FileProtector.Type.IMAGE, response.getFileId(), @@ -41,10 +31,6 @@ public class FileUtil { + Long.bitCount(aLo ^ bLo); } - public NoCopyCheckResult checkResult(Path path, FileProtector.Type fileType) { - return noCopyFileService.checkFile(path.toFile(), fileType); - } - private FileProtector.Type determineFileType(String mimeType) { if (mimeType == null) { return FileProtector.Type.IMAGE;