From 3987f982be0bd2fb04b1169511bfaeb0782f6f58 Mon Sep 17 00:00:00 2001
From: yexuejc-vm-win10 <1107047387@qq.com>
Date: Sun, 8 May 2022 16:43:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4Base64=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=8C=85=EF=BC=8C=E4=BD=BF=E5=85=B6=E5=85=BC=E5=AE=B9openjdk11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/yexuejc/base/util/FileUtil.java | 11 +++++++----
 src/main/java/com/yexuejc/base/util/ImgUtil.java  |  8 +++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/yexuejc/base/util/FileUtil.java b/src/main/java/com/yexuejc/base/util/FileUtil.java
index 337b895..0dea7ab 100644
--- a/src/main/java/com/yexuejc/base/util/FileUtil.java
+++ b/src/main/java/com/yexuejc/base/util/FileUtil.java
@@ -1,13 +1,12 @@
 package com.yexuejc.base.util;
 
-import sun.misc.BASE64Encoder;
-
 import java.io.*;
 import java.math.BigInteger;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
 import java.util.logging.Logger;
 import java.util.zip.CRC32;
 
@@ -300,8 +299,12 @@ public class FileUtil {
             e.printStackTrace();
         }
         // 对字节数组Base64编码
-        BASE64Encoder encoder = new BASE64Encoder();
-        return encoder.encode(data);
+        return new String(Base64.getEncoder().encode(data));
+    }
+
+    public static void main(String[] args) {
+        String s = base64(new File("Z:\\NAS\\04.coding\\yexuejc\\yexuejc-base"));
+        System.out.printf( s);
     }
 
     /**
diff --git a/src/main/java/com/yexuejc/base/util/ImgUtil.java b/src/main/java/com/yexuejc/base/util/ImgUtil.java
index 7aa3dbc..aa55731 100644
--- a/src/main/java/com/yexuejc/base/util/ImgUtil.java
+++ b/src/main/java/com/yexuejc/base/util/ImgUtil.java
@@ -1,7 +1,5 @@
 package com.yexuejc.base.util;
 
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
 
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReader;
@@ -11,6 +9,7 @@ import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.Proxy;
 import java.net.URL;
+import java.util.Base64;
 import java.util.Iterator;
 
 /**
@@ -47,8 +46,7 @@ public class ImgUtil {
             e.printStackTrace();
         }
         // 对字节数组Base64编码
-        BASE64Encoder encoder = new BASE64Encoder();
-        return encoder.encode(data.toByteArray());
+        return new String(Base64.getEncoder().encode(data.toByteArray()));
     }
 
     /**
@@ -237,7 +235,7 @@ public class ImgUtil {
      * @return String 编码后的字符串
      */
     public static String encode(byte[] bytes) {
-        return new BASE64Encoder().encode(bytes);
+        return new String(Base64.getEncoder().encode(bytes));
     }
 
     /**