wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus

This commit is contained in:
疯狂的狮子li 2021-06-24 15:46:01 +08:00
parent 24c7ff7959 cc2fbc7b89
commit 4962ec7589
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -51,13 +52,13 @@ public class CommonController
} }
String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
String filePath = RuoYiConfig.getDownloadPath() + fileName; String filePath = RuoYiConfig.getDownloadPath() + fileName;
File file = new File(filePath);
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
FileUtils.setAttachmentResponseHeader(response, realFileName); FileUtils.setAttachmentResponseHeader(response, realFileName);
FileUtils.writeToStream(filePath, response.getOutputStream()); FileUtils.writeToStream(file, response.getOutputStream());
if (delete) if (delete)
{ {
FileUtils.del(filePath); FileUtils.del(file);
} }
} }
catch (Exception e) catch (Exception e)
@ -110,8 +111,9 @@ public class CommonController
// 下载名称 // 下载名称
String downloadName = StrUtil.subAfter(downloadPath, "/",true); String downloadName = StrUtil.subAfter(downloadPath, "/",true);
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
File file = new File(downloadPath);
FileUtils.setAttachmentResponseHeader(response, downloadName); FileUtils.setAttachmentResponseHeader(response, downloadName);
FileUtils.writeToStream(downloadPath, response.getOutputStream()); FileUtils.writeToStream(file, response.getOutputStream());
} }
catch (Exception e) catch (Exception e)
{ {