导入模板replace_zone字典增加

音视频样例120s
This commit is contained in:
duandongmei
2018-10-19 09:13:43 +08:00
parent 905f19bc69
commit 5655f16c32
4 changed files with 35 additions and 20 deletions

View File

@@ -155,7 +155,7 @@ public class MultipartFileIntercepter extends CommonsMultipartResolver{
//私钥文件校验
if(!StringUtil.isEmpty(fileName) && fileName.toLowerCase().equals("privatekeyfilei")){
//文件类型错误
if(privateFileTypes.indexOf(","+FileUtils.getSuffix(file.getOriginalFilename().toLowerCase(), false)+",") == -1){
if((!StringUtil.isEmpty(privateFileTypes)) && (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(fileMaxSize >0 && file.getSize() > privateFileMaxSize){
@@ -164,7 +164,7 @@ public class MultipartFileIntercepter extends CommonsMultipartResolver{
//其他文件校验
}else{
//文件类型错误
if(fileTypes.indexOf(","+FileUtils.getSuffix(file.getOriginalFilename().toLowerCase(), false)+",") == -1){
if((!StringUtil.isEmpty(fileTypes)) && 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(fileMaxSize > 0l && file.getSize() > fileMaxSize){