1.不处理 sha256sum 相同的对象

2.暂时关闭缓存

dfs-store/src/main/java/cn/reghao/dfs/store/db/repository/ObjectRepository.java

@@ -51,13 +51,13 @@ public class ObjectRepository {
     public void delete(FileMeta fileMeta) {
     }
 
-    @Cacheable(cacheNames = "fileMeta", key = "#objectName", unless = "#result == null")
+    //@Cacheable(cacheNames = "fileMeta", key = "#objectName", unless = "#result == null")
     public FileMeta getByObjectName(String objectName) {
         log.info("查找 db");
         return fileMetaMapper.findByObjectName(objectName);
     }
 
-    @Cacheable(cacheNames = "fileMeta", key = "#sha256sum", unless = "#result == null")
+    //@Cacheable(cacheNames = "fileMeta", key = "#sha256sum", unless = "#result == null")
     public FileMeta getBySha256sum(String sha256sum) {
         return fileMetaMapper.findBySha256sum(sha256sum);
     }

dfs-store/src/main/java/cn/reghao/dfs/store/service/PutObjectService.java

@@ -39,12 +39,14 @@ public class PutObjectService {
         String objectName = objectProp.getObjectName();
         FileMeta fileMeta = objectRepository.getBySha256sum(sha256sum);
         if (fileMeta != null) {
-            copyObject(objectProp, originalFilename, fileMeta);
+            log.error("{} 已存在", sha256sum);
+            //copyObject(objectProp, originalFilename, fileMeta);
             FileUtils.deleteQuietly(savedFile);
 
-            String objectId = objectRepository.getByObjectName(objectName).getObjectId();
+            /*String objectId = objectRepository.getByObjectName(objectName).getObjectId();
             String url = objectNameService.getObjectUrl(objectName);
-            return new ObjectResult(objectName, objectId, ObjectType.Other.getCode(), "", url);
+            return new ObjectResult(objectName, objectId, ObjectType.Other.getCode(), "", url);*/
+            return null;
         } else {
             String savedPath = savedFile.getAbsolutePath();
             long size = savedFile.length();

dfs-store/src/main/java/cn/reghao/dfs/store/task/VideoFileProcessor.java

@@ -40,8 +40,8 @@ public class VideoFileProcessor {
     private final ObjectNameService objectNameService;
     private final FileStoreService fileStoreService;
     private final ExecutorService threadPool = ThreadPoolWrapper.threadPool("converter-pool", 10);
-    private final Set<String> audioCodecs = new HashSet<>();
-    private final Set<String> videoCodecs = new HashSet<>();
+    private final Set<String> audioCodecs = Set.of("aac", "mp3");
+    private final Set<String> videoCodecs = Set.of("h264");
 
     public VideoFileProcessor(MediaRepository mediaRepository, PutObjectService putObjectService,
                               ObjectNameService objectNameService, FileStoreService fileStoreService) {
@@ -49,8 +49,6 @@ public class VideoFileProcessor {
         this.putObjectService = putObjectService;
         this.objectNameService = objectNameService;
         this.fileStoreService = fileStoreService;
-        this.audioCodecs.addAll(Set.of("aac", "mp3"));
-        this.videoCodecs.addAll(Set.of("h264"));
     }
 
     public void process(String objectName, String objectId, String absolutePath) {