Merge branch 'feature-content5' into 'test_branch'

cme上传图片

See merge request !1514

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentImageController.java

@@ -129,7 +129,7 @@ public class ContentImageController {
                 CloudFileUtil.uploadPreFileByFieldKey(file, bucketName, videoPicFileId);
             }else if (fileFlag == 3) {
                 // cme临时图片只能上传到temp存储桶 只存一天有效期
-                CloudFileInfo cloudFileInfo = CloudFileUtil.uploadTempFile(file, fileType, CloudFileTypeEnum.IMAGE, CmeUtil.CME_TEMP_COS, CloudFileBusinessOptEnum.MATERIAL_CONTENT, 1L);
+                CloudFileInfo cloudFileInfo = CloudFileUtil.uploadTempFile(file, fileType, CloudFileTypeEnum.IMAGE, CmeUtil.CME_TEMP_COS, CloudFileBusinessOptEnum.MATERIAL_CONTENT, 1L,compressFlag,bucketName,videoPicFileId);
                 return RestResponse.successResult(cloudFileInfo);
             }
             return RestResponse.successResult();