ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ExcelFileUtil):

Browse Source 
针对于ExcelFileUtil工具类的修改建议：
1.PushBackInputStream回退流的markSupported()为false,并不支持mark和reset.
2.FileMagic.valueOf(InputStream in)判断了流的markSupported是否被支持,从而导致报错IOException.
3.使用FileMagic.prepareToCheckMagic(in)进行修改.
This commit is contained in:
kefan.qu 2020-09-02 17:09:40 +08:00
parent 6d21bb930e
commit 4dd1ce7604
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelFileUtil.java
View File

@ -1,14 +1,11 @@
package cn.hutool.poi.excel;
import cn.hutool.core.io.IORuntimeException;
import org.apache.poi.poifs.filesystem.FileMagic;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PushbackInputStream;
import org.apache.poi.poifs.filesystem.FileMagic;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
/**
* Excel文件工具类
@ -26,9 +23,19 @@ public class ExcelFileUtil {
* @return 是否为XLS格式的Excel文件（HSSF）
*/
public static boolean isXls(InputStream in) {
final PushbackInputStream pin = IoUtil.toPushbackStream(in, 8);
/**
* {@link java.io.PushbackInputStream}
* PushbackInputStream的markSupported()为false，并不支持mark和reset
* 如果强转成PushbackInputStream在调用FileMagic.valueOf(inputStream)时会报错
* {@link FileMagic}
* 报错内容：getFileMagic() only operates on streams which support mark(int)
* 此处修改成 final InputStream inputStream = FileMagic.prepareToCheckMagic(in)
* @author kefan.qu
*/
final InputStream inputStream = FileMagic.prepareToCheckMagic(in);
try {
return FileMagic.valueOf(pin) == FileMagic.OLE2;
return FileMagic.valueOf(inputStream) == FileMagic.OLE2;
} catch (IOException e) {
throw new IORuntimeException(e);
}