删除 file-api 依赖

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

@@ -3,7 +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.tnb.file.api.dto.media.*;
+import cn.reghao.oss.storeapi.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,7 +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.tnb.file.api.dto.media.*;
+import cn.reghao.oss.storeapi.dto.media.*;
 import cn.reghao.oss.storeapi.iface.MediaService;
 import org.springframework.stereotype.Service;
 

oss-console/src/test/java/OssConsoleTest.java

@@ -1,5 +1,4 @@
 import cn.reghao.oss.storeapi.constant.ObjectScope;
-import cn.reghao.oss.storeapi.constant.UploadChannel;
 import cn.reghao.oss.console.OssConsoleApplication;
 import cn.reghao.oss.console.account.service.AccountService;
 import cn.reghao.oss.console.app.model.dto.UploadChannelDto;

store-api/src/main/java/cn/reghao/oss/storeapi/constant/UploadChannel.java → oss-console/src/test/java/UploadChannel.java

@@ -1,5 +1,3 @@
-package cn.reghao.oss.storeapi.constant;
-
 import java.util.HashMap;
 import java.util.Map;
 

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

@@ -7,7 +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.tnb.file.api.dto.media.*;
+import cn.reghao.oss.storeapi.dto.media.*;
 import cn.reghao.oss.storeapi.rest.UploadFileRet;
 import com.google.gson.reflect.TypeToken;
 

oss-store/pom.xml

@@ -58,11 +58,6 @@
             <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,6 +1,6 @@
 package cn.reghao.oss.store.rpc;
 
-import cn.reghao.tnb.file.api.dto.media.*;
+import cn.reghao.oss.storeapi.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.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.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.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,11 +21,6 @@
             <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

@@ -0,0 +1,24 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,24 @@
+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

@@ -0,0 +1,24 @@
+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

@@ -0,0 +1,32 @@
+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

@@ -0,0 +1,22 @@
+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,6 +1,6 @@
 package cn.reghao.oss.storeapi.iface;
 
-import cn.reghao.tnb.file.api.dto.media.*;
+import cn.reghao.oss.storeapi.dto.media.*;
 
 import java.util.List;
 
@@ -11,6 +11,5 @@ import java.util.List;
 public interface MediaService {
     VideoInfo getVideoInfo(String videoFileId);
     List<ImageInfo> getImagesInfo(List<String> imageFileIds);
-    List<ConvertedImageInfo> getWebpInfo(int loginUser, List<String> imageFileIds);
     AudioInfo getAudioInfo(String audioFileId);
 }

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

@@ -1,6 +1,5 @@
 package cn.reghao.oss.storeapi.iface;
 
-import cn.reghao.oss.storeapi.dto.*;
 import cn.reghao.oss.storeapi.dto.ObjectInfo;
 
 import java.util.List;