添加 oss-common, 存放请求参数和返回值

oss-common/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.reghao.oss</groupId>
+    <artifactId>oss-common</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.6</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.1.Final</version>
+        </dependency>
+    </dependencies>
+</project>

oss-common/src/main/java/cn/reghao/oss/common/UploadFilePart.java

@@ -0,0 +1,35 @@
+package cn.reghao.oss.common;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @author reghao
+ * @date 2022-04-25 10:42:38
+ */
+@AllArgsConstructor
+@Getter
+@Setter
+public class UploadFilePart implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String pid;
+    private int channelId;
+    // 文件标识
+    private String identifier;
+    private String filename;
+    private String relativePath;
+    // 文件大小
+    private Long totalSize;
+    // 分片文件大小
+    private Integer chunkSize;
+    // 分片文件数量
+    private Long totalChunks;
+    // 当前分片文件索引
+    private Long chunkNumber;
+    // 当前分片文件大小
+    private Integer currentChunkSize;
+}

dfs-store/src/main/java/cn/reghao/dfs/store/model/dto/UploadFileRet.java → oss-common/src/main/java/cn/reghao/oss/common/UploadFileRet.java

@@ -1,13 +1,17 @@
-package cn.reghao.dfs.store.model.dto;
+package cn.reghao.oss.common;
 
 import lombok.Getter;
 
+import java.io.Serializable;
+
 /**
  * @author reghao
  * @date 2023-05-23 11:11:32
  */
 @Getter
-public class UploadFileRet {
+public class UploadFileRet implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private final String uploadId;
     private final String url;
     private final boolean merged;

dfs-store/src/main/java/cn/reghao/dfs/store/model/dto/UploadPrepare.java → oss-common/src/main/java/cn/reghao/oss/common/UploadPrepare.java

@@ -1,4 +1,4 @@
-package cn.reghao.dfs.store.model.dto;
+package cn.reghao.oss.common;
 
 import lombok.Getter;
 import lombok.Setter;

dfs-store/src/main/java/cn/reghao/dfs/store/model/dto/UploadPrepareRet.java → oss-common/src/main/java/cn/reghao/oss/common/UploadPrepareRet.java

@@ -1,15 +1,19 @@
-package cn.reghao.dfs.store.model.dto;
+package cn.reghao.oss.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.io.Serializable;
+
 /**
  * @author reghao
  * @date 2022-04-21 09:27:55
  */
 @AllArgsConstructor
 @Getter
-public class UploadPrepareRet {
+public class UploadPrepareRet implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private String uploadId;
     private long splitSize;
     private boolean exist;

oss-common/src/main/java/cn/reghao/oss/common/UploadedPart.java

@@ -0,0 +1,22 @@
+package cn.reghao.oss.common;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author reghao
+ * @date 2023-05-24 09:23:25
+ */
+@Setter
+@Getter
+public class UploadedPart implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private boolean skipUpload;
+    private boolean needMerge;
+    private List<String> uploaded;
+    private String url;
+}

oss-sdk/src/main/java/cn/reghao/oss/sdk/model/UploadFilePart.java

@@ -1,48 +0,0 @@
-package cn.reghao.oss.sdk.model;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.File;
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2022-04-25 10:42:38
- */
-@Getter
-@Setter
-public class UploadFilePart implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private byte[] bytes;
-    private int channelId;
-    private String pid;
-    // 文件标识
-    private String identifier;
-    private String filename;
-    private String relativePath;
-    // 文件大小
-    private Long totalSize;
-    // 分片文件大小
-    private Long chunkSize;
-    // 当前分片文件大小
-    private Integer currentChunkSize;
-    // 分片文件数量
-    private Integer totalChunks;
-    // 当前分片文件索引
-    private Integer chunkNumber;
-    private String partSha256sum;
-
-    public UploadFilePart(int channelId, String pid, String identifier, String filename, String relativePath,
-                          long totalSize, long chunkSize, int totalChunks) {
-        this.channelId = channelId;
-        this.pid = pid;
-        this.identifier = identifier;
-        this.filename = filename;
-        this.relativePath = relativePath;
-        this.totalSize = totalSize;
-        this.chunkSize = chunkSize;
-        this.totalChunks = totalChunks;
-    }
-}