删除 cn.reghao.oss.storeapi.dto.media, 引入 file-api 依赖

oss-console/src/main/java/cn/reghao/oss/console/app/controller/MediaController.java

@@ -3,10 +3,7 @@ package cn.reghao.oss.console.app.controller;
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.oss.console.app.model.dto.GetImageUrls;
 import cn.reghao.oss.console.app.rpc.MediaRpcService;
-import cn.reghao.oss.storeapi.dto.media.AudioInfo;
-import cn.reghao.oss.storeapi.dto.media.ConvertedImageInfo;
-import cn.reghao.oss.storeapi.dto.media.ImageInfo;
-import cn.reghao.oss.storeapi.dto.media.VideoInfo;
+import cn.reghao.tnb.file.api.dto.media.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;

oss-console/src/main/java/cn/reghao/oss/console/app/rpc/MediaRpcService.java

@@ -3,10 +3,7 @@ package cn.reghao.oss.console.app.rpc;
 import cn.reghao.oss.console.app.model.po.StoreNode;
 import cn.reghao.oss.console.app.service.UploadChannelService;
 import cn.reghao.oss.console.util.AuthKeyContext;
-import cn.reghao.oss.storeapi.dto.media.AudioInfo;
-import cn.reghao.oss.storeapi.dto.media.ConvertedImageInfo;
-import cn.reghao.oss.storeapi.dto.media.ImageInfo;
-import cn.reghao.oss.storeapi.dto.media.VideoInfo;
+import cn.reghao.tnb.file.api.dto.media.*;
 import cn.reghao.oss.storeapi.iface.MediaService;
 import org.springframework.stereotype.Service;
 

oss-sdk/src/main/java/cn/reghao/oss/sdk/OssConsoleClient.java

@@ -7,10 +7,7 @@ import cn.reghao.oss.storeapi.dto.ObjectChannel;
 import cn.reghao.oss.storeapi.dto.ObjectInfo;
 import cn.reghao.oss.storeapi.dto.ServerInfo;
 import cn.reghao.oss.storeapi.dto.StoreProperties;
-import cn.reghao.oss.storeapi.dto.media.AudioInfo;
-import cn.reghao.oss.storeapi.dto.media.ConvertedImageInfo;
-import cn.reghao.oss.storeapi.dto.media.ImageInfo;
-import cn.reghao.oss.storeapi.dto.media.VideoInfo;
+import cn.reghao.tnb.file.api.dto.media.*;
 import cn.reghao.oss.storeapi.rest.UploadFileRet;
 import com.google.gson.reflect.TypeToken;
 

oss-store/pom.xml

@@ -58,6 +58,11 @@
             <artifactId>oss-sdk</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>cn.reghao.tnb.file</groupId>
+            <artifactId>file-api</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>

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

@@ -1,9 +1,6 @@
 package cn.reghao.oss.store.rpc;
 
-import cn.reghao.oss.storeapi.dto.media.AudioInfo;
-import cn.reghao.oss.storeapi.dto.media.ConvertedImageInfo;
-import cn.reghao.oss.storeapi.dto.media.ImageInfo;
-import cn.reghao.oss.storeapi.dto.media.VideoInfo;
+import cn.reghao.tnb.file.api.dto.media.*;
 import cn.reghao.oss.storeapi.iface.MediaService;
 import cn.reghao.oss.store.task.MediaFileProcessor;
 import cn.reghao.oss.store.util.UserContext;

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

@@ -8,10 +8,10 @@ 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.storeapi.dto.ObjectMeta;
-import cn.reghao.oss.storeapi.dto.media.AudioInfo;
-import cn.reghao.oss.storeapi.dto.media.ConvertedImageInfo;
-import cn.reghao.oss.storeapi.dto.media.ImageInfo;
-import cn.reghao.oss.storeapi.dto.media.VideoInfo;
+import cn.reghao.tnb.file.api.dto.media.AudioInfo;
+import cn.reghao.tnb.file.api.dto.media.ConvertedImageInfo;
+import cn.reghao.tnb.file.api.dto.media.ImageInfo;
+import cn.reghao.tnb.file.api.dto.media.VideoInfo;
 import cn.reghao.oss.store.db.repository.ObjectRepository;
 import cn.reghao.oss.store.model.vo.ObjectResult;
 import cn.reghao.oss.store.service.FileStoreService;

