下载：按上传文件名下载

@@ -13,9 +13,13 @@ import com.lframework.starter.web.inner.service.SecurityUploadRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import java.io.File;
+import java.io.*;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import javax.validation.constraints.NotBlank;
+import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -43,7 +47,8 @@ public class SecurityDownloadController extends DefaultBaseController {
   @ApiOperation("下载文件（获取签名URL）")
   @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
   @GetMapping("/url")
-  public InvokeResult<String> getSecurityDownloadUrl(@NotBlank(message = "ID不能为空！") String id) {
+  public InvokeResult<String> getSecurityDownloadUrl(@NotBlank(message = "ID不能为空！") String id,
+      String fileName) {
     SecurityUploadRecord record = securityUploadRecordService.getById(id);
     if (record == null) {
       throw new AccessDeniedException();
@@ -53,14 +58,25 @@ public class SecurityDownloadController extends DefaultBaseController {
 //      throw new AccessDeniedException();
 //    }
 
-    return InvokeResultBuilder.success(
-        UploadUtil.generatePresignedUrl(record.getUploadType().getCode(), record.getFilePath()));
+    String url = UploadUtil.generatePresignedUrl(record.getUploadType().getCode(),
+        record.getFilePath());
+    if (StringUtils.isNotBlank(fileName)) {
+      try {
+        url = url + "&fileName=" + URLEncoder.encode(fileName, StandardCharsets.UTF_8.name())
+            .replace("+", "%20");
+      } catch (UnsupportedEncodingException e) {
+        e.printStackTrace();
+      }
+    }
+
+    return InvokeResultBuilder.success(url);
   }
 
   @ApiOperation("下载文件")
   @ApiImplicitParam(value = "签名", name = "sign", paramType = "query", required = true)
   @GetMapping
-  public void download(@NotBlank(message = "签名不能为空！") String sign) {
+  public void download(@NotBlank(message = "签名不能为空！") String sign, String fileName,
+      HttpServletResponse response) throws IOException {
     Object val = redisHandler.hget("security-upload", sign);
     log.info("val====" + val);
     if (val == null) {
@@ -73,6 +89,22 @@ public class SecurityDownloadController extends DefaultBaseController {
       throw new AccessDeniedException();
     }
 
-    ResponseUtil.download(file);
+    String downloadFileName = StringUtils.isBlank(fileName) ? file.getName() : fileName;
+    String encodedFileName = URLEncoder.encode(downloadFileName, StandardCharsets.UTF_8.name())
+        .replace("+", "%20");
+
+    response.setContentType("application/octet-stream");
+    response.setCharacterEncoding(StandardCharsets.UTF_8.name());
+    response.setHeader("Content-Disposition", "attachment;filename=" + encodedFileName);
+    response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+
+    try (InputStream in = new FileInputStream(file)) {
+      byte[] buffer = new byte[8192];
+      int len;
+      while ((len = in.read(buffer)) != -1) {
+        response.getOutputStream().write(buffer, 0, len);
+      }
+      response.getOutputStream().flush();
+    }
   }
 }