优化删除无用代码

oss-store/src/main/java/cn/reghao/oss/store/config/SpringLifecycle.java

@@ -10,7 +10,6 @@ import cn.reghao.oss.store.config.props.SpringProperties;
 import cn.reghao.oss.store.service.FileStoreService;
 import cn.reghao.oss.store.service.StoreChannelService;
 import cn.reghao.oss.store.service.StoreLocalCache;
-import cn.reghao.oss.store.task.FileTask;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.boot.ApplicationArguments;
@@ -27,17 +26,15 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 public class SpringLifecycle implements ApplicationRunner, DisposableBean {
-    private final FileTask fileTask;
     private final SpringProperties springProperties;
     private final FileStoreService fileStoreService;
     private final OssConsoleClient ossConsoleClient;
     private final StoreChannelService storeChannelService;
     private final StoreLocalCache storeLocalCache;
 
-    public SpringLifecycle(FileTask fileTask, SpringProperties springProperties, FileStoreService fileStoreService,
+    public SpringLifecycle(SpringProperties springProperties, FileStoreService fileStoreService,
                            OssConsoleClient ossConsoleClient, StoreChannelService storeChannelService,
                            StoreLocalCache storeLocalCache) {
-        this.fileTask = fileTask;
         this.springProperties = springProperties;
         this.fileStoreService = fileStoreService;
         this.ossConsoleClient = ossConsoleClient;
@@ -49,7 +46,6 @@ public class SpringLifecycle implements ApplicationRunner, DisposableBean {
     public void run(ApplicationArguments args) throws Exception {
         initStoreNode();
         log.info("执行文件任务...");
-        fileTask.exec();
         log.info("文件任务执行完成...");
     }
 

oss-store/src/main/java/cn/reghao/oss/store/db/mapper/AudioFileMapper.java

@@ -1,20 +0,0 @@
-package cn.reghao.oss.store.db.mapper;
-
-import cn.reghao.oss.store.model.po.AudioFile;
-import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.oss.store.api.dto.media.AudioInfo;
-import cn.reghao.oss.store.api.dto.media.AudioUrl;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2023-07-05 16:47:46
- */
-@Mapper
-public interface AudioFileMapper extends BaseMapper<AudioFile> {
-    List<AudioFile> findByAudioFileId(String audioFileId);
-    List<AudioInfo> findAudioInfo(String audioFileId);
-    List<AudioUrl> findAudioUrl(String audioFileId);
-}

oss-store/src/main/java/cn/reghao/oss/store/db/mapper/ImageFileMapper.java

@@ -1,23 +0,0 @@
-package cn.reghao.oss.store.db.mapper;
-
-import cn.reghao.oss.store.model.po.ImageFile;
-import cn.reghao.oss.store.model.vo.ImageObject;
-import cn.reghao.jutil.jdk.db.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author reghao
- * @date 2021-12-08 14:41:35
- */
-@Mapper
-public interface ImageFileMapper extends BaseMapper<ImageFile> {
-    void deleteByImageFileId(String imageFileId);
-    void deleteByImageFileIds(List<String> list);
-
-    List<ImageFile> findByImageFileId(String imageFileId);
-    List<ImageFile> findByImageFileIds(Set<String> list);
-    List<ImageObject> findAll1();
-}

oss-store/src/main/java/cn/reghao/oss/store/db/mapper/VideoFileMapper.java

@@ -1,22 +0,0 @@
-package cn.reghao.oss.store.db.mapper;
-
-import cn.reghao.oss.store.model.po.VideoFile;
-import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.oss.store.api.dto.media.VideoInfo;
-import cn.reghao.oss.store.api.dto.media.VideoUrlDto;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2023-10-13 15:59:11
- */
-@Mapper
-public interface VideoFileMapper extends BaseMapper<VideoFile> {
-    void deleteByVideoFileId(String videoFileId);
-
-    List<VideoUrlDto> findVideoUrls(String videoFileId);
-    List<VideoFile> findByVideoFileId(String videoFileId);
-    List<VideoInfo> findVideoInfo(String videoFileId);
-}

oss-store/src/main/java/cn/reghao/oss/store/db/repository/AudioRepository.java

@@ -1,38 +0,0 @@
-package cn.reghao.oss.store.db.repository;
-
-import cn.reghao.oss.store.api.dto.media.AudioInfo;
-import cn.reghao.oss.store.api.dto.media.AudioUrl;
-import cn.reghao.oss.store.db.mapper.AudioFileMapper;
-import cn.reghao.oss.store.model.po.AudioFile;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2023-08-28 15:00:43
- */
-@Repository
-public class AudioRepository {
-    private final AudioFileMapper audioFileMapper;
-
-    public AudioRepository(AudioFileMapper audioFileMapper) {
-        this.audioFileMapper = audioFileMapper;
-    }
-
-    public void saveAudioFiles(List<AudioFile> audioFiles) {
-        audioFileMapper.saveAll(audioFiles);
-    }
-
-    public List<AudioFile> findAudioFiles(String audioFileId) {
-        return audioFileMapper.findByAudioFileId(audioFileId);
-    }
-
-    public List<AudioInfo> getAudioInfo(String audioFileId) {
-        return audioFileMapper.findAudioInfo(audioFileId);
-    }
-
-    public List<AudioUrl> getAudioUrls(String audioFileId) {
-        return audioFileMapper.findAudioUrl(audioFileId);
-    }
-}

oss-store/src/main/java/cn/reghao/oss/store/db/repository/ImageRepository.java

@@ -1,81 +0,0 @@
-package cn.reghao.oss.store.db.repository;
-
-import cn.reghao.oss.store.api.dto.ObjectChannel;
-import cn.reghao.oss.store.api.dto.media.ImageUrlDto;
-import cn.reghao.oss.store.db.mapper.ImageFileMapper;
-import cn.reghao.oss.store.model.po.ImageFile;
-import cn.reghao.oss.store.service.StoreChannelService;
-import cn.reghao.oss.store.service.StoreLocalCache;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * @author reghao
- * @date 2023-08-28 15:00:43
- */
-@Repository
-public class ImageRepository {
-    private final ImageFileMapper imageFileMapper;
-    private final ObjectRepository objectRepository;
-    private final StoreLocalCache storeLocalCache;
-    private StoreChannelService storeChannelService;
-
-    public ImageRepository(ImageFileMapper imageFileMapper, ObjectRepository objectRepository,
-                           StoreLocalCache storeLocalCache, StoreChannelService storeChannelService) {
-        this.imageFileMapper = imageFileMapper;
-        this.objectRepository = objectRepository;
-        this.storeLocalCache = storeLocalCache;
-        this.storeChannelService = storeChannelService;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    public void saveImageFiles(List<ImageFile> imageFiles) {
-        imageFileMapper.saveAll(imageFiles);
-    }
-
-    public void deleteByImageFileIds(List<String> imageFileIds) {
-        imageFileIds.forEach(this::deleteImageFile);
-    }
-
-    public void deleteImageFile(String imageFileId) {
-        List<String> objectIds = imageFileMapper.findByImageFileId(imageFileId).stream()
-                .map(ImageFile::getObjectId)
-                .collect(Collectors.toList());
-        deleteImageFile0(imageFileId, objectIds);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    public void deleteImageFile0(String imageFileId, List<String> objectIds) {
-        imageFileMapper.deleteByImageFileId(imageFileId);
-    }
-
-    public List<ImageFile> findImageFiles(String imageFileId) {
-        return imageFileMapper.findByImageFileId(imageFileId);
-    }
-
-    public List<ImageFile> getImageFiles(List<String> imageFileIds) {
-        return imageFileMapper.findByImageFileIds(new HashSet<>(imageFileIds));
-    }
-
-    public List<ImageUrlDto> getImageUrls(Set<String> imageFileIds) {
-        List<ImageUrlDto> list = new ArrayList<>();
-        for (String imageFileId : imageFileIds) {
-            ImageUrlDto imageUrlDto = getImageUrl(imageFileId);
-            if (imageUrlDto != null) {
-                list.add(imageUrlDto);
-            }
-        }
-
-        return list;
-    }
-
-    public ImageUrlDto getImageUrl(String imageFileId) {
-        return null;
-    }
-}

oss-store/src/main/java/cn/reghao/oss/store/db/repository/VideoRepository.java

@@ -1,61 +0,0 @@
-package cn.reghao.oss.store.db.repository;
-
-import cn.reghao.oss.store.api.dto.media.VideoInfo;
-import cn.reghao.oss.store.api.dto.media.VideoUrlDto;
-import cn.reghao.oss.store.db.mapper.VideoFileMapper;
-import cn.reghao.oss.store.model.po.VideoFile;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author reghao
- * @date 2023-08-28 15:00:43
- */
-@Repository
-public class VideoRepository {
-    private final VideoFileMapper videoFileMapper;
-
-    public VideoRepository(VideoFileMapper videoFileMapper) {
-        this.videoFileMapper = videoFileMapper;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    public void saveVideoFiles(List<VideoFile> videoFiles) {
-        videoFileMapper.saveAll(videoFiles);
-    }
-
-    public List<String> deleteVideoFile(String videoFileId) {
-        List<String> objectIds = videoFileMapper.findByVideoFileId(videoFileId).stream()
-                .map(VideoFile::getObjectId)
-                .collect(Collectors.toList());
-        deleteVideoFile0(videoFileId);
-        return objectIds;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    public void deleteVideoFile0(String videoFileId) {
-        videoFileMapper.deleteByVideoFileId(videoFileId);
-    }
-
-    public List<VideoInfo> getVideoInfos(String videoFileId) {
-        return videoFileMapper.findVideoInfo(videoFileId);
-    }
-
-    public VideoFile getOriginalVideoFile(String videoFileId) {
-        List<VideoFile> list = videoFileMapper.findByVideoFileId(videoFileId);
-        return list.isEmpty() ? null : list.get(0);
-    }
-
-    public List<VideoFile> getVideoFiles(String videoFileId) {
-        List<VideoFile> list = videoFileMapper.findByVideoFileId(videoFileId);
-        return list;
-    }
-
-    //@Cacheable(cacheNames = "oss:store:videoUrls", key = "#videoFileId", unless = "#result.empty")
-    public List<VideoUrlDto> findVideoUrls(String videoFileId) {
-        return videoFileMapper.findVideoUrls(videoFileId);
-    }
-}

oss-store/src/main/java/cn/reghao/oss/store/model/po/AudioFile.java

@@ -1,35 +0,0 @@
-package cn.reghao.oss.store.model.po;
-
-import cn.reghao.jutil.jdk.db.BaseObject;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * 音频文件
- *
- * @author reghao
- * @date 2023-07-05 16:42:01
- */
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class AudioFile extends BaseObject<Integer> {
-    private String audioFileId;
-    private String objectId;
-    private int duration;
-    private String codec;
-    private Long bitRate;
-    private String url;
-
-    public AudioFile(String audioFileId, String objectId, String url, AudioFile audioFile) {
-        this.audioFileId = audioFileId;
-        this.objectId = objectId;
-        this.duration = audioFile.getDuration();
-        this.codec = audioFile.getCodec();
-        this.bitRate = audioFile.getBitRate();
-        this.url = url;
-    }
-}

oss-store/src/main/java/cn/reghao/oss/store/model/po/ImageFile.java

@@ -1,46 +0,0 @@
-package cn.reghao.oss.store.model.po;
-
-import cn.reghao.jutil.jdk.db.BaseObject;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * 图像文件
- *
- * @author reghao
- * @date 2021-12-08 13:52:01
- */
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class ImageFile extends BaseObject<Integer> {
-    // 原始文件的 objectId
-    private String imageFileId;
-    private String objectId;
-    private String format;
-    private String url;
-    private Integer width;
-    private Integer height;
-    private Boolean horizontal;
-
-    public ImageFile(String imageFileId, String objectId, String format, String url, Integer width, Integer height) {
-        this.imageFileId = imageFileId;
-        this.objectId = objectId;
-        this.format = format;
-        this.url = url;
-        this.width = width;
-        this.height = height;
-        this.horizontal = width > height;
-    }
-
-    public ImageFile(String imageFileId, String objectId, String url, ImageFile imageFile) {
-        this.imageFileId = imageFileId;
-        this.objectId = objectId;
-        this.format = imageFile.getFormat();
-        this.url = url;
-        this.width = imageFile.getWidth();
-        this.height = imageFile.getHeight();
-        this.horizontal = imageFile.getHorizontal();
-    }
-}

oss-store/src/main/java/cn/reghao/oss/store/rpc/MediaServiceImpl.java

@@ -2,7 +2,7 @@ package cn.reghao.oss.store.rpc;
 
 import cn.reghao.oss.store.api.dto.media.*;
 import cn.reghao.oss.store.api.iface.MediaService;
-import cn.reghao.oss.store.task.processor.MediaFileProcessor;
+import cn.reghao.oss.store.task.MediaFileProcessor;
 import cn.reghao.oss.store.util.UserContext;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;

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

@@ -1,21 +0,0 @@
-package cn.reghao.oss.store.task;
-
-import cn.reghao.oss.store.api.dto.ObjectChannel;
-import cn.reghao.oss.store.db.repository.ImageRepository;
-import cn.reghao.oss.store.model.vo.ObjectResult;
-import cn.reghao.oss.store.task.processor.AudioFileProcessor;
-import cn.reghao.oss.store.task.processor.DiskFileProcessor;
-import cn.reghao.oss.store.task.processor.ImageFileProcessor;
-import cn.reghao.oss.store.task.processor.VideoFileProcessor;
-import cn.reghao.oss.store.api.constant.ObjectType;
-import cn.reghao.oss.store.api.rest.UploadFileRet;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * @author reghao
- * @date 2023-05-22 18:11:03
- */
-@Slf4j
-public class FileProcessor {
-}

oss-store/src/main/java/cn/reghao/oss/store/task/FileTask.java

@@ -1,41 +0,0 @@
-package cn.reghao.oss.store.task;
-
-import cn.reghao.oss.store.db.repository.ObjectRepository;
-import cn.reghao.oss.store.model.vo.ObjectResult;
-import cn.reghao.oss.store.task.processor.AudioFileProcessor;
-import cn.reghao.oss.store.api.dto.ObjectMeta;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2023-08-29 18:03:39
- */
-@Service
-@Deprecated
-public class FileTask {
-    @Autowired
-    ObjectRepository objectRepository;
-    @Autowired
-    AudioFileProcessor audioFileProcessor;
-
-    public void exec() {
-    }
-
-    private void execTask() throws Exception {
-        List<String> objectNames = List.of(
-                "audio/playback/vJPA6ZGzV2.mp3"
-        );
-
-        for (String objectName : objectNames) {
-            ObjectMeta objectMeta = objectRepository.getObjectMetaByName(objectName);
-            String objectId = objectMeta.getObjectId();
-            int fileType = 1003;
-            String absolutePath = objectMeta.getAbsolutePath();
-            ObjectResult objectResult = new ObjectResult(objectName, objectId, fileType, absolutePath);
-            audioFileProcessor.process(objectResult);
-        }
-    }
-}

oss-store/src/main/java/cn/reghao/oss/store/task/processor/MediaFileProcessor.java → oss-store/src/main/java/cn/reghao/oss/store/task/MediaFileProcessor.java

@@ -1,4 +1,4 @@
-package cn.reghao.oss.store.task.processor;
+package cn.reghao.oss.store.task;
 
 import cn.reghao.jutil.media.FFmpegWrapper;
 import cn.reghao.jutil.media.ImageOps;

oss-store/src/main/java/cn/reghao/oss/store/model/po/VideoFile.java → oss-store/src/main/java/cn/reghao/oss/store/task/VideoFile.java

@@ -1,6 +1,5 @@
-package cn.reghao.oss.store.model.po;
+package cn.reghao.oss.store.task;
 
-import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -14,7 +13,7 @@ import lombok.Setter;
 @NoArgsConstructor
 @Setter
 @Getter
-public class VideoFile extends BaseObject<Integer> {
+public class VideoFile {
     // 原始文件的 objectId
     private String videoFileId;
     private String objectId;

oss-store/src/main/java/cn/reghao/oss/store/task/MediaConverter.java → oss-store/src/main/java/cn/reghao/oss/store/task/VideoFileProcessor.java

@@ -1,83 +1,139 @@
 package cn.reghao.oss.store.task;
 
-import cn.reghao.oss.store.db.repository.AudioRepository;
+import cn.reghao.jutil.jdk.security.DigestUtil;
+import cn.reghao.oss.store.api.dto.ObjectMeta;
 import cn.reghao.oss.store.db.repository.ObjectRepository;
-import cn.reghao.oss.store.db.repository.VideoRepository;
-import cn.reghao.oss.store.model.po.VideoFile;
 import cn.reghao.oss.store.model.vo.ObjectProp;
-import cn.reghao.oss.store.model.vo.ObjectResult;
 import cn.reghao.oss.store.service.FileStoreService;
-import cn.reghao.oss.store.service.ObjectNameService;
 import cn.reghao.oss.store.service.PutObjectService;
-import cn.reghao.oss.store.util.FileType;
-import cn.reghao.oss.store.util.UserContext;
-import cn.reghao.jutil.jdk.security.DigestUtil;
-import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
-import cn.reghao.jutil.media.FFmpegWrapper;
 import cn.reghao.jutil.media.model.AudioProps;
 import cn.reghao.jutil.media.model.MediaProps;
+import cn.reghao.jutil.media.model.VideoProps;
+import cn.reghao.oss.store.model.vo.ObjectResult;
+import cn.reghao.oss.store.util.FileType;
+import cn.reghao.oss.store.service.ObjectNameService;
+import cn.reghao.jutil.media.FFmpegWrapper;
 import cn.reghao.jutil.media.MediaQuality;
 import cn.reghao.jutil.media.MediaResolution;
-import cn.reghao.jutil.media.model.VideoProps;
-import cn.reghao.oss.store.api.dto.ObjectMeta;
+import cn.reghao.oss.store.api.rest.UploadFileRet;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
 
 /**
  * @author reghao
- * @date 2023-10-08 13:46:28
+ * @date 2023-01-11 10:40:17
  */
 @Slf4j
 @Service
-public class MediaConverter {
-    private final ExecutorService threadPool = ThreadPoolWrapper.threadPool("converter-pool", 10);
-    private final ObjectRepository objectRepository;
-    private final VideoRepository videoRepository;
-    private final AudioRepository audioRepository;
+public class VideoFileProcessor {
     private final ObjectNameService objectNameService;
-    private final FileStoreService fileStoreService;
     private final PutObjectService putObjectService;
+    private final ObjectRepository objectRepository;
+    private final FileStoreService fileStoreService;
 
-    public MediaConverter(ObjectRepository objectRepository, VideoRepository videoRepository,
-                          AudioRepository audioRepository, ObjectNameService objectNameService,
-                          FileStoreService fileStoreService, PutObjectService putObjectService) {
-        this.objectRepository = objectRepository;
-        this.videoRepository = videoRepository;
-        this.audioRepository = audioRepository;
+    public VideoFileProcessor(ObjectNameService objectNameService, PutObjectService putObjectService,
+                              ObjectRepository objectRepository, FileStoreService fileStoreService) {
         this.objectNameService = objectNameService;
-        this.fileStoreService = fileStoreService;
         this.putObjectService = putObjectService;
+        this.objectRepository = objectRepository;
+        this.fileStoreService = fileStoreService;
     }
 
-    public void convertVideo(String videoFileId) {
-        threadPool.submit(new ConvertVideoTask(videoFileId));
-    }
+    public UploadFileRet process(ObjectResult objectResult) throws Exception {
+        String objectName = objectResult.getObjectName();
+        String objectId = objectResult.getObjectId();
+        String videoFileId = objectId;
+        String objectUrl = objectNameService.getObjectUrl(objectName);
+        boolean duplicate = objectResult.isDuplicate();
+        if (duplicate) {
+            String dupObjectId = objectResult.getDupObjectId();
+            //List<VideoFile> videoFiles = videoRepository.getVideoFiles(dupObjectId);
+            List<VideoFile> videoFiles = new ArrayList<>();
+            VideoFile videoFile = videoFiles.get(0);
+            VideoFile videoFile1 = new VideoFile(videoFileId, objectId, objectUrl, videoFile);
+            List<VideoFile> list = new ArrayList<>();
+            list.add(videoFile1);
+
+            if (videoFiles.size() > 1) {
+                for (int i = 1; i < videoFiles.size(); i++) {
+                    VideoFile videoFile2 = videoFiles.get(i);
+                    ObjectResult objectResult1 = putObjectService.copyFromObjectId(videoFile2.getObjectId());
+                    String objectId1 = objectResult1.getObjectId();
+                    String objectUrl1 = objectNameService.getObjectUrl(objectResult1.getObjectName());
+                    list.add(new VideoFile(videoFileId, objectId1, objectUrl1, videoFile2));
+                }
+            }
+
+            //videoRepository.saveVideoFiles(list);
+            return new UploadFileRet(videoFileId, null);
+        }
+
+        String absolutePath = objectResult.getAbsolutePath();
+        MediaProps mediaProps = FFmpegWrapper.getMediaProps(absolutePath);
+        if (mediaProps == null) {
+            String errMsg = String.format("%s 的 FFmpeg 媒体信息为 null", objectName);
+            throw new Exception(errMsg);
+        }
+
+        VideoProps videoProps = mediaProps.getVideoProps();
+        if (videoProps == null) {
+            String errMsg = String.format("%s 的 FFmpeg 视频信息为 null", objectName);
+            throw new Exception(errMsg);
+        }
+
+        String videoCodec = videoProps.getCodecName();
+        long vbitRate = videoProps.getBitRate();
 
-    public void convertAudio(String audioFileId) {
-        threadPool.submit(new ConvertAudioTask(audioFileId));
+        String audioCodec = null;
+        long abitRate = 0;
+        AudioProps audioProps1 = mediaProps.getAudioProps();
+        if (audioProps1 != null) {
+            audioCodec = audioProps1.getCodecName();
+            abitRate = audioProps1.getBitRate();
+        }
+
+        /*if (videoCodecs.contains(videoCodec)) {
+            AudioProps audioProps = mediaProps.getAudioProps();
+            if (audioProps != null && !audioCodecs.contains(audioProps.getCodecName())) {
+                log.error("{} 对象的音频非 aac&mp3 编码, 暂不处理", objectName);
+                return null;
+            }
+        } else {
+            log.error("{} 对象的视频非 h264 编码, 暂不处理", objectName);
+            return null;
+        }*/
+        int width = videoProps.getCodedWidth().intValue();
+        int height = videoProps.getCodedHeight().intValue();
+        int duration = videoProps.getDuration().intValue();
+        MediaResolution mediaResolution = MediaQuality.getQuality(width, height);
+        String quality = mediaResolution.getQualityStr();
+        String urlType = FileType.getVideoUrlType(absolutePath);
+        VideoFile videoFile = new VideoFile(videoFileId, objectId, videoCodec, vbitRate, audioCodec, abitRate,
+                urlType, objectUrl, quality, width, height, duration);
+        //videoRepository.saveVideoFiles(List.of(videoFile));
+        return new UploadFileRet(videoFileId, null);
     }
 
     class ConvertVideoTask implements Runnable {
-        private final String videoFileId;
+        private final VideoFile videoFile;
 
-        public ConvertVideoTask(String videoFileId) {
-            this.videoFileId = videoFileId;
+        public ConvertVideoTask(VideoFile videoFile) {
+            this.videoFile = videoFile;
         }
 
         public void run() {
+            String videoFileId = videoFile.getVideoFileId();
             log.info("convert video file {}", videoFileId);
-            VideoFile videoFile = videoRepository.getOriginalVideoFile(videoFileId);
             int width = videoFile.getWidth();
             int height = videoFile.getHeight();
 
             ObjectMeta objectMeta = objectRepository.getObjectMetaById(videoFileId);
-            UserContext userContext = new UserContext(objectMeta.getUploadBy());
             String originalObjectName = objectMeta.getObjectName();
             String srcPath = objectMeta.getAbsolutePath();
             File srcFile = new File(srcPath);
@@ -134,23 +190,9 @@ public class MediaConverter {
                 String quality = mediaResolution.getQualityStr();
                 VideoFile videoFile1 = new VideoFile(videoFileId, objectId, videoCodec, vbitRate, audioCodec, abitRate,
                         urlType, url, quality, width, height, duration);
-                videoRepository.saveVideoFiles(List.of(videoFile1));
             } catch (Exception e) {
                 e.printStackTrace();
             }
         }
     }
-
-    class ConvertAudioTask implements Runnable {
-        private final String audioFileId;
-
-        public ConvertAudioTask(String audioFileId) {
-            this.audioFileId = audioFileId;
-        }
-
-        @Override
-        public void run() {
-            log.info("convert audio file {}", audioFileId);
-        }
-    }
 }

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

@@ -1,141 +0,0 @@
-package cn.reghao.oss.store.task.processor;
-
-import cn.reghao.oss.store.db.repository.AudioRepository;
-import cn.reghao.oss.store.model.po.AudioFile;
-import cn.reghao.oss.store.model.vo.ObjectProp;
-import cn.reghao.oss.store.model.vo.ObjectResult;
-import cn.reghao.oss.store.service.FileStoreService;
-import cn.reghao.oss.store.service.ObjectNameService;
-import cn.reghao.oss.store.service.PutObjectService;
-import cn.reghao.jutil.jdk.security.DigestUtil;
-import cn.reghao.jutil.media.FFmpegWrapper;
-import cn.reghao.jutil.media.model.AudioProps;
-import cn.reghao.jutil.media.model.MediaProps;
-import cn.reghao.oss.store.api.constant.SupportedMedia;
-import cn.reghao.oss.store.api.rest.UploadFileRet;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-/**
- * @author reghao
- * @date 2023-07-05 09:12:17
- */
-@Slf4j
-@Service
-public class AudioFileProcessor {
-    private final AudioRepository audioRepository;
-    private final PutObjectService putObjectService;
-    private final ObjectNameService objectNameService;
-    private final FileStoreService fileStoreService;
-
-    public AudioFileProcessor(AudioRepository audioRepository, PutObjectService putObjectService,
-                              ObjectNameService objectNameService, FileStoreService fileStoreService) {
-        this.audioRepository = audioRepository;
-        this.putObjectService = putObjectService;
-        this.objectNameService = objectNameService;
-        this.fileStoreService = fileStoreService;
-    }
-
-    public UploadFileRet process(ObjectResult objectResult) throws Exception {
-        String objectName = objectResult.getObjectName();
-        String objectId = objectResult.getObjectId();
-        String audioFileId = objectId;
-        String objectUrl = objectNameService.getObjectUrl(objectName);
-        boolean duplicate = objectResult.isDuplicate();
-        if (duplicate) {
-            String dupObjectId = objectResult.getDupObjectId();
-            List<AudioFile> audioFiles = audioRepository.findAudioFiles(dupObjectId);
-            AudioFile audioFile = audioFiles.get(0);
-            AudioFile audioFile1 = new AudioFile(audioFileId, objectId, objectUrl, audioFile);
-            List<AudioFile> list = new ArrayList<>();
-            list.add(audioFile1);
-
-            if (audioFiles.size() > 1) {
-                for (int i = 1; i < audioFiles.size(); i++) {
-                    AudioFile audioFile2 = audioFiles.get(i);
-                    ObjectResult objectResult1 = putObjectService.copyFromObjectId(audioFile2.getObjectId());
-                    String objectId1 = objectResult1.getObjectId();
-                    String objectUrl1 = objectNameService.getObjectUrl(objectResult1.getObjectName());
-                    list.add(new AudioFile(audioFileId, objectId1, objectUrl1, audioFile2));
-                }
-            }
-
-            audioRepository.saveAudioFiles(list);
-            return new UploadFileRet(objectId, null);
-        }
-
-        String absolutePath = objectResult.getAbsolutePath();
-        MediaProps mediaProps = FFmpegWrapper.getMediaProps(absolutePath);
-        if (mediaProps == null || mediaProps.getAudioProps() == null) {
-            String errMsg = String.format("%s 的 FFmpeg 音频信息为 null", objectName);
-            throw new Exception(errMsg);
-        }
-
-        AudioProps audioProps = mediaProps.getAudioProps();
-        String audioCodec = audioProps.getCodecName();
-        int duration = audioProps.getDuration().intValue();
-        long bitRate = audioProps.getBitRate();
-
-        List<AudioFile> list = new ArrayList<>();
-        AudioFile audioFile = new AudioFile(audioFileId, objectId, duration, audioCodec, bitRate, objectUrl);
-        list.add(audioFile);
-
-        if (!SupportedMedia.audioCodecs.contains(audioCodec)) {
-            File file = new File(objectResult.getAbsolutePath());
-            AudioFile audioFile1 = getConvertedAudioFile(audioFileId, file, objectName, ".m4a");
-            if (audioFile1 != null) {
-                list.add(audioFile1);
-            } else {
-                log.error("{} 对象转换为 aac 编码失败", objectName);
-            }
-        }
-
-        audioRepository.saveAudioFiles(list);
-        return new UploadFileRet(audioFileId, null);
-    }
-
-    private AudioFile getConvertedAudioFile(String audioFileId, File file, String originalObjectName, String suffix) {
-        String contentId = UUID.randomUUID().toString().replace("-", "");
-        String destPath = fileStoreService.genFilePath(contentId, file.length(), suffix);
-        try {
-            File savedFile = new File(destPath);
-            if (savedFile.exists()) {
-                throw new IOException(destPath + " exist");
-            }
-
-            int ret = FFmpegWrapper.convertAudio(file.getAbsolutePath(), destPath);
-            if (ret != 0) {
-                throw new Exception("音频转码失败");
-            }
-            String sha256sum = DigestUtil.sha256sum(destPath);
-            MediaProps mediaProps = FFmpegWrapper.getMediaProps(destPath);
-            if (mediaProps == null || mediaProps.getAudioProps() == null) {
-                log.error("转码后的 {} 文件 FFmpeg 音频信息为 null", destPath);
-                throw new Exception("音频编码信息获取失败");
-            }
-
-            AudioProps audioProps = mediaProps.getAudioProps();
-            String audioCodec = audioProps.getCodecName();
-            int duration = audioProps.getDuration().intValue();
-            long bitRate = audioProps.getBitRate();
-
-            ObjectProp objectProp = objectNameService.getObjectProp(originalObjectName, suffix);
-            String originalFilename = "";
-            ObjectResult objectResult = putObjectService.putObject(objectProp, contentId, savedFile, originalFilename, sha256sum);
-            String objectId = objectResult.getObjectId();
-            String url = objectNameService.getObjectUrl(objectResult.getObjectName());
-            String codec = "aac";
-            return new AudioFile(audioFileId, objectId, duration, codec, bitRate, url);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-}

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

@@ -1,26 +0,0 @@
-package cn.reghao.oss.store.task.processor;
-
-import cn.reghao.oss.store.model.vo.ObjectResult;
-import cn.reghao.oss.store.service.ObjectNameService;
-import cn.reghao.oss.store.api.rest.UploadFileRet;
-import org.springframework.stereotype.Service;
-
-/**
- * @author reghao
- * @date 2023-07-12 15:45:02
- */
-@Service
-public class DiskFileProcessor {
-    private final ObjectNameService objectNameService;
-
-    public DiskFileProcessor(ObjectNameService objectNameService) {
-        this.objectNameService = objectNameService;
-    }
-
-    public UploadFileRet process(ObjectResult objectResult) {
-        String objectName = objectResult.getObjectName();
-        String objectId = objectResult.getObjectId();
-        String objectUrl = objectNameService.getObjectUrl(objectName);
-        return new UploadFileRet(objectId, objectUrl);
-    }
-}

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

@@ -1,179 +0,0 @@
-package cn.reghao.oss.store.task.processor;
-
-import cn.reghao.oss.store.db.repository.ImageRepository;
-import cn.reghao.oss.store.model.vo.ObjectProp;
-import cn.reghao.oss.store.model.vo.ObjectResult;
-import cn.reghao.oss.store.service.FileStoreService;
-import cn.reghao.oss.store.service.ObjectNameService;
-import cn.reghao.oss.store.service.PutObjectService;
-import cn.reghao.jutil.jdk.security.DigestUtil;
-import cn.reghao.oss.store.model.po.ImageFile;
-import cn.reghao.jutil.media.ImageOps;
-import cn.reghao.oss.store.api.constant.SupportedMedia;
-import cn.reghao.oss.store.api.rest.UploadFileRet;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-/**
- * @author reghao
- * @date 2023-06-11 01:29:47
- */
-@Slf4j
-@Service
-public class ImageFileProcessor {
-    private final ImageRepository imageRepository;
-    private final FileStoreService fileStoreService;
-    private final ObjectNameService objectNameService;
-    private final PutObjectService putObjectService;
-
-    public ImageFileProcessor(ImageRepository imageRepository, FileStoreService fileStoreService,
-                              ObjectNameService objectNameService, PutObjectService putObjectService) {
-        this.imageRepository = imageRepository;
-        this.fileStoreService = fileStoreService;
-        this.objectNameService = objectNameService;
-        this.putObjectService = putObjectService;
-    }
-
-    public UploadFileRet processImage(ObjectResult objectResult) throws Exception {
-        String objectName = objectResult.getObjectName();
-        String objectId = objectResult.getObjectId();
-        String imageFileId = objectId;
-        String objectUrl = objectNameService.getObjectUrl(objectName);
-        boolean duplicate = objectResult.isDuplicate();
-        if (duplicate) {
-            return processDuplicate(objectResult);
-        }
-
-        String absolutePath = objectResult.getAbsolutePath();
-        File file = new File(absolutePath);
-        String format = ImageOps.getFormat(file);
-        if (!SupportedMedia.imageFormats.contains(format)) {
-            // 在 ChannelValidateService#validateImage 中已做过判断, 理论上不会执行这行代码
-            log.error("不支持 {} 图片格式", format);
-            return null;
-        }
-
-        ImageOps.Size size = ImageOps.info(new File(absolutePath));
-        int width = size.getWidth();
-        int height = size.getHeight();
-        List<ImageFile> list = new ArrayList<>();
-        list.add(new ImageFile(imageFileId, objectId, format, objectUrl, width, height));
-        if (false) {
-            ImageFile imageFile = getConvertedImageFile(objectResult, "webp", width, height);
-            list.add(imageFile);
-        }
-
-        imageRepository.saveImageFiles(list);
-        return new UploadFileRet(objectId, null);
-    }
-
-    private UploadFileRet processDuplicate(ObjectResult objectResult) throws Exception {
-        String objectName = objectResult.getObjectName();
-        String objectId = objectResult.getObjectId();
-        String imageFileId = objectId;
-        String objectUrl = objectNameService.getObjectUrl(objectName);
-        String dupObjectId = objectResult.getDupObjectId();
-        List<ImageFile> imageFiles = imageRepository.findImageFiles(dupObjectId);
-        ImageFile imageFile = imageFiles.get(0);
-        ImageFile imageFile1 = new ImageFile(imageFileId, objectId, objectUrl, imageFile);
-        List<ImageFile> list = new ArrayList<>();
-        list.add(imageFile1);
-
-        if (false) {
-            if (imageFiles.size() > 1) {
-                for (int i = 1; i < imageFiles.size(); i++) {
-                    ImageFile imageFile2 = imageFiles.get(i);
-                    ObjectResult objectResult1 = putObjectService.copyFromObjectId(imageFile2.getObjectId());
-                    String objectId1 = objectResult1.getObjectId();
-                    String objectUrl1 = objectNameService.getObjectUrl(objectResult1.getObjectName());
-                    list.add(new ImageFile(imageFileId, objectId1, objectUrl1, imageFile2));
-                }
-            } else {
-                int width = imageFile.getWidth();
-                int height = imageFile.getHeight();
-                ImageFile imageFile2 = getConvertedImageFile(objectResult, "webp", width, height);
-                list.add(imageFile2);
-            }
-        }
-
-        imageRepository.saveImageFiles(list);
-        return new UploadFileRet(objectId, null);
-    }
-
-    private ImageFile getConvertedImageFile(ObjectResult objectResult, String format, int width, int height) throws Exception {
-        String imageFileId = objectResult.getObjectId();
-        String originalObjectName = objectResult.getObjectName();
-        String absolutePath = objectResult.getAbsolutePath();
-        File srcFile = new File(absolutePath);
-        String contentId = UUID.randomUUID().toString().replace("-", "");
-        String destPath = fileStoreService.genFilePath(contentId, srcFile.length(), "."+format);
-        File destFile = new File(destPath);
-
-        String srcFormat = ImageOps.getFormat(srcFile);
-        if (srcFormat.equals("png")) {
-            if ("jpeg".equals(format) || "webp".equals(format)) {
-                ImageOps.convertPng(srcFile, destFile, format);
-            } else {
-                ImageOps.convert2thumbnail(srcFile, destFile, width, height);
-            }
-        } else {
-            if ("jpeg".equals(format)) {
-                ImageOps.convert2jpeg(srcFile, destFile);
-            } else if ("webp".equals(format)) {
-                ImageOps.convert2webp(srcFile, destFile);
-            } else {
-                ImageOps.convert2thumbnail(srcFile, destFile, width, height);
-            }
-        }
-
-        if (destFile.exists()) {
-            ObjectResult objectResult1 = saveImage(originalObjectName, contentId, "."+format, destFile);
-            String objectName1 = objectResult1.getObjectName();
-            String objectId1 = objectResult1.getObjectId();
-            String objectUrl1 = objectNameService.getObjectUrl(objectName1);
-            return new ImageFile(imageFileId, objectId1, format, objectUrl1, width, height);
-        } else {
-            throw new Exception("image conversion failed");
-        }
-    }
-
-    private ImageFile getThumbnailFile(ObjectResult objectResult, int width, int height) {
-        String imageFileId = objectResult.getObjectId();
-        String originalObjectName = objectResult.getObjectName();
-        String absolutePath = objectResult.getAbsolutePath();
-        File srcFile = new File(absolutePath);
-
-        //int width = 480;
-        //int height = 360;
-        String format = "jpeg";
-        String contentId = UUID.randomUUID().toString().replace("-", "");
-        String destPath = fileStoreService.genFilePath(contentId, srcFile.length(), "."+format);
-        File destFile = new File(destPath);
-        try {
-            ImageOps.convert2thumbnail(srcFile, destFile, width, height);
-            if (destFile.exists()) {
-                ObjectResult objectResult1 = saveImage(originalObjectName, contentId, "."+format, destFile);
-                String objectName1 = objectResult1.getObjectName();
-                String objectId1 = objectResult1.getObjectId();
-                String objectUrl1 = objectNameService.getObjectUrl(objectName1);
-                return new ImageFile(imageFileId, objectId1, format, objectUrl1, width, height);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    private ObjectResult saveImage(String originalObjectName, String contentId, String suffix, File savedFile)
-            throws Exception {
-        ObjectProp objectProp = objectNameService.getObjectProp(originalObjectName, suffix);
-        String sha256sum = DigestUtil.sha256sum(savedFile.getAbsolutePath());
-        return putObjectService.putObject(objectProp, contentId, savedFile, "", sha256sum);
-    }
-}

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

@@ -1,113 +0,0 @@
-package cn.reghao.oss.store.task.processor;
-
-import cn.reghao.oss.store.db.repository.VideoRepository;
-import cn.reghao.oss.store.service.PutObjectService;
-import cn.reghao.jutil.media.model.AudioProps;
-import cn.reghao.jutil.media.model.MediaProps;
-import cn.reghao.jutil.media.model.VideoProps;
-import cn.reghao.oss.store.model.vo.ObjectResult;
-import cn.reghao.oss.store.util.FileType;
-import cn.reghao.oss.store.service.ObjectNameService;
-import cn.reghao.oss.store.model.po.VideoFile;
-import cn.reghao.jutil.media.FFmpegWrapper;
-import cn.reghao.jutil.media.MediaQuality;
-import cn.reghao.jutil.media.MediaResolution;
-import cn.reghao.oss.store.api.rest.UploadFileRet;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2023-01-11 10:40:17
- */
-@Slf4j
-@Service
-public class VideoFileProcessor {
-    private final VideoRepository videoRepository;
-    private final ObjectNameService objectNameService;
-    private final PutObjectService putObjectService;
-
-    public VideoFileProcessor(VideoRepository videoRepository, ObjectNameService objectNameService,
-                              PutObjectService putObjectService) {
-        this.videoRepository = videoRepository;
-        this.objectNameService = objectNameService;
-        this.putObjectService = putObjectService;
-    }
-
-    public UploadFileRet process(ObjectResult objectResult) throws Exception {
-        String objectName = objectResult.getObjectName();
-        String objectId = objectResult.getObjectId();
-        String videoFileId = objectId;
-        String objectUrl = objectNameService.getObjectUrl(objectName);
-        boolean duplicate = objectResult.isDuplicate();
-        if (duplicate) {
-            String dupObjectId = objectResult.getDupObjectId();
-            List<VideoFile> videoFiles = videoRepository.getVideoFiles(dupObjectId);
-            VideoFile videoFile = videoFiles.get(0);
-            VideoFile videoFile1 = new VideoFile(videoFileId, objectId, objectUrl, videoFile);
-            List<VideoFile> list = new ArrayList<>();
-            list.add(videoFile1);
-
-            if (videoFiles.size() > 1) {
-                for (int i = 1; i < videoFiles.size(); i++) {
-                    VideoFile videoFile2 = videoFiles.get(i);
-                    ObjectResult objectResult1 = putObjectService.copyFromObjectId(videoFile2.getObjectId());
-                    String objectId1 = objectResult1.getObjectId();
-                    String objectUrl1 = objectNameService.getObjectUrl(objectResult1.getObjectName());
-                    list.add(new VideoFile(videoFileId, objectId1, objectUrl1, videoFile2));
-                }
-            }
-
-            videoRepository.saveVideoFiles(list);
-            return new UploadFileRet(videoFileId, null);
-        }
-
-        String absolutePath = objectResult.getAbsolutePath();
-        MediaProps mediaProps = FFmpegWrapper.getMediaProps(absolutePath);
-        if (mediaProps == null) {
-            String errMsg = String.format("%s 的 FFmpeg 媒体信息为 null", objectName);
-            throw new Exception(errMsg);
-        }
-
-        VideoProps videoProps = mediaProps.getVideoProps();
-        if (videoProps == null) {
-            String errMsg = String.format("%s 的 FFmpeg 视频信息为 null", objectName);
-            throw new Exception(errMsg);
-        }
-
-        String videoCodec = videoProps.getCodecName();
-        long vbitRate = videoProps.getBitRate();
-
-        String audioCodec = null;
-        long abitRate = 0;
-        AudioProps audioProps1 = mediaProps.getAudioProps();
-        if (audioProps1 != null) {
-            audioCodec = audioProps1.getCodecName();
-            abitRate = audioProps1.getBitRate();
-        }
-
-        /*if (videoCodecs.contains(videoCodec)) {
-            AudioProps audioProps = mediaProps.getAudioProps();
-            if (audioProps != null && !audioCodecs.contains(audioProps.getCodecName())) {
-                log.error("{} 对象的音频非 aac&mp3 编码, 暂不处理", objectName);
-                return null;
-            }
-        } else {
-            log.error("{} 对象的视频非 h264 编码, 暂不处理", objectName);
-            return null;
-        }*/
-        int width = videoProps.getCodedWidth().intValue();
-        int height = videoProps.getCodedHeight().intValue();
-        int duration = videoProps.getDuration().intValue();
-        MediaResolution mediaResolution = MediaQuality.getQuality(width, height);
-        String quality = mediaResolution.getQualityStr();
-        String urlType = FileType.getVideoUrlType(absolutePath);
-        VideoFile videoFile = new VideoFile(videoFileId, objectId, videoCodec, vbitRate, audioCodec, abitRate,
-                urlType, objectUrl, quality, width, height, duration);
-        videoRepository.saveVideoFiles(List.of(videoFile));
-        return new UploadFileRet(videoFileId, null);
-    }
-}

oss-store/src/main/resources/mapper/AudioFileMapper.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="cn.reghao.oss.store.db.mapper.AudioFileMapper">
-    <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into audio_file
-        (`audio_file_id`,`object_id`,`duration`,`codec`,`bit_rate`,`url`)
-        values
-        (#{audioFileId},#{objectId},#{duration},#{codec},#{bitRate},#{url})
-    </insert>
-    <insert id="saveAll" useGeneratedKeys="true" keyProperty="id">
-        insert into audio_file
-        (`audio_file_id`,`object_id`,`duration`,`codec`,`bit_rate`,`url`)
-        values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.audioFileId},#{item.objectId},#{item.duration},#{item.codec},#{item.bitRate},#{item.url})
-        </foreach>
-    </insert>
-
-    <select id="findByAudioFileId" resultType="cn.reghao.oss.store.model.po.AudioFile">
-        select *
-        from audio_file
-        where audio_file_id=#{audioFileId}
-    </select>
-    <select id="findAudioInfo" resultType="cn.reghao.oss.store.api.dto.media.AudioInfo">
-        select audio_file_id,duration,codec,url
-        from audio_file
-        where audio_file_id=#{audioFileId}
-        order by id desc
-    </select>
-    <select id="findAudioUrl" resultType="cn.reghao.oss.store.api.dto.media.AudioUrl">
-        select audio_file_id,bit_rate,codec,url
-        from audio_file
-        where audio_file_id=#{audioFileId}
-        order by id desc
-    </select>
-</mapper>

oss-store/src/main/resources/mapper/ImageFileMapper.xml

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="cn.reghao.oss.store.db.mapper.ImageFileMapper">
-    <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into image_file
-        (`image_file_id`,`object_id`,`format`,`url`,`width`,`height`,`horizontal`)
-        values 
-        (#{imageFileId},#{objectId},#{format},#{url},#{width},#{height},#{horizontal})
-    </insert>
-    <insert id="saveAll" useGeneratedKeys="true" keyProperty="id">
-        insert into image_file
-        (`image_file_id`,`object_id`,`format`,`url`,`width`,`height`,`horizontal`)
-        values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.imageFileId},#{item.objectId},#{item.format},#{item.url},#{item.width},#{item.height},#{item.horizontal})
-        </foreach>
-    </insert>
-
-    <delete id="deleteByImageFileId">
-        delete from image_file
-        where image_file_id=#{imageFileId}
-    </delete>
-    <delete id="deleteByImageFileIds">
-        delete from image_file
-        where image_file_id in
-        <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-
-    <select id="findAll" resultType="cn.reghao.oss.store.model.po.ImageFile">
-        select * from image_file
-    </select>
-    <select id="findByImageFileId" resultType="cn.reghao.oss.store.model.po.ImageFile">
-        select *
-        from image_file
-        where image_file_id=#{imageFileId}
-    </select>
-    <select id="findByImageFileIds" resultType="cn.reghao.oss.store.model.po.ImageFile">
-        select *
-        from image_file
-        where image_file_id in
-        <foreach collection="collection" item="item" separator="," open="(" close=")">
-            #{item}
-        </foreach>
-    </select>
-    <select id="findAll1" resultType="cn.reghao.oss.store.model.vo.ImageObject">
-        select image_file_id
-        from image_file
-    </select>
-</mapper>

oss-store/src/main/resources/mapper/VideoFileMapper.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="cn.reghao.oss.store.db.mapper.VideoFileMapper">
-    <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into video_file
-        (`video_file_id`,`object_id`,`video_codec`,`vbit_rate`,`audio_codec`,`abit_rate`,`url_type`,`url`,`quality`,`width`,`height`,`horizontal`,`duration`)
-        values 
-        (#{videoFileId},#{objectId},#{videoCodec},#{vbitRate},#{audioCodec},#{abitRate},#{urlType},#{url},#{quality},#{width},#{height},#{horizontal},#{duration})
-    </insert>
-    <insert id="saveAll" useGeneratedKeys="true" keyProperty="id">
-        insert into video_file
-        (`video_file_id`,`object_id`,`video_codec`,`vbit_rate`,`audio_codec`,`abit_rate`,`url_type`,`url`,`quality`,`width`,`height`,`horizontal`,`duration`)
-        values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.videoFileId},#{item.objectId},#{item.videoCodec},#{item.vbitRate},#{item.audioCodec},#{item.abitRate},#{item.urlType},#{item.url},#{item.quality},#{item.width},#{item.height},#{item.horizontal},#{item.duration})
-        </foreach>
-    </insert>
-
-    <delete id="deleteByVideoFileId">
-        delete from video_file
-        where video_file_id=#{videoFileId}
-    </delete>
-
-    <select id="findAll" resultType="cn.reghao.oss.store.model.po.VideoFile">
-        select * from video_file
-    </select>
-    <select id="findVideoInfo" resultType="cn.reghao.oss.store.api.dto.media.VideoInfo">
-        select video_file_id,duration,horizontal,quality,video_codec,audio_codec,url_type,url
-        from video_file
-        where video_file_id=#{videoFileId}
-    </select>
-    <select id="findByVideoFileId" resultType="cn.reghao.oss.store.model.po.VideoFile">
-        select * from video_file
-        where video_file_id=#{videoFileId}
-    </select>
-    <select id="findVideoUrls" resultType="cn.reghao.oss.store.api.dto.media.VideoUrlDto">
-        select url_type as type,url,width,height,quality
-        from video_file
-        where video_file_id=#{videoFileId}
-    </select>
-</mapper>