Merge remote-tracking branch 'origin/master_saas' into master_saas

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsTypeServiceImpl.java

@@ -51,14 +51,16 @@ public class SysNewsTypeServiceImpl extends BaseServiceImpl<Integer, SysNewsType
         return sysNewsTypeDao.queryByParentId(parentId);
     }
 
-    public List<SysNewsType> listWithTree(Integer id,String memo) {
+    public List<SysNewsType> listWithTree(Integer id, String memo) {
         SysNewsType newsType = sysNewsTypeDao.get(id);
         List<SysNewsType> all = sysNewsTypeDao.findAll(null);
 
         all.forEach(e -> {
-            List<SysNewsInformation> list = informationDao.queryBySubType(e.getId(),memo);
+            List<SysNewsInformation> list = informationDao.queryBySubType(e.getId(), memo);
             if (CollectionUtils.isNotEmpty(list)) {
                 e.setInformationList(list);
+            } else {
+                e.setInformationList(informationDao.queryBySubType(e.getId(), null));
             }
         });
 

mec-im/src/main/java/com/ym/service/Impl/LiveRoomServiceImpl.java

@@ -162,7 +162,7 @@ public class LiveRoomServiceImpl implements LiveRoomService {
         if (recordNotify.getCode().equals(200)) {
             if (Objects.nonNull(recordNotify.getType()) && recordNotify.getType() == 4) {
                 //云端录制文件地址
-                String fileUrl = storagePluginContext.getPublicUrl(recordNotify.getOutput().getFileUrl());
+                String fileUrl = storagePluginContext.getPublicUrl(recordNotify.getOutput().getFileUrl(),"live-rewind");
                 String roomId = recordNotify.getRoomId();
                 //写入数据库
                 try {

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/storage/StoragePlugin.java

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

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/storage/StoragePluginContext.java

@@ -38,16 +38,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();

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/storage/provider/AliyunOssStoragePlugin.java

@@ -168,8 +168,8 @@ public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean,
 		return client.postObject(bucketName, fileName, postData, unknowValueField);
 	}
 
-	@Override
-    public void setFileAcl(String fileName, Boolean isPublic) {
+    @Override
+    public void setFileAcl(String fileName, Boolean isPublic,String bucketName) {
 		return;
     }
 

mec-thirdparty/src/main/java/com/ym/mec/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){
 			//设为公开读