From 6c2ffe89955f141fe303710d9d0513c3198a37ef Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 8 Mar 2022 15:26:53 +0800
Subject: [PATCH] =?UTF-8?q?ocr=E8=AF=86=E5=88=AB-=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/controller/OcrRestfulController.java  | 37 +++----------------
 1 file changed, 6 insertions(+), 31 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRestfulController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRestfulController.java
index 52dd7db3c..73a8c5d45 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRestfulController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRestfulController.java
@@ -25,7 +25,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -70,18 +69,16 @@ public class OcrRestfulController{
         OutputStream os = null;
         response.reset();
         try {
-            String fileOldName = fileNameEncoding(fileName,request);
-            response.setHeader("Content-Disposition", "attachment; filename=" + fileOldName);
+            response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
             response.setContentType("application/octet-stream");
-            try {
-                String fullPath = ocrPath + fileOldName;
-                is = new FileInputStream(new File(fullPath));
-            } catch (FileNotFoundException var4) {
-                throw new JeroBootException("文件[" + ocrPath + fileOldName + "]不存在");
-            }
+
+            String fullPath = ocrPath + fileName;
+            is = new FileInputStream(fullPath);
             os = response.getOutputStream();
             IOUtils.copy(is, os);
             os.flush();
+        } catch (FileNotFoundException var4) {
+            throw new JeroBootException("文件[" + ocrPath + fileName + "]不存在");
         } catch (IOException e) {
             log.error(e.getMessage(), e);
         } finally {
@@ -90,28 +87,6 @@ public class OcrRestfulController{
         }
     }
 
-    /**
-     * @Author yangxuenan
-     * @Description 根据不同浏览器定义下载文件编码
-     * Date 2018/10/11 10:40
-     * @Param [fileName, request]
-     * @return java.lang.String
-     **/
-    public String fileNameEncoding(String fileName, HttpServletRequest request)	throws IOException {
-        String agent = request.getHeader("User-Agent");
-        if (agent.contains("Firefox")) {
-            /*BASE64Encoder base64Encoder = new BASE64Encoder();
-            fileName = "=?utf-8?B?"
-                    + base64Encoder.encode(fileName.getBytes("utf-8")) + "?=";*/
-            fileName = new String(fileName.getBytes("UTF-8"), "ISO8859-1"); // firefox浏览器
-        } else {
-            fileName = URLEncoder.encode(fileName, "utf-8");
-            //谷歌中空格变为+问题
-            fileName = fileName.replaceAll("\\+","%20");
-        }
-        return fileName;
-    }
-
     /**
      * 测试OCR
      * @param file