reghao 2 tahun lalu
induk
melakukan
aab8853275

+ 6 - 3
dfs-store/src/main/java/cn/reghao/dfs/store/rpc/ObjectServiceImpl.java

@@ -3,6 +3,7 @@ package cn.reghao.dfs.store.rpc;
 import cn.reghao.dfs.store.model.po.FileMeta;
 import cn.reghao.dfs.store.service.ObjectNameService;
 import cn.reghao.oss.api.dto.ObjectMeta;
+import cn.reghao.oss.api.dto.ObjectPrefix;
 import cn.reghao.oss.api.iface.ObjectService;
 import cn.reghao.dfs.store.db.mapper.FileMetaMapper;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -26,12 +27,14 @@ public class ObjectServiceImpl implements ObjectService {
     }
 
     @Override
-    public void putObjectPrefix(String objectPrefix, int acl) {
-        FileMeta fileMeta = fileMetaMapper.findByObjectName(objectPrefix);
+    public void putObjectPrefix(ObjectPrefix objectPrefix) {
+        String prefix = objectPrefix.getPrefix();
+        int acl = objectPrefix.getAcl();
+        FileMeta fileMeta = fileMetaMapper.findByObjectName(prefix);
         if (fileMeta != null) {
             return;
         }
-        objectNameService.createParentDirs(objectPrefix, acl);
+        objectNameService.createParentDirs(prefix, acl);
     }
 
     @Override

+ 21 - 0
oss-api/src/main/java/cn/reghao/oss/api/dto/ObjectPrefix.java

@@ -0,0 +1,21 @@
+package cn.reghao.oss.api.dto;
+
+import lombok.Getter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author reghao
+ * @date 2023-06-02 17:37:49
+ */
+@Getter
+public class ObjectPrefix implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @NotBlank
+    private String prefix;
+    @NotNull
+    private Integer acl;
+}

+ 2 - 1
oss-api/src/main/java/cn/reghao/oss/api/iface/ObjectService.java

@@ -1,6 +1,7 @@
 package cn.reghao.oss.api.iface;
 
 import cn.reghao.oss.api.dto.ObjectMeta;
+import cn.reghao.oss.api.dto.ObjectPrefix;
 
 import java.util.List;
 
@@ -9,7 +10,7 @@ import java.util.List;
  * @date 2023-05-28 23:25:06
  */
 public interface ObjectService {
-    void putObjectPrefix(String objectPrefix, int acl);
+    void putObjectPrefix(ObjectPrefix objectPrefix);
     List<String> getObjectPrefix();
     ObjectMeta getObject(String objectName);
 }

+ 2 - 0
oss-sdk/src/test/java/ObjectTest.java

@@ -16,6 +16,7 @@ public class ObjectTest {
     static void upload() {
         ObjectUploadService objectUploadService = new ObjectUploadService(endpoint);
         String filePath = "/home/reghao/Downloads/sxd.mp4";
+        filePath = "/home/reghao/Downloads/1.txt";
         File file = new File(filePath);
 
         long userId = 10020;
@@ -42,5 +43,6 @@ public class ObjectTest {
     }
 
     public static void main(String[] args) {
+        upload();
     }
 }

+ 3 - 3
zzz/deploy.sh

@@ -4,10 +4,10 @@
 #!/bin/bash
 
 cd /home/reghao/code/java/dfs/oss-common/
-mvn clean deploy &
+mvn clean deploy -Dmaven.test.skip &
 
 cd /home/reghao/code/java/dfs/oss-api/
-mvn clean deploy &
+mvn clean deploy -Dmaven.test.skip &
 
 cd /home/reghao/code/java/dfs/oss-sdk/
-mvn clean deploy &
+mvn clean deploy -Dmaven.test.skip &

+ 3 - 3
zzz/install.sh

@@ -4,10 +4,10 @@
 #!/bin/bash
 
 cd /home/reghao/code/java/dfs/oss-common/
-mvn clean install &
+mvn clean install -Dmaven.test.skip &
 
 cd /home/reghao/code/java/dfs/oss-api/
-mvn clean install &
+mvn clean install -Dmaven.test.skip &
 
 cd /home/reghao/code/java/dfs/oss-sdk/
-mvn clean install &
+mvn clean install -Dmaven.test.skip &