Merge branch 'feature-content5' into 'test_branch'

Feature content5

See merge request !1508

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

@@ -91,7 +91,7 @@ public class ContentAccountController {
         accountGenerateQrCodeQDTO.setEnterpriseId(accountGenerateQrCodeQo.getEnterpriseId());
         accountGenerateQrCodeQDTO.setSourceType(ContentAccountQrCodeSourceType.HAOBAN.getCode());
         accountGenerateQrCodeQDTO.setKey(accountGenerateQrCodeQo.getKey());
-        accountGenerateQrCodeQDTO.setAccountId(accountGenerateQrCodeQDTO.getAccountId());
+        accountGenerateQrCodeQDTO.setAccountId(accountGenerateQrCodeQo.getAccountId());
         ServiceResponse<AccountAuthorizeDTO> serviceResponse = contentAccountApiService.generateQrCode(accountGenerateQrCodeQDTO);
         if (!serviceResponse.isSuccess()) {
             return RestResponse.failure("500", "生成二维码异常");

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

@@ -55,7 +55,7 @@ public class ContentImageController {
         CloudFileTypeEnum cloudFileTypeEnum = CloudFileTypeEnum.getFileTypeByExtension(fileType);
         CloudFileInfo cloudFileInfo = null;
         //cme上传视频走 temp存储桶只存一天有效期
-        if (fileFlag != null && fileFlag == 1) {
+        if (fileFlag != null && fileFlag == 3) {
             cloudFileInfo = CloudFileUtil.getPreUploadTempFileInfo(fileType, cloudFileTypeEnum, CmeUtil.CME_TEMP_COS, CloudFileBusinessOptEnum.MATERIAL_CONTENT, 1L);
         }else {
             cloudFileInfo = CloudFileUtil.getPreUploadFileInfo(fileType, cloudFileTypeEnum, enterpriseDTO.getFactoryCode(), CloudFileBusinessOptEnum.MATERIAL_CONTENT);