diff --git a/src/main/java/com/nis/interceptor/MultipartFileIntercepter.java b/src/main/java/com/nis/interceptor/MultipartFileIntercepter.java index 2bbd3c549..b88aa6e59 100644 --- a/src/main/java/com/nis/interceptor/MultipartFileIntercepter.java +++ b/src/main/java/com/nis/interceptor/MultipartFileIntercepter.java @@ -158,7 +158,7 @@ public class MultipartFileIntercepter extends CommonsMultipartResolver{ if(privateFileTypes.indexOf(","+FileUtils.getSuffix(file.getOriginalFilename().toLowerCase(), false)+",") == -1){ throw new MultiPartNewException(errorInfo,file.getOriginalFilename(),privateFileTypes.substring(0,privateFileTypes.length()-1).substring(1),prop,null); } - if(file.getSize() > privateFileMaxSize){ + if(fileMaxSize >0 && file.getSize() > privateFileMaxSize){ throw new MultiPartNewException(errorInfo, file.getOriginalFilename(), file.getSize(), privateFileMaxSize,prop, null); } //其他文件校验 @@ -167,7 +167,7 @@ public class MultipartFileIntercepter extends CommonsMultipartResolver{ if(fileTypes.indexOf(","+FileUtils.getSuffix(file.getOriginalFilename().toLowerCase(), false)+",") == -1){ throw new MultiPartNewException(errorInfo,file.getOriginalFilename(),fileTypes.substring(0,fileTypes.length()-1).substring(1),prop,null); } - if(file.getSize() > fileMaxSize){ + if(fileMaxSize > 0l && file.getSize() > fileMaxSize){ throw new MultiPartNewException(errorInfo, file.getOriginalFilename(), file.getSize(), fileMaxSize,prop, null); } } diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index dce64af7a..35b683ea0 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -386,23 +386,22 @@ cert_upload_url_keyword=/intercept/strateagy #sample File Size 12M 12582912 sample_total_file_max_size=12582912 - #audio File Types audio_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,wav,mp3, #audio File Size 10M 10485760\uff08single\uff09 -audio_single_file_max_size=10485760 +audio_single_file_max_size=0 #speaker File Types \u8bf4\u8bdd\u4eba\u8bc6\u522b\u6587\u4ef6\u7c7b\u578b speaker_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,wav,mp3, #audio File Size 10M 10485760\uff08single\uff09 -speaker_single_file_max_size=10485760 +speaker_single_file_max_size=0 #video File Types video_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv, #video File Size 10M 10485760\uff08single\uff09 -video_single_file_max_size=10485760 +video_single_file_max_size=0 #face File Types \u4eba\u8138\u8bc6\u522b face_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv, #face File Size 10M 10485760\uff08single\uff09 -face_single_file_max_size=10485760 +face_single_file_max_size=0 #picture File Types picture_file_type=,bmp,jpg,tiff,raw,gif, #picture File Size 10M 10485760\uff08single\uff09 @@ -414,7 +413,7 @@ logo_single_file_max_size=10485760 #voip File Types voip_file_type=,mp3,mp4,flv,ivf,mp2v,jpg, #voip File Size 10M 10485760\uff08single\uff09 -voip_single_file_max_size=10485760 +voip_single_file_max_size=0 #digest File Types digest_file_type=,txt,doc,img,docx,pptx,xlsx,xls,ppt,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,wav,mp3,