zouxuan há 3 anos atrás
pai
commit
9c9eb4712d

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/LiveRoomVideoServiceImpl.java

@@ -62,7 +62,7 @@ public class LiveRoomVideoServiceImpl extends ServiceImpl<LiveRoomVideoDao, Live
         if (recordNotify.getCode().equals(200)) {
             if (Objects.nonNull(recordNotify.getType())) {
                 //云端录制文件地址
-                String fileUrl = storagePluginContext.getPublicUrl(recordNotify.getOutput().getFileUrl());
+                String fileUrl = storagePluginContext.getPublicUrl(recordNotify.getOutput().getFileUrl(),"live-rewind");
                 //房间uid
                 String roomUId = recordNotify.getRoomId();
                 //融云唯一id标识

+ 1 - 1
toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/storage/StoragePlugin.java

@@ -57,5 +57,5 @@ public interface StoragePlugin {
      * @param isPublic:
      * @return void
      */
-    void setFileAcl(String fileName,Boolean isPublic);
+    void setFileAcl(String fileName,Boolean isPublic,String bucketName);
 }

+ 4 - 4
toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/storage/StoragePluginContext.java

@@ -39,16 +39,16 @@ public class StoragePluginContext {
         return StoragePlugin.getUploadSign(uploadSign);
     }
 
-    public void setFileAcl(String storagePluginName,String fileName,Boolean isPublic){
+    public void setFileAcl(String storagePluginName,String fileName,Boolean isPublic,String bucketName){
         StoragePlugin storagePlugin = getStoragePlugin(storagePluginName);
-        storagePlugin.setFileAcl(fileName,isPublic);
+        storagePlugin.setFileAcl(fileName,isPublic,bucketName);
     }
 
-    public String getPublicUrl(String fileName){
+    public String getPublicUrl(String fileName,String bucketName){
         try {
             String substring = fileName.substring(0, fileName.lastIndexOf("?"));
             String substring1 = substring.substring(substring.lastIndexOf("/") + 1);
-            this.setFileAcl(KS3StoragePlugin.PLUGIN_NAME,substring1,true);
+            this.setFileAcl(KS3StoragePlugin.PLUGIN_NAME,substring1,true,bucketName);
             return substring;
         }catch (Exception e) {
             e.printStackTrace();

+ 1 - 1
toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/storage/provider/AliyunOssStoragePlugin.java

@@ -169,7 +169,7 @@ public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean,
     }
 
     @Override
-    public void setFileAcl(String fileName, Boolean isPublic) {
+    public void setFileAcl(String fileName, Boolean isPublic,String bucketName) {
         return;
     }
 

+ 1 - 1
toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/storage/provider/KS3StoragePlugin.java

@@ -193,7 +193,7 @@ public class KS3StoragePlugin implements StoragePlugin, InitializingBean, Dispos
     }
 
     @Override
-    public void setFileAcl(String fileName, Boolean isPublic) {
+    public void setFileAcl(String fileName, Boolean isPublic,String bucketName) {
         PutObjectACLRequest request = new PutObjectACLRequest(bucketName,fileName);
         if (isPublic){
             //设为公开读