上传 Video, Image 和 Audio 这三种文件的返回值只有一个 uploadId, 即它们原始文件的 objectId

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

@@ -1,6 +1,10 @@
 package cn.reghao.dfs.store.task;
 
 import cn.reghao.dfs.store.model.vo.ObjectResult;
+import cn.reghao.dfs.store.task.processor.AudioFileProcessor;
+import cn.reghao.dfs.store.task.processor.DiskFileProcessor;
+import cn.reghao.dfs.store.task.processor.ImageFileProcessor;
+import cn.reghao.dfs.store.task.processor.VideoFileProcessor;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
 import cn.reghao.oss.api.constant.ObjectType;
 import cn.reghao.oss.api.constant.UploadChannel;

dfs-store/src/main/java/cn/reghao/dfs/store/task/AudioFileProcessor.java → dfs-store/src/main/java/cn/reghao/dfs/store/task/processor/AudioFileProcessor.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.task;
+package cn.reghao.dfs.store.task.processor;
 
 import cn.reghao.dfs.store.db.repository.AudioRepository;
 import cn.reghao.dfs.store.model.po.AudioFile;
@@ -58,7 +58,7 @@ public class AudioFileProcessor {
             String audioCodec = audioFile.getCodec();
             AudioFile audioFile1 = new AudioFile(audioFileId, objectId1, audioCodec, url1);
             audioRepository.saveAudioFile(audioFile1);
-            return new UploadFileRet(objectId1, url1);
+            return new UploadFileRet(objectId1, null);
         }
 
         String absolutePath = objectResult.getAbsolutePath();
@@ -81,7 +81,7 @@ public class AudioFileProcessor {
         String url1 = objectNameService.getObjectUrl(objectResult1.getObjectName());
         AudioFile audioFile = new AudioFile(audioFileId, objectId1, audioCodec, url1);
         audioRepository.saveAudioFile(audioFile);
-        return new UploadFileRet(objectId1, url1);
+        return new UploadFileRet(objectId1, null);
     }
 
     private UploadFileRet getConvertedAudioFile(String audioFileId, File file, String originalObjectName, String suffix) {
@@ -107,7 +107,7 @@ public class AudioFileProcessor {
             String codec = "aac";
             AudioFile audioFile = new AudioFile(audioFileId, objectId, codec, url);
             audioRepository.saveAudioFile(audioFile);
-            return new UploadFileRet(objectId, url);
+            return new UploadFileRet(objectId, null);
         } catch (Exception e) {
             e.printStackTrace();
         }

dfs-store/src/main/java/cn/reghao/dfs/store/task/DiskFileProcessor.java → dfs-store/src/main/java/cn/reghao/dfs/store/task/processor/DiskFileProcessor.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.task;
+package cn.reghao.dfs.store.task.processor;
 
 import cn.reghao.dfs.store.model.vo.ObjectResult;
 import cn.reghao.dfs.store.service.ObjectNameService;

dfs-store/src/main/java/cn/reghao/dfs/store/task/ImageFileProcessor.java → dfs-store/src/main/java/cn/reghao/dfs/store/task/processor/ImageFileProcessor.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.task;
+package cn.reghao.dfs.store.task.processor;
 
 import cn.reghao.dfs.store.db.repository.ImageRepository;
 import cn.reghao.dfs.store.model.po.ImageUrl;
@@ -67,7 +67,7 @@ public class ImageFileProcessor {
             ImageUrl imageUrl1 = new ImageUrl(objectId, format, objectId, url, width, height);
 
             imageRepository.saveImageFile(imageFile1, List.of(imageUrl1));
-            return new UploadFileRet(objectId, url);
+            return new UploadFileRet(objectId, null);
         }
 
         String absolutePath = objectResult.getAbsolutePath();
@@ -82,7 +82,7 @@ public class ImageFileProcessor {
                 ImageFile imageFile = new ImageFile(objectId, width, height);
                 ImageUrl imageUrl = new ImageUrl(objectId, format, objectId, url, width, height);
                 imageRepository.saveImageFile(imageFile, List.of(imageUrl));
-                return new UploadFileRet(objectId, url);
+                return new UploadFileRet(objectId, null);
             } else {
                 log.info("不支持 {} 格式的文件", format);
             }
@@ -124,7 +124,7 @@ public class ImageFileProcessor {
             list.add(imageUrl1);
 
             imageRepository.saveImageFile(imageFile1, list);
-            return new UploadFileRet(objectId, url);
+            return new UploadFileRet(objectId, null);
         }
 
         String absolutePath = objectResult.getAbsolutePath();
@@ -148,7 +148,7 @@ public class ImageFileProcessor {
                 }
 
                 imageRepository.saveImageFile(imageFile, imageUrls);
-                return new UploadFileRet(objectId, url);
+                return new UploadFileRet(objectId, null);
             } else {
                 log.info("不支持 {} 格式的文件", format);
             }

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

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.task;
+package cn.reghao.dfs.store.task.processor;
 
 import cn.reghao.dfs.store.db.repository.VideoRepository;
 import cn.reghao.jutil.media.model.AudioProps;
@@ -82,7 +82,7 @@ public class VideoFileProcessor {
                     bitRate, quality, qualityStr, width, height);
 
             videoRepository.saveVideoFile(videoFile1, videoUrl1);
-            return new UploadFileRet(videoFileId, url);
+            return new UploadFileRet(videoFileId, null);
         }
 
         String absolutePath = objectResult.getAbsolutePath();
@@ -128,7 +128,7 @@ public class VideoFileProcessor {
         VideoUrl videoUrl  =
                 new VideoUrl(videoFileId, videoFileId, videoCodec, audioCodec, urlType, originalUrl, bitRate, mediaResolution);
         videoRepository.saveVideoFile(videoFile, videoUrl);
-        return new UploadFileRet(videoFileId, originalUrl);
+        return new UploadFileRet(videoFileId, null);
 
         //log.info("添加视频格式转码任务");
         //threadPool.submit(new ConvertTask());