增加app字典sql文件

Conflicts:
	src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java

README.md

@@ -1 +1 @@
-在公共分组功能逻辑完善之前，此分支为ntc界面系统的全集上线升级分支合并版。
+空间测绘

src/main/java/com/nis/domain/configuration/BaseCfg.java

@@ -63,6 +63,10 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	protected String hColumns;//导出隐藏列
 	
 	protected String compileIdNew;// 查询 配置ID 范围
+	
+	//批量操作时，记录isAudit和isValid检索条件
+	protected String batchAuditValue;
+	protected String batchValidValue;
 
 	/**
 	 * 定时任务信息
@@ -1004,6 +1008,17 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	public void setSchedule(ScheduleCfg schedule) {
 		this.schedule = schedule;
 	}
-	
+	public String getBatchAuditValue() {
+		return batchAuditValue;
+	}
+	public String getBatchValidValue() {
+		return batchValidValue;
+	}
+	public void setBatchAuditValue(String batchAuditValue) {
+		this.batchAuditValue = batchAuditValue;
+	}
+	public void setBatchValidValue(String batchValidValue) {
+		this.batchValidValue = batchValidValue;
+	}
 	
 }

src/main/java/com/nis/quartz/ScheduleCfgJob.java

@@ -330,7 +330,7 @@ public class ScheduleCfgJob implements Job {
 			Calendar invalidCal=Calendar.getInstance();
 			invalidCal.setTime(invalidTime);
 			invalidCal.add(Calendar.MINUTE, 2);
-			long invalidTimes=validStartCal.getTime().getTime();
+			long invalidTimes=invalidCal.getTime().getTime();
 			long currentTimes=new Date().getTime();
 			//开始时间设置为今天已过时，则将开始时间加上周期
 			if((currentTimes-validStartTimes) > 0) {

src/main/java/com/nis/util/ConfigServiceUtil.java

@@ -190,6 +190,7 @@ public class ConfigServiceUtil {
 					result=response.readEntity(String.class);
 				}
 			} catch (Exception e) {
+				e.printStackTrace();
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
 			}  
 			if(response != null && response.getStatus() == 200){
@@ -235,6 +236,7 @@ public class ConfigServiceUtil {
 					result=response.readEntity(String.class);
 				}
 			} catch (Exception e) {
+				e.printStackTrace();
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
 			}  
 			if(response != null && response.getStatus() == 200){
@@ -244,6 +246,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			e.printStackTrace();
 			logger.error("postCallbackCfg()",e);
 			throw e;
 		}finally {
@@ -279,6 +282,7 @@ public class ConfigServiceUtil {
 					result=response.readEntity(String.class);
 				}
 			} catch (Exception e) {
+				e.printStackTrace();
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
 			}  
 			if(response != null && response.getStatus() == 200){
@@ -326,6 +330,7 @@ public class ConfigServiceUtil {
 					result=response.readEntity(String.class);
 				}
 			} catch (Exception e) {
+				e.printStackTrace();
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
 			} 
 			if(response != null &&  response.getStatus() == 200){
@@ -375,6 +380,7 @@ public class ConfigServiceUtil {
 					result=response.readEntity(String.class);
 				}
 			} catch (Exception e) {
+				e.printStackTrace();
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
 			} 
 			if(response !=null && response.getStatus() == 200){
@@ -418,6 +424,7 @@ public class ConfigServiceUtil {
 //				bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class);
 				//获取响应结果
 			} catch (Exception e) {
+				e.printStackTrace();
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			} 
 		} catch (Exception e) {
@@ -452,6 +459,7 @@ public class ConfigServiceUtil {
 					result=response.readEntity(String.class);
 				}
 			} catch (Exception e) {
+				e.printStackTrace();
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
 			} 
 			if(response !=null && response.getStatus() == 200){

src/main/java/com/nis/util/Constants.java

@@ -363,6 +363,7 @@ public final class Constants {
 	public static final String FILE_UPLOAD_CFG = Configurations.getStringProperty("fileUploadCfg","fileUploadSources"); 
 	public static final String FILE_DIGEST_CFG=Configurations.getStringProperty("fileDigestCfg","fileDigestSources");
 	public static final String CONFIG_ID_SOURCES=Configurations.getStringProperty("configIdSources","configPzIdSources");
+	public static final String DEL_ALL_CFG=Configurations.getStringProperty("delAllCfg","delAllConfig");
 	//日志查询接口URL
 	public static final String LOG_BASE_URL = Configurations.getStringProperty("logBaseUrl","");
 	public static final String NTC_SERVICE_REPORT=Configurations.getStringProperty("ntcServiceReport","ntcServiceReport");

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

@@ -306,6 +306,13 @@ public class ExcelCsv {
 									dict="block_drop";
 									val = msgProp.getProperty(dict,dict);
 								}
+								if ("action".equals(ef.title()) && dict.equals("action_reject")
+										&& (Reflections.invokeGetter(e, "service").toString().equals("35")
+										|| Reflections.invokeGetter(e, "service").toString().equals("33")
+										|| Reflections.invokeGetter(e, "service").toString().equals("36"))) {
+									dict="block_drop";
+									val = msgProp.getProperty(dict,dict);
+								}
 								//ip spoofing redirect动作修改为Spoofing
 								if(ef.title().equals("block_type") 
 										&& (Reflections.invokeGetter(e, "serviceId").toString().equals("518"))) {

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

@@ -266,6 +266,9 @@ public class ExportExcel {
 			commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
 			index++;
 			//1、非空
+			commentStr=commentStr+"▶"+msgProp.getProperty("https_url_format_tip")+"\n";
+			index++;
+			//1、非空
 			commentStr=commentStr+"▶"+msgProp.getProperty("required")+"\n";
 			index++;
 		}
@@ -2308,6 +2311,13 @@ public class ExportExcel {
 									dict="block_drop";
 									val = msgProp.getProperty(dict,dict);
 								}
+								if ("action".equals(ef.title()) && dict.equals("action_reject")
+										&& (Reflections.invokeGetter(e, "service").toString().equals("35")
+										|| Reflections.invokeGetter(e, "service").toString().equals("33")
+										|| Reflections.invokeGetter(e, "service").toString().equals("36"))) {
+									dict="block_drop";
+									val = msgProp.getProperty(dict,dict);
+								}
 								//ip spoofing redirect动作修改为Spoofing
 								if(ef.title().equals("block_type") 
 										&& (Reflections.invokeGetter(e, "serviceId").toString().equals("518"))) {

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

@@ -488,11 +488,11 @@ public class ImportBigExcel extends XLSXCovertCSVReader{
 						if (valType == String.class){
 							String s = String.valueOf(val.toString().trim());
 							//0.0.0.0表示任意IP的含义
-							if(StringUtils.endsWith(s, ".0") && !s.endsWith("0.0.0.0")){
-								val = StringUtils.substringBefore(s, ".0");
-							}else{
-								val=val == null ? "" : StringEscapeUtils.escapeHtml4(val.toString().trim());
-							}
+//							if(StringUtils.endsWith(s, ".0") && !s.endsWith("0.0.0.0")){
+//								val = StringUtils.substringBefore(s, ".0");
+//							}else{
+							val=val == null ? "" : StringEscapeUtils.escapeHtml4(val.toString().trim());
+//							}
 						}else if (valType == Integer.class){
 							val = Double.valueOf(val.toString().trim()).intValue();
 						}else if (valType == Long.class){

src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java

@@ -138,6 +138,7 @@ public class CheckIpFormatThread implements Callable<String>{
 			// doLog属性检验
 			this.validDoLog(baseIpCfg,errInfo);
 			
+			
 			// 特殊字段验证
 			// packet ip ratelimit
 			if (serviceDict!=null && serviceDict.getAction().intValue() == 64 && (serviceDict.getFunctionId().intValue() == 5 
@@ -594,6 +595,23 @@ public class CheckIpFormatThread implements Callable<String>{
 						String subfix=baseIpCfg.getSrcIpAddress().split("-")[1];
 						baseIpCfg.setSrcIpAddress(prefix+"-"+prefix.substring(0, prefix.lastIndexOf(".")+1)+subfix);
 					}
+					//Tip:判断业务是否只展示源IP列,如果是,判断源IP是否是默认值,如果是默认值,提示源IP不能是默认值
+					if (configIpPortShow.indexOf("1") > -1 && configIpPortShow.indexOf("3") == -1) {// 源IP必填
+						String srcIpAddress = baseIpCfg.getSrcIpAddress();
+						Pattern ip4 = Constants.IPV4_IP_PATTERN;
+						Pattern ip6 = Constants.IPV6_IP_PATTERN;
+						Matcher ip4Matcher = ip4.matcher(srcIpAddress);
+						Matcher ip6Matcher = ip6.matcher(srcIpAddress);
+						if (ip4Matcher.matches() && srcIpAddress.startsWith("0.0.0.0")) {
+							errInfo.append(prop.getProperty("client_ip")+" "
+									+ String.format(prop.getProperty("can_not_be"), Constants.IPV4_DEFAULT_IP_VALUE)
+									+ ";");
+						} else if (ip6Matcher.matches() && srcIpAddress.startsWith("::")) {
+							errInfo.append(prop.getProperty("client_ip")+" "
+									+ String.format(prop.getProperty("can_not_be"), Constants.IPV6_DEFAULT_IP_VALUE)
+									+ ";");
+						}
+					}
 				}
 				if (StringUtils.isBlank(baseIpCfg.getDestIpAddress())) {
 					destIpEmpty = true;
@@ -605,6 +623,23 @@ public class CheckIpFormatThread implements Callable<String>{
 						String subfix=baseIpCfg.getDestIpAddress().split("-")[1];
 						baseIpCfg.setDestIpAddress(prefix+"-"+prefix.substring(0, prefix.lastIndexOf(".")+1)+subfix);
 					}
+					//Tip:判断业务是否只展示目的IP列,如果是,判断目的IP是否是默认值,如果是默认值,提示目的IP不能是默认值
+					if (configIpPortShow.indexOf("3") > -1 && configIpPortShow.indexOf("1") == -1) {// 目的IP必填
+						String destIpAddress = baseIpCfg.getDestIpAddress();
+						Pattern ip4 = Constants.IPV4_IP_PATTERN;
+						Pattern ip6 = Constants.IPV6_IP_PATTERN;
+						Matcher ip4Matcher = ip4.matcher(destIpAddress);
+						Matcher ip6Matcher = ip6.matcher(destIpAddress);
+						if (ip4Matcher.matches() && destIpAddress.startsWith("0.0.0.0")) {
+							errInfo.append(prop.getProperty("server_ip")+" "
+									+ String.format(prop.getProperty("can_not_be"), Constants.IPV4_DEFAULT_IP_VALUE)
+									+ ";");
+						} else if (ip6Matcher.matches() && destIpAddress.startsWith("::")) {
+							errInfo.append(prop.getProperty("server_ip")+" "
+									+ String.format(prop.getProperty("can_not_be"), Constants.IPV6_DEFAULT_IP_VALUE)
+									+ ";");
+						}
+					}
 				}
 				if (StringUtils.isBlank(baseIpCfg.getSrcPort())) {
 					srcPortEmpty = true;
@@ -666,6 +701,12 @@ public class CheckIpFormatThread implements Callable<String>{
 							}
 							baseIpCfg.setIpType(4);
 						}
+						//Tip:增加源IP和目的IP是否相等,如果相等,提示目的IP不能为空
+						if ((configIpPortShow.indexOf("3") > -1 && configIpPortShow.indexOf("1") > -1)
+								&& (baseIpCfg.getDestIpAddress().equals(baseIpCfg.getSrcIpAddress()))) {
+							errInfo.append(String.format(prop.getProperty("can_not_null"),
+									prop.getProperty("server_ip", "Server IP")) + ";");
+						}
 					}
 
 				} else if (srcIpEmpty) {// 源IP为空
@@ -707,6 +748,12 @@ public class CheckIpFormatThread implements Callable<String>{
 							}
 							baseIpCfg.setIpType(4);
 						}
+						//Tip:增加源IP和目的IP是否相等,如果相等,提示源的IP不能为空
+						if ((configIpPortShow.indexOf("3") > -1 && configIpPortShow.indexOf("1") > -1)
+								&& (baseIpCfg.getSrcIpAddress().equals(baseIpCfg.getDestIpAddress()))) {
+							errInfo.append(String.format(prop.getProperty("can_not_null"),
+									prop.getProperty("client_ip", "Client IP")) + ";");
+						}
 					}
 				} else {// 全不为空
 					String srcMatchType = this.validIPAddress("client_ip", errInfo, baseIpCfg.getSrcIpAddress(), ipType,
@@ -834,7 +881,7 @@ public class CheckIpFormatThread implements Callable<String>{
 					baseIpCfg.setDestPortPattern(1);
 				}
 				baseIpCfg.setDestPort(baseIpCfg.getDestPort().trim());
-				boolean validDestPort = this.validPort(errInfo, baseIpCfg.getSrcPort(),
+				boolean validDestPort = this.validPort(errInfo, baseIpCfg.getDestPort(),
 						srcPortPattern,"server_port");
 				
 				if (baseIpCfg.getProtocol()==null) {
@@ -901,6 +948,10 @@ public class CheckIpFormatThread implements Callable<String>{
 				// TODO 判断Direction的值
 				this.validDirection(errInfo, baseIpCfg.getDirection(), direction);
 			}
+			
+			//IP校验
+//			this.validSrcAndDescIp(baseIpCfg.getSrcIpAddress(), baseIpCfg.getDestIpAddress(), configIpPortShow,errInfo);
+			
 			if (errInfo.toString().length() > 0) {//
 				errTip.append(String.format(prop.getProperty("line"), baseIpCfg.getIndex()) + ",");
 				errTip.append(errInfo);

src/main/java/com/nis/web/controller/BaseController.java

@@ -2749,45 +2749,6 @@ public class BaseController {
 		
 		//全部审核通过，只查询当前条件下的所有未审核的配置 -批量审核通过/不通过
 		if(auditType.equals(1) || auditType.equals(2)) {
-			searchCfg.setIsValid(0);
-			searchCfg.setIsAudit(0);
-			searchAppCfg.setIsValid(0);
-			searchAppCfg.setIsAudit(0);
-			searchDigestCfg.setIsValid(0);
-			searchDigestCfg.setIsAudit(0);
-			searchFileSampleCfg.setIsValid(0);
-			searchFileSampleCfg.setIsAudit(0);
-			searchObjKeyringCfg.setIsValid(0);
-			searchObjKeyringCfg.setIsAudit(0);
-			searchTrustedCaCertCfg.setIsValid(0);
-			searchTrustedCaCertCfg.setIsAudit(0);
-			searchTrustedCaCrlCfg.setIsValid(0);
-			searchTrustedCaCrlCfg.setIsAudit(0);
-			searchDnsResStrategy.setIsValid(0);
-			searchDnsResStrategy.setIsAudit(0);
-			searchDnsIpCfg.setIsValid(0);
-			searchDnsIpCfg.setIsAudit(0);
-			searchIpPortCfg.setIsValid(0);
-			searchIpPortCfg.setIsAudit(0);
-			searchSignSampleCfg.setIsValid(0);
-			searchSignSampleCfg.setIsAudit(0);
-			searchDdosIpCfg.setIsValid(0);
-			searchDdosIpCfg.setIsAudit(0);
-			searchAppIpCfg.setIsValid(0);
-			searchAppIpCfg.setIsAudit(0);
-			searchAppHttpCfg.setIsValid(0);
-			searchAppHttpCfg.setIsAudit(0);
-			searchAppDomainCfg.setIsValid(0);
-			searchAppDomainCfg.setIsAudit(0);
-			searchAppTopicCfg.setIsValid(0);
-			searchAppTopicCfg.setIsAudit(0);
-			searchAppFeatureIndex.setIsValid(0);
-			searchAppFeatureIndex.setIsAudit(0);
-			searchAppSslCertCfg.setIsValid(0);
-			searchAppSslCertCfg.setIsAudit(0);
-			searchAsnIpCfg.setIsValid(0);
-			searchAsnIpCfg.setIsAudit(0);
-			
 			if(auditType.equals(1)) {
 				auditBatchCfg.setIsAudit(1);
 				auditBatchCfg.setIsValid(1);
@@ -2798,45 +2759,6 @@ public class BaseController {
 			auditBatchCfg.setAuditTime(new Date());
 			auditBatchCfg.setAuditorId(UserUtils.getUser().getId());
 		}else {
-		//全部取消通过，只查询当前条件下的所有审核通过的配置
-			searchCfg.setIsValid(1);
-			searchCfg.setIsAudit(1);
-			searchAppCfg.setIsValid(1);
-			searchAppCfg.setIsAudit(1);
-			searchDigestCfg.setIsValid(1);
-			searchDigestCfg.setIsAudit(1);
-			searchFileSampleCfg.setIsValid(1);
-			searchFileSampleCfg.setIsAudit(1);
-			searchObjKeyringCfg.setIsValid(1);
-			searchObjKeyringCfg.setIsAudit(1);
-			searchTrustedCaCertCfg.setIsValid(1);
-			searchTrustedCaCertCfg.setIsAudit(1);
-			searchTrustedCaCrlCfg.setIsValid(1);
-			searchTrustedCaCrlCfg.setIsAudit(1);
-			searchDnsResStrategy.setIsValid(1);
-			searchDnsResStrategy.setIsAudit(1);
-			searchDnsIpCfg.setIsValid(1);
-			searchDnsIpCfg.setIsAudit(1);
-			searchIpPortCfg.setIsValid(1);
-			searchIpPortCfg.setIsAudit(1);
-			searchSignSampleCfg.setIsValid(1);
-			searchSignSampleCfg.setIsAudit(1);
-			searchDdosIpCfg.setIsValid(1);
-			searchDdosIpCfg.setIsAudit(1);
-			searchAppIpCfg.setIsValid(1);
-			searchAppIpCfg.setIsAudit(1);
-			searchAppHttpCfg.setIsValid(1);
-			searchAppHttpCfg.setIsAudit(1);
-			searchAppDomainCfg.setIsValid(1);
-			searchAppDomainCfg.setIsAudit(1);
-			searchAppTopicCfg.setIsValid(1);
-			searchAppTopicCfg.setIsAudit(1);
-			searchAppFeatureIndex.setIsValid(1);
-			searchAppFeatureIndex.setIsAudit(1);
-			searchAppSslCertCfg.setIsValid(1);
-			searchAppSslCertCfg.setIsAudit(1);
-			searchAsnIpCfg.setIsValid(1);
-			searchAsnIpCfg.setIsAudit(1);
 			
 			auditBatchCfg.setIsAudit(3);
 			auditBatchCfg.setIsValid(0);
@@ -3296,11 +3218,42 @@ public class BaseController {
  		//批量审核通过时，如果没有携带isValid检索条件，返回界面需要将isValid置为null
 		if(!StringUtil.isEmpty(entity)) {
 			BaseCfg base=(BaseCfg)entity ;
-			if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
-				base.setIsValid(null);
-				BeanUtils.copyProperties(base, entity);
+			base.setBatchAuditValue("");
+			base.setBatchValidValue("");
+			//配置目标状态：1 1 生效,isAudit条件置为1，有selType条件,且不是isValid不改，没有sel改为isValid并且为1
+			if(base.getIsAudit()==1 && base.getIsValid()==1){
+				base.setIsAudit(1);
+				if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
+					base.setIsValid(null);
+				}else{
+					base.setIsValid(1);
+					base.setSeltype("isValid");
+				}
 			}
+			//配置目标状态：2 0 不通过,isAudit条件置为2，有selType条件,且不是isValid不改，没有sel改为isValid并且为0
+			if(base.getIsAudit()==2 && base.getIsValid()==0){
+				base.setIsAudit(2);
+				if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
+					base.setIsValid(null);
+				}else{
+					base.setIsValid(0);
+					base.setSeltype("isValid");
+				}
+			}
+			//配置目标状态：3 0 取消
+			if(base.getIsAudit()==3 && base.getIsValid()==0){
+				base.setIsAudit(3);
+				if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
+					base.setIsValid(null);
+				}else{
+					base.setIsValid(0);
+					base.setSeltype("isValid");
+				}
+			}
+			
+			BeanUtils.copyProperties(base, entity);
 		}
+		
 		long end=System.currentTimeMillis();
 		logger.warn("配置批量生效/失效耗时："+(end-start));
 	}
@@ -3319,7 +3272,6 @@ public class BaseController {
 		page.setPageNo(1);
 		page.setLastPage(false);
 		
-		// 只有未审核的配置可删除
 		CfgIndexInfo searchCfg = new CfgIndexInfo();
 		AppPolicyCfg searchAppCfg=new AppPolicyCfg();
 		FileDigestCfg searchDigestCfg=new FileDigestCfg();
@@ -3342,104 +3294,70 @@ public class BaseController {
 		// 传递检索条件
 		if(entity != null  && (entity instanceof CfgIndexInfo)) {
 			BeanUtils.copyProperties(entity, searchCfg);
-			searchCfg.setIsValid(0);
-			searchCfg.setIsAudit(0);
 			searchCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppPolicyCfg)) {
 			BeanUtils.copyProperties(entity, searchAppCfg);
-			searchAppCfg.setIsValid(0);
-			searchAppCfg.setIsAudit(0);
 			searchAppCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof FileDigestCfg)) {
 			BeanUtils.copyProperties(entity, searchDigestCfg);
-			searchDigestCfg.setIsValid(0);
-			searchDigestCfg.setIsAudit(0);
 			searchDigestCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AvFileSampleCfg)) {
 			BeanUtils.copyProperties(entity, searchFileSampleCfg);
-			searchFileSampleCfg.setIsValid(0);
-			searchFileSampleCfg.setIsAudit(0);
 			searchFileSampleCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof DdosIpCfg)) {
 			BeanUtils.copyProperties(entity, searchDdosIpCfg);
-			searchDdosIpCfg.setIsValid(0);
-			searchDdosIpCfg.setIsAudit(0);
 			searchDdosIpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppHttpCfg)) {
 			BeanUtils.copyProperties(entity, searchAppHttpCfg);
-			searchAppHttpCfg.setIsValid(0);
-			searchAppHttpCfg.setIsAudit(0);
 			searchAppHttpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppHttpCfg)) {
 			BeanUtils.copyProperties(entity, searchAppHttpCfg);
-			searchAppHttpCfg.setIsValid(0);
-			searchAppHttpCfg.setIsAudit(0);
 			searchAppHttpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppDomainCfg)) {
 			BeanUtils.copyProperties(entity, searchAppDomainCfg);
-			searchAppDomainCfg.setIsValid(0);
-			searchAppDomainCfg.setIsAudit(0);
 			searchAppDomainCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppTopicDomainCfg)) {
 			BeanUtils.copyProperties(entity, searchAppTopicCfg);
-			searchAppTopicCfg.setIsValid(0);
-			searchAppTopicCfg.setIsAudit(0);
 			searchAppTopicCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppSslCertCfg)) {
 			BeanUtils.copyProperties(entity, searchAppSslCertCfg);
-			searchAppSslCertCfg.setIsValid(0);
-			searchAppSslCertCfg.setIsAudit(0);
 			searchAppSslCertCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppIpCfg)) {
 			BeanUtils.copyProperties(entity, searchAppIpCfg);
-			searchAppIpCfg.setIsValid(0);
-			searchAppIpCfg.setIsAudit(0);
 			searchAppIpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppFeatureIndex)) {
 			BeanUtils.copyProperties(entity, searchAppFeatureIndex);
-			searchAppFeatureIndex.setIsValid(0);
-			searchAppFeatureIndex.setIsAudit(0);
 			searchAppFeatureIndex.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof DnsResStrategy)) {
 			BeanUtils.copyProperties(entity, searchDnsResStrategy);
-			searchDnsResStrategy.setIsValid(0);
-			searchDnsResStrategy.setIsAudit(0);
 			searchDnsResStrategy.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof DnsIpCfg)) {
 			BeanUtils.copyProperties(entity, searchDnsIpCfg);
-			searchDnsIpCfg.setIsValid(0);
-			searchDnsIpCfg.setIsAudit(0);
 			searchDnsIpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof PxyObjKeyring)) {
 			BeanUtils.copyProperties(entity, searchObjKeyringCfg);
-			searchObjKeyringCfg.setIsValid(0);
-			searchObjKeyringCfg.setIsAudit(0);
 			searchObjKeyringCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof PxyObjTrustedCaCert)) {
 			BeanUtils.copyProperties(entity, searchTrustedCaCertCfg);
-			searchTrustedCaCertCfg.setIsValid(0);
-			searchTrustedCaCertCfg.setIsAudit(0);
 			searchTrustedCaCertCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AsnIpCfg)) {
 			BeanUtils.copyProperties(entity, searchAsnIpCfg);
-			searchAsnIpCfg.setIsValid(0);
-			searchAsnIpCfg.setIsAudit(0);
 			searchAsnIpCfg.setFunctionId(functionId);
 		}
 		

src/main/java/com/nis/web/controller/SystemController.java

@@ -209,8 +209,6 @@ public class SystemController  extends BaseController{
 	public boolean clearPolicies(HttpServletRequest request, HttpServletResponse response) {
 		try {
 			systemService.clearPolicies();
-			/*ArrayList<Object> list = Lists.newArrayList();
-			System.out.println(list.get(6));*/
 			return true;
 		} catch (Exception e) {
 			logger.error("Clear Policies Error",e);

src/main/java/com/nis/web/controller/configuration/AppCfgController.java

@@ -126,9 +126,9 @@ public class AppCfgController extends BaseController {
 	 */
 	@RequestMapping(value = "ajaxAppName", method = RequestMethod.POST)
 	@ResponseBody
-	public List<Map<String, String>> ajaxAppName(Model model, String ids) {
+	public List<Map<String, String>> ajaxAppName(Model model, String ids,Integer cfgType) {
 		List<Map<String, String>> dataList = new ArrayList<>();
-		List<SpecificServiceCfg> serviceList = specificServiceCfgService.getBySpecServiceCodes(ids);
+		List<SpecificServiceCfg> serviceList = specificServiceCfgService.getBySpecServiceCodes(ids,cfgType);
 		Map<String, String> appMap = new HashMap<>();
 		Map<String, String> behavMap = new HashMap<>();
 		for (SpecificServiceCfg cfg : serviceList) {
@@ -192,6 +192,24 @@ public class AppCfgController extends BaseController {
 	public String policyCfgForm(Model model, String ids, AppPolicyCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids), null);
+			
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setSpecServiceId(app.getSpecServiceId());
+			}
+			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -356,8 +374,22 @@ public class AppCfgController extends BaseController {
 		Page<AppIpCfg> searchPage = new Page<AppIpCfg>(request, response, "r");
 		Page<AppIpCfg> page = appCfgService.findAppIpList(searchPage, cfg);
 		for (AppIpCfg entity : page.getList()) {
-			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
-			entity.setAppName(app.getSpecServiceName());
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppName(app.getSpecServiceName());
+			}
 		}
 		model.addAttribute("page", page);
 		initPageCondition(model, cfg);
@@ -377,6 +409,24 @@ public class AppCfgController extends BaseController {
 	public String ipCfgForm(Model model, String ids, AppIpCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppIpCfg(Long.parseLong(ids));
+			
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setSpecServiceId(app.getSpecServiceId());
+			}
+			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -551,8 +601,22 @@ public class AppCfgController extends BaseController {
 		Page<AppHttpCfg> searchPage = new Page<AppHttpCfg>(request, response, "r");
 		Page<AppHttpCfg> page = appCfgService.findAppHttpList(searchPage, cfg);
 		for (AppHttpCfg entity : page.getList()) {
-			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
-			entity.setAppName(app.getSpecServiceName());
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppName(app.getSpecServiceName());
+			}
 			// entity.setCfgKeywords(entity.getCfgKeywords().replace(Constants.KEYWORD_EXPR,
 			// "&"));
 		}
@@ -574,6 +638,24 @@ public class AppCfgController extends BaseController {
 	public String httpCfgForm(Model model, String ids, AppHttpCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppHttpCfg(Long.parseLong(ids));
+			
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setSpecServiceId(app.getSpecServiceId());
+			}
+			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -714,8 +796,22 @@ public class AppCfgController extends BaseController {
 		Page<AppDomainCfg> searchPage = new Page<AppDomainCfg>(request, response, "r");
 		Page<AppDomainCfg> page = appCfgService.findAppDomainList(searchPage, cfg);
 		for (AppDomainCfg entity : page.getList()) {
-			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
-			entity.setAppName(app.getSpecServiceName());
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppName(app.getSpecServiceName());
+			}
 		}
 		model.addAttribute("page", page);
 		initPageCondition(model, cfg);
@@ -735,6 +831,24 @@ public class AppCfgController extends BaseController {
 	public String domainCfgForm(Model model, String ids, AppDomainCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppDomainCfg(Long.parseLong(ids));
+			
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setSpecServiceId(app.getSpecServiceId());
+			}
+			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -897,8 +1011,22 @@ public class AppCfgController extends BaseController {
 		Page<AppByteCfg> searchPage = new Page<AppByteCfg>(request, response, "r");
 		Page<AppByteCfg> page = appCfgService.findAppByteList(searchPage, cfg);
 		for (AppByteCfg entity : page.getList()) {
-			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
-			entity.setAppName(app.getSpecServiceName());
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppName(app.getSpecServiceName());
+			}
 		}
 		model.addAttribute("page", page);
 		initPageCondition(model, cfg);
@@ -918,6 +1046,24 @@ public class AppCfgController extends BaseController {
 	public String byteCfgForm(Model model, String ids, AppByteCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppByteCfg(Long.parseLong(ids));
+			
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setSpecServiceId(app.getSpecServiceId());
+			}
+			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -1034,8 +1180,22 @@ public class AppCfgController extends BaseController {
 		Page<AppSslCertCfg> searchPage = new Page<AppSslCertCfg>(request, response, "r");
 		Page<AppSslCertCfg> page = appCfgService.findAppSslList(searchPage, cfg);
 		for (AppSslCertCfg entity : page.getList()) {
-			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
-			entity.setAppName(app.getSpecServiceName());
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppName(app.getSpecServiceName());
+			}
 		}
 		model.addAttribute("page", page);
 		initPageCondition(model, cfg);
@@ -1055,6 +1215,24 @@ public class AppCfgController extends BaseController {
 	public String sslCfgForm(Model model, String ids, AppSslCertCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppSslCfg(Long.parseLong(ids));
+			
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setSpecServiceId(app.getSpecServiceId());
+			}
+			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -1084,7 +1262,13 @@ public class AppCfgController extends BaseController {
 				entity.setAppCode(specificService.getSpecServiceCode());
 			}
 			appCfgService.saveOrUpdateAppSslCfg(entity);
-			addMessage(redirectAttributes, "success", "save_success");
+			//配置仅保存
+			if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) {
+				addMessage(redirectAttributes, "success", "save_success");
+			}else {
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("saveAppSslCfg failed", e);
@@ -1196,7 +1380,9 @@ public class AppCfgController extends BaseController {
 		Page<AppTcpCfg> page = appCfgService.findAppTcpList(searchPage, cfg);
 		for (AppTcpCfg entity : page.getList()) {
 			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
-			entity.setAppName(app.getSpecServiceName());
+			if(app!=null){
+				entity.setAppName(app.getSpecServiceName());
+			}
 		}
 		model.addAttribute("page", page);
 		initPageCondition(model, cfg);
@@ -1216,6 +1402,24 @@ public class AppCfgController extends BaseController {
 	public String tcpCfgForm(Model model, String ids, AppTcpCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppTcpCfg(Long.parseLong(ids));
+			
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setSpecServiceId(app.getSpecServiceId());
+			}
+			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -1331,8 +1535,22 @@ public class AppCfgController extends BaseController {
 		Page<AppHeaderCfg> searchPage = new Page<AppHeaderCfg>(request, response, "r");
 		Page<AppHeaderCfg> page = appCfgService.findAppHeaderList(searchPage, cfg);
 		for (AppHeaderCfg entity : page.getList()) {
-			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
-			entity.setAppName(app.getSpecServiceName());
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppName(app.getSpecServiceName());
+			}
 		}
 		model.addAttribute("page", page);
 		initPageCondition(model, cfg);
@@ -1352,6 +1570,24 @@ public class AppCfgController extends BaseController {
 	public String headerCfgForm(Model model, String ids, AppHeaderCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppHeaderCfg(Long.parseLong(ids));
+			
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setSpecServiceId(app.getSpecServiceId());
+			}
+			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -1848,8 +2084,20 @@ public class AppCfgController extends BaseController {
 					logTotal.put("sum",0L);
 					logTotals.add(logTotal);
 				}
-				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId());
-				if (app != null) {
+				// 查找社交应用的所有有效一级特定服务
+				SpecificServiceCfg appSpec = new SpecificServiceCfg();
+				for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+					if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+						appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+						break;
+					}
+				}
+				appSpec.setIsValid(Constants.VALID_YES);
+				appSpec.setIsLeaf(0);
+				appSpec.setSpecServiceCode(policy.getAppCode());
+				List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+				if (!StringUtil.isEmpty(appList)) {
+					SpecificServiceCfg app = appList.get(0);
 					policy.setSocialName(app.getSpecServiceName());
 				}
 			}
@@ -2059,7 +2307,9 @@ public class AppCfgController extends BaseController {
 
 			for (AppIpCfg appIp : ipLists) {
 				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(appIp.getSpecServiceId());
-				appIp.setAppName(app.getSpecServiceName());
+				if(app!=null){
+					appIp.setAppName(app.getSpecServiceName());
+				}
 			}
 			titleList.add(entity.getMenuNameCode());
 			classMap.put(entity.getMenuNameCode(), AppIpCfg.class);
@@ -2132,8 +2382,22 @@ public class AppCfgController extends BaseController {
 					http.setIsCaseInsenstive(0);
 				}
 				http.setCfgKeywords(Functions.replace(http.getCfgKeywords(), "***and***", " "));
-				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(http.getSpecServiceId());
-				http.setAppName(app.getSpecServiceName());
+				// 查找社交应用的所有有效一级特定服务
+				SpecificServiceCfg appSpec = new SpecificServiceCfg();
+				for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+					if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+						appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+						break;
+					}
+				}
+				appSpec.setIsValid(Constants.VALID_YES);
+				appSpec.setIsLeaf(0);
+				appSpec.setSpecServiceCode(http.getAppCode());
+				List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+				if (!StringUtil.isEmpty(appList)) {
+					SpecificServiceCfg app = appList.get(0);
+					http.setAppName(app.getSpecServiceName());
+				}
 			}
 
 			titleList.add(entity.getMenuNameCode());
@@ -2205,8 +2469,22 @@ public class AppCfgController extends BaseController {
 				}else{
 					domain.setIsCaseInsenstive(0);
 				}
-				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(domain.getSpecServiceId());
-				domain.setAppName(app.getSpecServiceName());
+				// 查找社交应用的所有有效一级特定服务
+				SpecificServiceCfg appSpec = new SpecificServiceCfg();
+				for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+					if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+						appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+						break;
+					}
+				}
+				appSpec.setIsValid(Constants.VALID_YES);
+				appSpec.setIsLeaf(0);
+				appSpec.setSpecServiceCode(domain.getAppCode());
+				List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+				if (!StringUtil.isEmpty(appList)) {
+					SpecificServiceCfg app = appList.get(0);
+					domain.setAppName(app.getSpecServiceName());
+				}
 			}
 
 			titleList.add(entity.getMenuNameCode());
@@ -2280,8 +2558,22 @@ public class AppCfgController extends BaseController {
 					ssl.setIsCaseInsenstive(0);
 				}
 				ssl.setCfgKeywords(Functions.replace(ssl.getCfgKeywords(), "***and***", " "));
-				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(ssl.getSpecServiceId());
-				ssl.setAppName(app.getSpecServiceName());
+				// 查找社交应用的所有有效一级特定服务
+				SpecificServiceCfg appSpec = new SpecificServiceCfg();
+				for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+					if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+						appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+						break;
+					}
+				}
+				appSpec.setIsValid(Constants.VALID_YES);
+				appSpec.setIsLeaf(0);
+				appSpec.setSpecServiceCode(ssl.getAppCode());
+				List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+				if (!StringUtil.isEmpty(appList)) {
+					SpecificServiceCfg app = appList.get(0);
+					ssl.setAppName(app.getSpecServiceName());
+				}
 			}
 			titleList.add(entity.getMenuNameCode());
 			classMap.put(entity.getMenuNameCode(), AppSslCertCfg.class);

src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java

@@ -87,8 +87,22 @@ public class AppFeatureCfgController extends BaseController {
 		Page<AppFeatureIndex> searchPage = new Page<AppFeatureIndex>(request, response, "r");
 		Page<AppFeatureIndex> page = appMultiFeatureCfgService.findAppFeatureIndexList(searchPage, cfg);
 		for (AppFeatureIndex entity : page.getList()) {
-			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
-			entity.setAppName(app.getSpecServiceName());
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppName(app.getSpecServiceName());
+			}
 		}
 		model.addAttribute("page", page);
 		initPageCondition(model, cfg);
@@ -115,6 +129,24 @@ public class AppFeatureCfgController extends BaseController {
 					entity.getFunctionId(), null));
 			entity.setNumCfgList(
 					appMultiFeatureCfgService.getAppTcpCfg(entity.getCompileId(), entity.getFunctionId(), null));