store-api/pom.xml

@@ -21,6 +21,11 @@
             <artifactId>jdk</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>cn.reghao.tnb.file</groupId>
+            <artifactId>file-api</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>

store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/AudioInfo.java

@@ -1,24 +0,0 @@
-package cn.reghao.oss.storeapi.dto.media;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2023-08-28 17:00:56
- */
-@AllArgsConstructor
-@Getter
-public class AudioInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String audioFileId;
-    private String objectId;
-    private int duration;
-    private String codec;
-    private Long bitRate;
-    private String url;
-}

store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/AudioUrl.java

@@ -1,21 +0,0 @@
-package cn.reghao.oss.storeapi.dto.media;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2023-10-12 15:07:44
- */
-@Setter
-@Getter
-public class AudioUrl implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String audioFileId;
-    private String codec;
-    private Long bitRate;
-    private String url;
-}

store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/ConvertedImageInfo.java

@@ -1,21 +0,0 @@
-package cn.reghao.oss.storeapi.dto.media;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2024-03-08 17:07:23
- */
-@AllArgsConstructor
-@Getter
-public class ConvertedImageInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String imageFileId;
-    private String objectId;
-    private String format;
-    private String url;
-}

store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/ImageInfo.java

@@ -1,24 +0,0 @@
-package cn.reghao.oss.storeapi.dto.media;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2024-03-08 10:56:27
- */
-@AllArgsConstructor
-@Getter
-public class ImageInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // 原始文件的 objectId
-    private String imageFileId;
-    private String objectId;
-    private String format;
-    private String url;
-    private Integer width;
-    private Integer height;
-}

store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/ImageUrlDto.java

@@ -1,24 +0,0 @@
-package cn.reghao.oss.storeapi.dto.media;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2023-08-28 15:50:38
- */
-@Setter
-@Getter
-public class ImageUrlDto implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String imageFileId;
-    private String originalUrl;
-    private String thumbnailUrl;
-
-    public ImageUrlDto(String imageFileId) {
-        this.imageFileId = imageFileId;
-    }
-}

store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/VideoInfo.java

@@ -1,32 +0,0 @@
-package cn.reghao.oss.storeapi.dto.media;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @author reghao
- * @date 2023-01-11 10:41:53
- */
-@AllArgsConstructor
-@Getter
-public class VideoInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String videoFileId;
-    private String objectId;
-    private String videoCodec;
-    private Long vbitRate;
-    private String audioCodec;
-    private Long abitRate;
-    private String urlType;
-    private String url;
-    private String quality;
-    private Integer width;
-    private Integer height;
-    // 单位秒
-    private Integer duration;
-    private LocalDateTime createTime;
-}

store-api/src/main/java/cn/reghao/oss/storeapi/dto/media/VideoUrlDto.java

@@ -1,22 +0,0 @@
-package cn.reghao.oss.storeapi.dto.media;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2023-01-10 09:51:53
- */
-@Getter
-@Setter
-public class VideoUrlDto implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String type;
-    private String url;
-    private int width;
-    private int height;
-    private String quality;
-}

store-api/src/main/java/cn/reghao/oss/storeapi/iface/MediaService.java

@@ -1,10 +1,6 @@
 package cn.reghao.oss.storeapi.iface;
 
-import cn.reghao.oss.storeapi.dto.media.*;
-import cn.reghao.oss.storeapi.dto.media.AudioInfo;
-import cn.reghao.oss.storeapi.dto.media.ConvertedImageInfo;
-import cn.reghao.oss.storeapi.dto.media.ImageInfo;
-import cn.reghao.oss.storeapi.dto.media.VideoInfo;
+import cn.reghao.tnb.file.api.dto.media.*;
 
 import java.util.List;