Browse Source

ftp 2022-04-08 sxm

master
[li_she] 4 years ago
parent
commit
047580ae3a
  1. 3
      src/main/java/com/gaotao/modules/ftp/controller/SysFtpController.java
  2. 4
      src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java

3
src/main/java/com/gaotao/modules/ftp/controller/SysFtpController.java

@ -48,7 +48,6 @@ public class SysFtpController extends AbstractController {
* 列表 * 列表
*/ */
@GetMapping("/list") @GetMapping("/list")
@RequiresPermissions("sys:oss:all")
public R list(@RequestParam Map<String, Object> params){ public R list(@RequestParam Map<String, Object> params){
PageUtils page = sysOssService.queryPage(params); PageUtils page = sysOssService.queryPage(params);
@ -156,7 +155,7 @@ public class SysFtpController extends AbstractController {
@GetMapping("/downFtpFile/{id}") @GetMapping("/downFtpFile/{id}")
public void downFtpFile(@PathVariable("id") Long id, HttpServletResponse response){ public void downFtpFile(@PathVariable("id") Long id, HttpServletResponse response){
SysOssEntity resultData =sysOssService.getById(id); SysOssEntity resultData =sysOssService.getById(id);
FTPUtils.downFile(response,"",resultData.getNewFileName());
FTPUtils.downFile(response,"",resultData.getNewFileName(),resultData.getFileName());
} }
} }

4
src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java

@ -494,7 +494,7 @@ public class FTPUtils {
* @param path * @param path
* @param fileName * @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(); FTPClient ftpClient = getFTPClient();
//判断链接是否关闭 //判断链接是否关闭
if(!ftpClient.isConnected()){ if(!ftpClient.isConnected()){
@ -529,7 +529,7 @@ public class FTPUtils {
// 清空response // 清空response
response.reset(); response.reset();
// 设置response的Header // 设置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.addHeader("Content-Length", "" + ftpFiles[i].getSize());
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");

Loading…
Cancel
Save