Merge 23c9e8c89b into aae9c61ab6

easyexcel-core/src/main/java/com/alibaba/excel/support/ExcelTypeEnum.java

@@ -59,12 +59,6 @@ public enum ExcelTypeEnum {
                 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())) {
@@ -74,10 +68,9 @@ public enum ExcelTypeEnum {
                 } 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()) {