fix 修复升级合并错误

疯狂的狮子li

2021-07-12 cd34c87afa730c48e2b2be61d700b1fee409e02c

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -18,6 +18,7 @@

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.util.HashMap;
import java.util.Map;

@@ -51,13 +52,13 @@
            }
            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
            String filePath = RuoYiConfig.getDownloadPath() + fileName;

         File file = new File(filePath);
            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
            FileUtils.setAttachmentResponseHeader(response, realFileName);
         FileUtils.writeToStream(filePath, response.getOutputStream());
         FileUtils.writeToStream(file, response.getOutputStream());
            if (delete)
            {
            FileUtils.del(filePath);
            FileUtils.del(file);
            }
        }
        catch (Exception e)
@@ -110,8 +111,9 @@
            // 下载名称
            String downloadName = StrUtil.subAfter(downloadPath, "/",true);
            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
         File file = new File(downloadPath);
            FileUtils.setAttachmentResponseHeader(response, downloadName);
            FileUtils.writeToStream(downloadPath, response.getOutputStream());
            FileUtils.writeToStream(file, response.getOutputStream());
        }
        catch (Exception e)
        {