Merge branch 'feature/社群' into 'developer'

下载

See merge request !854

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatHmController.java

 package com.gic.haoban.manage.web.controller.chat;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -54,8 +55,10 @@ import com.gic.log.record.anno.GicLogRecord;
 import com.gic.log.record.util.GicLogRecordCategoryEnum;
 import com.gic.log.record.util.GicLogRecordEvaluationContext;
 import com.gic.log.record.util.GicLogRecordOptTypeEnum;
-import com.gic.qcloud.BucketNameEnum;
-import com.gic.qcloud.FileUploadUtil;
+import com.gic.thirdparty.cloudfile.CloudFileUtil;
+import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;
+import com.gic.thirdparty.cloudfile.enums.CloudFileTypeEnum;
+import com.gic.thirdparty.cloudfile.pojo.CloudFileInfo;
 import com.gic.web.common.utils.DataPermissionExport;
 import com.gic.web.common.utils.ExecutorPoolSingleton;
 import com.google.common.collect.Sets;
@@ -469,14 +472,14 @@ public class GroupChatHmController {
                         out.close();
                     } catch (IOException e) {
                     }
-                    /*CloudFileTypeEnum cloudFileTypeEnum = CloudFileTypeEnum.OTHER;
+                    CloudFileTypeEnum cloudFileTypeEnum = CloudFileTypeEnum.OTHER;
                     CloudFileInfo cloudFileInfo = CloudFileUtil.uploadFile(new FileInputStream(tempFile), "zip",
                             cloudFileTypeEnum, au.getEnterpriseDTO().getFactoryCode(),
-                            CloudFileBusinessOptEnum.HAOBAN_COMMON);*/
-                    
-                    String url = FileUploadUtil.simpleUploadFileFromLocal(tempFile, fileName, BucketNameEnum.COMPRESS_60000.getName());
+                            CloudFileBusinessOptEnum.HAOBAN_COMMON);
                     DownloadReportDTO downloadReportDTO = new DownloadReportDTO();
-                    downloadReportDTO.setDownloadUrl("https://" + url);
+                    /*downloadReportDTO.setDownloadUrl("https://" + url);*/
+                    //String url = FileUploadUtil.simpleUploadFileFromLocal(tempFile, fileName, BucketNameEnum.COMPRESS_60000.getName());
+                    downloadReportDTO.setDownloadUrl(cloudFileInfo.getOrgFileUrl());
                     downloadReportService.updateDownloadReport(reportId, downloadReportDTO);
                     tempFile.deleteOnExit();
                 } catch (Exception e) {