add response header

src/main/java/com/zzsn/knowbase/controller/KnowledgeController.java

@@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -230,8 +231,14 @@ public class KnowledgeController {
     @PostMapping(value = "/export")
     public Result<?> exportCollectionXls(HttpServletRequest request,
                                          String newsIds, String fileIds) {
-        knowledgeService.exportExcel(newsIds);
-        knowledgeService.exportPackage(fileIds);
+        log.info("newsIds:{},fileIds:{}",newsIds,fileIds);
+        if(!newsIds.isEmpty()){
+            knowledgeService.exportExcel(newsIds);
+        }
+        if(!fileIds.isEmpty()){
+            knowledgeService.exportPackage(fileIds);
+        }
+
         return Result.OK(true);
     }
 
@@ -244,9 +251,11 @@ public class KnowledgeController {
 
     @RequestMapping(value = "/downloadFile")
     public void downloadXls(HttpServletResponse response, String newsIds, String fileIds) {
+        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
         //获取下载路径
         Object newsObject = redisUtil.get(newsIds);
         Object fileObject = redisUtil.get(fileIds);
+        String fileName = UUID.randomUUID().toString().replace("-", "");
         String newsFilePath = null;
         String fileFilePath = null;
         if (newsObject != null) {
@@ -261,20 +270,30 @@ public class KnowledgeController {
                 List<String> list=new ArrayList<>();
                 list.add(newsFilePath);
                 list.add(fileFilePath);
-                String filePath = knowledgeService.comprocessByName(list, UUID.randomUUID().toString().replace("-", ""));
+                log.info("newsFilePath:{},fileFilePath:{}",newsFilePath,fileFilePath);
+                String filePath = knowledgeService.comprocessByName(list,fileName );
+                log.info("filePath:{}",filePath);
+                response.setHeader("content-Disposition", "attachment;filename=" + URLEncoder.encode(filePath, "UTF-8"));
                 ExcelExportUtil.download(response, filePath, true);
                 return;
             }
             if (fileIds.isEmpty()) {//news
                 log.info("only news downloading");
                 redisUtil.del(newsIds);
+                if(newsFilePath==null){
+                    log.error("nothing");
+                    return;
+                }
+                log.info("newsFilePath:{}",newsFilePath);
+                response.setHeader("content-Disposition", "attachment;filename=" + URLEncoder.encode(newsFilePath, "UTF-8"));
                 ExcelExportUtil.download(response, newsFilePath, true);
                 return;
             }
             log.info("only files downloading");
             String s = knowledgeService.exportPackage(fileIds);
+            log.info("packageFile:{}",s);
+            response.setHeader("content-Disposition", "attachment;filename=" + URLEncoder.encode(s, "UTF-8"));
             ExcelExportUtil.download(response, s, true);
-
         } catch (Exception e) {
             e.printStackTrace();
             log.error(e.getMessage());

src/main/java/com/zzsn/knowbase/service/impl/KnowledgeServiceImpl.java

@@ -721,6 +721,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         for (KnowledgeVO knowledgeVO : knowledgeVOS) {
             pathList.add(filesStorage + knowledgeVO.getFiles().get(0).getFilePath());
         }
+        log.info("pathList:{}",pathList);
         String filePackage = comprocessByName(pathList, UUID.randomUUID().toString().replace("-",""));
         redisUtil.set(ids, filePackage, 3600 * 24);
         return filePackage;
@@ -742,7 +743,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
      * 将所有的文件都压缩到一个文件中去
      */
     public String comprocessByFile(List<File> fileNamemList, String key) {
-        String tmpFile = Constants.USER_HOME + Constants.FSP + "brap" + Constants.FSP + "download"
+        String tmpFile = "/storage" + Constants.FSP + "brap" + Constants.FSP + "download"
                 + Constants.FSP;
         byte[] buffer = new byte[4096];
         FileInputStream fis = null;