更新 postObject 接口

dfs-store/src/main/java/cn/reghao/dfs/store/controller/ObjectBasicController.java

@@ -24,7 +24,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
@@ -111,22 +110,25 @@ public class ObjectBasicController {
         String signature = postObject.getXAmzSignature();
         String policy = postObject.getPolicy();
 
-        String str[] = credential.split("/");
+        /*String str[] = credential.split("/");
         String accessKeyId = str[0];
         String dateStr = str[1];
         String regionName = str[2];
         String serviceName = str[3];
 
         String secretAccessKey = redisString.get(accessKeyId);
-        byte[] signingKey = OssUtil.getSigningKey(secretAccessKey, dateStr, regionName, serviceName);
+        byte[] signingKey = OssUtil.getSigningKey(secretAccessKey, dateStr, regionName, serviceName);*/
 
         String objectName = postObject.getKey();
-        String contentType = postObject.getContentType();
-
-        MultipartFile file = postObject.getFile();
-        long len = file.getSize();
-        InputStream inputStream = file.getInputStream();
-        putObjectService.postObject(objectName, len, contentType, inputStream);
+        MultipartFile multipartFile = postObject.getFile();
+        String tmpPath = String.format("/opt/tmp/tomcat/%s", UUID.randomUUID().toString().replace("-", ""));
+        File tmpFile = new File(tmpPath);
+        multipartFile.transferTo(tmpFile);
+
+        FileInputStream fis = new FileInputStream(tmpFile);
+        String sha256sum = DigestUtil.sha256sum(fis);
+        putObjectService.putObject(objectName, tmpFile, sha256sum);
+        tmpFile.delete();
         PostResponse postResponse = new PostResponse();
         return WebResult.success(postResponse);
     }

dfs-store/src/main/java/cn/reghao/dfs/store/service/PutObjectService.java

@@ -132,6 +132,7 @@ public class PutObjectService {
     }
 
     public void postObject(String objectName, long len, String contentType, InputStream inputStream) throws Exception {
+
     }
 
     private List<DataBlock> store(String contentId, long len, File file) throws IOException {

dfs-store/src/test/java/FileTest.java

@@ -1,5 +1,4 @@
 import lombok.extern.slf4j.Slf4j;
-import org.apache.tika.Tika;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -32,8 +31,5 @@ public class FileTest {
 
     public static void main(String[] args) {
         String filePath = "/opt/oss/disk/00b989fc-991b-4d4e-959e-9b6e19299b72/2/101//14abaa52e32243a196561c19a0ef70f1.dat";
-
-        Tika tika = new Tika();
-        log.info(tika.detect(filePath));
     }
 }