From 96286178ee1c257c130cb2ad964a781f36c4eee5 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期三, 10 五月 2023 16:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/teach/res/service/impl/HweiYunOBSServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/teach/res/service/impl/HweiYunOBSServiceImpl.java b/src/main/java/com/qxueyou/scc/teach/res/service/impl/HweiYunOBSServiceImpl.java
index 7343731..8589af1 100644
--- a/src/main/java/com/qxueyou/scc/teach/res/service/impl/HweiYunOBSServiceImpl.java
+++ b/src/main/java/com/qxueyou/scc/teach/res/service/impl/HweiYunOBSServiceImpl.java
@@ -23,6 +23,7 @@
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
@@ -105,6 +106,7 @@
return false;
}
+
@Override
public List<FileMeta> fileUpload(MultipartFile uploadFile, String objectKey) {
ObsClient obsClient = null;
@@ -125,17 +127,19 @@
}
InputStream inputStream = uploadFile.getInputStream();
long available = inputStream.available();
-// PutObjectRequest request = new PutObjectRequest(bucketName,objectKey,inputStream);
PutObjectRequest request = new PutObjectRequest(bucketName,destPath,inputStream);
ObjectMetadata objectMetadata = new ObjectMetadata();
objectMetadata.setContentLength(available);
request.setMetadata(objectMetadata);
-// request.
// 璁剧疆瀵硅薄璁块棶鏉冮檺涓哄叕鍏辫
request.setAcl(AccessControlList.REST_CANNED_PUBLIC_READ);
PutObjectResult result = obsClient.putObject(request);
fileMeta = new FileMeta();
ResFile file = fileService.insertFileToDBTwo(objectKey, uploadFile.getSize(), result.getObjectUrl(), uploadFile.getContentType());
+// SetObjectMetadataRequest ObjectMetadataRequest = new SetObjectMetadataRequest(bucketName, destPath);
+// ObjectMetadataRequest.setContentDisposition("inline");
+// obsClient.setObjectMetadata(ObjectMetadataRequest);
+
fileMeta.setFileId(file.getFileId());
fileMeta.setPath(result.getObjectUrl());
fileMeta.setFileSize(uploadFile.getSize() / 1024 + "kb");
--
Gitblit v1.8.0