From 6ad5584f403309801c5e09cbf57714bc84d39f78 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 01 十一月 2022 10:59:59 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/all/UploadService.java |   40 +++-------------------------------------
 1 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/lf/server/service/all/UploadService.java b/src/main/java/com/lf/server/service/all/UploadService.java
index fc43bd5..d6dd101 100644
--- a/src/main/java/com/lf/server/service/all/UploadService.java
+++ b/src/main/java/com/lf/server/service/all/UploadService.java
@@ -78,7 +78,7 @@
         } catch (Exception ex) {
             return ctrl.fail(ex.getMessage(), null);
         }
-   }
+    }
 
     /**
      * 鑾峰彇闄勪欢瀹炰綋绫�
@@ -114,25 +114,8 @@
                 return;
             }
 
-            setDownloadResponse(entity, res);
-            String filePath = pathHelper.getConfig().getUploadPath() + File.separator + entity.getPath();
-
-            // 閫氳繃response瀵硅薄锛岃幏鍙栧埌杈撳嚭娴�
-            ServletOutputStream outputStream = res.getOutputStream();
-            // 瀹氫箟杈撳叆娴侊紝閫氳繃杈撳叆娴佽鍙栨枃浠跺唴瀹�
-            FileInputStream fileInputStream = new FileInputStream(filePath);
-
-            int len = 0;
-            byte[] bytes = new byte[1024];
-            while ((len = fileInputStream.read(bytes)) != -1) {
-                // 閫氳繃杈撳叆娴佽鍙栨枃浠舵暟鎹紝鐒跺悗閫氳繃涓婅堪鐨勮緭鍑烘祦鍐欏洖娴忚鍣�
-                outputStream.write(bytes, 0, len);
-                outputStream.flush();
-            }
-
-            // 鍏抽棴璧勬簮
-            outputStream.close();
-            fileInputStream.close();
+            String file = pathHelper.getConfig().getUploadPath() + File.separator + entity.getPath();
+            WebHelper.download(file, res);
         } catch (Exception ex) {
             try {
                 String msg = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.ERROR, "鏂囦欢涓嬭浇鍑洪敊"));
@@ -142,22 +125,5 @@
             }
             log.error(ex.getMessage(), ex);
         }
-    }
-
-    /**
-     * 璁剧疆涓嬭浇鍝嶅簲淇℃伅
-     */
-    private void setDownloadResponse(AttachEntity entity, HttpServletResponse res) throws IOException {
-        String fileName = URLEncoder.encode(entity.getName(), "UTF-8");
-
-        // 璁剧疆鍝嶅簲澶翠腑鏂囦欢鐨勪笅杞芥柟寮忎负闄勪欢鏂瑰紡锛屼互鍙婅缃枃浠跺悕
-        res.setHeader("Content-Disposition", "attachment; filename=" + fileName);
-        // 璁剧疆鍝嶅簲澶寸殑缂栫爜鏍煎紡涓篣TF-8
-        res.setCharacterEncoding("UTF-8");
-
-        // 閫氳繃response瀵硅薄璁剧疆鍝嶅簲鏁版嵁鏍煎紡(濡傦細"text/plain; charset=utf-8")
-        String ext = FileHelper.getExtension(entity.getName());
-        String mime = FileHelper.getMime(ext);
-        res.setContentType(mime);
     }
 }

--
Gitblit v1.9.3