diff --git a/UPDATE.md b/UPDATE.md index fbe52df..1b254dc 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -1,6 +1,13 @@ yexuejc-base 更新记录 ------------------ +#### version :1.2.7 +**time:2018-12-24 15:31:01**
+**branch:** master
+**update:**
+>1. FileUtil增加base64转File `base64ToFile()` + +# #### version :1.2.6 **time:2018-12-21 14:58:49**
**branch:** master
diff --git a/pom.xml b/pom.xml index bdd8b05..00a2e9d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.yexuejc.base yexuejc-base - 1.2.6 + 1.2.7 ${project.artifactId} diff --git a/src/main/java/com/yexuejc/base/util/FileUtil.java b/src/main/java/com/yexuejc/base/util/FileUtil.java index e23ae2f..337b895 100644 --- a/src/main/java/com/yexuejc/base/util/FileUtil.java +++ b/src/main/java/com/yexuejc/base/util/FileUtil.java @@ -2,10 +2,7 @@ package com.yexuejc.base.util; import sun.misc.BASE64Encoder; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; +import java.io.*; import java.math.BigInteger; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; @@ -307,6 +304,37 @@ public class FileUtil { return encoder.encode(data); } + /** + * base64转文件 + *

+ * + * 文件转base64请使用 {@link FileUtil#base64(File)} + * + * + * @param decode baseByte + * @param fileName 文件名称(包含路径) + * @return 返回保存地址 + */ + public static String base64ToFile(byte[] decode, String fileName) { + + FileOutputStream out = null; + try { + out = new FileOutputStream(fileName); + out.write(decode); + } catch (IOException ioe) { + ioe.printStackTrace(); + } finally { + try { + if (out != null) { + out.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + return fileName; + } + /** * 获取文件大小 :直接返回大小 * diff --git a/src/main/java/com/yexuejc/base/util/ImgUtil.java b/src/main/java/com/yexuejc/base/util/ImgUtil.java index 48ed6ad..7aa3dbc 100644 --- a/src/main/java/com/yexuejc/base/util/ImgUtil.java +++ b/src/main/java/com/yexuejc/base/util/ImgUtil.java @@ -323,33 +323,6 @@ public class ImgUtil { return rs; } - /** - * base64转文件 - * - * @param decode baseByte - * @param fileName 文件名称(包含路径) - * @return 返回保存地址 - */ - public static String base64ToFile(byte[] decode, String fileName) { - - FileOutputStream out = null; - try { - out = new FileOutputStream(fileName); - out.write(decode); - } catch (IOException ioe) { - ioe.printStackTrace(); - } finally { - try { - if (out != null) { - out.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - return fileName; - } - public static class ImageInfo { /** * 图片大小