Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat-删除文件加密时的无效判断。 #3829

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

feat-删除文件加密时的无效判断。 #3829

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd81a09
feat-删除文件加密时的无效判断。
psxjoy Jun 12, 2024
9c48e46
feat-优化类型判断：无法通过后缀名判断文件类型时，直接通过魔法数判断。
psxjoy Jun 17, 2024
5684a2a
Merge branch 'refs/heads/master' into fix-20240612
psxjoy Jun 18, 2024
23c9e8c
Merge branch 'refs/heads/master' into fix-20240612
psxjoy Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions easyexcel-core/src/main/java/com/alibaba/excel/support/ExcelTypeEnum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,6 @@ public static ExcelTypeEnum valueOf(ReadWorkbook readWorkbook) {
if (!file.exists()) {
throw new ExcelAnalysisException("File " + file.getAbsolutePath() + " not exists.");
}
// If there is a password, use the FileMagic first
if (!StringUtils.isEmpty(readWorkbook.getPassword())) {
try (BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file))) {
return recognitionExcelType(bufferedInputStream);
}
}
// Use the name to determine the type
String fileName = file.getName();
if (fileName.endsWith(XLSX.getValue())) {
Expand All @@ -74,10 +68,9 @@ public static ExcelTypeEnum valueOf(ReadWorkbook readWorkbook) {
} else if (fileName.endsWith(CSV.getValue())) {
return CSV;
}
if (StringUtils.isEmpty(readWorkbook.getPassword())) {
try (BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file))) {
return recognitionExcelType(bufferedInputStream);
}
//If cannot get the name, use the magic number to determine the type
try (BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file))) {
return recognitionExcelType(bufferedInputStream);
}
}
if (!inputStream.markSupported()) {
Expand Down