From 845cb2e6577f9b65217b2d51638594e551a2b6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com>
Date: Thu, 24 Oct 2019 16:23:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=E6=97=B6?=
 =?UTF-8?q?url=E8=A7=A3=E7=A0=81=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/keking/utils/FileUtils.java   | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java b/jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java
index db675168..4c26335e 100644
--- a/jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java
+++ b/jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java
@@ -12,7 +12,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
 import java.io.*;
-import java.net.URLDecoder;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -328,26 +327,19 @@ public class FileUtils {
 
 
     public FileAttribute getFileAttribute(String url) {
-        String decodedUrl = null;
-        try {
-            decodedUrl = URLDecoder.decode(url, "utf-8");
-        } catch (UnsupportedEncodingException e){
-            log.error("url解码失败");
-        }
         String fileName;
         FileType type;
         String suffix;
-
-        String fullFileName = getUrlParameterReg(decodedUrl, "fullfilename");
+        String fullFileName = getUrlParameterReg(url, "fullfilename");
         if (!StringUtils.isEmpty(fullFileName)) {
             fileName = fullFileName;
             type = typeFromFileName(fileName);
             suffix = suffixFromFileName(fileName);
         } else {
-            fileName = getFileNameFromURL(decodedUrl);
+            fileName = getFileNameFromURL(url);
             type = typeFromUrl(url);
             suffix = suffixFromUrl(url);
         }
-        return new FileAttribute(type,suffix,fileName,url,decodedUrl);
+        return new FileAttribute(type,suffix,fileName,url,url);
     }
 }