+			
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setSpecServiceId(app.getSpecServiceId());
+			}
+			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -351,8 +383,22 @@ public class AppFeatureCfgController extends BaseController {
 			}
 
 			for (AppFeatureIndex feature : ipLists) {
-				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(feature.getSpecServiceId());
-				feature.setAppName(app.getSpecServiceName());
+				// 查找社交应用的所有有效一级特定服务
+				SpecificServiceCfg appSpec = new SpecificServiceCfg();
+				for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+					if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+						appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+						break;
+					}
+				}
+				appSpec.setIsValid(Constants.VALID_YES);
+				appSpec.setIsLeaf(0);
+				appSpec.setSpecServiceCode(feature.getAppCode());
+				List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+				if (!StringUtil.isEmpty(appList)) {
+					SpecificServiceCfg app = appList.get(0);
+					feature.setAppName(app.getSpecServiceName());
+				}
 			}
 			String cfgIndexInfoNoExport = ",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 			String appComplexNoExport = ",do_log,block_type,config_describe,valid_identifier,is_audit,creator,creator"

src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
+import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.configuration.AppPolicyCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
@@ -36,6 +37,7 @@ import com.nis.exceptions.CallExternalProceduresException;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
@@ -130,6 +132,25 @@ public class BasicProtocolController extends BaseController {
 	public String policyCfgForm(Model model, String ids, AppPolicyCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids), null);
+			
+
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setSpecServiceId(app.getSpecServiceId());
+			}
+			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -323,8 +344,20 @@ public class BasicProtocolController extends BaseController {
 					logTotal.put("sum",0L);
 					logTotals.add(logTotal);
 				}
-				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId());
-				if (app != null) {
+				// 查找社交应用的所有有效一级特定服务 TODO
+				SpecificServiceCfg appSpec = new SpecificServiceCfg();
+				for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+					if (Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL.equals(dict.getItemValue())) {
+						appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+						break;
+					}
+				}
+				appSpec.setIsValid(Constants.VALID_YES);
+				appSpec.setIsLeaf(0);
+				appSpec.setSpecServiceCode(policy.getAppCode());
+				List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+				if (!StringUtil.isEmpty(appList)) {
+					SpecificServiceCfg app = appList.get(0);
 					policy.setAppName(app.getSpecServiceName());
 				}
 

src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java

@@ -151,6 +151,24 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 	public String policyCfgForm(Model model, String ids, AppPolicyCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids), null);
+			
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceCode(entity.getAppCode());
+			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setSpecServiceId(app.getSpecServiceId());
+			}
+			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -347,8 +365,20 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 					logTotal.put("sum",0L);
 					logTotals.add(logTotal);
 				}
-				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId());
-				if (app != null) {
+				// 查找社交应用的所有有效一级特定服务 TODO
+				SpecificServiceCfg appSpec = new SpecificServiceCfg();
+				for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+					if (Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equals(dict.getItemValue())) {
+						appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+						break;
+					}
+				}
+				appSpec.setIsValid(Constants.VALID_YES);
+				appSpec.setIsLeaf(0);
+				appSpec.setSpecServiceCode(policy.getAppCode());
+				List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
+				if (!StringUtil.isEmpty(appList)) {
+					SpecificServiceCfg app = appList.get(0);
 					policy.setBehaviorName(app.getSpecServiceName());
 				}
 			}

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

@@ -311,7 +311,13 @@ public class AvController extends BaseController {
 			}
 
 			avCfgService.saveOrUpdateAvFileSample(entity, srcFile);
