diff --git a/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java index cebe88de8..cb7d25f5b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java @@ -4,7 +4,6 @@ import cn.hutool.core.codec.HexUtil; import cn.hutool.core.text.StrUtil; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Map; @@ -194,7 +193,7 @@ public class FileTypeUtil { * @throws IORuntimeException 读取文件引起的异常 */ public static String getType(File file,boolean isExact) throws IORuntimeException { - FileInputStream in = null; + InputStream in = null; try { in = IoUtil.toStream(file); return getType(in, file.getName(),isExact); diff --git a/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java index 15a1a4941..33016d60b 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java @@ -1763,6 +1763,7 @@ public class FileUtil extends PathUtil { * @param file 文件 * @return 输入流 * @throws IORuntimeException 文件未找到 + * @see IoUtil#toStream(File) */ public static BufferedInputStream getInputStream(final File file) throws IORuntimeException { return IoUtil.toBuffered(IoUtil.toStream(file)); diff --git a/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java index 739b68437..adf81e8c2 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java @@ -23,7 +23,6 @@ import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.Flushable; import java.io.IOException; @@ -38,6 +37,7 @@ import java.io.UnsupportedEncodingException; import java.io.Writer; import java.nio.CharBuffer; import java.nio.charset.Charset; +import java.nio.file.Files; import java.util.Collection; import java.util.Objects; @@ -525,15 +525,15 @@ public class IoUtil extends NioUtil { } /** - * 文件转为{@link FileInputStream} + * 文件转为{@link InputStream} * * @param file 文件 - * @return {@link FileInputStream} + * @return {@link InputStream} */ - public static FileInputStream toStream(final File file) { + public static InputStream toStream(final File file) { try { - return new FileInputStream(file); - } catch (final FileNotFoundException e) { + return Files.newInputStream(file.toPath()); + } catch (final IOException e) { throw new IORuntimeException(e); } }