Merge remote-tracking branch 'origin/master'

Alan

2021-02-19 63de9a0489ad9264fcd62dc0ac8791a6ec33874b

 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/MyUtil.java

@@ -1,18 +1,15 @@
package cc.mrbird.febs.common.core.utils;

import cc.mrbird.febs.common.core.entity.system.Dic;
import cc.mrbird.febs.common.core.exception.FebsException;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Dict;

import lombok.extern.slf4j.Slf4j;
import org.springframework.web.multipart.MultipartFile;
import cn.hutool.core.io.FileUtil;

import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.zip.ZipEntry;
@@ -21,6 +18,24 @@
@Slf4j
public class MyUtil {

    public static void downloadFile(File file, HttpServletResponse response) throws IOException {
        try (InputStream fin = new FileInputStream(file); ServletOutputStream out = response.getOutputStream()) {
            response.setCharacterEncoding("utf-8");
            response.setContentType("application/x-download");
            response.addHeader("Content-Disposition", "attachment;filename=resume.doc");

            byte[] buffer = new byte[1024];
            int bytesToRead = -1;
            // 通过循环将读入的Word文件的内容输出到浏览器中
            while ((bytesToRead = fin.read(buffer)) != -1) {
                out.write(buffer, 0, bytesToRead);
            }
        } catch (Exception e) {
            log.error("下载文件异常" + e);
            e.printStackTrace();
        }
    }

    public static void  download(HttpServletRequest request, HttpServletResponse response, List<File> files , List<String> fileName){
        //设置压缩包的名字
        //解决不同浏览器压缩包名字含有中文时乱码的问题