obs

4dkankan-utils-fyun-obs/src/main/java/com/fdkankan/fyun/oss/ObsFileService.java

@@ -33,7 +33,9 @@ public class ObsFileService extends AbstractFYunFileService {
     @Override
     public String uploadFile(String bucket, byte[] data, String remoteFilePath) {
         try {
-            obsClient.putObject(bucket, remoteFilePath, new ByteArrayInputStream(data));
+            PutObjectRequest putObjectRequest = new PutObjectRequest(bucket, remoteFilePath, new ByteArrayInputStream(data));
+            putObjectRequest.setAcl(AccessControlList.REST_CANNED_PUBLIC_READ);
+            obsClient.putObject(putObjectRequest);
         } catch (Exception e) {
             log.error("oss上传文件失败,remoteFilePath:" + remoteFilePath, e);
         }
@@ -48,6 +50,8 @@ public class ObsFileService extends AbstractFYunFileService {
     @Override
     public String uploadFile(String bucket, InputStream inputStream, String remoteFilePath) {
         try {
+            PutObjectRequest putObjectRequest = new PutObjectRequest(bucket, remoteFilePath, inputStream);
+            putObjectRequest.setAcl(AccessControlList.REST_CANNED_PUBLIC_READ);
             obsClient.putObject(bucket, remoteFilePath, inputStream);
             log.info("文件流上传成功，目标路径：remoteFilePath:{}", remoteFilePath);
         } catch (Exception e) {
@@ -74,11 +78,18 @@ public class ObsFileService extends AbstractFYunFileService {
             if (filePath.contains(".mp3")) {
                 metadata.setContentType("audio/mp3");
             }
+            if(CollUtil.isNotEmpty(headers)){
+                String contentEncoding = headers.get("Content-Encoding");
+                metadata.setContentEncoding(contentEncoding);
+            }
             if (CollUtil.isNotEmpty(headers)) {
                 Map<String, Object> collect = headers.keySet().stream().collect(Collectors.toMap(v -> v, v -> headers.get(v)));
-                metadata.setMetadata(collect);
+                metadata.setUserMetadata(collect);
             }
-            obsClient.putObject(bucket, remoteFilePath, file, metadata);
+            PutObjectRequest putObjectRequest = new PutObjectRequest(bucket, remoteFilePath, file);
+            putObjectRequest.setMetadata(metadata);
+            putObjectRequest.setAcl(AccessControlList.REST_CANNED_PUBLIC_READ);
+            obsClient.putObject(putObjectRequest);
             log.info("文件上传成功，path:{}", filePath);
         } catch (Exception e) {
             log.error("oss上传文件失败,filePath:"+filePath, e);