Преглед на файлове

优化上传文件类型过滤的方法

wkeyuan преди 2 години
родител
ревизия
ad7d4d8927
променени са 2 файла, в които са добавени 11 реда и са изтрити 3 реда
  1. 0 1
      src/main/java/com/baidu/ueditor/upload/StorageManager.java
  2. 11 2
      src/main/java/net/diaowen/common/plugs/file/FileMagicUtils.java

+ 0 - 1
src/main/java/com/baidu/ueditor/upload/StorageManager.java

@@ -48,7 +48,6 @@ public class StorageManager {
 
 	public static State saveFileByInputStream(InputStream is, String path,
 			long maxSize) {
-		System.out.println("saveFileByInputStream");
 		BaseState validateState = isUserUpFileType(is,path.substring(path.lastIndexOf(".")));
 		if(!validateState.isSuccess()) return validateState;
 		State state = new BaseState(false, AppInfo.IO_ERROR);

+ 11 - 2
src/main/java/net/diaowen/common/plugs/file/FileMagicUtils.java

@@ -26,8 +26,17 @@ public class FileMagicUtils {
 
     //根据文件获取对应的文件类型
     public static FileMagic getFileMagic(File inp, String fileSuffix) throws Exception {
-        FileInputStream fis = new FileInputStream(inp);
-        return getFileMagic(fis,fileSuffix);
+        FileMagic fileMagic = null;
+        FileInputStream fis = null;
+        try{
+            fis = new FileInputStream(inp);
+            fileMagic = getFileMagic(fis,fileSuffix);
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            if (fis!=null) fis.close();
+        }
+        return fileMagic;
     }
 
     //切换到使用最新的tika验测