导入模板replace_zone字典增加

音视频样例120s

src/main/java/com/nis/interceptor/MultipartFileIntercepter.java

@@ -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){

src/main/java/com/nis/util/excel/ExportExcel.java

@@ -148,6 +148,28 @@ public class ExportExcel {
 					}
 				}
 			}
+			if(StringUtil.isEmpty(commentStr)){
+				headerStr="";
+				commentStr="";
+			}
+		}
+		//replace_zone
+		if("replace_zone".equals(headerStr)){
+			commentStr="";
+			List<SysDataDictionaryItem> interceptReplaceZone=DictUtils.getDictList("INTERCEPT_REPLACE_ZONE");
+			if(interceptReplaceZone !=null && interceptReplaceZone.size()>0){
+				for (SysDataDictionaryItem sysDataDictionaryItem : interceptReplaceZone) {
+					if(StringUtil.isEmpty(msgProp.getProperty(sysDataDictionaryItem.getItemValue()))){
+						commentStr=commentStr+sysDataDictionaryItem.getItemCode()+":"+sysDataDictionaryItem.getItemValue()+"\n";
+					}else{
+						commentStr=commentStr+sysDataDictionaryItem.getItemCode()+":"+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+"\n";
+					}
+				}
+			}
+			if(StringUtil.isEmpty(commentStr)){
+				headerStr="";
+				commentStr="";
+			}
 		}
 		
 		if("policy_name".equals(headerStr)){

src/main/java/com/nis/web/controller/configuration/ntc/IpController.java

@@ -249,16 +249,16 @@ public class IpController extends BaseController{
 					}
 				}else if(regionDict.getFunctionId().equals(212)){ //IP Payload
 					List<IpPayloadTemplate> classList=new ArrayList<IpPayloadTemplate>();
-					ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpAllTemplate.class, 2);
+					ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpPayloadTemplate.class, 2);
 					excel.setDataList(this.getMsgProp(),classList,null).
 			    	write(request,response, fileName).dispose();
 				}else if(regionDict.getFunctionId().equals(7)){ //Dns IP
-					List<IpPayloadTemplate> classList=new ArrayList<IpPayloadTemplate>();
+					List<DnsIpTemplate> classList=new ArrayList<DnsIpTemplate>();
-					ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpAllTemplate.class, 2);
+					ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, DnsIpTemplate.class, 2);
 					excel.setDataList(this.getMsgProp(),classList,null).
 			    	write(request,response, fileName).dispose();
 				}else{
-					List<DnsIpTemplate> classList=new ArrayList<DnsIpTemplate>();
+					List<IpAllTemplate> classList=new ArrayList<IpAllTemplate>();
 					ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpAllTemplate.class, 2);
 					excel.setDataList(this.getMsgProp(),classList,null).
 			    	write(request,response, fileName).dispose();
@@ -266,17 +266,10 @@ public class IpController extends BaseController{
 			}
 			//str类模板
 			if(regionDict.getRegionType().equals(2)){
-				if(regionDict.getFunctionId().equals(212)){
 				List<StringAllTemplate> classList=new ArrayList<StringAllTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, StringAllTemplate.class, 2);
 				excel.setDataList(this.getMsgProp(),classList,null).
 		    	write(request,response, fileName).dispose();
-				}else{
-					List<StringAllTemplate> classList=new ArrayList<StringAllTemplate>();
-					ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, StringAllTemplate.class, 2);
-					excel.setDataList(this.getMsgProp(),classList,null).
-			    	write(request,response, fileName).dispose();
-				}
 			}
 			//district类模板
 			if(regionDict.getRegionType().equals(3)){

src/main/resources/nis.properties

@@ -424,11 +424,11 @@ digest_total_file_max_size=12582912
 #cert File Size 12M 12582912\uff08total\uff09 
 cert_total_file_max_size=12582912
 #public File Types
-public_file_type=,cer,crt,pem,p12,
+public_file_type=
 #public File Size 10M 10485760\uff08single\uff09
 public_single_file_max_size=10485760
 #private File Types
-private_file_type=,cer,crt,pem,p12,
+private_file_type=
 #private File Size 10M 10485760\uff08single\uff09
 private_single_file_max_size=10485760
 #YSP\u6587\u4ef6\u4fdd\u5b58\u8def\u5f84
@@ -530,4 +530,4 @@ isp_tag=isp
 mmFileDigestLog=mmFileDigestLogs
 ntcStreamMediaLog=ntcStreamMediaLogs
 #音视频样例限制时长，单位秒
-av_duration_limit=10
+av_duration_limit=120