From c2463a41ec1a24d060694af542e3381bd57089b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 27 Dec 2023 12:47:28 +0800
Subject: [PATCH] 'commit'

---
 .../06856ad1-50e0-4078-af05-b9ac27f27f4f.pdf  | Bin 115030 -> 115030 bytes
 .../b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf  | Bin 54324 -> 54324 bytes
 .../Collect/Controller/CollectController.java |   5 +----
 .../com/dsideal/QingLong/Util/CommonUtil.java |  12 ------------
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/WebRoot/Excel/06856ad1-50e0-4078-af05-b9ac27f27f4f.pdf b/WebRoot/Excel/06856ad1-50e0-4078-af05-b9ac27f27f4f.pdf
index c56a17a027daea4d9eb7c7b0af01f4974ef82c18..cfa7ee918d8560b97b1e611f9231364f88d50d19 100644
GIT binary patch
delta 100
zcmccC#D1-beZ%c~CUc|7ck88rRP(R;?Z4_7e>pfgx>=gLn7J5QSh^XT8Jn4!Ih#3~
z8ylOOxEUI`7&*Dx*%+8PIvW_dT9}y{85&xem|7aTSvndR7&<vRIUAcfx=uGc$fy7S
Dyo?>&

delta 100
zcmccC#D1-beZ%c~CR3Bick88rRP(R;?Z4_7e>pgr7#lcQ8e2MAx;VR<8Jn4!Ih#3~
z8@oEYIvSaq8k!r~*_fId85)>cm^zy~yIPo=7+9E_TR6H{Sem*TxtSZA8BI4k$fy7S
DxrQCV

diff --git a/WebRoot/Excel/b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf b/WebRoot/Excel/b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf
index d2e18c053de6f54de906d85800937c07adeec4aa..dfa099de2447e6feaca736837b3f448c0b837dd7 100644
GIT binary patch
delta 97
zcmWl~y9t0m3;@vLN^2V%H_*!^mqZZZelF+=7M6kz;Q($SID`0_cW&m~%>Hyn94&9x
y{2x_+t<ev21`P$$%#7?gaT3&_2nMk}Od|%*tQJ`c5D+Q~Ww9DFI*9~JeYYQwvl?dr

delta 97
zcmdn8f_cjd<_)j)m`#l>Cco2@0@0hf^-nBuGBb2Gu(WV7HF9+{Gcz_bHFGv|Ha9jg
yb~d*#v@kO<u(Pprb+&YKG<7v}buk9Ym^eCHn7dgR8XK9q7@C^7SxgqaA`bwM;~JR&

diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
index 7b80217b..1aa6a0eb 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
@@ -29,10 +29,7 @@ import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.text.ParseException;
 import java.util.*;
 
@@ -832,7 +829,7 @@ public class CollectController extends Controller {
             String pdfPath = excelPath.replace(".xlsx", ".pdf");
             AsposeUtil.xls2pdf(excelPath, pdfPath);
             OutputStream outputStream = getResponse().getOutputStream();
-            outputStream.write(CommonUtil.convertFileToByteArray(new File(pdfPath)));
+            outputStream.write(FileUtil.readBytes(pdfPath));
             outputStream.flush();
             renderNull();
         }
diff --git a/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java b/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java
index d48c7256..686f20ef 100644
--- a/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java
+++ b/src/main/java/com/dsideal/QingLong/Util/CommonUtil.java
@@ -22,7 +22,6 @@ import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -33,17 +32,6 @@ public class CommonUtil {
 
     public static String WebRoot;
 
-    public static byte[] convertFileToByteArray(File file) {
-        byte[] fileBytes = null;
-        try (FileInputStream fis = new FileInputStream(file)) {
-            fileBytes = new byte[(int) file.length()];
-            fis.read(fileBytes);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return fileBytes;
-    }
-
     //获取当前年份
     public static String getCurrentYear() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy");