dns无策略增加午欺骗ip的校验

app，协议详情列表跟图表百分比不同问题
日志所有传输层协议的title国际化恢复同检索条件国际化相同

45 files changed, 85 insertions, 44 deletions

diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java
index 3e9942b..ebf869a 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java
@@ -180,6 +180,24 @@ public class DnsIpCfgController extends BaseController {
 		return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+functionId;
 	}
 	
+	/**
+	 * DNS阻断无策略时检验
+	 * @param entity
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = {"/dnsNoStrategyCheck"})
+	public boolean dnsNoStrategyCheck(DnsIpCfg entity, HttpServletRequest request, HttpServletResponse response){
+		entity.setIsAudit(1);
+		entity.setIsValid(1);
+		List<DnsIpCfg> list = dnsIpCfgService.findDnsIpCfg(entity);
+		if(list.size() > 0){
+			return true;
+		}
+		return false;
+	}
 	
 	//dnsIp配置导出
 		@RequestMapping(value = "exportDnsIp")
diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
index 693b327..bd836ba 100644
--- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
@@ -270,7 +270,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 			Long totalPackets=0l;
 			Double totalGByte=0d;
 			DecimalFormat lf = new DecimalFormat("0");
-			DecimalFormat df = new DecimalFormat("0.00");
+			DecimalFormat df = new DecimalFormat("0.0000000000");
 			List<CodeResult> appCodeList = CodeDicUtils.getCodeList("appCode");
 			if(!StringUtil.isEmpty(list)){
 				for (Object object : list) {
@@ -338,7 +338,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 			Long totalPackets=0l;
 			Double totalGByte=0d;
 			DecimalFormat lf = new DecimalFormat("0");
-			DecimalFormat df = new DecimalFormat("0.00");
+			DecimalFormat df = new DecimalFormat("0.0000000000");
 			if(!StringUtil.isEmpty(list)){
 				for (Object object : list) {
 					Map m=(Map) object;
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
index 1301f1d..992f0ad 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -224,13 +224,14 @@
 											<label class="control-label col-md-3"><spring:message
 													code="policy_name" /></label>
 											<div class="col-md-6">
-												<select name="dnsStrategyId" class="selectpicker show-tick form-control">
+												<select name="dnsStrategyId" class="selectpicker show-tick form-control noStrategyCheck" ctx="${ctx }">
 												<option value="0" ><spring:message code="no_strategy"/></option>
 					               					<c:forEach items="${dnsResStrategys }" var="dnsStrategy">
 														<option value="${dnsStrategy.cfgId}" <c:if test="${_cfg.dnsStrategyId==dnsStrategy.cfgId }">selected</c:if>><spring:message code="${dnsStrategy.cfgDesc}"/></option>
 							              			</c:forEach>
 								                </select>
 											</div>
+											<div for="dnsStrategyId"></div>
 										</div>
 									</div>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
index 42d0f75..a7ecb9e 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
@@ -263,7 +263,7 @@ function protocolTypeChart(rs){
 		$(rs).each(function(i, d) {

 			data.push({

 				name: d.appName,

-				y: parseInt(d.GByte),

+				y: parseFloat(d.GByte),

 			});

 	   });

 		// 创建图例

diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
index 3fad104..7e9d719 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
@@ -252,7 +252,7 @@ function protocolTypeChart(rs){
 		$(rs).each(function(i, d) {

 			data.push({

 				name: d.protocolType,

-				y: parseInt(d.GByte),

+				y: parseFloat(d.GByte),

 			});

 	   });

 		// 创建图例

diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index b5d44ba..01193de 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -239,7 +239,7 @@ $(document).ready(function(){
 								<th class="sort-column label_app_id"><spring:message code='social_app'/></th>

 								<%-- <th class="sort-column label_app_source" isVisible="false"><spring:message code='label_app_source'/></th> --%> 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
index f68257f..0749ce6 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -185,7 +185,7 @@ $(document).ready(function(){
 								<th class="sort-column label_app_source"><spring:message code='label_app_source'/></th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

 								

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
index aabbf31..539bab8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
@@ -218,7 +218,7 @@
 								

 								<th class="sort-column entrance_id" isVisible="false"><spring:message code="entrance_id"/></th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
index eeda675..455e042 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -132,7 +132,7 @@ $(document).ready(function(){
 								<div class="row">

 									<div class="col-md-2 hidden">

 										<div class="form-group">

-										<label><spring:message code="protocol_type"/>：</label>

+										<label><spring:message code="transport_layer_protocol"/>：</label>

 										<c:set var="select"><spring:message code='select'/></c:set>

                                             <form:select path="transProto" class="selectpicker form-control" >

 												<form:option value=""><spring:message code="select"/></form:option>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
index e40dd08..ea7b209 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
@@ -237,7 +237,7 @@
 								<th  class="sort-column dns_sub"><spring:message code="dns_sub"/></th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

 								

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
index 908f42d..cb9e673 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -222,7 +222,7 @@ $(document).ready(function(){
 								<th  class="sort-column ftp_content"><spring:message code='ftp_content'/></th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

 								

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
index 2b37d96..d553b3a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
@@ -257,7 +257,7 @@
 								<th class="sort-column website"><spring:message code="website"/></th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

 								

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
index 86a655b..6a4be14 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -240,7 +240,7 @@
 								<th class="sort-column website"><spring:message code="website"/></th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

 								

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
index 7aea0ca..154596b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -220,7 +220,7 @@
 								<th class="sort-column recv_time" isVisible="false"><spring:message code="recv_time"/></th>

 								<th class="sort-column entrance_id" isVisible="false"><spring:message code="entrance_id"/></th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
index 105cdd6..f25efe6 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -168,7 +168,7 @@ $(document).ready(function(){
 								<th class="sort-column isakmp_mode"><spring:message code='isakmp_mode'/></th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

 								

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp
index fb1f231..e216bb4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp
@@ -196,7 +196,7 @@
 

 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp
index f7cd91e..1efed0e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp
@@ -196,7 +196,7 @@
 

 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
index 7a5adff..807bf7e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -180,7 +180,7 @@
 								<th class="sort-column encrypt_mode"><spring:message code="encrypt_mode" /></th>

 								<th class="sort-column chap_name"><spring:message code="user_name"/></th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
index 0e9f16a..eda7c98 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -248,7 +248,7 @@
 								<th class="sort-column eml_file"><spring:message code="eml_file"/></th>

 								<th class="sort-column eml_key" isVisible="false"><spring:message code="eml_key"/></th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
index 1287a4f..aaf653a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -185,7 +185,7 @@ $(document).ready(function(){
  								<th class="sort-column protocol" ><spring:message code='av_protocol'/></th> 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

 								

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
index 410552e..3a4024a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -183,7 +183,7 @@ $(document).ready(function(){
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>

  								<th class="sort-column protocol" ><spring:message code='av_protocol'/></th> 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
index 10ba938..7b75b9d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
@@ -225,7 +225,7 @@ $(document).ready(function(){
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>

  								<th class="sort-column protocol" ><spring:message code='av_protocol'/></th> 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index dbc9987..fab95bb 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -182,7 +182,7 @@ $(document).ready(function(){
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>

  								<th class="sort-column protocol" ><spring:message code='av_protocol'/></th> 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index 5f3aa3c..9ba1c97 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -180,7 +180,7 @@ $(document).ready(function(){
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>

  								<th class="sort-column protocol" ><spring:message code='av_protocol'/></th> 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
index 1e8e820..e05ee61 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
@@ -183,7 +183,7 @@ $(document).ready(function(){
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>

  								<th class="sort-column protocol" ><spring:message code='av_protocol'/></th> 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
index 1f5cef1..1a8f1ec 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -224,7 +224,7 @@ $(document).ready(function(){
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>

  								<th class="sort-column protocol" ><spring:message code='av_protocol'/></th> 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index 69bb5a7..f776783 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -284,7 +284,7 @@
  								<th class="sort-column protocol" ><spring:message code='av_protocol'/></th> 

 								

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
index bbadb12..7efe1f9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
@@ -224,7 +224,7 @@ $(document).ready(function(){
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>

  								<th class="sort-column protocol" ><spring:message code='av_protocol'/></th> 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
index fb6b465..a97149c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
@@ -224,7 +224,7 @@ $(document).ready(function(){
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>

  								<th class="sort-column protocol" ><spring:message code='av_protocol'/></th> 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index 5e64dfd..0372e9e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -224,7 +224,7 @@ $(document).ready(function(){
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>

  								<th class="sort-column protocol" ><spring:message code='av_protocol'/></th> 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
index 7aa1e92..b1ca842 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
@@ -224,7 +224,7 @@ $(document).ready(function(){
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>

  								<th class="sort-column protocol" ><spring:message code='av_protocol'/></th> 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index 19529f0..01b4c6b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -225,7 +225,7 @@ $(document).ready(function(){
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>

  								<th class="sort-column protocol" ><spring:message code='av_protocol'/></th> 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
index 9c4a4d8..b8354fe 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -190,7 +190,7 @@ $(document).ready(function(){
  								<th class="sort-column level"  isVisible="false"><spring:message code='harm_level'/></th>

 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>

  								 <th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
index 07bdc81..5df2df9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -233,7 +233,7 @@ $(document).ready(function(){
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>
  								 
  								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
index b472d8a..e8f93d4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
@@ -218,7 +218,7 @@ $(document).ready(function(){
 								<th class="sort-column url"><spring:message code='access_url'/></th>

 								<th><spring:message code='stream_media_protocol'/></th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
index 90ea29a..97d394e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -182,7 +182,7 @@ $(document).ready(function(){
 								<th class="sort-column hmac"><spring:message code='hmac'/></th>

 								<th class="sort-column tunnel_type"><spring:message code='tunnel_type'/></th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
index c38f324..228e654 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
@@ -222,7 +222,7 @@
 								<th class="sort-column p2p_file_id"><spring:message code="p2p_file_id"/></th>

 								<th class="sort-column p2p_keyword"><spring:message code="p2p_keyword"/></th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
index 71f9857..4a8d96b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -177,7 +177,7 @@
 								<th class="sort-column tunnel_type"><spring:message code="tunnel_type" /></th>

 								<th class="sort-column encrypt_mode"><spring:message code="encrypt_mode" /></th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
index 7494372..034028d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -184,7 +184,7 @@ $(document).ready(function(){
 								<th class="sort-column mac"><spring:message code='mac'/></th>

 								<th class="sort-column tunnel_type"><spring:message code='tunnel_type'/></th> 

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
index cd26a44..be098f2 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -236,7 +236,7 @@
 								<th class="sort-column san">SAN</th>

 								<th class="sort-column cn">CN</th>

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
index 8326c0d..50ab52e 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -222,7 +222,7 @@
 								<th class="sort-column website"><spring:message code="website"/></th>

 								

 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>

-								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>

+								<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>

 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>

 								<th class="sort-column d_ip"><spring:message code="server_ip"/></th>

 								<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
index 5a835fc..af2f41f 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
@@ -1011,4 +1011,23 @@ jQuery.validator.addMethod("ipMaskSole",function(value,element) {
 	}
 	
 	return flag;
+});
+
+// DNS阻断无策略校验
+jQuery.validator.addMethod("noStrategyCheck",function(value,element) {
+	var flag = true;
+	if(value == 0){
+		var ctx = $(element).attr("ctx");
+		var url = ctx+"/cfg/dnsIp/dnsNoStrategyCheck";
+		$.ajax({
+			type:'post',
+			async:false,
+			url: url,
+			data:{"dnsStrategyId":0},
+			success:function(data){
+				flag = data;
+			}
+		});
+	}
+	return flag;
 });
\ No newline at end of file
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
index ec1e2aa..4133474 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
@@ -80,6 +80,7 @@
 		asnNoUnique:"ASN already exists.",
 		areaUnique:"Area already exists.",
 		config_sync_tip:"The system is being maintained and temporarily inaccessible.",
-		ipMaskSole:"IP already exists."
+		ipMaskSole:"IP already exists.",
+		noStrategyCheck:"No effective spoofing IP configuration under default group."
 	});
 }(jQuery));
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
index d1b327e..970d3b6 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
@@ -80,6 +80,7 @@
 		asnNoUnique:"ASN уже существует.",
 		areaUnique:"Регион уже существует.",
 		config_sync_tip:"Система находится под техническим обслуживанием и временно недоступна.",
-		ipMaskSole:"IP уже существует."
+		ipMaskSole:"IP уже существует.",
+		noStrategyCheck:"No effective spoofing IP configuration under default group."
 	});
 }(jQuery));
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
index ab62f52..5297909 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
@@ -80,6 +80,7 @@
 		asnNoUnique:"ASN号已存在",
 		areaUnique:"该区域已存在",
 		config_sync_tip:"系统正在维护中，暂时不可访问！",
-		ipMaskSole:"IP已存在"
+		ipMaskSole:"IP已存在",
+		noStrategyCheck:"缺省组下无有效的欺骗IP配置"
 	});
 }(jQuery));