From 8741562463d59a37fced468c86a310cb34da87c2 Mon Sep 17 00:00:00 2001
From: yexuejc-vm-win10 <1107047387@qq.com>
Date: Sun, 8 May 2022 19:30:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A9=E5=B1=95FileUtil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yexuejc/base/util/FileUtil.java  | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/yexuejc/base/util/FileUtil.java b/src/main/java/com/yexuejc/base/util/FileUtil.java
index 0dea7ab..2c99a1a 100644
--- a/src/main/java/com/yexuejc/base/util/FileUtil.java
+++ b/src/main/java/com/yexuejc/base/util/FileUtil.java
@@ -285,7 +285,17 @@ public class FileUtil {
      * @param file
      * @return
      */
-    public static String base64(File file) {
+    public static String base64ToStr(File file) {
+        return new String(base64(file));
+    }
+
+    /**
+     * 获取文件base64
+     *
+     * @param file
+     * @return
+     */
+    public static byte[] base64(File file) {
         FileInputStream fileInputStream = null;
         byte[] data = null;
         // 读取图片字节数组
@@ -299,12 +309,22 @@ public class FileUtil {
             e.printStackTrace();
         }
         // 对字节数组Base64编码
-        return new String(Base64.getEncoder().encode(data));
+        return 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);
+    /**
+     * base64转文件
+     * <p>
+     * <i>
+     * 文件转base64请使用 {@link FileUtil#base64(File)}
+     * </i>
+     *
+     * @param decode   {@link FileUtil#base64ToStr(File)} 的结果
+     * @param fileName 文件名称（包含路径）
+     * @return 返回保存地址
+     */
+    public static String base64ToFile(String decode, String fileName) {
+        return base64ToFile(Base64.getDecoder().decode(decode.getBytes()), fileName);
     }
 
     /**