-			addMessage(redirectAttributes, "success", "save_success");
+			//配置仅保存
+			if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) {
+				addMessage(redirectAttributes, "success", "save_success");
+			}else {
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
+			}
 		} catch (Exception e) {
 			logger.error("文件上传失败", e);
 			e.printStackTrace();
@@ -339,7 +345,13 @@ public class AvController extends BaseController {
 			RedirectAttributes redirectAttributes, String ids, AvSignSampleCfg entity) {
 		try {
 			avCfgService.saveOrUpdateAvSignSample(entity);
-			addMessage(redirectAttributes, "success", "save_success");
+			//配置仅保存
+			if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) {
+				addMessage(redirectAttributes, "success", "save_success");
+			}else {
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
+			}
 		} catch (Exception e) {
 			logger.error("saveAudioSignSample failed", e);
 			e.printStackTrace();
@@ -591,7 +603,13 @@ public class AvController extends BaseController {
 				// if(!avSignSampleCfg.getAction().equals(avSignSampleCfg.getActionOld())||!avSignSampleCfg.getIsValid().equals(avSignSampleCfg.getIsValidOld())){
 				try {
 					avCfgService.auditAvSignSample(avSignSampleCfg);
-					addMessage(redirectAttributes, "success", "save_success");
+					//配置仅保存
+					if(StringUtil.isEmpty(avSignSampleCfg.getIsValid()) || avSignSampleCfg.getIsValid()!=1) {
+						addMessage(redirectAttributes, "success", "save_success");
+					}else {
+					//配置直接生效
+						addMessage(redirectAttributes, "success", "audit_success");
+					}
 				} catch (Exception e) {
 					e.printStackTrace();
 					if (e instanceof MaatConvertException) {

src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java

@@ -157,7 +157,13 @@ public class ControlPolicyController extends BaseController{
 			,RedirectAttributes redirectAttributes){
 		try{
 			controlPolicyService.saveOrUpdate(cfg,areaCfgIds);
-			addMessage(redirectAttributes,"success","save_success");
+			//配置仅保存
+			if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) {
+				addMessage(redirectAttributes, "success", "save_success");
+			}else {
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
+			}
 		}catch(Exception e){
 			logger.error("信息保存失败",e);
 			if(e instanceof MaatConvertException) {

src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java

@@ -118,7 +118,13 @@ public class FileStrategyController extends CommonController {
 				cfg.setContentLength(file.length());//文件长度
  			}
 			proxyFileStrategyService.saveOrUpdate(cfg);
-			addMessage(redirectAttributes,"success","save_success");
+			//配置仅保存
+			if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) {
+				addMessage(redirectAttributes, "success", "save_success");
+			}else {
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
+			}			
 		}catch(Exception e){
 			logger.error("信息保存失败",e);
 			if(e instanceof MaatConvertException) {

src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java

@@ -399,6 +399,15 @@ public class InterceptController extends CommonController {
 					}
 				}
 			}
+			
+			if (214==entity.getFunctionId()) {
+				for (CfgIndexInfo cfg : ipLists) {
+					if (!StringUtil.isBlank(cfg.getUserRegion1())) {
+						cfg.setUserRegion1(DictUtils.getDictLabels("SPOOFING_IP_TYPE", cfg.getUserRegion1(),cfg.getUserRegion1()));
+					}
+				}
+			}
+			
 			pktBinList = BaseStringCfg.replaceBaseKeyList(pktBinList);
 			httpUrlList = BaseStringCfg.baseHexList(httpUrlList);
 			dataMap.put(entity.getMenuNameCode(), ipLists);

src/main/java/com/nis/web/dao/SchedulerDao.java

@@ -79,4 +79,8 @@ public interface SchedulerDao extends CrudDao<ScheduleCfg> {
 	 */
 	int updateScheduleExceNew(ScheduleExceInfo exceInfo);
 	
+	/**
+	 * 失效所有定时任务
+	 */
+	void inValidAllSchedule();
 }

src/main/java/com/nis/web/dao/SchedulerDao.xml

@@ -364,6 +364,12 @@
 			compile_Id = #{compileId} and issue_status = #{issueStatus}
 	</update>
 
-
+	<update id="inValidAllSchedule">
+		update schedule_cfg 
+		<set>
+			del_flag = 0
+		</set>
+		WHERE del_flag =1
+	</update>
 
 </mapper>

src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml

@@ -128,15 +128,32 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
+	    	
 	    	<if test="creatorName != null and creatorName !=''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml

@@ -620,8 +620,13 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    	<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -721,21 +726,42 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+    		<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -880,8 +906,13 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    	<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{CFG_TYPE,jdbcType=VARCHAR}),'%') 
@@ -922,15 +953,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -1035,8 +1082,13 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    	<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -1050,15 +1102,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -1138,8 +1206,13 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    	<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -1150,15 +1223,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -1270,15 +1359,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -1377,8 +1482,13 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    	<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -1572,8 +1682,13 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    	<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -1587,15 +1702,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml

@@ -267,21 +267,42 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    	<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml

@@ -128,15 +128,31 @@
     	<if test="action != null">
     		AND a.ACTION=#{action,jdbcType=INTEGER}
     	</if>
-    	<if test="isValid != null">
-    		AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
-    	</if>
-    	<if test="isValid == null">
-    		AND a.IS_VALID != -1
-    	</if>
-    	<if test="isAudit != null">
-    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-    	</if>
+    	<choose>
+    		<!-- 判断是否批量操作 -->
+			<when test="batchValidValue != null and batchValidValue != ''">
+				AND  a.IS_VALID in (${batchValidValue})
+			</when>
+			<otherwise>
+				<if test="isValid != null">
+		    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
+		    	</if>
+		    	<if test="isValid == null">
+		    		AND  a.IS_VALID != -1
+		    	</if>
+			</otherwise>
+		</choose>
+    	<choose>
+    		<!-- 判断是否批量操作 -->
+			<when test="batchAuditValue != null and batchAuditValue != ''">
+		    		AND a.IS_AUDIT in(${batchAuditValue})
+			</when>
+			<otherwise>
+				<if test="isAudit != null">
+		    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+		    	</if>
+			</otherwise>
+		</choose>
     	<if test="creatorName != null and creatorName != ''">
     		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
     	</if>

src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml

@@ -310,15 +310,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -2128,6 +2144,12 @@
     update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER},
     <if test="isAudit != null">
     is_audit = #{isAudit,jdbcType=INTEGER},
+    </if>
+	<if test="auditTime !=null ">
+		audit_time = #{auditTime,jdbcType=TIMESTAMP},
+	</if>
+    <if test="auditorId != null" >
+      AUDITOR_ID = #{auditorId,jdbcType=INTEGER},
     </if>
     editor_id = #{editorId,jdbcType=INTEGER} , 
     edit_time = #{editTime,jdbcType=TIMESTAMP} 

src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml

@@ -208,15 +208,31 @@
 	    	<if test="action != null">
 	    		AND a.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND a.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  a.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  a.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND a.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml

@@ -219,15 +219,31 @@
 	    	<if test="action != null">
 	    		AND a.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND a.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  a.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  a.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND a.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml

@@ -117,15 +117,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName !=''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml

@@ -120,15 +120,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName !=''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml

@@ -85,15 +85,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml

@@ -232,9 +232,31 @@
 	    	<if test="isValid == null">
 	    		AND a.IS_VALID != -1
 	    	</if>
-	    	<if test="isAudit != null">
-	    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  a.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  a.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND a.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -1140,15 +1162,31 @@
 	    	<if test="action != null">
 	    		AND a.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND a.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  a.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  a.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND a.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml

@@ -1098,15 +1098,31 @@
 	    	<if test="action != null">
 	    		AND a.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND a.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  a.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  a.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+		    		AND a.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml

@@ -171,15 +171,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -254,15 +270,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml

@@ -189,15 +189,31 @@
 	    	<if test="action != null">
 	    		AND a.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND a.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  a.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  a.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND a.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.java

@@ -20,7 +20,7 @@ public interface SpecificServiceCfgDao extends CrudDao<SpecificServiceCfg> {
 	 * @return
 	 */
 	SpecificServiceCfg getBySpecServiceId(Integer specServiceId);
-	List<SpecificServiceCfg> getBySpecServiceCodes(@Param("ids")String ids);
+	List<SpecificServiceCfg> getBySpecServiceCodes(@Param("ids")String ids,@Param("cfgType")Integer cfgType);
 	/**
 	 * 查询所有符合条件顶层分页列表
 	 * @param specificServiceCfg

src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml

@@ -39,11 +39,11 @@
   <!-- 根据id查出对象 -->
   <select id="getBySpecServiceId" resultType="com.nis.domain.specific.SpecificServiceCfg" parameterType="java.lang.Integer">
   select <include refid="specificServiceCfgColumns" />
-  from specific_service_cfg s where s.spec_service_id = #{specServiceId}
+  from specific_service_cfg s where s.spec_service_id = #{specServiceId} and s.is_valid=1
   </select>
-  <select id="getBySpecServiceCodes" resultType="com.nis.domain.specific.SpecificServiceCfg" parameterType="java.lang.String">
+  <select id="getBySpecServiceCodes" resultType="com.nis.domain.specific.SpecificServiceCfg">
   select <include refid="specificServiceCfgColumns" />
-  from specific_service_cfg s where s.spec_service_code in(${ids})
+  from specific_service_cfg s where s.spec_service_code in(${ids}) and s.is_valid=1 and s.cfg_type=#{cfgType}
   </select>
   <select id="getRepeat" resultType="com.nis.domain.specific.SpecificServiceCfg" >
   select <include refid="specificServiceCfgColumns" />
@@ -54,11 +54,11 @@
   </select>
   <select id="getParentType" resultType="java.lang.Integer" parameterType="java.lang.Integer">
   select cfg_type
-  from specific_service_cfg s where s.spec_service_id = #{specServiceId}
+  from specific_service_cfg s where s.spec_service_id = #{specServiceId}  and s.is_valid=1
   </select>
   <select id="getParentCode" resultType="java.lang.Integer" parameterType="java.lang.Integer">
   select spec_service_code
-  from specific_service_cfg s where s.spec_service_id = #{specServiceId}
+  from specific_service_cfg s where s.spec_service_id = #{specServiceId}  and s.is_valid=1
   </select>
   
   <!-- 查出所有符合条件的顶层数据 -->

src/main/java/com/nis/web/service/SystemService.java

@@ -7,6 +7,11 @@ import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -24,10 +29,13 @@ import com.nis.domain.SrcIp;
 import com.nis.domain.SysRole;
 import com.nis.domain.SysUser;
 import com.nis.util.Configurations;
+import com.nis.util.Constants;
 import com.nis.util.DateUtils;
 import com.nis.util.IpUtil;
 import com.nis.util.ServiceConfigTemplateUtil;
 import com.nis.util.TimeConstants;
+import com.nis.util.httpclient.ClientUtil;
+import com.nis.web.dao.SchedulerDao;
 import com.nis.web.dao.SrcIpDao;
 import com.nis.web.dao.SysOfficeDao;
 import com.nis.web.dao.UserDao;
@@ -56,6 +64,9 @@ public class SystemService extends BaseService{
 	@Autowired
 	private CommonPolicyDao commonPolicyDao;
 	
+	@Autowired
+	private SchedulerDao schedulerDao;
+	
 	@Autowired
 	private SrcIpDao srcIpDao;
 	private RedisSerializer keySerializer = new StringSerializer();
@@ -173,16 +184,27 @@ public class SystemService extends BaseService{
 	}
 
 	public void clearPolicies() throws Exception {
-		// TODO 调用服务接口 告知flushAll
-		/*String destUrl = Constants.SERVICE_URL;
-		HttpClientUtil.get(destUrl);*/
-		Set<String> tableNameSet = ServiceConfigTemplateUtil.getAllTableName();
-		tableNameSet.add("pxy_obj_spoofing_ip_pool");
-		for (String tableName : tableNameSet) {
-			commonPolicyDao.clearPolicies(tableName);
+		// 调用服务接口 告知flushAll
+		String url = Constants.SERVICE_URL + Constants.DEL_ALL_CFG;
+		// 创建连接
+		WebTarget wt = ClientUtil.getWebTarger(url);
+		// 获取响应结果
+		Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON);
+		Response response = header.delete(); 
+		if(response.getStatus() == 200){
+			//String result= response.readEntity(String.class);
+			Set<String> tableNameSet = ServiceConfigTemplateUtil.getAllTableName();
+			tableNameSet.add("pxy_obj_spoofing_ip_pool");
+			for (String tableName : tableNameSet) {
+				commonPolicyDao.clearPolicies(tableName);
+			}
+			// 初始化分组
+			asnGroupInfoService.reLoadGroupInfo();
+			// 失效定时任务
+			schedulerDao.inValidAllSchedule();
+		}else {
+			throw new RuntimeException();
 		}
-		// 初始化分组
-		asnGroupInfoService.reLoadGroupInfo();
 		
 	}
 }

src/main/java/com/nis/web/service/configuration/AppCfgService.java

@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.google.common.collect.Lists;
 import com.nis.domain.Page;
+import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.basics.Varibles;
 import com.nis.domain.configuration.AppByteCfg;
@@ -90,6 +91,32 @@ public class AppCfgService extends BaseService {
 	public Page<AppPolicyCfg> findAppPolicyList(Page<AppPolicyCfg> page, AppPolicyCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (entity.getFunctionId() == 63 && Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+				if (entity.getFunctionId() == 407 && Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+				if (entity.getFunctionId() == 408 && Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
 		List<AppPolicyCfg> list = appCfgDao.findAppPolicyList(entity);
 		page.setList(list);
 		return page;
@@ -104,11 +131,59 @@ public class AppCfgService extends BaseService {
 	public Page<AppIpCfg> findAppIpList(Page<AppIpCfg> page, AppIpCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppIpCfg> list = appCfgDao.findAppIpList(entity);
 		page.setList(list);
 		return page;
 	}
 	public List<AppIpCfg> findAppIpList(AppIpCfg entity) {
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (entity.getFunctionId() == 63 && Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+				if (entity.getFunctionId() == 407 && Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+				if (entity.getFunctionId() == 408 && Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppIpCfg> list = appCfgDao.findAppIpList(entity);
 		return list;
 	}
@@ -121,6 +196,26 @@ public class AppCfgService extends BaseService {
 	public Page<AppHttpCfg> findAppHttpList(Page<AppHttpCfg> page, AppHttpCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppHttpCfg> list = appCfgDao.findAppHttpList(entity);
 		page.setList(list);
 		return page;
@@ -134,6 +229,26 @@ public class AppCfgService extends BaseService {
 	public Page<AppDomainCfg> findAppDomainList(Page<AppDomainCfg> page, AppDomainCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppDomainCfg> list = appCfgDao.findAppDomainList(entity);
 		page.setList(list);
 		return page;
@@ -174,6 +289,26 @@ public class AppCfgService extends BaseService {
 	public Page<AppByteCfg> findAppByteList(Page<AppByteCfg> page, AppByteCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppByteCfg> list = appCfgDao.findAppByteList(entity);
 		page.setList(list);
 		return page;
@@ -182,6 +317,26 @@ public class AppCfgService extends BaseService {
 	public Page<AppSslCertCfg> findAppSslList(Page<AppSslCertCfg> page, AppSslCertCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppSslCertCfg> list = appCfgDao.findAppSslList(entity);
 		page.setList(list);
 		return page;
@@ -195,6 +350,26 @@ public class AppCfgService extends BaseService {
 	public Page<AppTcpCfg> findAppTcpList(Page<AppTcpCfg> page, AppTcpCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppTcpCfg> list = appCfgDao.findAppTcpList(entity);
 		page.setList(list);
 		return page;
@@ -785,6 +960,10 @@ public class AppCfgService extends BaseService {
 	public void saveOrUpdateAppSslCfg(AppSslCertCfg entity) throws Exception {
 		// 设置区域运营商信息
 		setAreaEffectiveIds(entity);
+		int isValid=0; 
+		if(!StringUtil.isEmpty(entity.getIsValid()) && entity.getIsValid()==1) {
+			isValid=1;
+		}
 		if (entity.getCfgId() == null) {
 			Integer compileId = 0;
 			try {
@@ -836,6 +1015,12 @@ public class AppCfgService extends BaseService {
 			}
 
 		}
+		if(isValid==1) {
+			entity.setIsAudit(1);
+			entity.setIsValid(1);			
+			entity.setAuditTime(new Date());
+			auditAppSslCfg(entity, entity.getIsAudit());
+		}
 
 	}
 
@@ -2061,6 +2246,26 @@ public class AppCfgService extends BaseService {
 	public Page<AppHeaderCfg> findAppHeaderList(Page<AppHeaderCfg> page, AppHeaderCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppHeaderCfg> list = appCfgDao.findAppHeaderList(entity);
 		page.setList(list);
 		return page;
@@ -2230,4 +2435,5 @@ public class AppCfgService extends BaseService {
 		
 	}
 	
+	
 }

src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.nis.domain.Page;
+import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.configuration.AppComplexFeatureCfg;
 import com.nis.domain.configuration.AppFeatureIndex;
 import com.nis.domain.configuration.AppHttpCfg;
@@ -34,6 +35,7 @@ import com.nis.domain.maat.MaatCfg.GroupCfg;
 import com.nis.domain.maat.MaatCfg.IpCfg;
 import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
 import com.nis.domain.maat.MaatCfg.StringCfg;
+import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.domain.maat.ToMaatBean;
 import com.nis.domain.maat.ToMaatResult;
 import com.nis.exceptions.MaatConvertException;
@@ -42,6 +44,7 @@ import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.AppMultiFeatureCfgDao;
+import com.nis.web.dao.specific.SpecificServiceCfgDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
 
@@ -55,11 +58,33 @@ import com.nis.web.service.BaseService;
 public class AppMultiFeatureCfgService extends BaseService {
 	@Autowired
 	protected AppMultiFeatureCfgDao appMultiFeatureCfgDao;
+	@Autowired
+	protected SpecificServiceCfgDao specificServiceCfgDao;
 
 	//分页查询
 	public Page<AppFeatureIndex> findAppFeatureIndexList(Page<AppFeatureIndex> page, AppFeatureIndex entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppFeatureIndex> list = appMultiFeatureCfgDao.findAppFeatureIndexList(entity);
 		page.setList(list);
 		return page;

src/main/java/com/nis/web/service/configuration/AvContentCfgService.java

@@ -1554,7 +1554,7 @@ public class AvContentCfgService extends BaseService{
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditContUrl(entity,entity.getIsAudit(), Constants.INSERT_ACTION);
+				auditContUrl(entity,entity.getIsAudit(), Constants.UPDATE_ACTION);
 			}
 		}
 }

src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java

@@ -987,7 +987,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			maatBean.setAuditTime(entity.getAuditTime());
 			maatBean.setCreatorName(entity.getCurrentUser().getName());
 			maatBean.setVersion(Constants.MAAT_VERSION);
-			maatBean.setOpAction(Constants.INSERT_ACTION);
+			maatBean.setOpAction(Constants.UPDATE_ACTION);
 			//调用服务接口取消配置
 			String json=gsonToJson(maatBean);
 			logger.info("ssl配置下发配置参数："+json);

src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java

@@ -33,11 +33,11 @@ public class SpecificServiceCfgService extends BaseService{
 	public SpecificServiceCfg getBySpecServiceId(Integer specServiceId) {
 		return specificServiceCfgDao.getBySpecServiceId(specServiceId);
 	}
-	public List<SpecificServiceCfg> getBySpecServiceCodes(String specServiceCodes) {
+	public List<SpecificServiceCfg> getBySpecServiceCodes(String specServiceCodes,Integer cfgType) {
 		for(String specServiceId:specServiceCodes.split(",")) {
 			Integer.parseInt(specServiceId);
 		}
-		return specificServiceCfgDao.getBySpecServiceCodes(specServiceCodes);
+		return specificServiceCfgDao.getBySpecServiceCodes(specServiceCodes,cfgType);
 	}
 	/**
 	 * 查询所有符合条件的顶层分页

src/main/resources/messages/message_en.properties

@@ -547,7 +547,7 @@ ftp_ip=FTP IP Configuration
 dns_ip=DNS IP Configuration
 dns_domain=DNS Domain Configuration
 action=Action
-has_prohibit_delete=Only unconfirmed configuration can be deleted
+has_prohibit_delete=Only unaudited and cancel configurations can be deleted
 has_prohibit_nopass=Only unconfirmed configuration can be confirmed
 has_prohibit_pass=Only unconfirmed configuration can be confirmed
 multiple_keywords_tip=Multiple keyword can be input,Please separate it with the return key.
@@ -1527,3 +1527,4 @@ url_group_manage=URL Group Manage
 range_cross=Found intersections between Server IP address and Client IP address
 app_ip_correlation=APP IP Correlation
 public_private_file_error=Public-private key mismatch
+https_url_format_tip=URL(http[s]://xxx.xx)

src/main/resources/messages/message_ru.properties

@@ -547,7 +547,7 @@ ftp_ip=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f
 dns_ip=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f DNS IP
 dns_domain=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0434\u043e\u043c\u0435\u043d\u0430 DNS
 action=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435
-has_prohibit_delete=\u0422\u043e\u043b\u044c\u043a\u043e \u043d\u0435\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u043d\u0430\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0443\u0434\u0430\u043b\u0435\u043d\u0430
+has_prohibit_delete= только удаляет незаконченные настройки и отменяет проверку конфигурации
 has_prohibit_nopass=\u0422\u043e\u043b\u044c\u043a\u043e \u043d\u0435\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u043d\u0430\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0430
 has_prohibit_pass=\u0422\u043e\u043b\u044c\u043a\u043e \u043d\u0435\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u043d\u0430\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0430
 multiple_keywords_tip=\u041c\u043e\u0436\u043d\u043e \u0432\u0432\u0435\u0441\u0442\u0438 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043a\u043b\u044e\u0447\u0435\u0432\u044b\u0445 \u0441\u043b\u043e\u0432,\u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435 \u0438\u0445 \u043a\u043b\u0430\u0432\u0438\u0448\u0435\u0439 "Enter".
@@ -1490,34 +1490,34 @@ GByte=GByte
 interval=\u041f\u0440\u043e\u043c\u0435\u0436\u0443\u0442\u043e\u043a
 month=\u041c\u0435\u0441\u044f\u0446\u044b
 day=\u0414\u043d\u0438
-week=weeks
+week=\u043d\u0435\u0434\u0435\u043b\u044c
 startTime=\u041d\u0430\u0447\u0430\u0442\u044c
 endTime=\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c
 single=\u041e\u0434\u043d\u043e\u043a\u0440\u0430\u0442\u043d\u043e
 everyDay=\u0415\u0436\u0435\u0434\u043d\u0435\u0432\u043d\u043e
 everyWeek=\u0415\u0436\u0435\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u043e
 everyMonth=\u0415\u0436\u0435\u043c\u0435\u0441\u044f\u0447\u043d\u043e
-on=On
-is_schduler=Scheduler
-validate_error=Unexpected error occurred while validating
-v4_num=IPv4 Number
-v6_num=IPv6 Number
+on=\u041e\u0442\u043a\u0440\u044b\u0442\u044c
+is_schduler=\u041f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0449\u0438\u043a
+validate_error=\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0435
+v4_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e ipv4
+v6_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e ipv6
 always=\u041f\u043e\u0441\u0442\u043e\u044f\u043d\u043d\u043e
-schedule=Scheduler
-cancel_all=Cancel all configurations!
-pre_version=Previous Version
-approved_all=Approve all configurations!
-protection_list_manage=Protection List Manage
-effective=Effective
-admin_user_warn=Admin User Warn
-interface_total=Interface Total
-service_total=Service Total
-none_file_tip=Please Choose File!
+schedule=\u041f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0449\u0438\u043a
+cancel_all=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0441\u0435 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438%21
+pre_version=\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0430\u044f \u0412\u0435\u0440\u0441\u0438\u044f
+approved_all=\u0423\u0442\u0432\u0440\u0435\u0434\u0438\u0442\u044c \u0432\u0441\u0435 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438%21
+protection_list_manage=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0421\u043f\u0438\u0441\u043a\u043e\u043c \u0417\u0430\u0449\u0438\u0442\u044b%21
+effective=\u0410\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435
+admin_user_warn=\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435 \u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0410\u0434\u043c\u0438\u043d
+interface_total=\u041e\u0431\u0449\u0435\u0435 \u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0418\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430
+service_total=\u041e\u0431\u0449\u0435\u0435 \u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0421\u0435\u0440\u0432\u0438\u0441\u0430
+none_file_tip=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b%21
 the_same_ip_type=IP-\u0430\u0434\u0440\u0435\u0441 \u043A\u043B\u0438\u0435\u043D\u0442\u0430 \u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0434\u043E\u043B\u0436\u043D\u044B \u0438\u043C\u0435\u0442\u044C \u043E\u0434\u0438\u043D \u0438 \u0442\u043E\u0442 \u0436\u0435 \u0442\u0438\u043F.
-src_ip_pattern=Client IP Pattern
-dest_ip_pattern=Server IP Pattern
-src_port_pattern=Client Port Pattern
-dest_port_pattern=Server Port Pattern
+src_ip_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 ip \u041a\u043b\u0438\u0435\u043d\u0442\u0430
+dest_ip_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 ip \u0421\u0435\u0440\u0432\u0435\u0440\u0430
+src_port_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 \u041f\u043e\u0440\u0442\u0430 \u041a\u043b\u0438\u0435\u043d\u0442\u0430
+dest_port_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 \u041f\u043e\u0440\u0442\u0430 \u0421\u0435\u0440\u0432\u0435\u0440\u0430
 url_group_configuration=URL Group Configuration
 dns_keyword_group_configuration=DNS Keyword Group Configuration
 app_ip_correlation=APP IP Correlation
@@ -1527,6 +1527,7 @@ common_group=Common Group
 dns_keyword_group_manage=DNS Keyword Group Manage
 old_asn_group_manage=ASN Group
 url_group_manage=URL Group Manage
-range_cross=Found intersections between Server IP address and Client IP address
-app_ip_correlation=APP IP Correlation
-public_private_file_error=Public-private key mismatch
+range_cross=\u041d\u0430\u0439\u0434\u0435\u043d\u044b \u043f\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043d\u0438\u044f \u043c\u0435\u0436\u0434\u0443 ip-\u0430\u0434\u0440\u0435\u0441\u043e\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0438 ip-\u0430\u0434\u0440\u0435\u0441\u043e\u043c \u043a\u043b\u0438\u0435\u043d\u0442\u0430
+app_ip_correlation=\u041a\u043e\u0440\u0440\u0435\u043b\u044f\u0446\u0438\u044f ip-\u0430\u0434\u0440\u0435\u0441\u043e\u0432 \u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439
+public_private_file_error=\u041d\u0435\u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u043e-\u043f\u0440\u0438\u0432\u0430\u0442\u043d\u043e\u0433\u043e \u043a\u043b\u044e\u0447\u0430.
+https_url_format_tip=URL(http[s]://xxx.xx)

src/main/resources/messages/message_zh_CN.properties

@@ -546,7 +546,7 @@ ftp_ip=FTP IP\u914d\u7f6e
 dns_ip=DNS IP\u914d\u7f6e
 dns_domain=DNS\u57df\u540d\u914d\u7f6e
 action=\u52a8\u4f5c
-has_prohibit_delete=\u53ea\u6709\u672a\u5ba1\u6838\u7684\u914d\u7f6e\u53ef\u5220\u9664
+has_prohibit_delete=\u53ea\u80fd\u5220\u9664\u672a\u5ba1\u6838\u7684\u914d\u7f6e\u4e0e\u53d6\u6d88\u5ba1\u6838\u901a\u8fc7\u7684\u914d\u7f6e
 has_prohibit_nopass=\u53ea\u6709\u672a\u5ba1\u6838\u7684\u914d\u7f6e\u53ef\u672a\u901a\u8fc7\u5ba1\u6838
 has_prohibit_pass=\u53ea\u6709\u672a\u5ba1\u6838\u7684\u914d\u7f6e\u53ef\u4ee5\u5ba1\u6838\u901a\u8fc7
 multiple_keywords_tip=\u53ef\u540c\u65f6\u8f93\u5165\u591a\u6761\u5173\u952e\u5b57\uff0c\u8bf7\u4ee5\u56de\u8f66\u952e\u9694\u5f00\u3002
@@ -1116,11 +1116,11 @@ access_policy=\u8bbf\u95ee\u7b56\u7565
 nat_policy=\u5730\u5740\u8f6c\u6362\u7b56\u7565
 dns_policy_object=DNS\u7b56\u7565\u5bf9\u8c61
 proxy_policy_object=Proxy\u7b56\u7565\u5bf9\u8c61 
-APP_PAYLOAD_ADMIN=APP Payload Admin
-APP_HTTP_ADMIN=APP HTTP Admin
-APP_DNS_ADMIN=APP DNS Admin
-APP_SSL_ADMIN=APP SSL Admin
-APP_DK_GL=APP Correlation Feature
+APP_PAYLOAD_ADMIN=APP Payload \u7279\u5f81
+APP_HTTP_ADMIN=APP HTTP \u7279\u5f81
+APP_DNS_ADMIN=APP DNS \u7279\u5f81
+APP_SSL_ADMIN=APP SSL \u7279\u5f81
+APP_DK_GL=APP \u5173\u8054\u7279\u5f81
 dnat_complex_loop=DNAT IP\u590d\u7528\u56de\u6d41
 snat_policy=SNAT\u590d\u7528\u7b56\u7565
 dnat_policy=DNAT\u590d\u7528\u7b56\u7565
@@ -1141,7 +1141,7 @@ protocol_identify=\u57FA\u7840\u534F\u8BAE
 MM_FILE_DIGEST=\u6587\u4ef6\u6458\u8981
 NTC_ASN_IP=ASN
 NTC_STREAMING_MEDIA_URL=URL
-NTC_VOIP_ACCOUNT=VoIP Account
+NTC_VOIP_ACCOUNT=VoIP \u8d26\u6237
 export_failed=\u5bfc\u51fa\u5931\u8d25
 user_manage=\u5ba2\u6237\u7aef\u8d26\u53f7\u7ba1\u7406
 ip_reuse_policy_object=IP\u590d\u7528\u7b56\u7565\u5bf9\u8c61
@@ -1163,7 +1163,7 @@ log_user=\u64cd\u4f5c\u7528\u6237
 log_submission=\u8bf7\u6c42\u65b9\u6cd5
 log_ip=\u64cd\u4f5c\u8005IP
 log_exception_info=\u5f02\u5e38\u4fe1\u606f
-system_log=Log Management
+system_log=Log \u7ba1\u7406
 protected_ddos=\u4fdd\u62a4DDOS\u653b\u51fb
 usual_ddos=\u5e38\u7528DDOS\u653b\u51fb
 mail_address=\u90ae\u4ef6\u5730\u5740
@@ -1194,17 +1194,17 @@ certificate_error=\u516c\u94a5\u3001\u79c1\u94a5\u6587\u4ef6\u683c\u5f0f\u9519\u
 public_file_error=\u516c\u94a5\u6587\u4ef6\u683c\u5f0f\u9519\u8bef
 keyframe_pic_required=\u5c1a\u672a\u9009\u62e9\u5173\u952e\u5e27\u56fe\u7247
 private_file_error=\u79c1\u94a5\u6587\u4ef6\u683c\u5f0f\u9519\u8bef
-ipv4_range_tip=IPv4 Range
-ipv4_subnet_tip=IPv4/Subnet Mask
-ipv6_range_tip=IPv6 Range
-ipv6_subnet_tip=IPv6/Subnet Mask
-example_tip=For Example
-rule_desc_tip=Rule description
-port_comment_tip=Port must between 0 and 65535
-port_mask_comment_tip=Port and port mask must between 0 and 65535
-multi_keywords_tip=Allow multiple keywords to be entered and multiple keywords to be replaced by line breaks.
-visible_keyword_tip=Single keyword is not allowed to enter invisible characters.
-single_keyword_tip=Only single key input is allowed.
+ipv4_range_tip=IPv4 \u8303\u56f4
+ipv4_subnet_tip=IPv4/\u5b50\u7f51\u63a9\u7801
+ipv6_range_tip=IPv6 \u8303\u56f4
+ipv6_subnet_tip=IPv6/\u5b50\u7f51\u63a9\u7801
+example_tip=\u4f8b\u5982
+rule_desc_tip=\u89c4\u5219\u63cf\u8ff0
+port_comment_tip=Port\u5fc5\u987b\u5728 0 \u548c 65535 \u4e4b\u95f4
+port_mask_comment_tip=Port \u548c port \u63a9\u7801 \u5fc5\u987b\u5728 0 \u548c 65535 \u4e4b\u95f4
+multi_keywords_tip=\u5141\u8bb8\u8f93\u5165\u591a\u4e2a\u5173\u952e\u5b57\uff0c\u5e76\u7528\u6362\u884c\u7b26\u66ff\u6362\u591a\u4e2a\u5173\u952e\u5b57
+visible_keyword_tip=\u5355\u4e2a\u5173\u952e\u5b57\u4e0d\u5141\u8bb8\u8f93\u5165\u4e0d\u53ef\u89c1\u7684\u5b57\u7b26
+single_keyword_tip=\u53ea\u5141\u8bb8\u8f93\u5165\u4e00\u4e2a\u952e
 ipv4_mask_range_tip=IP\u63a9\u7801\u5fc5\u987b\u4ecb\u4e8e16\u548c32\u4e4b\u95f4
 ipv6_mask_range_tip=IP\u63a9\u7801\u5fc5\u987b\u4ecb\u4e8e2\u548c128\u4e4b\u95f4
 letter_cancel_info=\u53d6\u6d88\u5ba1\u6838\u6765\u51fd
@@ -1216,7 +1216,7 @@ has_invisible_char=%s\u5305\u542b\u4e0d\u53ef\u89c1\u5b57\u7b26
 not_multiple=%s\u4e0d\u652f\u6301\u591a\u4e2a\u5173\u952e\u5b57
 template_error=\u5bfc\u5165\u6a21\u677f\u9519\u8bef.
 asn_no=ASN
-query=Query
+query=\u67e5\u8be2
 cfg_operation_log=\u914d\u7f6e\u64cd\u4f5c\u65e5\u5fd7
 function_name=\u64cd\u4f5c\u6a21\u5757
 config_service_statistics=\u914d\u7f6e\u7edf\u8ba1
@@ -1232,7 +1232,7 @@ default_value=\u9ed8\u8ba4\u503c
 intercept=\u62e6\u622a
 unkown_error=\u672a\u77e5\u9519\u8bef\u4fe1\u606f
 exception_info=\u5f02\u5e38\u4fe1\u606f
-no_tc_udp_port_comment_tip=Port must be 0
+no_tc_udp_port_comment_tip=Port \u5fc5\u987b\u4e3a 0
 website_advanced_reject=HTTP Advanced\u963b\u65ad
 website_advanced_monit=HTTP Advanced\u76d1\u6d4b
 snat_ip_reuse_adress_pool_loop=SNAT\u5730\u5740\u6c60\u7ba1\u7406\u56de\u6d41
@@ -1322,10 +1322,10 @@ transfer_bytes=\u4f20\u8f93\u6570\u636e\u5b57\u8282
 user_info=\u7528\u6237\u4fe1\u606f
 user_list=\u7528\u6237\u5217\u8868
 equal_password=\u5bc6\u7801\u4e0d\u4e00\u81f4\uff01
-outgoing_unicast_packets=Upload Packets
-outgoing_unicast_total_size=Upload Byte
-incoming_unicast_packets=Download Packets
-incoming_unicast_total_size=Download Byte
+outgoing_unicast_packets=\u4e0a\u4f20\u6570\u636e\u5305\u6570
+outgoing_unicast_total_size=\u4e0a\u4f20\u6570\u636e\u5b57\u8282\u6570
+incoming_unicast_packets=\u4e0b\u8f7d\u6570\u636e\u5305\u6570
+incoming_unicast_total_size=\u4e0b\u8f7d\u6570\u636e\u5b57\u8282\u6570
 address_pool=\u5730\u5740\u6c60\u540d\u79f0
 ip_total=IP\u603b\u6570
 available_ip_total=\u53ef\u7528IP\u6570
@@ -1358,17 +1358,17 @@ website_keyword_monit=\u5173\u952e\u5b57\u76d1\u6d4b
 website_keyword_reject=\u5173\u952e\u5b57\u963b\u65ad
 radius_log=Radius \u65e5\u5fd7
 message_type=Code
-nas_ip=NAS IP Address
-framed_ip=Framed IP Address
-log_user_name=User Name
+nas_ip=NAS IP \u5730\u5740
+framed_ip=Framed IP \u5730\u5740
+log_user_name=\u7528\u6237\u540d
 av_tips=\u5bf9\u4e8e\u97f3\u89c6\u9891\u7f16\u7801\u7684\u7d22\u5f15\u4fe1\u606f\u5728\u97f3\u89c6\u9891\u6587\u4ef6\u5c3e\u90e8\u7684\u60c5\u51b5\uff0c\u672c\u7cfb\u7edf\u4e0d\u4e88\u652f\u6301\uff0c\u5bf9\u4e8e\u5206\u8fa8\u7387\u5927\u4e8e4\u5146\u7684\u89c6\u9891\uff0c\u672c\u7cfb\u7edf\u4e0d\u4e88\u652f\u6301
 asn_ip_group_delete=(\u8be5ASN\u7ec4\u4e0b\u7684IP\u914d\u7f6e\u4e5f\u4f1a\u88ab\u5220\u9664)
 keyword_log_tips=\u6e05\u6d17\u540e\u7f51\u9875\u5173\u952e\u5b57\u65e5\u5fd7\uff0c\u7f51\u9875\u5173\u952e\u5b57\u7ba1\u63a7\u72b6\u51b5\u4e0d\u7406\u60f3\u65f6\uff0c\u53ef\u5c06\u6e05\u6d17\u540e\u5efa\u8bae\u7ed9\u51fa\u7684\u547d\u4e2d\u5173\u952e\u5b57\u7f51\u9875\u914d\u7f6e\u4e3aURL\u7ba1\u63a7
 conn_record=\u901a\u8054\u5173\u7cfb
 bps=Gbps
-bps_percent=Bps Percent
+bps_percent=Bps \u767e\u5206\u6bd4
 pps=PPS
-pps_percent=pps Percent
+pps_percent=pps \u767e\u5206\u6bd4
 spoofing_ip_object=Spoofing IP Pool
 spoofing_ip_policy=IP Spoofing
 action_spoofing=Spoofing
@@ -1376,32 +1376,32 @@ spoofing=spoofing
 service=Service
 s_asn=SASN
 d_asn=DASN
-asn_conn_report=ASN Statistics
-https_url_report=Http(s) URL Statistics
+asn_conn_report=ASN\u7edf\u8ba1
+https_url_report=Http(s) URL\u7edf\u8ba1
 url=URL
-sum=SUM
-url_count=URL Count
-ip_range_report=IN/EX Host Identity
+sum=\u603b\u91cf
+url_count=URL \u6570\u91cf
+ip_range_report=IP\u8303\u56f4\u7edf\u8ba1
 ip_start=Start IP
 ip_end=End IP
-ip_start_num=IP Start Num
-ip_end_num=IP End Num
+ip_start_num=IP Start \u6570\u91cf
+ip_end_num=IP End \u6570\u91cf
 ip_sub=IP Subnet
-start_ip=Start IP
-end_ip=End IP
+start_ip=\u6e90 IP
+end_ip=\u76ee\u7684 IP
 action_detail=\u52a8\u4f5c\u8be6\u60c5
 pass=Pass
 live_link=Live
-area_type=Area Type
+area_type=\u5730\u57df\u7c7b\u578b
 dns_group_manage=DNS\u5206\u7ec4\u7ba1\u7406
 asn_group_manage=ASN\u5206\u7ec4\u7ba1\u7406
 ip_group_manage=IP\u5206\u7ec4\u7ba1\u7406
 ip_spoofing_group_manage=IP Spoofing\u5206\u7ec4\u7ba1\u7406
-min_tcp=Min
-max_tcp=Max
+min_tcp=\u6700\u5c0f
+max_tcp=\u6700\u5927
 APP_TCP_SESSION_BYTE=Session
-ip_count=Unique IP Count
-counnection_count=Connection Count
+ip_count=Unique IP \u6570\u91cf
+counnection_count=Connection \u6570\u91cf
 asn=ASN
 Unique_num=Unique
 ip=IP
@@ -1410,8 +1410,8 @@ unique_num=Unique
 import_limit_is=\u5bfc\u5165\u9650\u5236\u6700\u5927\u6761\u6570
 upload_limit_is=\u6587\u4ef6\u4e0a\u4f20\u4e2a\u6570\u9650\u5236
 count=\u6570\u91cf
-do_blacklist=Blacklist Option
-l3_header_error=Only four attribute values are allowed to be entered at most
+do_blacklist=\u672c\u5730\u9ed1\u540d\u5355
+l3_header_error=\u6700\u591a\u53ea\u5141\u8bb8\u8f93\u5165\u56db\u4e2a\u5c5e\u6027\u503c
 IP_HEADER=IP Header
 ICMP_HEADER=ICMP Header
 offset_expression=Offset Expression
@@ -1486,7 +1486,7 @@ GByte=GByte
 interval=\u95f4\u9694
 month=\u6708
 day=\u65e5
-week=weeks
+week=\u5468
 startTime=\u5f00\u59cb\u65f6\u95f4
 endTime=\u7ed3\u675f\u65f6\u95f4
 single=\u5355\u6b21
@@ -1496,8 +1496,8 @@ everyMonth=\u6bcf\u6708
 on=On
 validate_error=\u9a8c\u8bc1\u65f6\u53d1\u751f\u610f\u5916\u9519\u8bef
 is_schduler=\u5b9a\u65f6\u5668
-v4_num=IPv4 Number
-v6_num=IPv6 Number
+v4_num=IPv4 \u6570\u91cf
+v6_num=IPv6 \u6570\u91cf
 always=\u957f\u671f
 schedule=Scheduler
 cancel_all=\u53d6\u6d88\u6240\u6709\u914d\u7f6e!
@@ -1516,15 +1516,16 @@ src_ip_pattern=\u6E90IP\u683C\u5F0F
 dest_ip_pattern=\u76EE\u7684IP\u683C\u5F0F
 src_port_pattern=\u6E90\u7AEF\u53E3\u683C\u5F0F
 dest_port_pattern=\u76EE\u7684\u7AEF\u53E3\u683C\u5F0F
-url_group_configuration=URL Group Configuration
-dns_keyword_group_configuration=DNS Keyword Group Configuration
-app_ip_correlation=APP IP Correlation
-ip_group=IP Group
-common_ip_config=Common IP Config
-common_group=Common Group
-dns_keyword_group_manage=DNS Keyword Group Manage
-old_asn_group_manage=ASN Group
-url_group_manage=URL Group Manage
+url_group_configuration=URL \u5206\u7ec4\u914d\u7f6e
+dns_keyword_group_configuration=DNS \u5173\u952e\u5b57\u5206\u7ec4\u914d\u7f6e
+app_ip_correlation=APP IP \u901a\u8054
+ip_group=IP \u5206\u7ec4
+common_ip_config=Common IP \u914d\u7f6e
+common_group=Common \u5206\u7ec4
+dns_keyword_group_manage=DNS \u5173\u952e\u5b57\u5206\u7ec4\u7ba1\u7406
+old_asn_group_manage=ASN \u5206\u7ec4
+url_group_manage=URL \u5206\u7ec4 \u7ba1\u7406
 range_cross=\u6E90IP\u4E0E\u76EE\u7684IP\u8303\u56F4\u6709\u4EA4\u53C9
 app_ip_correlation=APP\u5173\u8054\u7279\u5F81IP\u914D\u7F6E
-public_private_file_error=\u516C\u79C1\u94A5\u8BC1\u4E66\u4E0D\u5339\u914D
+public_private_file_error=\u516C\u79C1\u94A5\u8BC1\u4E66\u4E0D\u5339\u914D
+https_url_format_tip=URL(http[s]://xxx.xx)

src/main/resources/nis.properties

@@ -182,8 +182,8 @@ ntcTotalReport=v1/ntcTotalReport
 trafficIpActiveFiveMinute=v1/trafficIpActiveFiveMinute
 trafficIpActiveOneHour=v1/trafficIpActiveOneHour
 
-client_connect_timeout=300000
-client_read_timeout=300000
+client_connect_timeout=500000
+client_read_timeout=500000
 log_time_interval=300000
 logsearch_menu_id=152
 #use elasticsearch or not#
@@ -485,7 +485,7 @@ ntcCollectRadiusLog=v1/ntcCollectRadiusLogs
 ntcConnRecordLog=v1/ntcConnRecordLogs
 ntcConnRecordPercent=v1/ntcConnRecordPercent
 #\u5bfc\u51fa\u6700\u5927\u6761\u6570
-maxLogExportSize=2000
+maxLogExportSize=20000
 pxy_crtl_subscribe_id_region=PXY_CTRL_SUBSCRIBE_ID
 ntc_subscribe_id_region=NTC_SUBSCRIBE_ID
 ntcAsnRecord=v1/ntcAsnRecord
@@ -519,4 +519,5 @@ trafficAppBpsTrend=v1/trafficAppBpsTrend
 #vpn cgi error info
 cgiError=cannot connect to vpnserver,Connection to the server has failed,Specified object can not be found,Too many users,User already exists,Too many created users,The destination server is not a VPN server,The connection has been interrupted,
 #\u83b7\u53d6\u670d\u52a1\u914d\u7f6e\u603b\u91cf\u63a5\u53e3
-getConfigByService=v1/getConfigByService
+getConfigByService=v1/getConfigByService
+delAllCfg=v1/delAllConfig

src/main/resources/sql/spaceMappingSql/code_app_dic.sql

@@ -0,0 +1,719 @@
+delete from code_app_dic;
+INSERT INTO `code_app_dic` VALUES (1, 'Other', 'Other', '0', '', '', 1, NULL, '', '');
+INSERT INTO `code_app_dic` VALUES (2, 'Skype', 'Skype', '100001', '', 'Skype video calls/calls\nSkype voice\nSkype message\nSkype transfer', 1, 0000000002, 'IM', '');
+INSERT INTO `code_app_dic` VALUES (3, 'Instagram', 'Instagram', '100101', '', 'Instagram video\nInstagram message\nInstagram live\nInstagram adding photos and videos', 1, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (4, 'Youtube', 'Youtube', '100201', '', 'Youtube video\nYoutube live\nYoutube adding videos', 1, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (5, 'Facebook', 'Facebook', '100301', '', 'Facebook video\nFacebook live\nFacebook message', 1, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (6, 'WhatsApp', 'WhatsApp', '100401', '', 'Whats App message\nWhat\'s App calls/video calls\nWhat\'s App transfer', 1, 0000000002, 'IM', '');
+INSERT INTO `code_app_dic` VALUES (7, 'Periscope', 'Periscope', '100501', '', '', 1, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (8, 'Viber', 'Viber', '100601', '', 'Viber calls/video calls\nViber message\nViber transfer', 1, 0000000002, 'IM', '');
+INSERT INTO `code_app_dic` VALUES (9, 'Twitter', 'Twitter', '100701', '', '', 1, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (10, 'Vkontakte', 'Vkontakte', '100801', '', 'Vkontakte video\nVkontakte message\nVkontakte live', 1, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (11, 'Telegram', 'Telegram', '100901', '', 'Telegram message\nTelegram calls/video calls\nTelegram transfer', 1, 0000000002, 'IM', '');
+INSERT INTO `code_app_dic` VALUES (12, 'Odnoklassniki', 'Odnoklassniki', '101001', '', 'Odnoklassniki message\nOdnoklassniki video', 1, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (13, 'Mail agent', 'Mail agent', '101101', '', 'Mail agent message\nMail agent calls\nMail agent transfer', 1, 0000000002, 'IM', '');
+INSERT INTO `code_app_dic` VALUES (14, 'FaceTime', 'FaceTime', '101201', '', 'Facetime video calls\nFacetime voice calls', 1, 0000000002, 'IM', '');
+INSERT INTO `code_app_dic` VALUES (15, 'Snapchat', 'Snapchat', '101301', '', '', 1, 0000000002, 'IM', '');
+INSERT INTO `code_app_dic` VALUES (16, 'Google', 'Google', '101401', '', '', 1, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (17, 'Yandex', 'Yandex', '101501', '', '', 1, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (18, 'Yandex Browser Turbo', 'Yandex Browser Turbo', '101601', '', '', 1, 0000000017, 'Browser', '');
+INSERT INTO `code_app_dic` VALUES (19, 'Opera', 'Opera', '101701', '', '', 1, 0000000017, 'Browser', '');
+INSERT INTO `code_app_dic` VALUES (20, 'AppStore', 'AppStore', '101801', '', '', 1, 0000000015, 'ApplicationMarket', '');
+INSERT INTO `code_app_dic` VALUES (21, 'PlayMarket', 'PlayMarket', '101901', '', '', 1, 0000000015, 'ApplicationMarket', '');
+INSERT INTO `code_app_dic` VALUES (22, 'Drugvokrug social networking', 'Drugvokrug social networking', '102001', '', '', 1, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (23, 'Badoo social networking', 'Badoo social networking', '102101', '', '', 1, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (24, 'WeChat', 'WeChat', '102201', '', '', 1, 0000000002, 'IM', '');
+INSERT INTO `code_app_dic` VALUES (25, 'Zello', 'Zello', '102301', '', '', 1, 0000000002, 'IM', '');
+INSERT INTO `code_app_dic` VALUES (26, 'Freegate', 'Freegate', '102401', '', '', 1, 0000000020, 'VPN', '');
+INSERT INTO `code_app_dic` VALUES (27, 'Psiphon', 'Psiphon', '102501', '', '', 1, 0000000020, 'VPN', '');
+INSERT INTO `code_app_dic` VALUES (28, 'TOR', 'TOR', '102601', '', '', 1, 0000000020, 'VPN', '');
+INSERT INTO `code_app_dic` VALUES (29, 'Orbot', 'Orbot', '102701', '', '', 1, 0000000020, 'VPN', '');
+INSERT INTO `code_app_dic` VALUES (30, 'Tunnel Bear VPN', 'Tunnel Bear VPN', '102801', '', '', 1, 0000000020, 'VPN', '');
+INSERT INTO `code_app_dic` VALUES (31, 'HotSpot Shield VPN', 'HotSpot Shield VPN', '102901', '', '', 1, 0000000020, 'VPN', '');
+INSERT INTO `code_app_dic` VALUES (32, 'VPN Master', 'VPN Master', '103001', '', '', 1, 0000000020, 'VPN', '');
+INSERT INTO `code_app_dic` VALUES (33, 'Hola VPN', 'Hola VPN', '103101', '', '', 1, 0000000020, 'VPN', '');
+INSERT INTO `code_app_dic` VALUES (34, 'HideMyAss VPN', 'HideMyAss VPN', '103201', '', '', 1, 0000000020, 'VPN', '');
+INSERT INTO `code_app_dic` VALUES (35, 'Zenmate VPN', 'Zenmate VPN', '103301', '', '', 1, 0000000020, 'VPN', '');
+INSERT INTO `code_app_dic` VALUES (36, 'SignalPrivateMessenger', 'SignalPrivateMessenger', '103401', '', '', 1, 0000000002, 'IM', '');
+INSERT INTO `code_app_dic` VALUES (37, 'Unspecified', 'Unspecified', '268435455', '', '', 1, 0268435455, 'Unspecified', '');
+INSERT INTO `code_app_dic` VALUES (38, 'RFA', 'RFA', '200001', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (39, 'VOA', 'VOA', '200002', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (40, 'lantern', 'lantern', '200003', '', '', 0, 0000000020, 'vpn', '');
+INSERT INTO `code_app_dic` VALUES (41, 'Line', 'Line', '200004', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (42, 'voxer', 'voxer', '200005', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (43, 'ZeroNet', 'ZeroNet', '200006', '', '', 0, 0000000011, 'Network', '');
+INSERT INTO `code_app_dic` VALUES (44, 'Zalo', 'Zalo', '200007', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (45, 'free_browser', 'free_browser', '200008', '', '', 0, 0000000017, 'Browser', '');
+INSERT INTO `code_app_dic` VALUES (46, 'Diaspora', 'Diaspora', '200009', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (47, 'browsec', 'browsec', '200010', '', '', 0, 0000000020, 'VPN', '');
+INSERT INTO `code_app_dic` VALUES (48, 'Chrome_plugin_chuguo', 'Chrome_plugin_chuguo', '200011', '', '', 0, 0000000020, 'vpn', '');
+INSERT INTO `code_app_dic` VALUES (49, 'GoGo_SocksHttp', 'GoGo_SocksHttp', '200012', '', '', 0, 0000000011, 'Network', '');
+INSERT INTO `code_app_dic` VALUES (50, 'ultrasurf_chrome', 'ultrasurf_chrome', '200013', '', '', 0, 0000000020, 'VPN', '');
+INSERT INTO `code_app_dic` VALUES (51, 'pinterest', 'pinterest', '200014', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (52, 'Swisscom', 'Swisscom', '200015', '', '', 0, 0000000011, 'Network', '');
+INSERT INTO `code_app_dic` VALUES (53, 'Threema', 'Threema', '200016', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (54, 'Circuit_iOS', 'Circuit_iOS', '200017', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (55, 'Chrome_plugin_FastsTunnel', 'Chrome_plugin_FastsTunnel', '200018', '', '', 0, 0000000022, 'EncryptedTraffic', '');
+INSERT INTO `code_app_dic` VALUES (56, 'OoVoo', 'OoVoo', '200019', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (57, 'Vine', 'Vine', '200020', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (58, 'Keek', 'Keek', '200021', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (59, 'Hi', 'Hi', '200022', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (60, 'HeyTell', 'HeyTell', '200023', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (61, 'HikeMessenger', 'HikeMessenger', '200024', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (62, 'Nonoh', 'Nonoh', '200025', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (63, 'Path', 'Path', '200026', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (64, 'Kik', 'Kik', '200027', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (65, 'BBM', 'BBM', '200028', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (66, 'Talkray', 'Talkray', '200029', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (67, 'HelloTalk', 'HelloTalk', '200030', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (68, 'Skout', 'Skout', '200031', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (69, 'MeetMe', 'MeetMe', '200032', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (70, 'Nextdoor', 'Nextdoor', '200033', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (71, 'Shots', 'Shots', '200034', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (72, 'Zoosk', 'Zoosk', '200035', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (73, 'TextPlus', 'TextPlus', '200036', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (74, 'Maaii', 'Maaii', '200037', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (75, 'Ustream', 'Ustream', '200038', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (76, 'Yikyak', 'Yikyak', '200039', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (77, 'chatsecure', 'chatsecure', '200040', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (78, 'freecalls', 'freecalls', '200041', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (79, 'SignalPrivateMessenger', 'SignalPrivateMessenger', '200042', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (80, 'USGOV_CIA', 'USGOV_CIA', '200043', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (81, 'USGOV_FBI', 'USGOV_FBI', '200044', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (82, 'USGOV_DHS', 'USGOV_DHS', '200045', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (83, 'shenxun_Secure_Call_android', 'shenxun_Secure_Call_android', '200046', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (84, 'shenxun_Secure_Call_web', 'shenxun_Secure_Call_web', '200047', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (85, 'UProxy', 'UProxy', '200048', '', '', 0, 0000000011, 'Network', '');
+INSERT INTO `code_app_dic` VALUES (86, 'soma', 'soma', '200049', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (87, 'PlayerUnknown\'s_Battlegrounds', 'PlayerUnknown\'s_Battlegrounds', '200050', '', '', 0, 0000000009, 'Game', '');
+INSERT INTO `code_app_dic` VALUES (88, 'STEAM', 'STEAM', '200051', '', '', 0, 0000000009, 'GAME', '');
+INSERT INTO `code_app_dic` VALUES (89, 'dalai_lama', 'dalai_lama', '200052', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (90, 'Steam_forum', 'Steam_forum', '200053', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (91, 'Microsoft Online Certificate', 'Microsoft Online Certificate', '200054', '', '', 0, 0000000011, 'Network', '');
+INSERT INTO `code_app_dic` VALUES (92, 'sogou_spider', 'sogou_spider', '200055', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (93, 'baidu_mobie', 'baidu_mobie', '200056', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (94, 'Apple Push Service', 'Apple Push Service', '200057', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (95, 'IQIYI', 'IQIYI', '200058', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (96, 'baidu_spider', 'baidu_spider', '200059', '', '', 0, 0000000011, 'Network', '');
+INSERT INTO `code_app_dic` VALUES (97, 'Weibo', 'Weibo', '200060', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (98, 'Apple captive service', 'Apple captive service', '200061', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (99, 'Microsoft wns', 'Microsoft wns', '200062', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (100, '360_safe_pc', '360_safe_pc', '200063', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (101, 'Sogou Public Service', 'Sogou Public Service', '200064', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (102, 'Lenovo app_POST service', 'Lenovo app_POST service', '200065', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (103, 'Apple securityd service', 'Apple securityd service', '200066', '', '', 0, 0000000022, 'EncryptedTraffic', '');
+INSERT INTO `code_app_dic` VALUES (104, 'Weather pass', 'Weather pass', '200067', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (105, 'Apple Service Pack', 'Apple Service Pack', '200068', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (106, 'Fast pressure', 'Fast pressure', '200069', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (107, 'SemrushBot', 'SemrushBot', '200070', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (108, 'Adrefs_spider', 'Adrefs_spider', '200071', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (109, 'AndroidDownloadManager', 'AndroidDownloadManager', '200072', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (110, 'XenderTop', 'XenderTop', '200073', '', '', 0, 0000000003, 'Cloud', '');
+INSERT INTO `code_app_dic` VALUES (111, 'microsoft_update', 'microsoft_update', '200074', '', '', 0, 0000000015, 'SoftwareUpdate', '');
+INSERT INTO `code_app_dic` VALUES (112, 'Youku', 'Youku', '200075', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (113, 'Google_spider', 'Google_spider', '200076', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (114, 'Microsoft User Experience and Telemetry Components', 'Microsoft User Experience and Telemetry Components', '200077', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (115, 'MICROSOFT_DEVICE_METADATA_RETRIEVAL_CLIENT', 'MICROSOFT_DEVICE_METADATA_RETRIEVAL_CLIENT', '200078', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (116, 'Microsoft ncsi', 'Microsoft ncsi', '200079', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (117, 'Microsoft Privacy Collection Service', 'Microsoft Privacy Collection Service', '200080', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (118, 'uTorrent', 'uTorrent', '200081', '', '', 0, 0000000007, 'DataTransfer', '');
+INSERT INTO `code_app_dic` VALUES (119, 'Edge', 'Edge', '200082', '', '', 0, 0000000017, 'Browser', '');
+INSERT INTO `code_app_dic` VALUES (120, 'Lenovo Music Store', 'Lenovo Music Store', '200083', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (121, 'LieBao', 'LieBao', '200084', '', '', 0, 0000000017, 'Browser', '');
+INSERT INTO `code_app_dic` VALUES (122, 'majesti_spider', 'majesti_spider', '200085', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (123, 'DotBot', 'DotBot', '200086', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (124, 'Millet Update', 'Millet Update', '200087', '', '', 0, 0000000015, 'SoftwareUpdate', '');
+INSERT INTO `code_app_dic` VALUES (125, 'Today’s headlines', 'Today’s headlines', '200088', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (126, 'Microsoft live', 'Microsoft live', '200089', '', '', 0, 0000000009, 'Game', '');
+INSERT INTO `code_app_dic` VALUES (127, 'Microsoft OneNote', 'Microsoft OneNote', '200090', '', '', 0, 0000000019, 'Collaborative', '');
+INSERT INTO `code_app_dic` VALUES (128, 'Bing_spider', 'Bing_spider', '200091', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (129, 'Apple location service', 'Apple location service', '200092', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (130, 'Kuaishou', 'Kuaishou', '200093', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (131, 'LeTV video', 'LeTV video', '200094', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (132, 'QQ', 'QQ', '200095', '', '', 0, 0000000002, 'CHAT', '');
+INSERT INTO `code_app_dic` VALUES (133, 'Wps', 'Wps', '200096', '', '', 0, 0000000019, 'Collaborative', '');
+INSERT INTO `code_app_dic` VALUES (134, 'kugou music', 'kugou music', '200097', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (135, 'kuwo music', 'kuwo music', '200098', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (136, '360_common_service', '360_common_service', '200099', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (137, 'Camera360', 'Camera360', '200100', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (138, 'Outlook', 'Outlook', '200101', '', '', 0, 0000000008, 'Email', '');
+INSERT INTO `code_app_dic` VALUES (139, 'zhihu', 'zhihu', '200102', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (140, 'Tencent video', 'Tencent video', '200103', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (141, 'funshion', 'funshion', '200104', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (142, 'QQ shared service', 'QQ shared service', '200105', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (143, 'Microsoft wdcp service', 'Microsoft wdcp service', '200106', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (144, 'Microsoft Media_center_pc', 'Microsoft Media_center_pc', '200107', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (145, '360 phone helper', '360 phone helper', '200108', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (146, 'Kingsoft Public Service', 'Kingsoft Public Service', '200109', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (147, 'Ios_wifi connection', 'Ios_wifi connection', '200110', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (148, 'Teamviewer', 'Teamviewer', '200111', '', '', 0, 0000000013, 'REMOTE_ACCESS', '');
+INSERT INTO `code_app_dic` VALUES (149, 'Baidu cloud disk', 'Baidu cloud disk', '200112', '', '', 0, 0000000003, 'Cloud', '');
+INSERT INTO `code_app_dic` VALUES (150, 'Tencent News', 'Tencent News', '200113', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (151, 'Baidu map', 'Baidu map', '200114', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (152, 'Panda TV', 'Panda TV', '200115', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (153, 'Thunder', 'Thunder', '200116', '', '', 0, 0000000007, 'DOWNLOAD_FT', '');
+INSERT INTO `code_app_dic` VALUES (154, 'NetEase cloud music', 'NetEase cloud music', '200117', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (155, 'QQ music', 'QQ music', '200118', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (156, 'Itools', 'Itools', '200119', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (157, 'Jingdong Finance', 'Jingdong Finance', '200120', '', '', 0, 0000000001, 'Finance', '');
+INSERT INTO `code_app_dic` VALUES (158, 'PycURL', 'PycURL', '200121', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (159, 'Yahoo_Spider', 'Yahoo_Spider', '200122', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (160, 'Himalayan FM', 'Himalayan FM', '200123', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (161, 'Youdao_dict', 'Youdao_dict', '200124', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (162, 'Microsoft_spynet', 'Microsoft_spynet', '200125', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (163, 'proximicBot', 'proximicBot', '200126', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (164, 'Foxit_reader', 'Foxit_reader', '200127', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (165, 'Sohu Video', 'Sohu Video', '200128', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (166, 'BlueStacks', 'BlueStacks', '200129', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (167, 'Beauty group', 'Beauty group', '200130', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (168, 'Kmplayer', 'Kmplayer', '200131', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (169, 'TaoBao', 'TaoBao', '200132', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (170, 'Exabot', 'Exabot', '200133', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (171, 'Ubuntu_apt_get', 'Ubuntu_apt_get', '200134', '', '', 0, 0000000015, 'SoftwareUpdate', '');
+INSERT INTO `code_app_dic` VALUES (172, 'Oriental Fortune', 'Oriental Fortune', '200135', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (173, 'JikeSpider', 'JikeSpider', '200136', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (174, 'Itunesstored', 'Itunesstored', '200137', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (175, 'GAD map', 'GAD map', '200138', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (176, 'ifeng News', 'ifeng News', '200139', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (177, 'BoardReaderBot', 'BoardReaderBot', '200140', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (178, 'AmazonBot', 'AmazonBot', '200141', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (179, 'Alipay', 'Alipay', '200142', '', '', 0, 0000000001, 'Finance', '');
+INSERT INTO `code_app_dic` VALUES (180, 'Alipay security controls', 'Alipay security controls', '200143', '', '', 0, 0000000001, 'Finance', '');
+INSERT INTO `code_app_dic` VALUES (181, '360 security guards (antivirus)', '360 security guards (antivirus)', '200144', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (182, '360 logon service', '360 logon service', '200145', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (183, 'BLP_bbot', 'BLP_bbot', '200146', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (184, 'Keep', 'Keep', '200147', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (185, 'WiFi universal key', 'WiFi universal key', '200148', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (186, 'Baidu Music', 'Baidu Music', '200149', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (187, 'Vip.com', 'Vip.com', '200150', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (188, 'JD.COM', 'JD.COM', '200151', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (189, 'sina', 'sina', '200152', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (190, 'youdao Public service', 'youdao Public service', '200153', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (191, 'Jinshan public service', 'Jinshan public service', '200154', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (192, 'Baidu guard', 'Baidu guard', '200155', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (193, 'Apple system update service', 'Apple system update service', '200156', '', '', 0, 0000000015, 'SoftwareUpdate', '');
+INSERT INTO `code_app_dic` VALUES (194, 'momo', 'momo', '200157', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (195, 'CNZZ statistics', 'CNZZ statistics', '200158', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (196, 'Microsoft one_drive service', 'Microsoft one_drive service', '200159', '', '', 0, 0000000003, 'Cloud', '');
+INSERT INTO `code_app_dic` VALUES (197, 'WindowsStore', 'WindowsStore', '200160', '', '', 0, 0000000015, 'SoftwareUpdate', '');
+INSERT INTO `code_app_dic` VALUES (198, 'duba', 'duba', '200161', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (199, 'Baidu HD', 'Baidu HD', '200162', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (200, 'qunar', 'qunar', '200163', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (201, 'qianxunyingshi', 'qianxunyingshi', '200164', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (202, 'KuaiyanKanShuSpider', 'KuaiyanKanShuSpider', '200165', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (203, 'Mail.RU_Bot_Robot', 'Mail.RU_Bot_Robot', '200166', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (204, 'MpCommunication', 'MpCommunication', '200167', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (205, 'Weather forecast', 'Weather forecast', '200168', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (206, 'Ltx71_spider', 'Ltx71_spider', '200169', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (207, 'Ia_archiver', 'Ia_archiver', '200170', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (208, 'Ali Wangwang', 'Ali Wangwang', '200171', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (209, 'UC home page (information)', 'UC home page (information)', '200172', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (210, 'Yeti', 'Yeti', '200173', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (211, 'Rtorrent', 'Rtorrent', '200174', '', '', 0, 0000000007, 'DataTransfer', '');
+INSERT INTO `code_app_dic` VALUES (212, 'QQPim', 'QQPim', '200175', '', '', 0, 0000000007, 'DataTransfer', '');
+INSERT INTO `code_app_dic` VALUES (213, 'NetEase News', 'NetEase News', '200176', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (214, 'sina sports', 'sina sports', '200177', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (215, 'Exchange of foreign exchange', 'Exchange of foreign exchange', '200178', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (216, 'BlueStacks update', 'BlueStacks update', '200179', '', '', 0, 0000000015, 'SoftwareUpdate', '');
+INSERT INTO `code_app_dic` VALUES (217, 'youdao', 'youdao', '200180', '', '', 0, 0000000019, 'Collaborative', '');
+INSERT INTO `code_app_dic` VALUES (218, 'QQ computer housekeeper', 'QQ computer housekeeper', '200181', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (219, 'UltraEdit', 'UltraEdit', '200182', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (220, 'EasouSpider', 'EasouSpider', '200183', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (221, 'QQ Zone', 'QQ Zone', '200184', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (222, 'Foxmail', 'Foxmail', '200185', '', '', 0, 0000000008, 'Email', '');
+INSERT INTO `code_app_dic` VALUES (223, 'Pingdom.com', 'Pingdom.com', '200186', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (224, 'Sina Finance', 'Sina Finance', '200187', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (225, 'QQ one key login', 'QQ one key login', '200188', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (226, 'Norton', 'Norton', '200189', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (227, 'Baidu waimai', 'Baidu waimai', '200190', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (228, 'YaCy', 'YaCy', '200191', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (229, 'Haitong e Haitong', 'Haitong e Haitong', '200192', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (230, 'AdsBot-Google', 'AdsBot-Google', '200193', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (231, 'Guangfa Yijin', 'Guangfa Yijin', '200194', '', '', 0, 0000000001, 'Finance', '');
+INSERT INTO `code_app_dic` VALUES (232, 'Ali security program', 'Ali security program', '200195', '', '', 0, 0000000022, 'EncryptedTraffic', '');
+INSERT INTO `code_app_dic` VALUES (233, 'Cliqzbot', 'Cliqzbot', '200196', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (234, 'Mobike', 'Mobike', '200197', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (235, 'Kingsoft PowerWord', 'Kingsoft PowerWord', '200198', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (236, 'meishij', 'meishij', '200199', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (237, 'CCB mobile bank', 'CCB mobile bank', '200200', '', '', 0, 0000000001, 'Finance', '');
+INSERT INTO `code_app_dic` VALUES (238, 'Mega SkyDrive', 'Mega SkyDrive', '200201', '', '', 0, 0000000003, 'Cloud', '');
+INSERT INTO `code_app_dic` VALUES (239, 'douyu', 'douyu', '200202', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (240, 'Flamingo_SearchEngine', 'Flamingo_SearchEngine', '200203', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (241, 'Lenovo shop', 'Lenovo shop', '200204', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (242, 'Uc news', 'Uc news', '200205', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (243, 'Volcano small video', 'Volcano small video', '200206', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (244, 'Meitu Xiu Xiu', 'Meitu Xiu Xiu', '200207', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (245, 'Kaspersky', 'Kaspersky', '200208', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (246, 'AcFun', 'AcFun', '200209', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (247, 'Slackbot', 'Slackbot', '200210', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (248, 'Snowball', 'Snowball', '200211', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (249, 'SafeDNSBot', 'SafeDNSBot', '200212', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (250, 'Great wisdom', 'Great wisdom', '200213', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (251, 'Mailbox of NetEase', 'Mailbox of NetEase', '200214', '', '', 0, 0000000008, 'Email', '');
+INSERT INTO `code_app_dic` VALUES (252, 'peasecod', 'peasecod', '200215', '', '', 0, 0000000015, 'SoftwareUpdate', '');
+INSERT INTO `code_app_dic` VALUES (253, 'Gold ten data', 'Gold ten data', '200216', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (254, 'Linkdexbot', 'Linkdexbot', '200217', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (255, 'Sina blog', 'Sina blog', '200218', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (256, 'Ginger', 'Ginger', '200219', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (257, 'Microsoft activation verification', 'Microsoft activation verification', '200220', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (258, 'Facebot', 'Facebot', '200221', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (259, 'Dangdang', 'Dangdang', '200222', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (260, 'QQ cyclone', 'QQ cyclone', '200223', '', '', 0, 0000000007, 'DataTransfer', '');
+INSERT INTO `code_app_dic` VALUES (261, 'Wp_feedbot', 'Wp_feedbot', '200224', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (262, 'ICBC', 'ICBC', '200225', '', '', 0, 0000000001, 'Finance', '');
+INSERT INTO `code_app_dic` VALUES (263, 'Public service', 'Public service', '200226', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (264, 'Magpie-crawler', 'Magpie-crawler', '200227', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (265, 'xianyu', 'xianyu', '200228', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (266, 'GetIntentBot', 'GetIntentBot', '200229', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (267, 'Papers', 'Papers', '200230', '', '', 0, 0000000003, 'Cloud', '');
+INSERT INTO `code_app_dic` VALUES (268, 'NewsGator', 'NewsGator', '200231', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (269, 'RankFlexBot', 'RankFlexBot', '200232', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (270, 'rogerbot', 'rogerbot', '200233', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (271, 'SurdotlyBot', 'SurdotlyBot', '200234', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (272, 'CheckMarkNetworkBot', 'CheckMarkNetworkBot', '200235', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (273, 'pyspider', 'pyspider', '200236', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (274, 'spbot', 'spbot', '200237', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (275, 'Huaxia Bank', 'Huaxia Bank', '200238', '', '', 0, 0000000001, 'Finance', '');
+INSERT INTO `code_app_dic` VALUES (276, 'glory of king', 'glory of king', '200239', '', '', 0, 0000000009, 'Game', '');
+INSERT INTO `code_app_dic` VALUES (277, 'msnbot-Products', 'msnbot-Products', '200240', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (278, 'archive.org', 'archive.org', '200241', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (279, 'applebot', 'applebot', '200242', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (280, 'alicall', 'alicall', '200243', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (281, 'Superfeedrbot', 'Superfeedrbot', '200244', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (282, 'QQ mailbox', 'QQ mailbox', '200245', '', '', 0, 0000000008, 'Email', '');
+INSERT INTO `code_app_dic` VALUES (283, 'coccocbot-webBot', 'coccocbot-webBot', '200246', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (284, 'dingtalk', 'dingtalk', '200247', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (285, 'Dragonbot', 'Dragonbot', '200248', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (286, 'Mediatoolkitbot', 'Mediatoolkitbot', '200249', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (287, 'bitcomet', 'bitcomet', '200250', '', '', 0, 0000000007, 'DataTransfer', '');
+INSERT INTO `code_app_dic` VALUES (288, 'filetopia', 'filetopia', '200251', '', '', 0, 0000000007, 'Download-FileTransfer-FileSharing', '');
+INSERT INTO `code_app_dic` VALUES (289, 'flashget', 'flashget', '200252', '', '', 0, 0000000007, 'DataTransfer', '');
+INSERT INTO `code_app_dic` VALUES (290, 'oracle', 'oracle', '200253', '', '', 0, 0000000006, 'DATABASE', '');
+INSERT INTO `code_app_dic` VALUES (291, 'yyvoice', 'yyvoice', '200254', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (292, 'imesh', 'imesh', '200255', '', '', 0, 0000000007, 'Download-FileTransfer-FileSharing', '');
+INSERT INTO `code_app_dic` VALUES (293, 'citrix', 'citrix', '200256', '', '', 0, 0000000011, 'NETWORK', '');
+INSERT INTO `code_app_dic` VALUES (294, 'corba', 'corba', '200257', '', '', 0, 0000000014, 'RPC', '');
+INSERT INTO `code_app_dic` VALUES (295, 'dameware', 'dameware', '200258', '', '', 0, 0000000013, 'RemoteAccess', '');
+INSERT INTO `code_app_dic` VALUES (296, 'pcanywhere', 'pcanywhere', '200259', '', '', 0, 0000000013, 'REMOTE_ACCESS', '');
+INSERT INTO `code_app_dic` VALUES (297, 'qq_rdp', 'qq_rdp', '200260', '', '', 0, 0000000013, 'RemoteAccess', '');
+INSERT INTO `code_app_dic` VALUES (298, 'poco', 'poco', '200261', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (299, 'qqdownload', 'qqdownload', '200262', '', '', 0, 0000000007, 'DataTransfer', '');
+INSERT INTO `code_app_dic` VALUES (300, 'applejuice', 'applejuice', '200263', '', '', 0, 0000000007, 'DOWNLOAD_FT', '');
+INSERT INTO `code_app_dic` VALUES (301, 'stealthnet', 'stealthnet', '200264', '', '', 0, 0000000007, 'DOWNLOAD_FT', '');
+INSERT INTO `code_app_dic` VALUES (302, 'winmx', 'winmx', '200265', '', '', 0, 0000000007, 'Download-FileTransfer-FileSharing', '');
+INSERT INTO `code_app_dic` VALUES (303, 'emule', 'emule', '200266', '', '', 0, 0000000007, 'DataTransfer', '');
+INSERT INTO `code_app_dic` VALUES (304, 'emule_decrypt', 'emule_decrypt', '200267', '', '', 0, 0000000007, 'DataTransfer', '');
+INSERT INTO `code_app_dic` VALUES (305, 'qvod', 'qvod', '200268', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (306, 'mysql', 'mysql', '200269', '', '', 0, 0000000006, 'DATABASE', '');
+INSERT INTO `code_app_dic` VALUES (307, 'icecast', 'icecast', '200270', '', '', 0, 0000000010, 'MEDIA', '');
+INSERT INTO `code_app_dic` VALUES (308, 'mms', 'mms', '200271', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (309, 'pplive', 'pplive', '200272', '', '', 0, 0000000010, 'MEDIA', '');
+INSERT INTO `code_app_dic` VALUES (310, 'ppstream', 'ppstream', '200273', '', '', 0, 0000000010, 'MEDIA', '');
+INSERT INTO `code_app_dic` VALUES (311, 'sopcast', 'sopcast', '200274', '', '', 0, 0000000010, 'MEDIA', '');
+INSERT INTO `code_app_dic` VALUES (312, 'tvants', 'tvants', '200275', '', '', 0, 0000000010, 'MEDIA', '');
+INSERT INTO `code_app_dic` VALUES (313, 'sohutv', 'sohutv', '200276', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (314, 'iku', 'iku', '200277', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (315, 'qqlive', 'qqlive', '200278', '', '', 0, 0000000010, 'MEDIA', '');
+INSERT INTO `code_app_dic` VALUES (316, 'rsync', 'rsync', '200279', '', '', 0, 0000000007, 'DATA_TRANSFER', '');
+INSERT INTO `code_app_dic` VALUES (317, 'xunyou_speedup', 'xunyou_speedup', '200280', '', '', 0, 0000000023, 'Tools', '');
+INSERT INTO `code_app_dic` VALUES (318, 'msn', 'msn', '200281', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (319, 'popo', 'popo', '200282', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (320, 'sinauc', 'sinauc', '200283', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (321, 'qqbattle', 'qqbattle', '200284', '', '', 0, 0000000014, 'SocilNetwork', '');
+INSERT INTO `code_app_dic` VALUES (322, 'quake', 'quake', '200285', '', '', 0, 0000000009, 'Game', '');
+INSERT INTO `code_app_dic` VALUES (323, 'xbox', 'xbox', '200286', '', '', 0, 0000000009, 'GAME', '');
+INSERT INTO `code_app_dic` VALUES (324, 'wow', 'wow', '200287', '', '', 0, 0000000009, 'Game', '');
+INSERT INTO `code_app_dic` VALUES (325, 'lol', 'lol', '200288', '', '', 0, 0000000009, 'Game', '');
+INSERT INTO `code_app_dic` VALUES (326, 'PostgreSQL', 'PostgreSQL', '200289', '', '', 0, 0000000006, 'DATABASE', '');
+INSERT INTO `code_app_dic` VALUES (327, 'TDS', 'TDS', '200290', '', '', 0, NULL, '', '');
+INSERT INTO `code_app_dic` VALUES (328, 'VMware', 'VMware', '200291', '', '', 0, 0000000013, 'REMOTE_ACCESS', '');
+INSERT INTO `code_app_dic` VALUES (329, 'Kontiki', 'Kontiki', '200292', '', '', 0, 0000000010, 'MEDIA', '');
+INSERT INTO `code_app_dic` VALUES (330, 'OpenFT', 'OpenFT', '200293', '', '', 0, 0000000007, 'DOWNLOAD_FT', '');
+INSERT INTO `code_app_dic` VALUES (331, 'Gnutella', 'Gnutella', '200294', '', '', 0, 0000000007, 'DOWNLOAD_FT', '');
+INSERT INTO `code_app_dic` VALUES (332, 'eDonkey', 'eDonkey', '200295', '', '', 0, 0000000007, 'DOWNLOAD_FT', '');
+INSERT INTO `code_app_dic` VALUES (333, 'AVI', 'AVI', '200296', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (334, 'RealMedia', 'RealMedia', '200297', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (335, 'Windowsmedia', 'Windowsmedia', '200298', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (336, 'MOVE', 'MOVE', '200299', '', '', 0, NULL, '', '');
+INSERT INTO `code_app_dic` VALUES (337, 'Feidian', 'Feidian', '200300', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (338, 'Zattoo', 'Zattoo', '200301', '', '', 0, 0000000010, 'MEDIA', '');
+INSERT INTO `code_app_dic` VALUES (339, 'SHOUTCast', 'SHOUTCast', '200302', '', '', 0, 0000000010, 'MEDIA', '');
+INSERT INTO `code_app_dic` VALUES (340, 'TVUplayer', 'TVUplayer', '200303', '', '', 0, 0000000010, 'MEDIA', '');
+INSERT INTO `code_app_dic` VALUES (341, 'VeohTV', 'VeohTV', '200304', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (342, 'Soulseek', 'Soulseek', '200305', '', '', 0, 0000000007, 'DOWNLOAD_FT', '');
+INSERT INTO `code_app_dic` VALUES (343, 'GaduGadu', 'GaduGadu', '200306', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (344, 'Oscar', 'Oscar', '200307', '', '', 0, 0000000002, 'CHAT', '');
+INSERT INTO `code_app_dic` VALUES (345, 'Yahoo', 'Yahoo', '200308', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (346, 'Battlefield', 'Battlefield', '200309', '', '', 0, 0000000009, 'GAME', '');
+INSERT INTO `code_app_dic` VALUES (347, 'Halflife2', 'Halflife2', '200310', '', '', 0, 0000000009, 'GAME', '');
+INSERT INTO `code_app_dic` VALUES (348, 'World of Warcraft', 'World of Warcraft', '200311', '', '', 0, 0000000009, 'Game', '');
+INSERT INTO `code_app_dic` VALUES (349, 'USENET', 'USENET', '200312', '', '', 0, 0000000004, 'WEB', '');
+INSERT INTO `code_app_dic` VALUES (350, 'AFP', 'AFP', '200313', '', '', 0, 0000000007, 'DATA_TRANSFER', '');
+INSERT INTO `code_app_dic` VALUES (351, 'Truphone', 'Truphone', '200314', '', '', 0, 0000000021, 'VOIP', '');
+INSERT INTO `code_app_dic` VALUES (352, 'Armagetron', 'Armagetron', '200315', '', '', 0, 0000000009, 'GAME', '');
+INSERT INTO `code_app_dic` VALUES (353, 'CrossFire', 'CrossFire', '200316', '', '', 0, 0000000014, 'RPC', '');
+INSERT INTO `code_app_dic` VALUES (354, 'Dofus', 'Dofus', '200317', '', '', 0, 0000000009, 'GAME', '');
+INSERT INTO `code_app_dic` VALUES (355, 'Fiesta', 'Fiesta', '200318', '', '', 0, 0000000009, 'GAME', '');
+INSERT INTO `code_app_dic` VALUES (356, 'Florensia', 'Florensia', '200319', '', '', 0, 0000000009, 'GAME', '');
+INSERT INTO `code_app_dic` VALUES (357, 'Guildwars', 'Guildwars', '200320', '', '', 0, 0000000009, 'GAME', '');
+INSERT INTO `code_app_dic` VALUES (358, 'HTTP Application Activesync', 'HTTP Application Activesync', '200321', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (359, 'MapleStory', 'MapleStory', '200322', '', '', 0, 0000000009, 'GAME', '');
+INSERT INTO `code_app_dic` VALUES (360, 'msSQL', 'msSQL', '200323', '', '', 0, 0000000006, 'Database', '');
+INSERT INTO `code_app_dic` VALUES (361, 'WARCRAFT3', 'WARCRAFT3', '200324', '', '', 0, 0000000009, 'GAME', '');
+INSERT INTO `code_app_dic` VALUES (362, 'World of Kung Fu', 'World of Kung Fu', '200325', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (363, 'MEEBO', 'MEEBO', '200326', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (364, 'DropBox', 'DropBox', '200327', '', '', 0, 0000000003, 'CLOUD', '');
+INSERT INTO `code_app_dic` VALUES (365, 'HTTP Proxy', 'HTTP Proxy', '200328', '', '', 0, 0000000011, 'Network', '');
+INSERT INTO `code_app_dic` VALUES (366, 'Netflix', 'Netflix', '200329', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (367, 'CitrixOnline/GotoMeeting', 'CitrixOnline/GotoMeeting', '200330', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (368, 'Webex', 'Webex', '200331', '', '', 0, 0000000019, 'COLLABORATIVE', '');
+INSERT INTO `code_app_dic` VALUES (369, 'Apple iCloud', 'Apple iCloud', '200332', '', '', 0, 0000000003, 'Cloud', '');
+INSERT INTO `code_app_dic` VALUES (370, 'Apple iTunes', 'Apple iTunes', '200333', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (371, 'WindowsUpdate', 'WindowsUpdate', '200334', '', '', 0, 0000000015, 'SoftwareUpdate', '');
+INSERT INTO `code_app_dic` VALUES (372, 'Tuenti', 'Tuenti', '200335', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (373, 'LotusNotes', 'LotusNotes', '200336', '', '', 0, 0000000019, 'COLLABORATIVE', '');
+INSERT INTO `code_app_dic` VALUES (374, 'RemoteScan', 'RemoteScan', '200337', '', '', 0, 0000000011, 'NETWORK', '');
+INSERT INTO `code_app_dic` VALUES (375, 'Spotify', 'Spotify', '200338', '', '', 0, 0000000018, 'STREAMING', '');
+INSERT INTO `code_app_dic` VALUES (376, 'CiscoVPN', 'CiscoVPN', '200339', '', '', 0, 0000000020, 'VPN', '');
+INSERT INTO `code_app_dic` VALUES (377, 'TeamSpeak', 'TeamSpeak', '200340', '', '', 0, 0000000002, 'CHAT', '');
+INSERT INTO `code_app_dic` VALUES (378, 'UbuntuONE', 'UbuntuONE', '200341', '', '', 0, 0000000003, 'CLOUD', '');
+INSERT INTO `code_app_dic` VALUES (379, 'CNN', 'CNN', '200342', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (380, 'Wikipedia', 'Wikipedia', '200343', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (381, 'Collectd', 'Collectd', '200344', '', '', 0, 0000000018, 'SYSTEM_OS', '');
+INSERT INTO `code_app_dic` VALUES (382, 'Redis', 'Redis', '200345', '', '', 0, 0000000006, 'DATABASE', '');
+INSERT INTO `code_app_dic` VALUES (383, 'ZeroMQ', 'ZeroMQ', '200346', '', '', 0, 0000000014, 'RPC', '');
+INSERT INTO `code_app_dic` VALUES (384, 'Stracraft', 'Stracraft', '200347', '', '', 0, 0000000009, 'Game', '');
+INSERT INTO `code_app_dic` VALUES (385, 'Simet', 'Simet', '200348', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (386, 'OpenSignal', 'OpenSignal', '200349', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (387, '99Taxi', '99Taxi', '200350', '', '', 0, 0000000004, 'Web', '');
+INSERT INTO `code_app_dic` VALUES (388, 'GloboTV', 'GloboTV', '200351', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (389, 'Deezer', 'Deezer', '200352', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (390, 'Microsoft cloud services', 'Microsoft cloud services', '200353', '', '', 0, 0000000003, 'Cloud', '');
+INSERT INTO `code_app_dic` VALUES (391, 'Twitch', 'Twitch', '200354', '', '', 0, 0000000010, 'Media', '');
+INSERT INTO `code_app_dic` VALUES (392, 'KakaoTalk Voice and Chat', 'KakaoTalk Voice and Chat', '200355', '', '', 0, 0000000002, 'Chat', '');
+INSERT INTO `code_app_dic` VALUES (393, '360.cn', '360.cn', '200357', '', '', 0, 0000000026, '', 'SECURITY');
+INSERT INTO `code_app_dic` VALUES (394, '360Safeguard_P2P', '360Safeguard_P2P', '200358', '', '', 0, 0000000026, '', 'SECURITY');
+INSERT INTO `code_app_dic` VALUES (395, '4D', '4D', '200359', '', '', 0, 0000000006, '', 'DATABASES');
+INSERT INTO `code_app_dic` VALUES (396, 'acercloud', 'acercloud', '200360', '', '', 0, 0000000003, '', 'CLOUD');
+INSERT INTO `code_app_dic` VALUES (397, 'acestream', 'acestream', '200361', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (398, 'airdroid', 'airdroid', '200362', '', '', 0, 0000000003, '', 'CLOUD');
+INSERT INTO `code_app_dic` VALUES (399, 'airmedia', 'airmedia', '200363', '', '', 0, 0000000013, '', 'REMOTE');
+INSERT INTO `code_app_dic` VALUES (400, 'akamai', 'akamai', '200364', '', '', 0, 0000000011, '', 'MONITORING');
+INSERT INTO `code_app_dic` VALUES (401, 'akamai_transfer', 'akamai_transfer', '200365', '', '', 0, 0000000027, '', 'CDN');
+INSERT INTO `code_app_dic` VALUES (402, 'amanda', 'amanda', '200366', '', '', 0, 0000000007, '', 'FILES');
+INSERT INTO `code_app_dic` VALUES (403, 'amp', 'amp', '200367', '', '', 0, 0000000011, '', 'MONITORING');
+INSERT INTO `code_app_dic` VALUES (404, 'Appear.in', 'Appear.in', '200368', '', '', 0, 0000000021, '', 'VOIP');
+INSERT INTO `code_app_dic` VALUES (405, 'ares', 'ares', '200369', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (406, 'ARKSurvivalEvolved', 'ARKSurvivalEvolved', '200370', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (407, 'ARMA3Server', 'ARMA3Server', '200371', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (408, 'ARMA2Server', 'ARMA2Server', '200372', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (409, 'AvastSecureDNS', 'AvastSecureDNS', '200373', '', '', 0, 0000000011, '', 'SERVICES');
+INSERT INTO `code_app_dic` VALUES (410, 'azureus', 'azureus', '200374', '', '', 0, 0000000011, '', 'SERVICES');
+INSERT INTO `code_app_dic` VALUES (411, 'backweb', 'backweb', '200375', '', '', 0, 0000000026, '', 'SECURITY');
+INSERT INTO `code_app_dic` VALUES (412, 'BadBaidu', 'BadBaidu', '200376', '', '', 0, 0000000025, '', 'MALWARE');
+INSERT INTO `code_app_dic` VALUES (413, 'baofeng', 'baofeng', '200377', '', '', 0, 0000000016, '', 'STREAMING');
+INSERT INTO `code_app_dic` VALUES (414, 'bitext', 'bitext', '200378', '', '', 0, 0000000011, '', 'SERVICES');
+INSERT INTO `code_app_dic` VALUES (415, 'BlackDesertOnline', 'BlackDesertOnline', '200379', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (416, 'Blizzard', 'Blizzard', '200380', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (417, 'bmdp', 'bmdp', '200381', '', '', 0, 0000000007, '', 'FILES');
+INSERT INTO `code_app_dic` VALUES (418, 'bncs', 'bncs', '200382', '', '', 0, 0000000011, '', 'SERVICES');
+INSERT INTO `code_app_dic` VALUES (419, 'btdht', 'btdht', '200383', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (420, 'btsync', 'btsync', '200384', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (421, 'cacaoweb', 'cacaoweb', '200385', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (422, 'chatango', 'chatango', '200386', '', '', 0, 0000000002, '', 'CHAT');
+INSERT INTO `code_app_dic` VALUES (423, 'chivalry', 'chivalry', '200387', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (424, 'cirn', 'cirn', '200388', '', '', 0, 0000000011, '', 'MONITORING');
+INSERT INTO `code_app_dic` VALUES (425, 'cisco_sslvpn', 'cisco_sslvpn', '200389', '', '', 0, 0000000020, '', 'TUNNELLING');
+INSERT INTO `code_app_dic` VALUES (426, 'clash_of_clans', 'clash_of_clans', '200390', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (427, 'Clubbox', 'Clubbox', '200391', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (428, 'cod', 'cod', '200392', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (429, 'cod_waw', 'cod_waw', '200393', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (430, 'combatarms', 'combatarms', '200394', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (431, 'combatarms_p2p', 'combatarms_p2p', '200395', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (432, 'ConquerOnline', 'ConquerOnline', '200396', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (433, 'Counterstrike1.6', 'Counterstrike1.6', '200397', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (434, 'Checkpoint_RDP', 'Checkpoint_RDP', '200398', '', '', 0, 0000000023, '', 'KEY_EXCHANGE');
+INSERT INTO `code_app_dic` VALUES (435, 'crashplan', 'crashplan', '200399', '', '', 0, 0000000003, '', 'CLOUD');
+INSERT INTO `code_app_dic` VALUES (436, 'crossout', 'crossout', '200400', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (437, 'cryptic', 'cryptic', '200401', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (438, 'cvs', 'cvs', '200402', '', '', 0, 0000000023, '', 'RCS');
+INSERT INTO `code_app_dic` VALUES (439, 'dash', 'dash', '200403', '', '', 0, 0000000001, '', 'ECOMMERCE');
+INSERT INTO `code_app_dic` VALUES (440, 'dc', 'dc', '200404', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (441, 'db2', 'db2', '200405', '', '', 0, 0000000006, '', 'DATABASES');
+INSERT INTO `code_app_dic` VALUES (442, 'dell_backup', 'dell_backup', '200406', '', '', 0, 0000000003, '', 'CLOUD');
+INSERT INTO `code_app_dic` VALUES (443, 'Demonware', 'Demonware', '200407', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (444, 'destiny', 'destiny', '200408', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (445, 'diablo2', 'diablo2', '200409', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (446, 'isakmp', 'isakmp', '200410', '', '', 0, 0000000023, '', 'KEY_EXCHANGE');
+INSERT INTO `code_app_dic` VALUES (447, 'jedi', 'jedi', '200411', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (448, 'jedi_academy', 'jedi_academy', '200412', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (449, 'jx3online', 'jx3online', '200413', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (450, 'kankan', 'kankan', '200414', '', '', 0, 0000000016, '', 'STREAMING');
+INSERT INTO `code_app_dic` VALUES (451, 'kaseya', 'kaseya', '200415', '', '', 0, 0000000013, '', 'REMOTE');
+INSERT INTO `code_app_dic` VALUES (452, 'kazaa', 'kazaa', '200416', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (453, 'kuaibo', 'kuaibo', '200417', '', '', 0, 0000000016, '', 'STREAMING');
+INSERT INTO `code_app_dic` VALUES (454, 'lifeforge', 'lifeforge', '200418', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (455, 'linkproof', 'linkproof', '200419', '', '', 0, 0000000011, '', 'MONITORING');
+INSERT INTO `code_app_dic` VALUES (456, 'litecoin', 'litecoin', '200420', '', '', 0, 0000000001, '', 'ECOMMERCE');
+INSERT INTO `code_app_dic` VALUES (457, 'maxicloud', 'maxicloud', '200421', '', '', 0, 0000000003, '', 'CLOUD');
+INSERT INTO `code_app_dic` VALUES (458, 'merakicloud', 'merakicloud', '200422', '', '', 0, 0000000003, '', 'CLOUD');
+INSERT INTO `code_app_dic` VALUES (459, 'minecraft', 'minecraft', '200423', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (460, 'mongo', 'mongo', '200424', '', '', 0, 0000000006, '', 'DATABASES');
+INSERT INTO `code_app_dic` VALUES (461, 'msoffice_mac', 'msoffice_mac', '200425', '', '', 0, 0000000011, '', 'BROADCAST');
+INSERT INTO `code_app_dic` VALUES (462, 'munin', 'munin', '200426', '', '', 0, 0000000011, '', 'MONITORING');
+INSERT INTO `code_app_dic` VALUES (463, 'mzinga', 'mzinga', '200427', '', '', 0, 0000000002, '', 'CHAT');
+INSERT INTO `code_app_dic` VALUES (464, 'n2ping', 'n2ping', '200428', '', '', 0, 0000000020, '', 'TUNNELLING');
+INSERT INTO `code_app_dic` VALUES (465, 'ncsoft', 'ncsoft', '200429', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (466, 'netcat_cctv', 'netcat_cctv', '200430', '', '', 0, 0000000019, '', 'IPCAMERAS');
+INSERT INTO `code_app_dic` VALUES (467, 'neverwinter', 'neverwinter', '200431', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (468, 'newerth', 'newerth', '200432', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (469, 'nintendo', 'nintendo', '200433', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (470, 'nntps', 'nntps', '200434', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (471, 'noction', 'noction', '200435', '', '', 0, 0000000011, '', 'MONITORING');
+INSERT INTO `code_app_dic` VALUES (472, 'noe', 'noe', '200436', '', '', 0, 0000000021, '', 'VOIP');
+INSERT INTO `code_app_dic` VALUES (473, 'norton_backup', 'norton_backup', '200437', '', '', 0, 0000000003, '', 'CLOUD');
+INSERT INTO `code_app_dic` VALUES (474, 'omegle', 'omegle', '200438', '', '', 0, 0000000002, '', 'CHAT');
+INSERT INTO `code_app_dic` VALUES (475, 'opaserv', 'opaserv', '200439', '', '', 0, 0000000024, '', 'MALWARE');
+INSERT INTO `code_app_dic` VALUES (476, 'orbit', 'orbit', '200440', '', '', 0, 0000000007, '', 'FILES');
+INSERT INTO `code_app_dic` VALUES (477, 'ourworld', 'ourworld', '200441', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (478, 'overwatch', 'overwatch', '200442', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (479, 'diablo3', 'diablo3', '200443', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (480, 'dianping', 'dianping', '200444', '', '', 0, 0000000027, '', 'MOBILE_APP');
+INSERT INTO `code_app_dic` VALUES (481, 'dianshijia', 'dianshijia', '200445', '', '', 0, 0000000010, '', 'P2PTV');
+INSERT INTO `code_app_dic` VALUES (482, 'discord', 'discord', '200446', '', '', 0, 0000000021, '', 'VOIP');
+INSERT INTO `code_app_dic` VALUES (483, 'dogecoin', 'dogecoin', '200447', '', '', 0, 0000000001, '', 'ECOMMERCE');
+INSERT INTO `code_app_dic` VALUES (484, 'dota2', 'dota2', '200448', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (485, 'douyu_chat', 'douyu_chat', '200449', '', '', 0, 0000000002, '', 'CHAT');
+INSERT INTO `code_app_dic` VALUES (486, 'doyo', 'doyo', '200450', '', '', 0, 0000000016, '', 'STREAMING');
+INSERT INTO `code_app_dic` VALUES (487, 'driveshare', 'driveshare', '200451', '', '', 0, 0000000007, '', 'FILES');
+INSERT INTO `code_app_dic` VALUES (488, 'dtls', 'dtls', '200452', '', '', 0, 0000000022, '', 'ENCRYPT');
+INSERT INTO `code_app_dic` VALUES (489, 'dueling_network', 'dueling_network', '200453', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (490, 'dvrns', 'dvrns', '200454', '', '', 0, 0000000011, '', 'SERVICES');
+INSERT INTO `code_app_dic` VALUES (491, 'dxp', 'dxp', '200455', '', '', 0, 0000000011, '', 'SERVICES');
+INSERT INTO `code_app_dic` VALUES (492, 'ea_games', 'ea_games', '200456', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (493, 'epson', 'epson', '200457', '', '', 0, 0000000011, '', 'PRINTING');
+INSERT INTO `code_app_dic` VALUES (494, 'eso', 'eso', '200458', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (495, 'etrust', 'etrust', '200459', '', '', 0, 0000000011, '', 'SERVICES');
+INSERT INTO `code_app_dic` VALUES (496, 'fasp', 'fasp', '200460', '', '', 0, 0000000007, '', 'FILES');
+INSERT INTO `code_app_dic` VALUES (497, 'finalfantasy_xiv', 'finalfantasy_xiv', '200461', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (498, 'flash', 'flash', '200462', '', '', 0, 0000000016, '', 'STREAMING');
+INSERT INTO `code_app_dic` VALUES (499, 'fliggy', 'fliggy', '200463', '', '', 0, 0000000001, '', 'ECOMMERCE');
+INSERT INTO `code_app_dic` VALUES (500, 'fortinet', 'fortinet', '200464', '', '', 0, 0000000025, '', 'SECURITY');
+INSERT INTO `code_app_dic` VALUES (501, 'foscam', 'foscam', '200465', '', '', 0, 0000000019, '', 'IPCAMERAS');
+INSERT INTO `code_app_dic` VALUES (502, 'freechal', 'freechal', '200466', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (503, 'fring', 'fring', '200467', '', '', 0, 0000000021, '', 'VOIP');
+INSERT INTO `code_app_dic` VALUES (504, 'fuckcoin', 'fuckcoin', '200468', '', '', 0, 0000000001, '', 'ECOMMERCE');
+INSERT INTO `code_app_dic` VALUES (505, 'gamespy', 'gamespy', '200469', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (506, 'gangsofspace', 'gangsofspace', '200470', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (507, 'garena', 'garena', '200471', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (508, 'gearsofwar', 'gearsofwar', '200472', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (509, 'giop', 'giop', '200473', '', '', 0, 0000000013, '', 'REMOTE');
+INSERT INTO `code_app_dic` VALUES (510, 'git', 'git', '200474', '', '', 0, 0000000023, '', 'RCS');
+INSERT INTO `code_app_dic` VALUES (511, 'glupteba', 'glupteba', '200475', '', '', 0, 0000000025, '', 'MALWARE');
+INSERT INTO `code_app_dic` VALUES (512, 'gnutella2', 'gnutella2', '200476', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (513, 'gokuchat', 'gokuchat', '200477', '', '', 0, 0000000002, '', 'CHAT');
+INSERT INTO `code_app_dic` VALUES (514, 'google_hangouts', 'google_hangouts', '200478', '', '', 0, 0000000002, '', 'CHAT');
+INSERT INTO `code_app_dic` VALUES (515, 'gotomeeting', 'gotomeeting', '200479', '', '', 0, 0000000002, '', 'CHAT');
+INSERT INTO `code_app_dic` VALUES (516, 'gprs_tunnel', 'gprs_tunnel', '200480', '', '', 0, 0000000020, '', 'TUNNELLING');
+INSERT INTO `code_app_dic` VALUES (517, 'graal_online_era', 'graal_online_era', '200481', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (518, 'gsm', 'gsm', '200482', '', '', 0, 0000000011, '', 'MONITORING');
+INSERT INTO `code_app_dic` VALUES (519, 'h1z1', 'h1z1', '200483', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (520, 'halo_online', 'halo_online', '200484', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (521, 'hamachi', 'hamachi', '200485', '', '', 0, 0000000020, '', 'TUNNELLING');
+INSERT INTO `code_app_dic` VALUES (522, 'harveys', 'harveys', '200486', '', '', 0, 0000000007, '', 'FILES');
+INSERT INTO `code_app_dic` VALUES (523, 'hearthstone', 'hearthstone', '200487', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (524, 'heroes_generals', 'heroes_generals', '200488', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (525, 'hots', 'hots', '200489', '', '', 0, 0000000020, '', 'TUNNELLING');
+INSERT INTO `code_app_dic` VALUES (526, 'icp', 'icp', '200490', '', '', 0, 0000000023, '', 'CACHING');
+INSERT INTO `code_app_dic` VALUES (527, 'icq', 'icq', '200491', '', '', 0, 0000000002, '', 'CHAT');
+INSERT INTO `code_app_dic` VALUES (528, 'id', 'id', '200492', '', '', 0, 0000000011, '', 'SERVICES');
+INSERT INTO `code_app_dic` VALUES (529, 'idrive_sync', 'idrive_sync', '200493', '', '', 0, 0000000003, '', 'CLOUD');
+INSERT INTO `code_app_dic` VALUES (530, 'ipmsg', 'ipmsg', '200494', '', '', 0, 0000000002, '', 'CHAT');
+INSERT INTO `code_app_dic` VALUES (531, 'ipop', 'ipop', '200495', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (532, 'ipsharkk', 'ipsharkk', '200496', '', '', 0, 0000000020, '', 'TUNNELLING');
+INSERT INTO `code_app_dic` VALUES (533, 'palringo', 'palringo', '200497', '', '', 0, 0000000002, '', 'CHAT');
+INSERT INTO `code_app_dic` VALUES (534, 'paltalk', 'paltalk', '200498', '', '', 0, 0000000002, '', 'CHAT');
+INSERT INTO `code_app_dic` VALUES (535, 'pando', 'pando', '200499', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (536, 'panipani', 'panipani', '200500', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (537, 'pdbox', 'pdbox', '200501', '', '', 0, 0000000003, '', 'CLOUD');
+INSERT INTO `code_app_dic` VALUES (538, 'planetside2', 'planetside2', '200502', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (539, 'portmap_rpc', 'portmap_rpc', '200503', '', '', 0, 0000000011, '', 'SERVICES');
+INSERT INTO `code_app_dic` VALUES (540, 'ps4_remoteplay', 'ps4_remoteplay', '200504', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (541, 'psn', 'psn', '200505', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (542, 'psn_store', 'psn_store', '200506', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (543, 'punkbuster', 'punkbuster', '200507', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (544, 'pyzor', 'pyzor', '200508', '', '', 0, 0000000024, '', 'ANTISPAM');
+INSERT INTO `code_app_dic` VALUES (545, 'qcloud_ilvb', 'qcloud_ilvb', '200509', '', '', 0, 0000000016, '', 'STREAMING');
+INSERT INTO `code_app_dic` VALUES (546, 'qqpcmgr', 'qqpcmgr', '200510', '', '', 0, 0000000026, '', 'SECURITY');
+INSERT INTO `code_app_dic` VALUES (547, 'ramsey_dash', 'ramsey_dash', '200511', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (548, 'razor', 'razor', '200512', '', '', 0, 0000000024, '', 'ANTISPAM');
+INSERT INTO `code_app_dic` VALUES (549, 'rbls', 'rbls', '200513', '', '', 0, 0000000024, '', 'ANTISPAM');
+INSERT INTO `code_app_dic` VALUES (550, 'realvnc', 'realvnc', '200514', '', '', 0, 0000000013, '', 'REMOTE');
+INSERT INTO `code_app_dic` VALUES (551, 'relay', 'relay', '200515', '', '', 0, 0000000011, '', 'NAT');
+INSERT INTO `code_app_dic` VALUES (552, 'revolver_nblbt', 'revolver_nblbt', '200516', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (553, 'rising_storm', 'rising_storm', '200517', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (554, 'roblox', 'roblox', '200518', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (555, 'robocraft', 'robocraft', '200519', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (556, 'rpc_scan', 'rpc_scan', '200520', '', '', 0, 0000000011, '', 'MONITORING');
+INSERT INTO `code_app_dic` VALUES (557, 'runescape', 'runescape', '200521', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (558, 'sanandreas', 'sanandreas', '200522', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (559, 'saprouter', 'saprouter', '200523', '', '', 0, 0000000011, '', 'SERVICES');
+INSERT INTO `code_app_dic` VALUES (560, 'secondlife', 'secondlife', '200524', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (561, 'serialnumberd', 'serialnumberd', '200525', '', '', 0, 0000000011, '', 'SERVICES');
+INSERT INTO `code_app_dic` VALUES (562, 'silkroadonline', 'silkroadonline', '200526', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (563, 'smite', 'smite', '200527', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (564, 'snapvpn', 'snapvpn', '200528', '', '', 0, 0000000020, '', 'TUNNELLING');
+INSERT INTO `code_app_dic` VALUES (565, 'spamfighter', 'spamfighter', '200529', '', '', 0, 0000000024, '', 'ANTISPAM');
+INSERT INTO `code_app_dic` VALUES (566, 'speedin', 'speedin', '200530', '', '', 0, 0000000020, '', 'TUNNELLING');
+INSERT INTO `code_app_dic` VALUES (567, 'speedtest', 'speedtest', '200531', '', '', 0, 0000000011, '', 'MONITORING');
+INSERT INTO `code_app_dic` VALUES (568, 'spotify_broadcast', 'spotify_broadcast', '200532', '', '', 0, 0000000011, '', 'BROADCAST');
+INSERT INTO `code_app_dic` VALUES (569, 'sqlexp', 'sqlexp', '200533', '', '', 0, 0000000025, '', 'MALWARE');
+INSERT INTO `code_app_dic` VALUES (570, 'starcitizen', 'starcitizen', '200534', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (571, 'starcraft', 'starcraft', '200535', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (572, 'starleaf', 'starleaf', '200536', '', '', 0, 0000000021, '', 'VOIP');
+INSERT INTO `code_app_dic` VALUES (573, 'steam_friends', 'steam_friends', '200537', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (574, 'storm_worm', 'storm_worm', '200538', '', '', 0, 0000000025, '', 'MALWARE');
+INSERT INTO `code_app_dic` VALUES (575, 'stratum', 'stratum', '200539', '', '', 0, 0000000001, '', 'ECOMMERCE');
+INSERT INTO `code_app_dic` VALUES (576, 'supl', 'supl', '200540', '', '', 0, 0000000027, '', 'LOCATION');
+INSERT INTO `code_app_dic` VALUES (577, 'svn', 'svn', '200541', '', '', 0, 0000000023, '', 'RCS');
+INSERT INTO `code_app_dic` VALUES (578, 'talesrunner', 'talesrunner', '200542', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (579, 'tankix', 'tankix', '200543', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (580, 'telecomkey', 'telecomkey', '200544', '', '', 0, 0000000021, '', 'TELCO');
+INSERT INTO `code_app_dic` VALUES (581, 'telnet_exploit', 'telnet_exploit', '200545', '', '', 0, 0000000025, '', 'MALWARE');
+INSERT INTO `code_app_dic` VALUES (582, 'tencent_games', 'tencent_games', '200546', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (583, 'tenfivecoin', 'tenfivecoin', '200547', '', '', 0, 0000000001, '', 'ECOMMERCE');
+INSERT INTO `code_app_dic` VALUES (584, 'tensafe', 'tensafe', '200548', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (585, 'tera', 'tera', '200549', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (586, 'tetrisonline', 'tetrisonline', '200550', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (587, 'thq', 'thq', '200551', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (588, 'tip', 'tip', '200552', '', '', 0, 0000000001, '', 'ECOMMERCE');
+INSERT INTO `code_app_dic` VALUES (589, 'torchlight2', 'torchlight2', '200553', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (590, 'traceroute', 'traceroute', '200554', '', '', 0, 0000000011, '', 'MONITORING');
+INSERT INTO `code_app_dic` VALUES (591, 'trackmania', 'trackmania', '200555', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (592, 'tremulous', 'tremulous', '200556', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (593, 'trion', 'trion', '200557', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (594, 'trojan_zeroaccess', 'trojan_zeroaccess', '200558', '', '', 0, 0000000024, '', 'MALWARE');
+INSERT INTO `code_app_dic` VALUES (595, 'twitcasting', 'twitcasting', '200559', '', '', 0, 0000000016, '', 'STREAMING');
+INSERT INTO `code_app_dic` VALUES (596, 'twitch_irc', 'twitch_irc', '200560', '', '', 0, 0000000002, '', 'CHAT');
+INSERT INTO `code_app_dic` VALUES (597, 'ubisoft_games', 'ubisoft_games', '200561', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (598, 'umeye', 'umeye', '200562', '', '', 0, 0000000019, '', 'IPCAMERAS');
+INSERT INTO `code_app_dic` VALUES (599, 'vainglory', 'vainglory', '200563', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (600, 'ventrilo', 'ventrilo', '200564', '', '', 0, 0000000021, '', 'VOIP');
+INSERT INTO `code_app_dic` VALUES (601, 'vivox', 'vivox', '200565', '', '', 0, 0000000021, '', 'VOIP');
+INSERT INTO `code_app_dic` VALUES (602, 'vodlocker', 'vodlocker', '200566', '', '', 0, 0000000004, '', 'WEB');
+INSERT INTO `code_app_dic` VALUES (603, 'vpnrobot', 'vpnrobot', '200567', '', '', 0, 0000000020, '', 'TUNNELLING');
+INSERT INTO `code_app_dic` VALUES (604, 'vpn_unlimited', 'vpn_unlimited', '200568', '', '', 0, 0000000020, '', 'TUNNELLING');
+INSERT INTO `code_app_dic` VALUES (605, 'vxworks_exploit', 'vxworks_exploit', '200569', '', '', 0, 0000000025, '', 'MALWARE');
+INSERT INTO `code_app_dic` VALUES (606, 'warthunder', 'warthunder', '200570', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (607, 'weblogic', 'weblogic', '200571', '', '', 0, 0000000006, '', 'DATABASES');
+INSERT INTO `code_app_dic` VALUES (608, 'web_junk', 'web_junk', '200572', '', '', 0, 0000000028, '', 'MIXED');
+INSERT INTO `code_app_dic` VALUES (609, 'weiqi', 'weiqi', '200573', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (610, 'win_message', 'win_message', '200574', '', '', 0, 0000000024, '', 'MALWARE');
+INSERT INTO `code_app_dic` VALUES (611, 'wizard101', 'wizard101', '200575', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (612, 'wns', 'wns', '200576', '', '', 0, 0000000003, '', 'CLOUD');
+INSERT INTO `code_app_dic` VALUES (613, 'wolf_et', 'wolf_et', '200577', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (614, 'worm_22105', 'worm_22105', '200578', '', '', 0, 0000000024, '', 'MALWARE');
+INSERT INTO `code_app_dic` VALUES (615, 'wuala', 'wuala', '200579', '', '', 0, 0000000003, '', 'CLOUD');
+INSERT INTO `code_app_dic` VALUES (616, 'xfire_p2p', 'xfire_p2p', '200580', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (617, 'xiami', 'xiami', '200581', '', '', 0, 0000000016, '', 'STREAMING');
+INSERT INTO `code_app_dic` VALUES (618, 'xunlei', 'xunlei', '200582', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (619, 'xunlei_accel', 'xunlei_accel', '200583', '', '', 0, 0000000007, '', 'P2P');
+INSERT INTO `code_app_dic` VALUES (620, 'xunlei_jsq', 'xunlei_jsq', '200584', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (621, 'xunyou', 'xunyou', '200585', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (622, 'xymon', 'xymon', '200586', '', '', 0, 0000000011, '', 'MONITORING');
+INSERT INTO `code_app_dic` VALUES (623, 'yahoo_error', 'yahoo_error', '200587', '', '', 0, 0000000002, '', 'CHAT');
+INSERT INTO `code_app_dic` VALUES (624, 'yahoo_games', 'yahoo_games', '200588', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (625, 'yahoo_webcam', 'yahoo_webcam', '200589', '', '', 0, 0000000002, '', 'CHAT');
+INSERT INTO `code_app_dic` VALUES (626, 'zabbix', 'zabbix', '200590', '', '', 0, 0000000011, '', 'MONITORING');
+INSERT INTO `code_app_dic` VALUES (627, 'zeroaccess', 'zeroaccess', '200591', '', '', 0, 0000000025, '', 'MALWARE');
+INSERT INTO `code_app_dic` VALUES (628, 'zoom', 'zoom', '200592', '', '', 0, 0000000021, '', 'VOIP');
+INSERT INTO `code_app_dic` VALUES (629, 'zynga', 'zynga', '200593', '', '', 0, 0000000009, '', 'GAMING');
+INSERT INTO `code_app_dic` VALUES (630, 'ICMP_Flood', 'ICMP_Flood', '200594', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (631, 'IPFRAG_Flood', 'IPFRAG_Flood', '200595', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (632, 'SYN_Flood', 'SYN_Flood', '200596', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (633, 'ACK_Flood', 'ACK_Flood', '200597', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (634, 'RST_Flood', 'RST_Flood', '200598', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (635, 'DNS_Flood', 'DNS_Flood', '200599', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (636, 'NTP_Flood', 'NTP_Flood', '200600', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (637, 'UDP_Flood', 'UDP_Flood', '200601', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (638, 'HTTP_Flood', 'HTTP_Flood', '200602', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (639, 'SSDP_Flood', 'SSDP_Flood', '200603', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (640, 'baiduP2P', 'baiduP2P', '200604', '', '', 0, 0000000007, '', '');
+INSERT INTO `code_app_dic` VALUES (641, 'CSGlobalOffensive', 'CSGlobalOffensive', '200605', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (642, 'AllSeeingEye', 'AllSeeingEye', '200606', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (643, 'Bittorrent_Extension', 'Bittorrent_Extension', '200607', '', '', 0, 0000000007, '', '');
+INSERT INTO `code_app_dic` VALUES (644, 'BitTorrentSync', 'BitTorrentSync', '200608', '', '', 0, 0000000007, '', '');
+INSERT INTO `code_app_dic` VALUES (645, 'Call_of_Duty', 'Call_of_Duty', '200609', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (646, 'CitrixICA', 'CitrixICA', '200612', '', '', 0, 0000000013, '', '');
+INSERT INTO `code_app_dic` VALUES (647, 'Citrix_Jedi', 'Citrix_Jedi', '200613', '', '', 0, 0000000013, '', '');
+INSERT INTO `code_app_dic` VALUES (648, 'ClashOfClans', 'ClashOfClans', '200614', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (649, 'Canon_BJNP', 'Canon_BJNP', '200615', '', '', 0, 0000000023, '', '');
+INSERT INTO `code_app_dic` VALUES (650, 'DoyoP2P', 'DoyoP2P', '200617', '', '', 0, 0000000007, '', '');
+INSERT INTO `code_app_dic` VALUES (651, 'FortiClientSSLVPN', 'FortiClientSSLVPN', '200618', '', '', 0, 0000000020, '', '');
+INSERT INTO `code_app_dic` VALUES (652, 'GTA_SanAndreas_Multiplayer', 'GTA_SanAndreas_Multiplayer', '200619', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (653, 'HalfLife', 'HalfLife', '200620', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (654, 'IBM-DB2', 'IBM-DB2', '200621', '', '', 0, 0000000006, '', '');
+INSERT INTO `code_app_dic` VALUES (655, 'Flash_Player', 'Flash_Player', '200622', '', '', 0, 0000000023, '', '');
+INSERT INTO `code_app_dic` VALUES (656, 'Kugou', 'Kugou', '200623', '', '', 0, 0000000010, '', '');
+INSERT INTO `code_app_dic` VALUES (657, 'LeagueOfLegends', 'LeagueOfLegends', '200624', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (658, 'GluptebaBackdoor', 'GluptebaBackdoor', '200625', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (659, 'MedalOfHonor', 'MedalOfHonor', '200626', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (660, 'MultiTheftAuto', 'MultiTheftAuto', '200628', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (661, 'NetcoreScan', 'NetcoreScan', '200631', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (662, 'NeverwinterNights', 'NeverwinterNights', '200632', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (663, 'NoctionIRP', 'NoctionIRP', '200633', '', '', 0, 0000000024, '', '');
+INSERT INTO `code_app_dic` VALUES (664, 'JavaObjectSerialised', 'JavaObjectSerialised', '200634', '', '', 0, 0000000024, '', '');
+INSERT INTO `code_app_dic` VALUES (665, 'RealPlayer', 'RealPlayer', '200635', '', '', 0, 0000000023, '', '');
+INSERT INTO `code_app_dic` VALUES (666, 'TeamFortress2', 'TeamFortress2', '200636', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (667, 'TheCrew', 'TheCrew', '200637', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (668, 'TurboVPN', 'TurboVPN', '200638', '', '', 0, 0000000020, '', '');
+INSERT INTO `code_app_dic` VALUES (669, 'MSN_Voice', 'MSN_Voice', '200639', '', '', 0, 0000000002, '', '');
+INSERT INTO `code_app_dic` VALUES (670, 'MaplestoryChina', 'MaplestoryChina', '200640', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (671, 'Message4U', 'Message4U', '200641', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (672, 'MongoDB', 'MongoDB', '200642', '', '', 0, 0000000006, '', '');
+INSERT INTO `code_app_dic` VALUES (673, 'NDTThroughput', 'NDTThroughput', '200643', '', '', 0, 0000000024, '', '');
+INSERT INTO `code_app_dic` VALUES (674, 'NET-MFP', 'NET-MFP', '200644', '', '', 0, 0000000004, '', '');
+INSERT INTO `code_app_dic` VALUES (675, 'WindowsMessenger', 'WindowsMessenger', '200645', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (676, 'WolfensteinEnemyTerritory', 'WolfensteinEnemyTerritory', '200646', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (677, 'XboxLive', 'XboxLive', '200647', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (678, 'RBL', 'RBL', '200649', '', '', 0, 0000000008, '', '');
+INSERT INTO `code_app_dic` VALUES (679, 'RPC_Exploit', 'RPC_Exploit', '200650', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (680, 'Rejection', 'Rejection', '200651', '', '', 0, 0000000028, '', '');
+INSERT INTO `code_app_dic` VALUES (681, 'Silverplatter_DXP', 'Silverplatter_DXP', '200655', '', '', 0, 0000000006, '', '');
+INSERT INTO `code_app_dic` VALUES (682, 'TencentWNS', 'TencentWNS', '200659', '', '', 0, 0000000003, '', '');
+INSERT INTO `code_app_dic` VALUES (683, 'TrionGames', 'TrionGames', '200660', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (684, 'Trojan.Win32.Generic!SB', 'Trojan.Win32.Generic!SB', '200661', '', '', 0, 0000000025, '', '');
+INSERT INTO `code_app_dic` VALUES (685, 'WorldOfWarcraft', 'WorldOfWarcraft', '200666', '', '', 0, 0000000009, '', '');
+INSERT INTO `code_app_dic` VALUES (686, 'YY', 'YY', '200667', '', '', 0, 0000000023, '', '');
+INSERT INTO `code_app_dic` VALUES (687, 'nopayload', 'nopayload', '200669', '', '', 0, 0000000029, '', '');
+INSERT INTO `code_app_dic` VALUES (688, 'No_FirstPkt', 'No_FirstPkt', '200670', '', '', 0, 0000000029, '', '');
+INSERT INTO `code_app_dic` VALUES (689, 'Invalid', 'Invalid', '200671', '', '', 0, 0000000028, '', '');
+INSERT INTO `code_app_dic` VALUES (691, 'Eurosport', 'Eurosport', '300010', '', '', 0, 0000000014, '', NULL);
+INSERT INTO `code_app_dic` VALUES (693, 'yandex-cn', 'yandex-cn', '300007', '', '', 0, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (695, 'lab', 'lab', '300011', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (697, 'test19', 'test19', '300012', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (699, 'app test', 'app test', '300013', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (701, 'ApplePush', 'ApplePush', '103501', '', '', 1, 0000000004, '', NULL);
+INSERT INTO `code_app_dic` VALUES (703, 'GooglePush', 'GooglePush', '103601', '', '', 1, 0000000004, '', NULL);
+INSERT INTO `code_app_dic` VALUES (705, 'indriver', 'indriver', '300014', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (706, 'astrabus', 'astrabus', '300006', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (707, 'chrome', 'chrome', '300004', '', '', 1, 0000000017, '', NULL);
+INSERT INTO `code_app_dic` VALUES (708, 'firefox', 'firefox', '300005', '', '', 1, 0000000017, '', NULL);
+INSERT INTO `code_app_dic` VALUES (709, 'icmp_google', 'icmp_google', '300008', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (710, 'kolesa.kz', 'kolesa.kz', '300009', '', '', 1, 0000000010, '', NULL);
+INSERT INTO `code_app_dic` VALUES (711, 'tiktok', 'tiktok', '300015', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (713, 'drug_test', 'drug_test', '300016', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (715, 'whatsapp_test', 'whatsapp_test', '300017', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (717, 'qqqqq', 'qqqqq', '300018', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (719, 'New Applicaiton', 'New Applicaiton', '300019', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (721, 'test', 'test', '300020', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (723, 'HMA', 'HMA', '300021', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (725, 'sina', 'sina', '300022', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (727, 'DoNotBlock_Psiphon_Cert', 'DoNotBlock_Psiphon_Cert', '300023', '', '', 1, 0000000020, '', NULL);
+INSERT INTO `code_app_dic` VALUES (729, 'skype_pc', 'skype_pc', '300024', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (731, 'tor_test', 'tor_test', '300025', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (733, 'tor_test_1', 'tor_test_1', '300026', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (735, 'tor_test2', 'tor_test2', '300027', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (737, 'prcdn_test', 'prcdn_test', '300028', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (739, 'avast_test', 'avast_test', '300029', '', '', 1, 0268435455, '', NULL);
+INSERT INTO `code_app_dic` VALUES (741, 'google_test', 'google_test', '300030', '', '', 1, 0268435455, '', NULL);

src/main/resources/sql/spaceMappingSql/code_behavior_type_dic.sql

@@ -0,0 +1,48 @@
+delete from code_behavior_type_dic;
+INSERT INTO `code_behavior_type_dic` VALUES (1, 'Other', '0');
+INSERT INTO `code_behavior_type_dic` VALUES (2, 'Video Chatting', '90001');
+INSERT INTO `code_behavior_type_dic` VALUES (3, 'other', '90006');
+INSERT INTO `code_behavior_type_dic` VALUES (4, 'HTTP Streaming', '91001');
+INSERT INTO `code_behavior_type_dic` VALUES (5, 'Mobile_HTTP_Streaming', '91002');
+INSERT INTO `code_behavior_type_dic` VALUES (6, 'HTTP_File_Transfer', '91003');
+INSERT INTO `code_behavior_type_dic` VALUES (7, 'HTTP_Browsing', '91004');
+INSERT INTO `code_behavior_type_dic` VALUES (8, 'Mobile_HTTP_Browsing', '91005');
+INSERT INTO `code_behavior_type_dic` VALUES (9, 'HTTP DownloadManager', '91006');
+INSERT INTO `code_behavior_type_dic` VALUES (10, 'Mobile_HTTP_DownloadManager', '91007');
+INSERT INTO `code_behavior_type_dic` VALUES (11, 'HTTP_Audio', '91008');
+INSERT INTO `code_behavior_type_dic` VALUES (12, 'HTTP_TUNNEL', '91009');
+INSERT INTO `code_behavior_type_dic` VALUES (13, 'ftp_control', '91010');
+INSERT INTO `code_behavior_type_dic` VALUES (14, 'ftp_data', '91011');
+INSERT INTO `code_behavior_type_dic` VALUES (15, 'Skype video calls/calls', '100002');
+INSERT INTO `code_behavior_type_dic` VALUES (16, 'Skype voice/transfer', '100003');
+INSERT INTO `code_behavior_type_dic` VALUES (17, 'Skype message', '100004');
+INSERT INTO `code_behavior_type_dic` VALUES (18, 'Instagram video', '100102');
+INSERT INTO `code_behavior_type_dic` VALUES (19, 'Instagram message/adding photos and videos', '100103');
+INSERT INTO `code_behavior_type_dic` VALUES (20, 'Instagram live', '100104');
+INSERT INTO `code_behavior_type_dic` VALUES (22, 'Youtube video', '100202');
+INSERT INTO `code_behavior_type_dic` VALUES (23, 'Youtube live', '100203');
+INSERT INTO `code_behavior_type_dic` VALUES (24, 'Youtube adding videos', '100204');
+INSERT INTO `code_behavior_type_dic` VALUES (25, 'Facebook video/message(voice)', '100302');
+INSERT INTO `code_behavior_type_dic` VALUES (26, 'Facebook live', '100303');
+INSERT INTO `code_behavior_type_dic` VALUES (27, 'Facebook message(text)', '100304');
+INSERT INTO `code_behavior_type_dic` VALUES (28, 'What\'s App transfer/message', '100402');
+INSERT INTO `code_behavior_type_dic` VALUES (29, 'Viber transfer', '100504');
+INSERT INTO `code_behavior_type_dic` VALUES (30, 'Vkontakte video', '100602');
+INSERT INTO `code_behavior_type_dic` VALUES (31, 'Vkontakte message', '100603');
+INSERT INTO `code_behavior_type_dic` VALUES (32, 'Vkontakte live', '100604');
+INSERT INTO `code_behavior_type_dic` VALUES (33, 'Odnoklassniki message', '100802');
+INSERT INTO `code_behavior_type_dic` VALUES (34, 'Odnoklassniki video', '100803');
+INSERT INTO `code_behavior_type_dic` VALUES (35, 'Mail agent message', '100902');
+INSERT INTO `code_behavior_type_dic` VALUES (36, 'Mail agent calls', '100903');
+INSERT INTO `code_behavior_type_dic` VALUES (37, 'Mail agent transfer', '100904');
+INSERT INTO `code_behavior_type_dic` VALUES (38, 'Facetime video calls', '101002');
+INSERT INTO `code_behavior_type_dic` VALUES (39, 'signal message', '101102');
+INSERT INTO `code_behavior_type_dic` VALUES (40, 'signal transfer', '101103');
+INSERT INTO `code_behavior_type_dic` VALUES (41, 'Opera Turbo', '101702');
+INSERT INTO `code_behavior_type_dic` VALUES (42, 'Opera mini', '101703');
+INSERT INTO `code_behavior_type_dic` VALUES (43, 'Tor browser', '102602');
+INSERT INTO `code_behavior_type_dic` VALUES (44, 'Tor mode', '102603');
+INSERT INTO `code_behavior_type_dic` VALUES (45, 'backpass', '255');
+INSERT INTO `code_behavior_type_dic` VALUES (46, 'unspecified', '268435455');
+INSERT INTO `code_behavior_type_dic` VALUES (47, 'Viber call', '100502');
+INSERT INTO `code_behavior_type_dic` VALUES (101009, 'Telegram call', '100702');

src/main/resources/sql/spaceMappingSql/code_browser_type_dic.sql

@@ -0,0 +1,30 @@
+delete from code_browser_type_dic;
+INSERT INTO `code_browser_type_dic` VALUES (1, 'Other', '0', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (2, 'Safari', '400001', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (3, 'Mozilla Firefox', '400101', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (4, 'Google Chrome', '400201', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (5, 'Edge', '400301', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (6, 'Opera', '400401', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (7, 'Yandex', '400501', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (8, 'Android brower', '400601', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (9, 'Konqueror', '400701', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (10, 'Bing', '400801', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (11, 'SogouMobileBrowser', '400901', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (12, 'SogouBrowser', '401001', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (13, 'OPPO', '401101', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (14, 'UCBrowser', '401201', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (15, '2345Browser', '401301', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (16, 'QQBrowser', '401401', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (17, 'QQMobileBrowser', '401501', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (18, 'baidubrowser', '401601', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (19, 'LieBao', '401701', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (20, 'MiuiBrowser', '401801', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (21, 'SamsungBrowser', '401901', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (22, 'IE', '402001', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (23, 'GriOS', '402101', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (24, '360SE', '402201', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (25, 'Maxthon', '402301', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (26, 'The World', '402401', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (27, 'JuziBrowser', '402501', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (28, 'TencentTraveler', '402601', NULL);
+INSERT INTO `code_browser_type_dic` VALUES (29, 'Unspecified', '268435455', NULL);

src/main/resources/sql/spaceMappingSql/code_os_type_dic.sql

@@ -0,0 +1,18 @@
+delete from code_os_type_dic;
+INSERT INTO `code_os_type_dic` VALUES (1, 'Other', '0', '');
+INSERT INTO `code_os_type_dic` VALUES (2, 'Windows', '300001', '');
+INSERT INTO `code_os_type_dic` VALUES (3, 'Linux/Android', '300101', '');
+INSERT INTO `code_os_type_dic` VALUES (4, 'Mac OS X', '300201', '');
+INSERT INTO `code_os_type_dic` VALUES (5, 'OpenBSD', '300301', '');
+INSERT INTO `code_os_type_dic` VALUES (6, 'FreeBSD', '300401', '');
+INSERT INTO `code_os_type_dic` VALUES (7, 'Solaris', '300501', '');
+INSERT INTO `code_os_type_dic` VALUES (8, 'OpenVMS', '300601', '');
+INSERT INTO `code_os_type_dic` VALUES (9, 'NeXTSTEP', '300701', '');
+INSERT INTO `code_os_type_dic` VALUES (10, 'HP-UX', '300801', '');
+INSERT INTO `code_os_type_dic` VALUES (11, 'Tru64', '300901', '');
+INSERT INTO `code_os_type_dic` VALUES (12, 'IOS', '301001', '');
+INSERT INTO `code_os_type_dic` VALUES (13, 'Blackberry', '301101', '');
+INSERT INTO `code_os_type_dic` VALUES (14, 'Windows Phone', '301201', NULL);
+INSERT INTO `code_os_type_dic` VALUES (15, 'Android', '301301', NULL);
+INSERT INTO `code_os_type_dic` VALUES (16, 'Symbian', '301401', NULL);
+INSERT INTO `code_os_type_dic` VALUES (17, 'Unspecified', '268435455', NULL);

src/main/resources/sql/spaceMappingSql/code_protocol_type_dic.sql

@@ -0,0 +1,126 @@
+delete from code_protocol_type_dic;
+INSERT INTO `code_protocol_type_dic` VALUES (1, 'Other', '0', NULL, '');
+INSERT INTO `code_protocol_type_dic` VALUES (2, 'TCP', '10001', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (3, 'UDP', '10002', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (4, 'DNS', '10003', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (5, 'FTP', '10004', 105, '');
+INSERT INTO `code_protocol_type_dic` VALUES (6, 'FTPS', '10005', 105, '');
+INSERT INTO `code_protocol_type_dic` VALUES (7, 'GRE', '10006', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (8, 'HTTP', '10007', 104, '行为（见行为类型sheet）：\nHTTP Streaming\nMobile_HTTP_Streaming\nHTTP_File_Transfer\nHTTP_Browsing\nMobile_HTTP_Browsing\nHTTP DownloadManager\nHTTP_Audio\nMobile_HTTP_DownloadManager  HTTP TUNNEL');
+INSERT INTO `code_protocol_type_dic` VALUES (9, 'HTTPS', '10008', 104, '');
+INSERT INTO `code_protocol_type_dic` VALUES (10, 'ICMP', '10009', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (11, 'IKE', '10010', 102, '');
+INSERT INTO `code_protocol_type_dic` VALUES (12, 'IMAP', '10011', 106, '');
+INSERT INTO `code_protocol_type_dic` VALUES (13, 'IMAPS', '10012', 106, '');
+INSERT INTO `code_protocol_type_dic` VALUES (14, 'IPSEC', '10013', 102, '');
+INSERT INTO `code_protocol_type_dic` VALUES (15, 'XMPP', '10014', 101, '');
+INSERT INTO `code_protocol_type_dic` VALUES (16, 'L2TP', '10015', 103, '');
+INSERT INTO `code_protocol_type_dic` VALUES (17, 'NTP', '10016', 112, '');
+INSERT INTO `code_protocol_type_dic` VALUES (18, 'POP3', '10017', 106, '');
+INSERT INTO `code_protocol_type_dic` VALUES (19, 'POP3 SSL', '10018', 106, '');
+INSERT INTO `code_protocol_type_dic` VALUES (20, 'PPTP', '10019', 103, '');
+INSERT INTO `code_protocol_type_dic` VALUES (21, 'Quic', '10020', 104, '');
+INSERT INTO `code_protocol_type_dic` VALUES (22, 'SIP', '10021', 101, '');
+INSERT INTO `code_protocol_type_dic` VALUES (23, 'smb', '10022', 112, '');
+INSERT INTO `code_protocol_type_dic` VALUES (24, 'SMTP', '10023', 106, '');
+INSERT INTO `code_protocol_type_dic` VALUES (25, 'SMTPS', '10024', 106, '');
+INSERT INTO `code_protocol_type_dic` VALUES (26, 'SPDY', '10025', 104, 'google tcp');
+INSERT INTO `code_protocol_type_dic` VALUES (27, 'SSH', '10028', 109, '');
+INSERT INTO `code_protocol_type_dic` VALUES (28, 'SSL', '10029', 104, '');
+INSERT INTO `code_protocol_type_dic` VALUES (29, 'SOCKS', '10030', 108, 'procy');
+INSERT INTO `code_protocol_type_dic` VALUES (30, 'BITTORRENT', '10031', 105, '');
+INSERT INTO `code_protocol_type_dic` VALUES (31, 'RTSP', '10032', 110, '');
+INSERT INTO `code_protocol_type_dic` VALUES (32, 'TELNET', '10033', 109, '');
+INSERT INTO `code_protocol_type_dic` VALUES (33, 'UTP', '10034', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (34, 'FASTTRACK', '10035', 105, '');
+INSERT INTO `code_protocol_type_dic` VALUES (35, 'SKINNY', '10036', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (36, 'IAX', '10037', 114, '');
+INSERT INTO `code_protocol_type_dic` VALUES (37, 'MGCP', '10038', 114, '');
+INSERT INTO `code_protocol_type_dic` VALUES (38, 'RTCP', '10039', 114, '');
+INSERT INTO `code_protocol_type_dic` VALUES (39, 'RTP', '10040', 114, '');
+INSERT INTO `code_protocol_type_dic` VALUES (40, 'VNC', '10041', 109, '');
+INSERT INTO `code_protocol_type_dic` VALUES (41, 'XDMCP', '10042', 109, '');
+INSERT INTO `code_protocol_type_dic` VALUES (42, 'RDP', '10043', 109, '');
+INSERT INTO `code_protocol_type_dic` VALUES (43, 'AIMINI', '10044', 105, '');
+INSERT INTO `code_protocol_type_dic` VALUES (44, 'IPP', '10045', 112, '');
+INSERT INTO `code_protocol_type_dic` VALUES (45, 'NFS', '10046', 105, '');
+INSERT INTO `code_protocol_type_dic` VALUES (46, 'TFTP', '10047', 105, '');
+INSERT INTO `code_protocol_type_dic` VALUES (47, 'BGP', '10048', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (48, 'DHCP', '10049', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (49, 'DHCPV6', '10050', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (50, 'FINGER', '10051', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (51, 'KERBEROS', '10052', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (52, 'LDAP', '10053', 112, '');
+INSERT INTO `code_protocol_type_dic` VALUES (53, 'MDNS', '10054', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (54, 'NNTP', '10055', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (55, 'SNMP', '10056', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (56, 'SSDP', '10057', 112, '');
+INSERT INTO `code_protocol_type_dic` VALUES (57, 'SYSLOG', '10058', 112, '');
+INSERT INTO `code_protocol_type_dic` VALUES (58, 'WHOIS', '10059', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (59, 'RADIUS', '10060', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (60, 'OPENVPN', '10061', 113, '');
+INSERT INTO `code_protocol_type_dic` VALUES (61, 'STUN', '10062', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (62, 'TEREDO', '10063', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (63, 'GTP', '10064', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (64, 'RTMP', '10065', 110, '');
+INSERT INTO `code_protocol_type_dic` VALUES (65, 'chargen_tcp_udp', '10066', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (66, 'llmnr_udp', '10067', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (67, 'nbns_udp', '10068', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (68, 'NETBIOS', '10069', 112, '');
+INSERT INTO `code_protocol_type_dic` VALUES (69, 'DirectDownloadLink', '10070', 105, '');
+INSERT INTO `code_protocol_type_dic` VALUES (70, 'I23V5', '10071', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (71, 'DirectConnect', '10072', 105, '');
+INSERT INTO `code_protocol_type_dic` VALUES (72, 'OFF', '10073', NULL, '');
+INSERT INTO `code_protocol_type_dic` VALUES (73, 'OGG', '10074', 110, '');
+INSERT INTO `code_protocol_type_dic` VALUES (74, 'MPEG', '10075', 110, '');
+INSERT INTO `code_protocol_type_dic` VALUES (75, 'IRC', '10076', 101, '');
+INSERT INTO `code_protocol_type_dic` VALUES (76, 'Jabber', '10077', 101, '');
+INSERT INTO `code_protocol_type_dic` VALUES (77, 'VRRP', '10078', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (78, 'IGMP', '10079', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (79, 'EGP', '10080', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (80, 'SCTP', '10081', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (81, 'OSPF', '10082', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (82, 'IP in IP', '10083', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (83, 'ICMPv6', '10084', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (84, 'DCE RPC', '10085', 109, '');
+INSERT INTO `code_protocol_type_dic` VALUES (85, 'NetFlow_IPFIX', '10086', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (86, 'sFlow', '10087', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (87, 'HTTP Connect (SSL over HTTP)', '10088', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (88, 'SAP', '10089', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (89, 'UPnP', '10090', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (90, 'H323', '10091', 114, '');
+INSERT INTO `code_protocol_type_dic` VALUES (91, 'Megaco', '10092', 114, '');
+INSERT INTO `code_protocol_type_dic` VALUES (92, 'bacnet', '10094', 109, '');
+INSERT INTO `code_protocol_type_dic` VALUES (93, 'bjnp', '10096', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (94, 'cgp', '10097', 109, '');
+INSERT INTO `code_protocol_type_dic` VALUES (95, 'dahua', '10098', 116, '');
+INSERT INTO `code_protocol_type_dic` VALUES (96, 'dcc', '10099', 101, '');
+INSERT INTO `code_protocol_type_dic` VALUES (97, 'kademlia', '10100', 105, '');
+INSERT INTO `code_protocol_type_dic` VALUES (98, 'lansync', '10101', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (99, 'ldap_ad', '10102', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (100, 'llp2p', '10103', 110, '');
+INSERT INTO `code_protocol_type_dic` VALUES (101, 'mfnp', '10104', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (102, 'mp2p', '10105', 105, '');
+INSERT INTO `code_protocol_type_dic` VALUES (103, 'msn_cache', '10106', 101, '');
+INSERT INTO `code_protocol_type_dic` VALUES (104, 'msn_video', '10107', 101, '');
+INSERT INTO `code_protocol_type_dic` VALUES (105, 'msnc', '10108', 105, '');
+INSERT INTO `code_protocol_type_dic` VALUES (106, 'netflow', '10109', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (107, 'notes_rpc', '10110', 13, '');
+INSERT INTO `code_protocol_type_dic` VALUES (108, 'esp', '10111', 113, '');
+INSERT INTO `code_protocol_type_dic` VALUES (109, 'fbcdn_ssl', '10112', 113, '');
+INSERT INTO `code_protocol_type_dic` VALUES (110, 'forticlient_sslvpn', '10113', 113, '');
+INSERT INTO `code_protocol_type_dic` VALUES (111, 'rfb', '10114', 109, '');
+INSERT INTO `code_protocol_type_dic` VALUES (112, 'rtmfp', '10115', 101, '');
+INSERT INTO `code_protocol_type_dic` VALUES (113, 'slp', '10117', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (114, 'steam_inhomebroadcast', '10118', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (115, 'steam_localbroadcast', '10119', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (116, 'tpkt', '10120', 114, '');
+INSERT INTO `code_protocol_type_dic` VALUES (117, 'xmpps', '10121', 101, '');
+INSERT INTO `code_protocol_type_dic` VALUES (118, 'S7COMM', '10122', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (119, 'CitrixCGP', '10123', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (120, 'ID_Protocol', '10124', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (121, 'SMTP_Secure', '10125', 106, '');
+INSERT INTO `code_protocol_type_dic` VALUES (122, 'NAT-PMP', '10126', 107, '');
+INSERT INTO `code_protocol_type_dic` VALUES (123, 'Unspecified', '268435455', NULL, '');
+INSERT INTO `code_protocol_type_dic` VALUES (124, 'bitcoin', '10095', NULL, NULL);
+INSERT INTO `code_protocol_type_dic` VALUES (125, 'App Defined', '19999', NULL, NULL);

src/main/resources/sql/spaceMappingSql/code_service_type_dic.sql

@@ -0,0 +1,24 @@
+delete from code_service_type_dic;
+INSERT INTO `code_service_type_dic` VALUES (1, 'Finance', '1');
+INSERT INTO `code_service_type_dic` VALUES (2, 'Chat', '2');
+INSERT INTO `code_service_type_dic` VALUES (3, 'Cloud', '3');
+INSERT INTO `code_service_type_dic` VALUES (4, 'Web', '4');
+INSERT INTO `code_service_type_dic` VALUES (5, 'DataTransfer', '5');
+INSERT INTO `code_service_type_dic` VALUES (6, 'Database', '6');
+INSERT INTO `code_service_type_dic` VALUES (7, 'Download-FileTransfer-FileSharing', '7');
+INSERT INTO `code_service_type_dic` VALUES (8, 'Email', '8');
+INSERT INTO `code_service_type_dic` VALUES (9, 'Game', '9');
+INSERT INTO `code_service_type_dic` VALUES (10, 'Media', '10');
+INSERT INTO `code_service_type_dic` VALUES (11, 'Network', '11');
+INSERT INTO `code_service_type_dic` VALUES (12, 'RPC', '12');
+INSERT INTO `code_service_type_dic` VALUES (13, 'RemoteAccess', '13');
+INSERT INTO `code_service_type_dic` VALUES (14, 'SocilNetwork', '14');
+INSERT INTO `code_service_type_dic` VALUES (15, 'SoftwareUpdate', '15');
+INSERT INTO `code_service_type_dic` VALUES (16, 'Streaming', '16');
+INSERT INTO `code_service_type_dic` VALUES (17, 'Browser', '17');
+INSERT INTO `code_service_type_dic` VALUES (18, 'System', '18');
+INSERT INTO `code_service_type_dic` VALUES (19, 'Collaborative', '19');
+INSERT INTO `code_service_type_dic` VALUES (20, 'VPN', '20');
+INSERT INTO `code_service_type_dic` VALUES (21, 'VoIP', '21');
+INSERT INTO `code_service_type_dic` VALUES (22, 'EncryptedTraffic', '22');
+INSERT INTO `code_service_type_dic` VALUES (23, 'Unspecified', '268435455');

src/main/resources/sql/spaceMappingSql/code_web_service_dic.sql

@@ -0,0 +1,233 @@
+delete from code_web_service_dic;
+INSERT INTO `code_web_service_dic` VALUES (1, 'Other', 'Other', '0', '');
+INSERT INTO `code_web_service_dic` VALUES (2, 'Google', 'Google.com', '1', '');
+INSERT INTO `code_web_service_dic` VALUES (3, 'Youtube', 'Youtube.com', '1001', '');
+INSERT INTO `code_web_service_dic` VALUES (4, 'Facebook', 'Facebook.com', '2001', '');
+INSERT INTO `code_web_service_dic` VALUES (5, 'Baidu', 'Baidu.com', '3001', '');
+INSERT INTO `code_web_service_dic` VALUES (6, 'Wikipedia', 'Wikipedia.org', '4001', '');
+INSERT INTO `code_web_service_dic` VALUES (7, 'Reddit', 'Reddit.com', '5001', '');
+INSERT INTO `code_web_service_dic` VALUES (8, 'Yahoo', 'Yahoo.com', '6001', '');
+INSERT INTO `code_web_service_dic` VALUES (9, 'Qq', 'Qq.com', '7001', '');
+INSERT INTO `code_web_service_dic` VALUES (10, 'Taobao', 'Taobao.com', '8001', '');
+INSERT INTO `code_web_service_dic` VALUES (11, 'Amazon', 'Amazon.com', '9001', '');
+INSERT INTO `code_web_service_dic` VALUES (12, 'Tmall', 'Tmall.com', '10001', '');
+INSERT INTO `code_web_service_dic` VALUES (13, 'Twitter', 'Twitter.com', '11001', '');
+INSERT INTO `code_web_service_dic` VALUES (14, 'Sohu', 'Sohu.com', '12001', '');
+INSERT INTO `code_web_service_dic` VALUES (15, 'Instagram', 'Instagram.com', '13001', '');
+INSERT INTO `code_web_service_dic` VALUES (16, 'Vk', 'Vk.com', '14001', '');
+INSERT INTO `code_web_service_dic` VALUES (17, 'Live', 'Live.com', '15001', '');
+INSERT INTO `code_web_service_dic` VALUES (18, 'Jd', 'Jd.com', '16001', '');
+INSERT INTO `code_web_service_dic` VALUES (19, 'Sina', 'Sina.com.cn', '17001', '');
+INSERT INTO `code_web_service_dic` VALUES (20, 'Weibo', 'Weibo.com', '18001', '');
+INSERT INTO `code_web_service_dic` VALUES (21, 'Yandex', 'Yandex.ru', '19001', '');
+INSERT INTO `code_web_service_dic` VALUES (22, '360', '360.cn', '20001', '');
+INSERT INTO `code_web_service_dic` VALUES (23, 'Netflix', 'Netflix.com', '22001', '');
+INSERT INTO `code_web_service_dic` VALUES (24, 'Pornhub', 'Pornhub.com', '23001', '');
+INSERT INTO `code_web_service_dic` VALUES (25, 'Twitch', 'Twitch.tv', '24001', '');
+INSERT INTO `code_web_service_dic` VALUES (26, 'Linkedin', 'Linkedin.com', '25001', '');
+INSERT INTO `code_web_service_dic` VALUES (27, 'Csdn', 'Csdn.net', '26001', '');
+INSERT INTO `code_web_service_dic` VALUES (28, 'Microsoft', 'Microsoft.com', '28001', '');
+INSERT INTO `code_web_service_dic` VALUES (29, 'Office', 'Office.com', '29001', '');
+INSERT INTO `code_web_service_dic` VALUES (30, 'Bing', 'Bing.com', '30001', '');
+INSERT INTO `code_web_service_dic` VALUES (31, 'Ebay', 'Ebay.com', '31001', '');
+INSERT INTO `code_web_service_dic` VALUES (32, 'Alipay', 'Alipay.com', '32001', '');
+INSERT INTO `code_web_service_dic` VALUES (33, 'Xvideos', 'Xvideos.com', '33001', '');
+INSERT INTO `code_web_service_dic` VALUES (34, 'Mail', 'Mail.ru', '34001', '');
+INSERT INTO `code_web_service_dic` VALUES (35, 'Ok', 'Ok.ru', '35001', '');
+INSERT INTO `code_web_service_dic` VALUES (36, 'Msn', 'Msn.com', '36001', '');
+INSERT INTO `code_web_service_dic` VALUES (37, 'Imgur', 'Imgur.com', '39001', '');
+INSERT INTO `code_web_service_dic` VALUES (38, 'Aliexpress', 'Aliexpress.com', '40001', '');
+INSERT INTO `code_web_service_dic` VALUES (39, 'Tumblr', 'Tumblr.com', '41001', '');
+INSERT INTO `code_web_service_dic` VALUES (40, 'Wordpress', 'Wordpress.com', '42001', '');
+INSERT INTO `code_web_service_dic` VALUES (41, 'Wikia', 'Wikia.com', '43001', '');
+INSERT INTO `code_web_service_dic` VALUES (42, 'Imdb', 'Imdb.com', '44001', '');
+INSERT INTO `code_web_service_dic` VALUES (43, 'Whatsapp', 'Whatsapp.com', '45001', '');
+INSERT INTO `code_web_service_dic` VALUES (44, 'Stackoverflow', 'Stackoverflow.com', '46001', '');
+INSERT INTO `code_web_service_dic` VALUES (45, 'Github', 'Github.com', '47001', '');
+INSERT INTO `code_web_service_dic` VALUES (46, 'Livejasmin', 'Livejasmin.com', '48001', '');
+INSERT INTO `code_web_service_dic` VALUES (47, 'Xhamster', 'Xhamster.com', '49001', '');
+INSERT INTO `code_web_service_dic` VALUES (48, 'Hao123', 'Hao123.com', '50001', '');
+INSERT INTO `code_web_service_dic` VALUES (49, 'Blogspot', 'Blogspot.com', '51001', '');
+INSERT INTO `code_web_service_dic` VALUES (50, 'Deloton', 'Deloton.com', '52001', '');
+INSERT INTO `code_web_service_dic` VALUES (51, 'Paypal', 'Paypal.com', '53001', '');
+INSERT INTO `code_web_service_dic` VALUES (52, 'Tribunnews', 'Tribunnews.com', '54001', '');
+INSERT INTO `code_web_service_dic` VALUES (53, 'Popads', 'Popads.net', '55001', '');
+INSERT INTO `code_web_service_dic` VALUES (54, 'Apple', 'Apple.com', '56001', '');
+INSERT INTO `code_web_service_dic` VALUES (55, 'Diply', 'Diply.com', '57001', '');
+INSERT INTO `code_web_service_dic` VALUES (56, 'Bongacams', 'Bongacams.com', '58001', '');
+INSERT INTO `code_web_service_dic` VALUES (57, 'Pinterest', 'Pinterest.com', '60001', '');
+INSERT INTO `code_web_service_dic` VALUES (58, 'Xnxx', 'Xnxx.com', '61001', '');
+INSERT INTO `code_web_service_dic` VALUES (59, 'Adobe', 'Adobe.com', '62001', '');
+INSERT INTO `code_web_service_dic` VALUES (60, 'Providr', 'Providr.com', '63001', '');
+INSERT INTO `code_web_service_dic` VALUES (61, 'Coccoc', 'Coccoc.com', '65001', '');
+INSERT INTO `code_web_service_dic` VALUES (62, 'Txxx', 'Txxx.com', '66001', '');
+INSERT INTO `code_web_service_dic` VALUES (63, 'Dropbox', 'Dropbox.com', '67001', '');
+INSERT INTO `code_web_service_dic` VALUES (64, 'Savefrom', 'Savefrom.net', '69001', '');
+INSERT INTO `code_web_service_dic` VALUES (65, 'Pixnet', 'Pixnet.net', '70001', '');
+INSERT INTO `code_web_service_dic` VALUES (66, 'Bbc', 'Bbc.com', '71001', '');
+INSERT INTO `code_web_service_dic` VALUES (67, 'Thestartmagazine', 'Thestartmagazine.com', '72001', '');
+INSERT INTO `code_web_service_dic` VALUES (68, 'Quora', 'Quora.com', '73001', '');
+INSERT INTO `code_web_service_dic` VALUES (69, 'Tianya', 'Tianya.cn', '74001', '');
+INSERT INTO `code_web_service_dic` VALUES (70, 'Soso', 'Soso.com', '75001', '');
+INSERT INTO `code_web_service_dic` VALUES (71, 'Chaturbate', 'Chaturbate.com', '76001', '');
+INSERT INTO `code_web_service_dic` VALUES (72, 'Amazonaws', 'Amazonaws.com', '77001', '');
+INSERT INTO `code_web_service_dic` VALUES (73, 'Booking', 'Booking.com', '78001', '');
+INSERT INTO `code_web_service_dic` VALUES (74, 'Espn', 'Espn.com', '79001', '');
+INSERT INTO `code_web_service_dic` VALUES (75, 'haosou', 'So.com', '80001', '');
+INSERT INTO `code_web_service_dic` VALUES (76, 'Cnn', 'Cnn.com', '81001', '');
+INSERT INTO `code_web_service_dic` VALUES (77, 'Craigslist', 'Craigslist.org', '82001', '');
+INSERT INTO `code_web_service_dic` VALUES (78, 'Nicovideo', 'Nicovideo.jp', '83001', '');
+INSERT INTO `code_web_service_dic` VALUES (79, 'Xinhuanet', 'Xinhuanet.com', '84001', '');
+INSERT INTO `code_web_service_dic` VALUES (80, 'Soundcloud', 'Soundcloud.com', '85001', '');
+INSERT INTO `code_web_service_dic` VALUES (81, 'Tokopedia', 'Tokopedia.com', '86001', '');
+INSERT INTO `code_web_service_dic` VALUES (82, 'Dailymotion', 'Dailymotion.com', '87001', '');
+INSERT INTO `code_web_service_dic` VALUES (83, 'Youth', 'Youth.cn', '88001', '');
+INSERT INTO `code_web_service_dic` VALUES (84, 'Nytimes', 'Nytimes.com', '89001', '');
+INSERT INTO `code_web_service_dic` VALUES (85, 'Detik', 'Detik.com', '90001', '');
+INSERT INTO `code_web_service_dic` VALUES (86, 'Ask', 'Ask.com', '91001', '');
+INSERT INTO `code_web_service_dic` VALUES (87, 'Naver', 'Naver.com', '92001', '');
+INSERT INTO `code_web_service_dic` VALUES (88, 'Stackexchange', 'Stackexchange.com', '93001', '');
+INSERT INTO `code_web_service_dic` VALUES (89, 'Dkn', 'Dkn.tv', '94001', '');
+INSERT INTO `code_web_service_dic` VALUES (90, 'Thepiratebay', 'Thepiratebay.org', '95001', '');
+INSERT INTO `code_web_service_dic` VALUES (91, 'Roblox', 'Roblox.com', '96001', '');
+INSERT INTO `code_web_service_dic` VALUES (92, 'Rakuten', 'Rakuten.co.jp', '97001', '');
+INSERT INTO `code_web_service_dic` VALUES (93, 'Onlinesbi', 'Onlinesbi.com', '98001', '');
+INSERT INTO `code_web_service_dic` VALUES (94, 'Openload', 'Openload.co', '99001', '');
+INSERT INTO `code_web_service_dic` VALUES (95, 'Spotify', 'Spotify.com', '100001', '');
+INSERT INTO `code_web_service_dic` VALUES (96, 'Nih', 'Nih.gov', '101001', '');
+INSERT INTO `code_web_service_dic` VALUES (97, 'Vimeo', 'Vimeo.com', '102001', '');
+INSERT INTO `code_web_service_dic` VALUES (98, 'Fc2', 'Fc2.com', '103001', '');
+INSERT INTO `code_web_service_dic` VALUES (99, 'Aparat', 'Aparat.com', '104001', '');
+INSERT INTO `code_web_service_dic` VALUES (100, 'Ettoday', 'Ettoday.net', '105001', '');
+INSERT INTO `code_web_service_dic` VALUES (101, 'Mozilla', 'Mozilla.org', '106001', '');
+INSERT INTO `code_web_service_dic` VALUES (102, '1688', '1688.com', '107001', '');
+INSERT INTO `code_web_service_dic` VALUES (103, 'K618', 'K618.cn', '108001', '');
+INSERT INTO `code_web_service_dic` VALUES (104, 'Exdynsrv', 'Exdynsrv.com', '109001', '');
+INSERT INTO `code_web_service_dic` VALUES (105, 'Oath', 'Oath.com', '110001', '');
+INSERT INTO `code_web_service_dic` VALUES (106, 'Ntd', 'Ntd.tv', '111001', '');
+INSERT INTO `code_web_service_dic` VALUES (107, 'Theguardian', 'Theguardian.com', '112001', '');
+INSERT INTO `code_web_service_dic` VALUES (108, 'Mediafire', 'Mediafire.com', '113001', '');
+INSERT INTO `code_web_service_dic` VALUES (109, 'Chase', 'Chase.com', '114001', '');
+INSERT INTO `code_web_service_dic` VALUES (110, 'Flipkart', 'Flipkart.com', '115001', '');
+INSERT INTO `code_web_service_dic` VALUES (111, 'Exosrv', 'Exosrv.com', '116001', '');
+INSERT INTO `code_web_service_dic` VALUES (112, 'Avito', 'Avito.ru', '117001', '');
+INSERT INTO `code_web_service_dic` VALUES (113, 'Slideshare', 'Slideshare.net', '118001', '');
+INSERT INTO `code_web_service_dic` VALUES (114, 'Dailymail', 'Dailymail.co.uk', '119001', '');
+INSERT INTO `code_web_service_dic` VALUES (115, 'Discordapp', 'Discordapp.com', '120001', '');
+INSERT INTO `code_web_service_dic` VALUES (116, 'Zhihu', 'Zhihu.com', '121001', '');
+INSERT INTO `code_web_service_dic` VALUES (117, 'Salesforce', 'Salesforce.com', '122001', '');
+INSERT INTO `code_web_service_dic` VALUES (118, 'Theepochtimes', 'Theepochtimes.com', '123001', '');
+INSERT INTO `code_web_service_dic` VALUES (119, 'Softonic', 'Softonic.com', '124001', '恶意网站-无图标');
+INSERT INTO `code_web_service_dic` VALUES (120, 'Globo', 'Globo.com', '125001', '');
+INSERT INTO `code_web_service_dic` VALUES (121, 'Bukalapak', 'Bukalapak.com', '126001', '');
+INSERT INTO `code_web_service_dic` VALUES (122, 'Douyu', 'Douyu.com', '127001', '');
+INSERT INTO `code_web_service_dic` VALUES (123, 'Nextoptim', 'Nextoptim.com', '128001', '');
+INSERT INTO `code_web_service_dic` VALUES (124, 'Deviantart', 'Deviantart.com', '129001', '');
+INSERT INTO `code_web_service_dic` VALUES (125, 'Indeed', 'Indeed.com', '130001', '');
+INSERT INTO `code_web_service_dic` VALUES (126, 'Lolsided', 'Lolsided.com', '131001', '');
+INSERT INTO `code_web_service_dic` VALUES (127, 'Bles', 'Bles.com', '132001', '');
+INSERT INTO `code_web_service_dic` VALUES (128, 'Cnet', 'Cnet.com', '133001', '');
+INSERT INTO `code_web_service_dic` VALUES (129, 'Alibaba', 'Alibaba.com', '134001', '');
+INSERT INTO `code_web_service_dic` VALUES (130, 'Bet9ja', 'Bet9ja.com', '135001', '');
+INSERT INTO `code_web_service_dic` VALUES (131, 'Vice', 'Vice.com', '136001', '恶意网站-无图标');
+INSERT INTO `code_web_service_dic` VALUES (132, 'Lifedaily', 'Lifedaily.com', '137001', '');
+INSERT INTO `code_web_service_dic` VALUES (133, 'Hotmovs', 'Hotmovs.com', '138001', '');
+INSERT INTO `code_web_service_dic` VALUES (134, 'Sogou', 'Sogou.com', '139001', '');
+INSERT INTO `code_web_service_dic` VALUES (135, 'Uol', 'Uol.com.br', '140001', '');
+INSERT INTO `code_web_service_dic` VALUES (136, 'Doubleclick', 'Doubleclick.net', '141001', '');
+INSERT INTO `code_web_service_dic` VALUES (137, 'Mercadolivre', 'Mercadolivre.com.br', '142001', '');
+INSERT INTO `code_web_service_dic` VALUES (138, 'Speakol', 'Speakol.com', '143001', '');
+INSERT INTO `code_web_service_dic` VALUES (139, 'Babytree', 'Babytree.com', '144001', '');
+INSERT INTO `code_web_service_dic` VALUES (140, 'Liputan6', 'Liputan6.com', '145001', '');
+INSERT INTO `code_web_service_dic` VALUES (141, 'Wikihow', 'Wikihow.com', '146001', '');
+INSERT INTO `code_web_service_dic` VALUES (142, 'China', 'China.com.cn', '147001', '');
+INSERT INTO `code_web_service_dic` VALUES (143, 'Etsy', 'Etsy.com', '148001', '');
+INSERT INTO `code_web_service_dic` VALUES (144, 'W3schools', 'W3schools.com', '149001', '');
+INSERT INTO `code_web_service_dic` VALUES (145, 'Youm7', 'Youm7.com', '150001', '');
+INSERT INTO `code_web_service_dic` VALUES (146, 'Scribd', 'Scribd.com', '151001', '');
+INSERT INTO `code_web_service_dic` VALUES (147, 'Rumble', 'Rumble.com', '152001', '');
+INSERT INTO `code_web_service_dic` VALUES (148, 'Walmart', 'Walmart.com', '153001', '');
+INSERT INTO `code_web_service_dic` VALUES (149, 'Twimg', 'Twimg.com', '154001', '');
+INSERT INTO `code_web_service_dic` VALUES (150, 'Yelp', 'Yelp.com', '155001', '');
+INSERT INTO `code_web_service_dic` VALUES (151, 'Kompas', 'Kompas.com', '156001', '');
+INSERT INTO `code_web_service_dic` VALUES (152, 'Messenger', 'Messenger.com', '157001', '');
+INSERT INTO `code_web_service_dic` VALUES (153, 'Onlinevideoconverter', 'Onlinevideoconverter.com', '159001', '');
+INSERT INTO `code_web_service_dic` VALUES (154, 'Redtube', 'Redtube.com', '160001', '');
+INSERT INTO `code_web_service_dic` VALUES (155, 'Gmw', 'Gmw.cn', '161001', '');
+INSERT INTO `code_web_service_dic` VALUES (156, 'Caijing', 'Caijing.com.cn', '162001', '');
+INSERT INTO `code_web_service_dic` VALUES (157, 'Mama', 'Mama.cn', '163001', '同twitter');
+INSERT INTO `code_web_service_dic` VALUES (158, 'Chinadaily', 'Chinadaily.com.cn', '164001', '');
+INSERT INTO `code_web_service_dic` VALUES (159, 'Cricbuzz', 'Cricbuzz.com', '165001', '');
+INSERT INTO `code_web_service_dic` VALUES (160, 'Ladbible', 'Ladbible.com', '166001', '');
+INSERT INTO `code_web_service_dic` VALUES (161, 'Doublepimpssl', 'Doublepimpssl.com', '167001', '');
+INSERT INTO `code_web_service_dic` VALUES (162, 'Steampowered', 'Steampowered.com', '168001', '');
+INSERT INTO `code_web_service_dic` VALUES (163, 'Mega', 'Mega.nz', '169001', '');
+INSERT INTO `code_web_service_dic` VALUES (164, 'Yts', 'Yts.am', '170001', '');
+INSERT INTO `code_web_service_dic` VALUES (165, 'Youporn', 'Youporn.com', '171001', '');
+INSERT INTO `code_web_service_dic` VALUES (166, 'Buzzfeed', 'Buzzfeed.com', '172001', '');
+INSERT INTO `code_web_service_dic` VALUES (167, 'Indiatimes', 'Indiatimes.com', '173001', '');
+INSERT INTO `code_web_service_dic` VALUES (168, 'Hotstar', 'Hotstar.com', '174001', '');
+INSERT INTO `code_web_service_dic` VALUES (169, 'Cnblogs', 'Cnblogs.com', '175001', '');
+INSERT INTO `code_web_service_dic` VALUES (170, 'Bet365', 'Bet365.com', '176001', '');
+INSERT INTO `code_web_service_dic` VALUES (171, 'Wetransfer', 'Wetransfer.com', '177001', '');
+INSERT INTO `code_web_service_dic` VALUES (172, 'Eastday', 'Eastday.com', '178001', '');
+INSERT INTO `code_web_service_dic` VALUES (173, 'Rambler', 'Rambler.ru', '179001', '');
+INSERT INTO `code_web_service_dic` VALUES (174, 'Coinmarketcap', 'Coinmarketcap.com', '180001', '');
+INSERT INTO `code_web_service_dic` VALUES (175, 'Huanqiu', 'Huanqiu.com', '181001', '');
+INSERT INTO `code_web_service_dic` VALUES (176, 'Hulu', 'Hulu.com', '182001', '');
+INSERT INTO `code_web_service_dic` VALUES (177, 'Abs-cbn', 'Abs-cbn.com', '183001', '');
+INSERT INTO `code_web_service_dic` VALUES (178, 'Steamcommunity', 'Steamcommunity.com', '184001', '');
+INSERT INTO `code_web_service_dic` VALUES (179, '4chan', '4chan.org', '185001', '');
+INSERT INTO `code_web_service_dic` VALUES (180, 'Metropcs', 'Metropcs.mobi', '186001', '');
+INSERT INTO `code_web_service_dic` VALUES (181, 'Zillow', 'Zillow.com', '187001', '');
+INSERT INTO `code_web_service_dic` VALUES (182, 'Godaddy', 'Godaddy.com', '188001', '');
+INSERT INTO `code_web_service_dic` VALUES (183, 'Blastingnews', 'Blastingnews.com', '189001', '');
+INSERT INTO `code_web_service_dic` VALUES (184, 'Washingtonpost', 'Washingtonpost.com', '190001', '');
+INSERT INTO `code_web_service_dic` VALUES (185, 'Upornia', 'Upornia.com', '191001', '');
+INSERT INTO `code_web_service_dic` VALUES (186, 'Nownews', 'Nownews.com', '192001', '');
+INSERT INTO `code_web_service_dic` VALUES (187, 'Hibids10', 'Hibids10.com', '193001', '');
+INSERT INTO `code_web_service_dic` VALUES (188, 'Aliyun', 'Aliyun.com', '194001', '');
+INSERT INTO `code_web_service_dic` VALUES (189, 'Fapmeth', 'Fapmeth.com', '195001', '');
+INSERT INTO `code_web_service_dic` VALUES (190, 'Genius', 'Genius.com', '196001', '');
+INSERT INTO `code_web_service_dic` VALUES (191, 'Tripadvisor', 'Tripadvisor.com', '197001', '');
+INSERT INTO `code_web_service_dic` VALUES (192, 'Bilibili', 'Bilibili.com', '198001', '');
+INSERT INTO `code_web_service_dic` VALUES (193, 'Livejournal', 'Livejournal.com', '199001', '');
+INSERT INTO `code_web_service_dic` VALUES (194, 'Irctc', 'Irctc.co.in', '200001', '');
+INSERT INTO `code_web_service_dic` VALUES (195, 'Slack', 'Slack.com', '201001', '');
+INSERT INTO `code_web_service_dic` VALUES (196, 'Bankofamerica', 'Bankofamerica.com', '202001', '广告网站，无图标');
+INSERT INTO `code_web_service_dic` VALUES (197, 'Forbes', 'Forbes.com', '203001', '');
+INSERT INTO `code_web_service_dic` VALUES (198, 'Archive', 'Archive.org', '204001', '广告网站，无图标');
+INSERT INTO `code_web_service_dic` VALUES (199, 'Ebay-kleinanzeigen', 'Ebay-kleinanzeigen.de', '205001', '');
+INSERT INTO `code_web_service_dic` VALUES (200, 'Doublepimp', 'Doublepimp.com', '206001', '');
+INSERT INTO `code_web_service_dic` VALUES (201, 'Foxnews', 'Foxnews.com', '207001', '');
+INSERT INTO `code_web_service_dic` VALUES (202, 'Wellsfargo', 'Wellsfargo.com', '208001', '');
+INSERT INTO `code_web_service_dic` VALUES (203, 'Speedtest', 'Speedtest.net', '209001', '');
+INSERT INTO `code_web_service_dic` VALUES (204, 'Researchgate', 'Researchgate.net', '210001', '');
+INSERT INTO `code_web_service_dic` VALUES (205, 'Medium', 'Medium.com', '211001', '');
+INSERT INTO `code_web_service_dic` VALUES (206, 'Gfycat', 'Gfycat.com', '212001', '');
+INSERT INTO `code_web_service_dic` VALUES (207, 'Exoclick', 'Exoclick.com', '213001', '');
+INSERT INTO `code_web_service_dic` VALUES (208, '1337x', '1337x.to', '214001', '');
+INSERT INTO `code_web_service_dic` VALUES (209, 'Ltn', 'Ltn.com.tw', '215001', '');
+INSERT INTO `code_web_service_dic` VALUES (210, 'Hclips', 'Hclips.com', '216001', '');
+INSERT INTO `code_web_service_dic` VALUES (211, 'Redd', 'Redd.it', '217001', '');
+INSERT INTO `code_web_service_dic` VALUES (212, 'Trello', 'Trello.com', '218001', '');
+INSERT INTO `code_web_service_dic` VALUES (213, 'Duckduckgo', 'Duckduckgo.com', '219001', '');
+INSERT INTO `code_web_service_dic` VALUES (214, 'Xfinity', 'Xfinity.com', '220001', '');
+INSERT INTO `code_web_service_dic` VALUES (215, 'Cloudfront', 'Cloudfront.net', '221001', '');
+INSERT INTO `code_web_service_dic` VALUES (216, 'Blackboard', 'Blackboard.com', '222001', '');
+INSERT INTO `code_web_service_dic` VALUES (217, 'Elfagr', 'Elfagr.com', '223001', '');
+INSERT INTO `code_web_service_dic` VALUES (218, 'Weather', 'Weather.com', '224001', '');
+INSERT INTO `code_web_service_dic` VALUES (219, 'Youdao', 'Youdao.com', '225001', '');
+INSERT INTO `code_web_service_dic` VALUES (220, 'Sberbank', 'Sberbank.ru', '226001', '');
+INSERT INTO `code_web_service_dic` VALUES (221, 'Rednet', 'Rednet.cn', '227001', '');
+INSERT INTO `code_web_service_dic` VALUES (222, 'Iqiyi', 'Iqiyi.com', '228001', '');
+INSERT INTO `code_web_service_dic` VALUES (223, 'Setn', 'Setn.com', '229001', '');
+INSERT INTO `code_web_service_dic` VALUES (224, 'People', 'People.com.cn', '230001', '');
+INSERT INTO `code_web_service_dic` VALUES (225, 'Leboncoin', NULL, '231001', '');
+INSERT INTO `code_web_service_dic` VALUES (226, 'Gmx', NULL, '232001', 'NOTICE！！！：无独立图标');
+INSERT INTO `code_web_service_dic` VALUES (227, 'Shutterstock', NULL, '233001', '');
+INSERT INTO `code_web_service_dic` VALUES (228, 'Blogger', NULL, '234001', '');
+INSERT INTO `code_web_service_dic` VALUES (229, 'Ikea', NULL, '235001', '');
+INSERT INTO `code_web_service_dic` VALUES (230, 'Kakaku', NULL, '236001', '');
+INSERT INTO `code_web_service_dic` VALUES (231, 'Hdzog', NULL, '237001', '');
+INSERT INTO `code_web_service_dic` VALUES (232, 'Unspecified', NULL, '268435455', '');

src/main/resources/sql/spaceMappingSql/create_database.sql

@@ -0,0 +1 @@
+create database gwall_kxc default character set utf8mb4 collate utf8mb4_general_ci;

src/main/webapp/WEB-INF/tags/sys/delRow.tag

@@ -164,6 +164,26 @@ function del(url){
 			}
 		}
 	}else{
+		var isAudit=$("#isAudit").val();
+		var isValid=$("#isValid").val();
+		
+		// 批量删除：is_audit 3/0/null &&  is_valid 0/null  此条件下允许（取反提示）
+		if(!((isAudit==null || isAudit=='' || isAudit==3 || isAudit==0 ) 
+				&& (isValid==null || isValid==''|| isValid==0))){
+			top.$.jBox.tip("<spring:message code='has_prohibit_delete'/>", "<spring:message code='info'/>");
+			return;
+		}
+		
+		if(isAudit==null || isAudit==''){
+			isAudit="3,0";
+		}
+		if(isValid==null || isValid==''){
+			isValid="0";
+		}
+		
+		url=url+"&batchAuditValue="+isAudit;
+		url=url+"&batchValidValue="+isValid;
+		
 		url = url+"&"
 		if(isBatch(url)) {
 			top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='delete_all'/>",function(v,h,f){
@@ -227,6 +247,24 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 					doAll(checkboxes,url);
 		}
 	}else{
+		var isAudit=$("#isAudit").val();
+		var isValid=$("#isValid").val();
+		
+		// 审核通过：is_audit 0/null &&  is_valid 0  此条件下允许（取反提示）
+		if(!((isAudit==null || isAudit=='' || isAudit==0 ) 
+				&& (isValid==null  || isValid==''|| isValid==0))){
+			top.$.jBox.tip("<spring:message code='has_prohibit_pass'/>", "<spring:message code='info'/>");
+			return;
+		}
+		
+		if(isAudit==null || isAudit==''){
+			isAudit="0";
+		}
+		if(isValid==null || isValid==''){
+			isValid="0";
+		}
+		url=url+"&batchAuditValue="+isAudit;
+		url=url+"&batchValidValue="+isValid;
 		url = url+"&"
 		//配置批量下发
 		if(isBatch(url)){
@@ -255,6 +293,27 @@ function noPassOpt(url){
 		}
 		
 	}else{
+		
+		var isAudit=$("#isAudit").val();
+		var isValid=$("#isValid").val();
+		
+		// 审核不通过：is_audit 0/null &&  is_valid 0/null  此条件下允许（取反提示）
+		if(!((isAudit==null || isAudit=='' || isAudit==0 ) 
+				&& (isValid==null  || isValid==''|| isValid==0))){
+			top.$.jBox.tip("<spring:message code='has_prohibit_nopass'/>", "<spring:message code='info'/>");
+			return;
+		}
+		
+		if(isAudit==null || isAudit==''){
+			isAudit="0";
+		}
+		if(isValid==null || isValid==''){
+			isValid="0";
+		}
+		
+		url=url+"&batchAuditValue="+isAudit;
+		url=url+"&batchValidValue="+isValid;
+		
 		url = url+"&"
 		//配置批量审核（未通过）
 		if(isBatch(url)){
@@ -333,6 +392,24 @@ function cancelPassOpt(url){
 		}
 		
 	}else{
+		var isAudit=$("#isAudit").val();
+		var isValid=$("#isValid").val();
+		// 取消审核通过：is_audit 1/null &&  is_valid 0(定时任务)/1/null  此条件下允许（取反提示）
+		if(!((isAudit==null || isAudit=='' || isAudit==1 ) 
+				&& (isValid==null || isValid=='' || isValid==1 || isValid==0))){
+			top.$.jBox.tip("<spring:message code='hasnot_approved'/>", "<spring:message code='info'/>");
+			return;
+		}
+		
+		if(isAudit==null || isAudit==''){
+			isAudit="1";
+		}
+		if(isValid==null || isValid==''){
+			isValid="1,0";
+		}
+		url=url+"&batchAuditValue="+isAudit;
+		url=url+"&batchValidValue="+isValid;
+		
 		url = url+"&"
 		//配置批量取消
 		if(isBatch(url)){

src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp

@@ -116,7 +116,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		
 			<%-- <shiro:hasPermission name="avContUrl:config"> --%>
-				<button type="button" class="btn btn-primary"
+				<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/basics/asnGroup/asnGroupForm'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp

@@ -37,6 +37,8 @@
 			$(".Wdate").attr("value",'');
 			$("#description").attr("value",'');
 			$("#searchForm")[0].reset();
+			$("#organization").val("");
+			$("#userRegion1").val("");
 		});
 		
 		if($("#exportType").val() != null && $("#exportType").val() != ""){
@@ -66,7 +68,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		
 			<shiro:hasPermission name="asn:ip:config">
-				<button type="button" class="btn btn-primary"
+				<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/basics/asn/addForm?functionId=${cfg.functionId}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>
@@ -77,7 +79,7 @@
 					</c:if>
 				</c:forEach>
 				<c:if test="${regionImport eq 'true'}">
-					<button type="button" class="btn btn-primary import" >
+					<button type="button" class="importId btn btn-primary import" >
 						<i class="fa fa-plus"></i>
 					<spring:message code="import"></spring:message></button>
 				</c:if>

src/main/webapp/WEB-INF/views/basics/dictList.jsp

@@ -38,7 +38,7 @@
 <body>
 	<div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/sys/dict/dictItemForm?dictionaryId=${sysDataDictionaryItem.dictionaryId }'">
+		<button type="button" class="addId btn btn-primary" onClick="javascript:window.location='${ctx}/sys/dict/dictItemForm?dictionaryId=${sysDataDictionaryItem.dictionaryId }'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"/></button>
 	</div>

src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp

@@ -103,7 +103,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		
 			<%-- <shiro:hasPermission name="avContUrl:config"> --%>
-				<button type="button" class="btn btn-primary"
+				<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/basics/policyGroup/policyGroupForm?groupType=${cfg.groupType}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/basics/protectionInfoList.jsp

@@ -94,7 +94,7 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/basics/innerProtectionList/form'">
+		<button type="button" class="addId btn btn-primary" onClick="javascript:window.location='${ctx}/basics/innerProtectionList/form'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message>
 		</button>

src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp

@@ -106,7 +106,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 <%-- 		<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/basics/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>	 --%>
 			<shiro:hasPermission name="basics:${permission_type}:add">
-			 <button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'"><i class="fa fa-plus"></i><spring:message code="add"></spring:message></button>
+			 <button type="button" class="addId btn btn-primary" onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'"><i class="fa fa-plus"></i><spring:message code="add"></spring:message></button>
 			</shiro:hasPermission>
 	</div>
 	

src/main/webapp/WEB-INF/views/basics/sysDictList.jsp

@@ -136,7 +136,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 	<%-- <button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/basics/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button> --%>
 	<shiro:hasPermission name="basics:${permission_type}:add">
-		<button type="button" class="btn btn-primary"
+		<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp

@@ -12,7 +12,7 @@
 	
 	<shiro:hasPermission name="basics:taskInfo:config">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-primary"
+		<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/basics/taskInfo/form?functionId=${taskInfo.functionId}'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"/></button>

src/main/webapp/WEB-INF/views/basics/userIpCfgList.jsp

@@ -60,7 +60,7 @@
  	<div class="theme-panel hidden-xs hidden-sm">
 		
 			<shiro:hasPermission name="asn:ip:config">
-				<button type="button" class="btn btn-primary"
+				<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/basics/vpn/addForm?functionId=${cfg.functionId}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp

@@ -38,7 +38,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		
 			<shiro:hasPermission name="app:built_in_file:config">
-				<button type="button" class="btn btn-primary"
+				<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/app/appBuiltinFeatureFileForm?functionId=${cfg.functionId}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp

@@ -49,7 +49,7 @@
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:byte:config">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/app/byteCfgForm?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp

@@ -55,7 +55,7 @@
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:domain:config">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/app/domainCfgForm?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>
@@ -72,7 +72,7 @@
 			</c:if>
 		</c:forEach>
 		<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
-			<button type="button" class="btn btn-primary import" >
+			<button type="button" class="importId btn btn-primary import" >
 				<i class="fa fa-plus"></i>
 			<spring:message code="import"></spring:message></button>
 		</c:if>

src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp

@@ -102,7 +102,7 @@
     </c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="${configPermissionName }">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/app/headerCfgForm?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp

@@ -56,7 +56,7 @@
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:http:config">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/app/httpCfgForm?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>
@@ -73,7 +73,7 @@
 			</c:if>
 		</c:forEach>
 		<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
-			<button type="button" class="btn btn-primary import" >
+			<button type="button" class="importId btn btn-primary import" >
 				<i class="fa fa-plus"></i>
 			<spring:message code="import"></spring:message></button>
 		</c:if>

src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp

@@ -58,7 +58,7 @@
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:ip:config">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/app/ipCfgForm?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>
@@ -75,7 +75,7 @@
 			</c:if>
 		</c:forEach>
 		<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
-			<button type="button" class="btn btn-primary import" >
+			<button type="button" class="importId btn btn-primary import" >
 				<i class="fa fa-plus"></i>
 			<spring:message code="import"></spring:message></button>
 		</c:if>

src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp

@@ -112,7 +112,7 @@
     </c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="${configPermissionName }">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/app/feature/multiFeatureCfgForm?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>
@@ -131,7 +131,7 @@
 			</c:if>
 		</c:forEach>
 		<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
-			<button type="button" class="btn btn-primary import" >
+			<button type="button" class="importId btn btn-primary import" >
 				<i class="fa fa-plus"></i>
 			<spring:message code="import"></spring:message></button>
 		</c:if>

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp

@@ -59,14 +59,15 @@ $(function(){
 		submitHandler: function(form){
 			var flag = true;
 			//代表所有业务都隐藏了，提示必须增加一种业务数据
-			/* if($(".boxSolid").length ==$(".boxSolid.hidden").length){
+			if($("[name=action]:checked").val()==1&&$(".boxSolid").length ==$(".boxSolid.hidden").length){
 				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
 				return;
-			} */
+			}
+			/*
 			if($("[name=action]:checked").val()==1&&$(".ipPortAdd").parents(".form-section").next(".boxSolid").is(":hidden")){
 				 top.$.jBox.tip("<spring:message code='ip_must_select'/>", "<spring:message code='info'/>");
 				 return false;
-			}
+			}*/
 			$(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
 				if($(this).val()==''){
 					$(this).parents(".form-group").find(

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp

@@ -100,9 +100,12 @@
 <body>
 
 <div class="page-content">
+	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
+	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
+	</c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:policy:config">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/app/policyCfgForm?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"></spring:message></button>
@@ -119,7 +122,7 @@
 				</c:if>
 			</c:forEach>
 			<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
-				<button type="button" class="btn btn-primary import" >
+				<button type="button" class="importId btn btn-primary import" >
 					<i class="fa fa-plus"></i>
 				<spring:message code="import"></spring:message></button>
 			</c:if>
@@ -195,7 +198,14 @@
 	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
 													<form:option value=""><spring:message code="select"/></form:option>
 													<c:forEach items="${serviceList}" var="service">
-														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+														<c:choose>
+															<c:when test="${service.action eq 16}">
+																<form:option value="${service.action }"><spring:message code="block_drop"/></form:option>
+															</c:when>
+															<c:otherwise>
+																<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+															</c:otherwise>
+														</c:choose>
 													</c:forEach>
 											 </form:select>
 											 <form:select path="isValid" class="selectpicker select2 input-small" >
@@ -444,8 +454,8 @@
 											</c:forEach>
 								    	</c:if>
 								    </td>
-								    <td class="appCode" id="${cfg.appCode }">${cfg.appCode }</td>
-								    <td class="behavCode" id="${cfg.behavCode }">${cfg.behavCode }</td>
+								    <td class="appCode" id="${cfg.appCode }" cfgType="${app }"></td>
+								    <td class="behavCode" id="${cfg.behavCode }" cfgType="${app }"></td>
 								<%--     <td>${cfg.ratelimit }</td> --%>
 									<td>
 										<c:choose>

src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp

@@ -95,6 +95,8 @@ function changeDistrict(obj){
                        	<input type="hidden" name="compileId" value="${_cfg.compileId}">
                        	<input type="hidden" name="functionId" value="${_cfg.functionId}">
                        	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
+                       	<input type="hidden" name="isValid" value="${_cfg.isValid}">
+							<input type="hidden" name="isAudit" value="${_cfg.isAudit}">
                        	<input type="hidden" id="appCode" name="appCode" value="${_cfg.appCode}">
                        	<input type="hidden" id="behavCode" name="behavCode" value="${_cfg.behavCode}">
                        	<!-- 配置域类型 -->
@@ -434,18 +436,36 @@ function changeDistrict(obj){
                           	<%--  <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> --%>
                           </div>
                           <div class="form-actions">
-                              <div class="row">
-                                  <div class="col-md-6">
-                                      <div class="row">
-                                          <div class="col-md-offset-3 col-md-8">
-                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
-                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
-                                          </div>
-                                      </div>
-                                  </div>
-                                  <div class="col-md-6"> </div>
-                              </div>
-                          </div>
+									<div class="row">
+										<div class="col-md-6">
+											<div class="row">
+												<div class="col-md-offset-3 col-md-8">
+													<c:set var="auditPermission" value="false"></c:set>
+													<!-- 拥有配置新增直接生效的功能权限 -->
+													<shiro:hasPermission name="save:audit:permission">
+														<c:set var="auditPermission" value="true"></c:set>
+													</shiro:hasPermission>
+													<c:choose>
+														<c:when test="${!(fns:getUser().isAdmin()) && auditPermission}">
+															<button id="audit" type="submit" class="btn green">
+															<spring:message code="submit" />
+														</button>
+														</c:when>
+														<c:otherwise>
+															<button id="save" type="submit" class="btn green">
+																<spring:message code="submit" />
+															</button>
+														</c:otherwise>
+													</c:choose>
+													<button id="cancel" type="button" class="btn default">
+														<spring:message code="cancel" />
+													</button>
+												</div>
+											</div>
+										</div>
+										<div class="col-md-6"></div>
+									</div>
+								</div>
                       </form>
                       <!-- END FORM-->
                   </div>

src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp

@@ -55,7 +55,7 @@
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:ssl:config">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/app/sslCfgForm?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp

@@ -47,7 +47,7 @@
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:tcp:config">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/app/tcpCfgForm?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp

@@ -53,7 +53,7 @@
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:topic:config">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/app/topicDomainCfgForm?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"></spring:message></button>
@@ -71,7 +71,7 @@
 				</c:if>
 			</c:forEach>
 			<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
-				<button type="button" class="btn btn-primary import" >
+				<button type="button" class="importId btn btn-primary import" >
 					<i class="fa fa-plus"></i>
 				<spring:message code="import"></spring:message></button>
 			</c:if>

src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp

@@ -67,7 +67,7 @@
 		<%-- <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/app/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button> --%>
 		<c:if test="${audit==0}">
 		<shiro:hasPermission name="cfg:add">
-		<button type="button" class="btn btn-primary"
+		<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/cfg/app/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
 		</shiro:hasPermission>
 		</c:if>

src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp

@@ -87,7 +87,7 @@
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="asn:policy:config">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/cfg/asnPolicy/form?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp

@@ -104,7 +104,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		
 			<shiro:hasPermission name="avContIp:config">
-				<button type="button" class="btn btn-primary"
+				<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/ntc/av/contIpForm?functionId=${cfg.functionId}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp

@@ -114,8 +114,8 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<shiro:hasPermission name="avVoip:config">
-		<button type="button" class="btn btn-primary"
+		<shiro:hasPermission name="avContUrl:config">
+		<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/ntc/av/contUrlForm?functionId=${cfg.functionId}'">
 		<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>
@@ -132,7 +132,7 @@
 			</c:if>
 		</c:forEach>
 		<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
-			<button type="button" class="btn btn-primary import" >
+			<button type="button" class="importId btn btn-primary import" >
 				<i class="fa fa-plus"></i>
 			<spring:message code="import"></spring:message></button>
 		</c:if>
@@ -211,7 +211,7 @@
 	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
-							 		<shiro:hasPermission name="avVoip:config">
+							 		<shiro:hasPermission name="avContUrl:config">
 							 			<sys:delRow url="${ctx}/ntc/av/contUrlForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/av/updateAvContUrlValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
 <%--                                         <sys:delRow url="${ctx}/ntc/av/exportStream?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/av/contUrlList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow> --%>

src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp

@@ -280,6 +280,13 @@ function hiddenlevel(level){
 			$("select[name='level']").val("90");
 			$("select[name='level']").selectpicker("refresh");
 		}
+	}else{
+		var action=$("input[name='action']:checked").val();
+		if(action==16){
+			$(".level").addClass("hidden");
+		}else {
+			$(".level").removeClass("hidden");
+		}
 	}
 }
 

src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp

@@ -59,7 +59,7 @@
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 			<shiro:hasPermission name="avFileSample:config">
-				<button type="button" class="btn btn-primary"
+				<button type="button" class="addId btn btn-primary"
 					onClick="javascript:window.location='${ctx}/ntc/av/sample/fileSampleForm?functionId=${cfg.functionId}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp

@@ -104,7 +104,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		
 			<shiro:hasPermission name="avPicIp:config">
-				<button type="button" class="btn btn-primary"
+				<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/ntc/av/picIpForm?functionId=${cfg.functionId}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp

@@ -103,7 +103,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		
 			<shiro:hasPermission name="avPicUrl:config">
-				<button type="button" class="btn btn-primary"
+				<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/ntc/av/picUrlForm?functionId=${cfg.functionId}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp

@@ -59,7 +59,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		
 			<shiro:hasPermission name="avSignSample:config">
-				<button type="button" class="btn btn-primary"
+				<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/ntc/av/sample/audioSignSampleForm?functionId=${cfg.functionId}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp

@@ -113,7 +113,7 @@
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="avVoip:config">
-		<button type="button" class="btn btn-primary"
+		<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/ntc/av/voipForm?functionId=${cfg.functionId}'">
 		<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>
@@ -130,7 +130,7 @@
 			</c:if>
 		</c:forEach>
 		<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
-			<button type="button" class="btn btn-primary import" >
+			<button type="button" class="importId btn btn-primary import" >
 				<i class="fa fa-plus"></i>
 			<spring:message code="import"></spring:message></button>
 		</c:if>

src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp

@@ -66,11 +66,16 @@ $(function(){
 				return;
 			}
 			 */
-			 var flag = true;
+			//代表所有业务都隐藏了，提示必须增加一种业务数据
+			if($("[name=action]:checked").val()==1&&$(".boxSolid").length ==$(".boxSolid.hidden").length) {
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+			}
+			 /*
 			 if($("[name=action]:checked").val()==1&&$(".ipPortAdd").parents(".form-section").next(".boxSolid").is(":hidden")){
 				 top.$.jBox.tip("<spring:message code='ip_must_select'/>", "<spring:message code='info'/>");
 				 return false;
-			 }
+			 }*/
 			 $(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
 					
 					if($(this).val()==''){

src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp

@@ -105,7 +105,7 @@
 	</c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="basicprotocol:config">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/basicprotocol/form?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"></spring:message></button>
@@ -122,7 +122,7 @@
 				</c:if>
 			</c:forEach>
 			<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
-				<button type="button" class="btn btn-primary import" >
+				<button type="button" class="importId btn btn-primary import" >
 					<i class="fa fa-plus"></i>
 				<spring:message code="import"></spring:message></button>
 			</c:if>
@@ -199,7 +199,16 @@
 	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
 													<form:option value=""><spring:message code="select"/></form:option>
 													<c:forEach items="${serviceList}" var="service">
-														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													
+														<c:choose>
+															<c:when test="${service.action eq 16}">
+																<form:option value="${service.action }"><spring:message code="block_drop"/></form:option>
+															</c:when>
+															<c:otherwise>
+																<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+															</c:otherwise>
+														</c:choose>
+														
 													</c:forEach>
 											 </form:select>
 											 <form:select path="isValid" class="selectpicker select2 input-small" >
@@ -446,7 +455,7 @@
 											</c:forEach>
 								    	</c:if>
 								    </td>
-								    <td class="appCode" id="${cfg.appCode }">${cfg.appCode }</td>
+								    <td class="appCode" id="${cfg.appCode }" cfgType="${app }"></td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>

src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp

@@ -58,7 +58,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		<%-- <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button> --%>
 			<shiro:hasPermission name="${requiresPermissionPrefix.concat(':config')}">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}${urlPrefix}/form?functionId=${cfg.functionId}&cfgName=${cfgName}'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp

@@ -53,7 +53,7 @@
 	<!-- 模板导入，end -->
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="${requiresPermissionPrefix.concat(':config')}">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}${urlPrefix}/form?functionId=${cfg.functionId}&cfgName=${cfgName}'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp

@@ -55,7 +55,7 @@
 		<%-- <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button> --%>
 		<c:if test="${audit==0}">
 		<shiro:hasPermission name="cfg:complex:add">
-		<button type="button" class="btn btn-primary"
+		<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp

@@ -65,7 +65,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		
 			<shiro:hasPermission name="ddos:ip:config">
-				<button type="button" class="btn btn-primary"
+				<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/manipulation/ddos/form?functionId=${cfg.functionId}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>
@@ -82,7 +82,7 @@
 					</c:if>
 				</c:forEach>
 				<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
-					<button type="button" class="btn btn-primary import" >
+					<button type="button" class="importId btn btn-primary import" >
 						<i class="fa fa-plus"></i>
 					<spring:message code="import"></spring:message></button>
 				</c:if>

src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp

@@ -64,7 +64,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		
 			<shiro:hasPermission name="dns:fake:ip:config">
-				<button type="button" class="btn btn-primary"
+				<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/cfg/dnsIp/form?functionId=${cfg.functionId}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>
@@ -81,7 +81,7 @@
 					</c:if>
 				</c:forEach>
 				<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
-					<button type="button" class="btn btn-primary import" >
+					<button type="button" class="importId btn btn-primary import" >
 						<i class="fa fa-plus"></i>
 					<spring:message code="import"></spring:message></button>
 				</c:if>

src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp

@@ -50,6 +50,11 @@ $(function(){
 		},
 		submitHandler: function(form){
 			var flag = true;
+			//代表所有业务都隐藏了，提示必须增加一种业务数据
+			if($("[name=action]:checked").val()==1&&$(".boxSolid").length ==$(".boxSolid.hidden").length){
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+			}
 			$(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
 				if($(this).val()==''){
 					$(this).parents(".form-group").find(

src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp

@@ -100,9 +100,12 @@
 <body>
 
 <div class="page-content">
+	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
+	<c:if test="${dict.itemValue eq 'encrypted_tunnel_behavior'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
+	</c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="encryptedtunnelbehav:config">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/encryptedtunnelbehav/form?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>
@@ -119,7 +122,7 @@
 			</c:if>
 		</c:forEach>
 		<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
-			<button type="button" class="btn btn-primary import" >
+			<button type="button" class="importId btn btn-primary import" >
 				<i class="fa fa-plus"></i>
 			<spring:message code="import"></spring:message></button>
 		</c:if>
@@ -196,7 +199,14 @@
 	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
 													<form:option value=""><spring:message code="select"/></form:option>
 													<c:forEach items="${serviceList}" var="service">
-														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+														<c:choose>
+															<c:when test="${service.action eq 16}">
+																<form:option value="${service.action }"><spring:message code="block_drop"/></form:option>
+															</c:when>
+															<c:otherwise>
+																<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+															</c:otherwise>
+														</c:choose>
 													</c:forEach>
 											 </form:select>
 											 <form:select path="isValid" class="selectpicker select2 input-small" >
@@ -444,8 +454,8 @@
 											</c:forEach>
 								    	</c:if>
 								    </td>
-								    <td class="appCode" id="${cfg.appCode }">${cfg.appCode }</td>
-								    <td class="behavCode" id="${cfg.behavCode }">${cfg.behavCode }</td>
+								    <td class="appCode" id="${cfg.appCode }" cfgType="${app }"></td>
+								    <td class="behavCode" id="${cfg.behavCode }" cfgType="${app }"></td>
 								    <td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp

@@ -15,7 +15,8 @@
 			sampleFileValidate();
 			
 		});
-		hiddenlevel($("select[name='cfdsLevel']").val());
+		//hiddenlevel($("select[name='cfdsLevel']").val());
+		hiddenlevel(null);
 		$(".action").on("change", function() {
 			$("#serviceId").val($(this).attr("serviceId"));
 			$("#protocolId").val($(this).attr("protocolId"));

src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp

@@ -130,7 +130,7 @@
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="fileTransfer:fileDigest:config">
-			<button type="button" class="btn btn-primary"
+			<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/ntc/fileTransfer/fileDigestForm?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>