From 047580ae3a21f2bae465e1f2dc86038c83c78e69 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Fri, 8 Apr 2022 17:06:49 +0800 Subject: [PATCH] ftp 2022-04-08 sxm --- .../com/gaotao/modules/ftp/controller/SysFtpController.java | 3 +-- src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gaotao/modules/ftp/controller/SysFtpController.java b/src/main/java/com/gaotao/modules/ftp/controller/SysFtpController.java index cfbf599..aad2908 100644 --- a/src/main/java/com/gaotao/modules/ftp/controller/SysFtpController.java +++ b/src/main/java/com/gaotao/modules/ftp/controller/SysFtpController.java @@ -48,7 +48,6 @@ public class SysFtpController extends AbstractController { * 列表 */ @GetMapping("/list") - @RequiresPermissions("sys:oss:all") public R list(@RequestParam Map params){ PageUtils page = sysOssService.queryPage(params); @@ -156,7 +155,7 @@ public class SysFtpController extends AbstractController { @GetMapping("/downFtpFile/{id}") public void downFtpFile(@PathVariable("id") Long id, HttpServletResponse response){ SysOssEntity resultData =sysOssService.getById(id); - FTPUtils.downFile(response,"",resultData.getNewFileName()); + FTPUtils.downFile(response,"",resultData.getNewFileName(),resultData.getFileName()); } } diff --git a/src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java b/src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java index 7fb3141..661d675 100644 --- a/src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java +++ b/src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java @@ -494,7 +494,7 @@ public class FTPUtils { * @param path * @param fileName */ - public static void downFile( HttpServletResponse response, String path, String fileName){ + public static void downFile( HttpServletResponse response, String path, String fileName,String nameFile){ FTPClient ftpClient = getFTPClient(); //判断链接是否关闭 if(!ftpClient.isConnected()){ @@ -529,7 +529,7 @@ public class FTPUtils { // 清空response response.reset(); // 设置response的Header - response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8")); + response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(nameFile, "UTF-8")); response.addHeader("Content-Length", "" + ftpFiles[i].getSize()); response.setContentType("application/octet-stream"); response.setCharacterEncoding("UTF-8");