From b5862e6ea76be876d676f3b57a911c18775e69d5 Mon Sep 17 00:00:00 2001
From: shuleisanshi <shuleisanshi@163.com>
Date: Tue, 29 Oct 2019 10:48:38 +0800
Subject: [PATCH] :arrow_up: upgrade Hutool

---
 util/pom.xml                                   | 18 ++++++++++++++++--
 .../youngbingdong/util/excel/ExcelUtil.java    |  5 ++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/util/pom.xml b/util/pom.xml
index c20ceb8..e8ca401 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -14,6 +14,7 @@
 
     <properties>
         <java.version>1.8</java.version>
+        <hutool-core.version>5.0.3</hutool-core.version>
     </properties>
 
     <dependencies>
@@ -51,10 +52,23 @@
             <version>3.14.2</version>
         </dependency>
 
+        <!-- Hutool 工具集 https://www.hutool.cn/docs/index.html#/ -->
         <dependency>
             <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>4.6.1</version>
+            <artifactId>hutool-core</artifactId>
+            <version>${hutool-core.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-crypto</artifactId>
+            <version>${hutool-core.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-http</artifactId>
+            <version>${hutool-core.version}</version>
         </dependency>
 
         <dependency>
diff --git a/util/src/main/java/com/youngbingdong/util/excel/ExcelUtil.java b/util/src/main/java/com/youngbingdong/util/excel/ExcelUtil.java
index eb57e7a..f6be2d9 100644
--- a/util/src/main/java/com/youngbingdong/util/excel/ExcelUtil.java
+++ b/util/src/main/java/com/youngbingdong/util/excel/ExcelUtil.java
@@ -1,12 +1,12 @@
 package com.youngbingdong.util.excel;
 
+import cn.hutool.core.codec.Base64;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.youngbingdong.util.spring.RequestHolder;
 import org.springframework.web.multipart.MultipartFile;
-import sun.misc.BASE64Encoder;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -69,9 +69,8 @@ public static void writeToWeb(String fileName, List<?> data) throws IOException
     private static String fileNameEncoding(String fileName) throws IOException {
         String agent = RequestHolder.currentRequest().getHeader("User-Agent");
         if (agent.contains("Firefox")) {
-            BASE64Encoder base64Encoder = new BASE64Encoder();
             fileName = "=?utf-8?B?"
-                    + base64Encoder.encode(fileName.getBytes(StandardCharsets.UTF_8)) + "?=";
+                    + Base64.encode(fileName.getBytes(StandardCharsets.UTF_8)) + "?=";
         } else {
             fileName = URLEncoder.encode(fileName, "utf-8");
         }