From 8d48d9a354bb583e65c0e4b9196e306d9cda599b Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Wed, 10 Oct 2018 16:17:19 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=EF=BC=881=EF=BC=89=E9=9F=B3=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91url=E6=97=A5=E5=BF=97=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=EF=BC=882=EF=BC=89=E6=89=80=E6=9C=89=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E4=BC=A0=E8=BE=93=E5=B1=82=E5=8D=8F=E8=AE=AE=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E4=BF=AE=E6=94=B9=20=EF=BC=883=EF=BC=89?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/log/NtcStreamMediaLog.java |  27 ++
 .../log/ntc/MmAvUrlLogController.java         |  16 +-
 .../resources/messages/message_en.properties  |   5 +-
 .../resources/messages/message_ru.properties  |   5 +-
 .../messages/message_zh_CN.properties         |   5 +-
 .../views/log/manipulation/dkBehaviorList.jsp |   4 +-
 .../webapp/WEB-INF/views/log/ntc/appList.jsp  |   4 +-
 .../webapp/WEB-INF/views/log/ntc/bgpList.jsp  |   4 +-
 .../webapp/WEB-INF/views/log/ntc/ddosList.jsp |   4 +-
 .../webapp/WEB-INF/views/log/ntc/dnsList.jsp  |   4 +-
 .../webapp/WEB-INF/views/log/ntc/ftpList.jsp  |   4 +-
 .../webapp/WEB-INF/views/log/ntc/httpList.jsp |   4 +-
 .../webapp/WEB-INF/views/log/ntc/ipList.jsp   |  12 +-
 .../WEB-INF/views/log/ntc/ipsecList.jsp       |   4 +-
 .../WEB-INF/views/log/ntc/l2tpLogList.jsp     |   4 +-
 .../webapp/WEB-INF/views/log/ntc/mailList.jsp |   4 +-
 .../WEB-INF/views/log/ntc/mmAvIpList.jsp      |   2 +-
 .../WEB-INF/views/log/ntc/mmAvUrlList.jsp     |   4 +-
 .../views/log/ntc/mmFileDigestList.jsp        |   4 +-
 .../WEB-INF/views/log/ntc/mmPicIpList.jsp     |   4 +-
 .../WEB-INF/views/log/ntc/mmPicUrlList.jsp    |   4 +-
 .../views/log/ntc/mmPornAudioSampleList.jsp   |   4 +-
 .../views/log/ntc/mmPornVideoSampleList.jsp   |   4 +-
 .../views/log/ntc/mmSampleAudioList.jsp       |   4 +-
 .../views/log/ntc/mmSampleFaceList.jsp        |   4 +-
 .../views/log/ntc/mmSampleLogoList.jsp        |   4 +-
 .../WEB-INF/views/log/ntc/mmSamplePicList.jsp |   4 +-
 .../views/log/ntc/mmSampleSpeakerList.jsp     |   4 +-
 .../views/log/ntc/mmSampleVideoList.jsp       |   4 +-
 .../views/log/ntc/mmSampleVoipList.jsp        |   4 +-
 .../views/log/ntc/mmVoipAccountList.jsp       |   4 +-
 .../WEB-INF/views/log/ntc/mmVoipIpList.jsp    |   4 +-
 .../WEB-INF/views/log/ntc/ntcStreamMedia.jsp  | 270 ++++++++++++++++++
 .../WEB-INF/views/log/ntc/openVpnList.jsp     |   4 +-
 .../webapp/WEB-INF/views/log/ntc/p2pList.jsp  |   4 +-
 .../WEB-INF/views/log/ntc/pptpLogList.jsp     |   4 +-
 .../webapp/WEB-INF/views/log/ntc/sshList.jsp  |   4 +-
 .../WEB-INF/views/log/ntc/sslLogList.jsp      |   4 +-
 .../WEB-INF/views/log/pxy/pxyHttpList.jsp     |   4 +-
 39 files changed, 386 insertions(+), 80 deletions(-)
 create mode 100644 src/main/java/com/nis/domain/log/NtcStreamMediaLog.java
 create mode 100644 src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp

diff --git a/src/main/java/com/nis/domain/log/NtcStreamMediaLog.java b/src/main/java/com/nis/domain/log/NtcStreamMediaLog.java
new file mode 100644
index 000000000..ad74410e7
--- /dev/null
+++ b/src/main/java/com/nis/domain/log/NtcStreamMediaLog.java
@@ -0,0 +1,27 @@
+package com.nis.domain.log;
+
+/**
+ * @ClassName:NtcStreamMediaLog
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author (wx)
+ * @date 2018年7月16日 下午3:11:42
+ * @version V1.0
+ */
+public class NtcStreamMediaLog  extends BaseLogEntity<NtcStreamMediaLog> {
+
+	private static final long serialVersionUID = 1446933545638550170L;
+	protected String url;
+	protected String protocol;
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+}
diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java
index 80f30463d..b0b8fa217 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java
@@ -20,7 +20,7 @@ import com.google.gson.reflect.TypeToken;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
-import com.nis.domain.log.MmAvUrlLog;
+import com.nis.domain.log.NtcStreamMediaLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
@@ -42,11 +42,11 @@ public class MmAvUrlLogController extends BaseController{
 	 * @throws IOException
 	 */
 	@RequestMapping(value={"list",""})
-	public String list(Model model,@ModelAttribute("log")MmAvUrlLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
+	public String list(Model model,@ModelAttribute("log")NtcStreamMediaLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
 		
 		try {
 			
-			PageLog<MmAvUrlLog> page = new PageLog<MmAvUrlLog>(request, response);
+			PageLog<NtcStreamMediaLog> page = new PageLog<NtcStreamMediaLog>(request, response);
 			Map<String, Object> params=new HashMap<>();
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
@@ -62,13 +62,13 @@ public class MmAvUrlLogController extends BaseController{
 			
 			Gson gson = new GsonBuilder().create();
 			//gson泛型支持
-			LogRecvData<MmAvUrlLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<MmAvUrlLog>>(){}.getType());
+			LogRecvData<NtcStreamMediaLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<NtcStreamMediaLog>>(){}.getType());
 			
 			if (fromJson.getStatus().intValue() == 200) {
-				Page<MmAvUrlLog> data = fromJson.getData();
+				Page<NtcStreamMediaLog> data = fromJson.getData();
 				page.setList(data.getList());
-				List<MmAvUrlLog> list = page.getList();
-				for (MmAvUrlLog l : list) {
+				List<NtcStreamMediaLog> list = page.getList();
+				for (NtcStreamMediaLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
 					setLogAction(l,serviceList);
 				}
@@ -79,7 +79,7 @@ public class MmAvUrlLogController extends BaseController{
 			logger.error("查询音视频url日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
-		return "/log/ntc/mmAvUrlList";
+		return "/log/ntc/ntcStreamMedia";
 	}
 	
 }
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 932c8a8bb..bc702fc82 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1200,4 +1200,7 @@ dnat_policy=DNAT Reuse Policy
 report_total=Total
 message_type=Message Type
 as=AS
-route=Route
\ No newline at end of file
+route=Route
+transport_layer_protocol=TLS Protocol
+av_voip_monit=VoIP Monit
+av_voip_reject=VoIP Reject
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index eeba48c6b..6b4603bc9 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1202,4 +1202,7 @@ dnat_policy=DNAT Reuse Policy
 report_total=Total
 message_type=\u6D88\u606F\u7C7B\u578B
 as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7
-route=\u8DEF\u7531\u4FE1\u606F
\ No newline at end of file
+route=\u8DEF\u7531\u4FE1\u606F
+transport_layer_protocol=TLS Protocol
+av_voip_monit=VoIP\u76D1\u6D4B
+av_voip_reject=VoIP\u7BA1\u63A7
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index bed04829f..461a88a3d 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1194,4 +1194,7 @@ dnat_policy=DNAT\u590D\u7528\u7B56\u7565
 report_total=\u5408\u8BA1
 message_type=\u6D88\u606F\u7C7B\u578B
 as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7
-route=\u8DEF\u7531\u4FE1\u606F
\ No newline at end of file
+route=\u8DEF\u7531\u4FE1\u606F
+transport_layer_protocol=\u4F20\u8F93\u5C42\u534F\u8BAE
+av_voip_monit=VoIP\u76D1\u6D4B
+av_voip_reject=VoIP\u7BA1\u63A7
\ No newline at end of file
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 443517053..cd8d985d2 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -111,7 +111,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -194,7 +194,7 @@ $(document).ready(function(){
 									<th><spring:message code='s2c_byte_num'/></th>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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 c33373d1f..9798b5603 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -174,7 +174,7 @@ $(document).ready(function(){
 									<th><spring:message code='found_time'/></th>
 									<th><spring:message code='entrance'/></th>
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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 9836888c7..87018298a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
@@ -97,7 +97,7 @@
 							<div class="row">
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='protocol_type'/>：</label>
+                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
                                        	<form:select path="transProto" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
 											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
@@ -172,7 +172,7 @@
 								<th><spring:message code="found_time"/></th>
 								<th><spring:message code="entrance"/></th>
 								<th><spring:message code="clj_ip"/></th>
-								<th><spring:message code="protocol"/></th>
+								<th><spring:message code="transport_layer_protocol"/></th>
 								<th><spring:message code='addr_type'/></th>
 								<th><spring:message code="server_ip"/></th>
 								<th><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 125594b0f..a4185893f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -89,7 +89,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>
@@ -172,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='is_blcok'/></th>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></th>
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 4c5bf3c21..ae9fac004 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
@@ -99,7 +99,7 @@
 							<div class="row">
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='protocol_type'/>：</label>
+                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
                                        	<form:select path="transProto" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
 											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
@@ -194,7 +194,7 @@
 								<th><spring:message code="dns_sub"/></th> --%>
 								
 								<th><spring:message code="clj_ip"/></th>
-								<th><spring:message code="protocol"/></th>
+								<th><spring:message code="transport_layer_protocol"/></th>
 								<th><spring:message code='addr_type'/></th>
 								<th><spring:message code="server_ip"/></th>
 								<th><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 7be16da58..727eb6055 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -179,7 +179,7 @@ $(document).ready(function(){
 									<th><spring:message code='ftp_content'/></th>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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 fa92b9475..907c52bb0 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -97,7 +97,7 @@
 							<div class="row">
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='protocol_type'/>：</label>
+                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
                                        	<form:select path="transProto" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
 											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
@@ -192,7 +192,7 @@
 								<th><spring:message code="website"/></th>
 								
 								<th><spring:message code="clj_ip"/></th>
-								<th><spring:message code="protocol"/></th>
+								<th><spring:message code="transport_layer_protocol"/></th>
 								<th><spring:message code='addr_type'/></th>
 								<th><spring:message code="server_ip"/></th>
 								<th><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 549f4c49d..8bd3bb8af 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -52,11 +52,11 @@
 									<form:option value=""><spring:message code="action"/></form:option>
 									<c:forEach items="${serviceList}" var="service"
 											varStatus="satus">
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)  && (service.action ne 96)}">  
-												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+										<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> --%>
+											<c:if test="${(service.action ne 128) && (service.action ne 32)  && (service.action ne 96)}">  
+												<form:option value="${service.action}"><spring:message code="${service.serviceName}"/></form:option>
 											</c:if>
-										</c:forEach>
+										<%-- </c:forEach> --%>
 									</c:forEach>
 								</form:select>
 							</div>
@@ -97,7 +97,7 @@
 							<div class="row">
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='protocol_type'/>：</label>
+                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
                                        	<form:select path="transProto" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
 											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
@@ -173,7 +173,7 @@
 								<th><spring:message code="found_time"/></th>
 								<th><spring:message code="entrance"/></th>
 								<th><spring:message code="clj_ip"/></th>
-								<th><spring:message code="protocol"/></th>
+								<th><spring:message code="transport_layer_protocol"/></th>
 								<th><spring:message code='addr_type'/></th>
 								<th><spring:message code="server_ip"/></th>
 								<th><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 559b2e3ce..9a5f50add 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -88,7 +88,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -165,7 +165,7 @@ $(document).ready(function(){
 									<th><spring:message code='isakmp_mode'/></th>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol_type'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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 772bd8a33..8ab08335c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -101,7 +101,7 @@
 									<div class="row">
 										<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="protocol_type"/>：</label>
+											<label><spring:message code="transport_layer_protocol"/>：</label>
 											<form:select path="transProto" class="selectpicker form-control select2">
 												<form:option value=""><spring:message code="select"/></form:option>
 												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
@@ -177,7 +177,7 @@
 										<th><spring:message code="user_name"/></th>
 										
 										<th><spring:message code="clj_ip" /></th>
-										<th><spring:message code="protocol_type" /></th>
+										<th><spring:message code="transport_layer_protocol" /></th>
 										<th><spring:message code="addr_type" /></th>
 										<th><spring:message code="serverip" /></th>
 										<th><spring:message code="clientip" /></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 9bc377770..a291b304a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -97,7 +97,7 @@
 							<div class="row">
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='protocol_type'/>：</label>
+                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
                                        	<form:select path="transProto" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
 											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
@@ -180,7 +180,7 @@
 								<th><spring:message code="eml_key"/></th>
 								
 								<th><spring:message code="clj_ip"/></th>
-								<th><spring:message code="protocol"/></th>
+								<th><spring:message code="transport_layer_protocol"/></th>
 								<th><spring:message code="addr_type" /></th>
 								<th><spring:message code="server_ip"/></th>
 								<th><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 0a7794b00..c09022d29 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -101,7 +101,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
index 2d3b66508..e1d88d075 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -181,7 +181,7 @@ $(document).ready(function(){
 <%-- 									<th><spring:message code='av_protocol'/></th> --%>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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 b8f5cf02e..09c750f3c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
@@ -101,7 +101,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -182,7 +182,7 @@ $(document).ready(function(){
 <%-- 									<th><spring:message code='av_protocol'/></th> --%>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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 39bc22fa6..b85e81972 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -181,7 +181,7 @@ $(document).ready(function(){
 								<%--<th><spring:message code='av_protocol'/></th> --%>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol_type'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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 18b818d15..a49aa275b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -99,7 +99,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -178,7 +178,7 @@ $(document).ready(function(){
 									<%-- <th><spring:message code='av_protocol'/></th> --%>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol_type'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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 c4dbc4474..325f5ed2e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -181,7 +181,7 @@ $(document).ready(function(){
 									<%-- <th><spring:message code='av_protocol'/></th> --%>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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 f8ff20077..09202a595 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -181,7 +181,7 @@ $(document).ready(function(){
 									<%-- <th><spring:message code='av_protocol'/></th> --%>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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 8afb4f0cb..5023a9698 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -135,7 +135,7 @@
 									<div class="row">
 										<div class="col-md-2">
 											<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>
@@ -239,7 +239,7 @@
 										<%-- <th><spring:message code='av_protocol' /></th> --%>
 										
 										<th><spring:message code='clj_ip' /></th>
-										<th><spring:message code='protocol_type' /></th>
+										<th><spring:message code='transport_layer_protocol' /></th>
 										<th><spring:message code='addr_type' /></th>
 										<th><spring:message code='serverip' /></th>
 										<th><spring:message code='clientip' /></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 9b47a58bc..4f9168b46 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -181,7 +181,7 @@ $(document).ready(function(){
 									<%-- <th><spring:message code='av_protocol' /></th> --%>
 									
 									<th><spring:message code='clj_ip' /></th>
-									<th><spring:message code='protocol_type' /></th>
+									<th><spring:message code='transport_layer_protocol' /></th>
 									<th><spring:message code='addr_type' /></th>
 									<th><spring:message code='serverip' /></th>
 									<th><spring:message code='clientip' /></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 f4d27eb04..cb96570d6 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -181,7 +181,7 @@ $(document).ready(function(){
 									<%-- <th><spring:message code='av_protocol' /></th> --%>
 									
 									<th><spring:message code='clj_ip' /></th>
-									<th><spring:message code='protocol_type' /></th>
+									<th><spring:message code='transport_layer_protocol' /></th>
 									<th><spring:message code='addr_type' /></th>
 									<th><spring:message code='serverip' /></th>
 									<th><spring:message code='clientip' /></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 c29c8d891..20269d3f4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -101,7 +101,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -180,7 +180,7 @@ $(document).ready(function(){
 									<%-- <th><spring:message code='av_protocol' /></th> --%>
 									
 									<th><spring:message code='clj_ip' /></th>
-									<th><spring:message code='protocol_type' /></th>
+									<th><spring:message code='transport_layer_protocol' /></th>
 									<th><spring:message code='addr_type' /></th>
 									<th><spring:message code='serverip' /></th>
 									<th><spring:message code='clientip' /></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 994b90ff8..96bfa264d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -181,7 +181,7 @@ $(document).ready(function(){
 									<%-- <th><spring:message code='av_protocol' /></th> --%>
 									
 									<th><spring:message code='clj_ip' /></th>
-									<th><spring:message code='protocol_type' /></th>
+									<th><spring:message code='transport_layer_protocol' /></th>
 									<th><spring:message code='addr_type' /></th>
 									<th><spring:message code='serverip' /></th>
 									<th><spring:message code='clientip' /></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 5f9bcb172..b0a5c3f23 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -181,7 +181,7 @@ $(document).ready(function(){
 									<%-- <th><spring:message code='av_protocol' /></th> --%>
 									
 									<th><spring:message code='clj_ip' /></th>
-									<th><spring:message code='protocol_type' /></th>
+									<th><spring:message code='transport_layer_protocol' /></th>
 									<th><spring:message code='addr_type' /></th>
 									<th><spring:message code='serverip' /></th>
 									<th><spring:message code='clientip' /></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
index e642a9239..6a993fa79 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -188,7 +188,7 @@ $(document).ready(function(){
 									<th><spring:message code='fd_type'/></th>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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 87c609dc3..db13a1b6a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -188,7 +188,7 @@ $(document).ready(function(){
 									<th><spring:message code='fd_type'/></th>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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 e3dbd2628..7385c6f6b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -188,7 +188,7 @@ $(document).ready(function(){
 									<th><spring:message code='fd_type'/></th>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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
new file mode 100644
index 000000000..99d040521
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
@@ -0,0 +1,270 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+
+<script type="text/javascript">
+$(document).ready(function(){
+	//筛选功能
+	filterActionInit();
+	//reset
+	$("#resetBtn").on("click",function(){
+		$("select.selectpicker").each(function(){
+			$(this).selectpicker('val',$(this).find('option:first').val());
+			$(this).find("option").attr("selected",false);
+			$(this).find("option:first").attr("selected",true);
+		});
+		$(".Wdate").attr("value",'');
+		$(':input','#searchForm')
+		.not(':button,:submit,:reset,:hidden')
+		.attr("value",'');
+		$("#searchForm")[0].reset();
+	});
+	
+});
+
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+	</div>
+	<h3 class="page-title">
+		<spring:message code="streaming_media"/>
+	</h3>
+	
+	<h5 class="page-header"></h5>
+		<div class="col-md-12">
+			<div class="portlet">
+				<div class="portlet-body">
+					<div class="row"  >
+						<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/mmAvUrlLogs" method="post" class="form-search">
+							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
+							
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
+							
+							<!-- 搜索内容与操作按钮栏 -->
+							<div class="col-md-12">
+								<div class="pull-left">
+									<form:select path="action" class="selectpicker select2 input-small">
+									<form:option value=""><spring:message code="action"/></form:option>
+									<c:forEach items="${serviceList}" var="service"
+											varStatus="satus">
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96)  }">  
+												<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+								</form:select>
+							</div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
+	                             	</div>
+	                                 	<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+											value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+                        		</div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
+	                             	</div>
+	                                 	<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
+											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+                        		</div>
+	                               
+	                               <div class="pull-left">
+	                               		 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+										 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
+									</div>
+
+									<div class="pull-right">
+                                        <a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
+                                    </div>
+							</div>
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+										<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>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
+										</div>
+									</div>
+									
+									<%-- <div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="direct"/>：</label>
+											<form:select path="direction" class="selectpicker select2 form-control">
+	                                        <form:option value=""><spring:message code="select"/></form:option>
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
+											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+								             </c:forEach>
+	                                    	</form:select>
+									</div>
+									</div> --%>
+									<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="entrance"/>：</label>
+										<form:select path="entranceId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('ENTRANCE')}" var="entrance" >
+												<form:option value="${entrance.itemCode}"><spring:message code="${entrance.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+									</div>
+									<div class="col-md-2">
+											<div class="form-group">
+	                                            <label><spring:message code="clj_ip"/>：</label>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
+	                                        </div>
+										</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clientip"/>：</label>
+											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="serverip"/>：</label>
+											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<label><spring:message code="cfg_id"></spring:message>：</label>
+										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									</div>
+								</div>
+							</div>
+							<!-- /筛选搜索内容栏    结束-->
+						</form:form>
+					</div> 
+					<sys:message content="${message}"/>
+					<div class="table-responsive">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
+							<thead>
+								<tr>
+									<th><spring:message code='cfg_id'/></th>
+									<th><spring:message code="action"/></th>
+									<th><spring:message code='found_time'/></th>
+									<th><spring:message code='entrance'/></th>
+									<th><spring:message code='access_url'/></th>
+									<th><spring:message code='protocol'/></th>
+									
+									<th><spring:message code='clj_ip'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
+									<th><spring:message code='addr_type'/></th>
+									<th><spring:message code='serverip'/></th>
+									<th><spring:message code='clientip'/></th>
+									<th><spring:message code='serverport'/></th>
+									<th><spring:message code='clientport'/></th>
+<%-- 									<th><spring:message code='deviceid'/></th> --%>
+<%-- 									<th><spring:message code='direct'/></th> --%>
+									<th><spring:message code='stream_type'/></th>
+<%-- 									<th><spring:message code='nest_addr_list'/></th> --%>
+									<th><spring:message code='server_locate'/></th>
+									<th><spring:message code='client_locate'/></th>
+									<th><spring:message code='s_asn'/></th>
+									<th><spring:message code='d_asn'/></th>
+									<th><spring:message code='s_subscribe_id'/></th>
+									<th><spring:message code='d_subscribe_id'/></th>
+									<th><spring:message code='scene_file'/></th>
+								</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
+								<tr>
+									<td>${log.cfgId } <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a></td> 
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+											<c:if test="${dict.itemCode eq log.action}">
+												<spring:message code="${dict.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td>${log.foundTime}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.entranceId}">
+												<spring:message code="${dict.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									
+									<td>
+										<c:if test="${fn:startsWith(log.url, 'http://')}">
+											 ${fn:substring(log.url,7,-1)}  
+										</c:if>
+										<c:if test="${!fn:startsWith(log.url, 'http://') and !empty log.url}">
+											${log.url}
+										</c:if>
+									</td>
+									<td>${log.protocol}</td>
+									
+									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
+									<td>${log.transProto}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="dic">
+											<c:if test="${log.addrType==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
+									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
+									<td>${log.dPort}</td>
+									<td>${log.sPort}</td>
+									<%-- <td>${log.deviceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
+											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td> --%>
+									<td>
+										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
+											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
+				               			</c:forEach>
+									</td>
+									<%-- <td>
+										${log.addrList}
+									</td> --%>
+									<td>${log.serverLocate}</td>
+									<td>${log.clientLocate}</td>
+									<td>${log.sAsn}</td>
+									<td>${log.dAsn}</td>
+									<td>${log.sSubscribeId}</td>
+									<td>${log.dSubscribeId}</td>
+									<td>${log.sceneFile}</td>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>
+					</div>
+			</div>
+		</div>
+	</div>
+	</div>
+</body>
+</html>
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 234860093..f311cec38 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -180,7 +180,7 @@ $(document).ready(function(){
 									<th><spring:message code='tunnel_type'/></th>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol_type'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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 ec55096c9..f65bfcc11 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
@@ -114,7 +114,7 @@
 							<div class="row">
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='protocol_type'/>：</label>
+                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
                                        	<form:select path="transProto" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
 											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
@@ -194,7 +194,7 @@
 								<th><spring:message code="p2p_keyword"/></th>
 								
 								<th><spring:message code="clj_ip"/></th>
-								<th><spring:message code="protocol"/></th>
+								<th><spring:message code="transport_layer_protocol"/></th>
 								<th><spring:message code='addr_type'/></th>
 								<th><spring:message code="server_ip"/></th>
 								<th><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 06a7d78b2..1dfd92932 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -101,7 +101,7 @@
 									<div class="row">
 										<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="protocol_type"/>：</label>
+											<label><spring:message code="transport_layer_protocol"/>：</label>
 											<form:select path="transProto" class="selectpicker form-control select2">
 												<form:option value=""><spring:message code="select"/></form:option>
 												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
@@ -175,7 +175,7 @@
 										<th><spring:message code="encrypt_mode" /></th>
 										
 										<th><spring:message code="clj_ip" /></th>
-										<th><spring:message code="protocol_type" /></th>
+										<th><spring:message code="transport_layer_protocol" /></th>
 										<th><spring:message code="addr_type" /></th>
 										<th><spring:message code="serverip" /></th>
 										<th><spring:message code="clientip" /></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 b4a8a19f0..61c3e2eda 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -102,7 +102,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -182,7 +182,7 @@ $(document).ready(function(){
 									<th><spring:message code='tunnel_type'/></th> --%>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol_type'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></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 f09c22051..77da39c21 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -110,7 +110,7 @@
 									<div class="row">
 										<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="protocol_type"/>：</label>
+											<label><spring:message code="transport_layer_protocol"/>：</label>
 											<form:select path="transProto" class="selectpicker form-control select2">
 											<form:option value=""><spring:message code="select"/></form:option>
 												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
@@ -186,7 +186,7 @@
 										<th>CN</th>
 										
 										<th><spring:message code="clj_ip" /></th>
-										<th><spring:message code="protocol_type" /></th>
+										<th><spring:message code="transport_layer_protocol" /></th>
 										<th><spring:message code="addr_type" /></th>
 										<th><spring:message code="serverip" /></th>
 										<th><spring:message code="clientip" /></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 b8cc0c68a..9a9bbdf57 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -84,7 +84,7 @@
 							<div class="row">
 								<div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='protocol_type'/>：</label>
+                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
                                        	<form:select path="transProto" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
 											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
@@ -159,7 +159,7 @@
 								<th><spring:message code="entrance"/></th>
 								<th> URL  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
 								<th><spring:message code="clj_ip"/></th>
-								<th><spring:message code="protocol"/></th>
+								<th><spring:message code="transport_layer_protocol"/></th>
 								<th><spring:message code="server_ip"/></th>
 								<th><spring:message code="client_ip"/></th>
 								<th><spring:message code="server_port"/></th>

From 653b56f5c6670a7f0835e42103a879b28ad5f325 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Wed, 10 Oct 2018 16:55:34 +0800
Subject: [PATCH 2/9] =?UTF-8?q?bgp=E6=97=A5=E5=BF=97type=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=8D=A2=E6=88=90=E5=AD=97=E5=85=B8=E5=8F=96=E5=80=BC=EF=BC=8C?=
 =?UTF-8?q?as=E5=AD=97=E6=AE=B5=E6=8D=A2=E6=88=90asNum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/log/NtcBGPLog.java        | 10 +++++-----
 .../resources/sql/20181010/add_bgp_message_type.sql    |  2 ++
 src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp      |  8 ++++++--
 3 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 src/main/resources/sql/20181010/add_bgp_message_type.sql

diff --git a/src/main/java/com/nis/domain/log/NtcBGPLog.java b/src/main/java/com/nis/domain/log/NtcBGPLog.java
index 785d76219..64a1ac784 100644
--- a/src/main/java/com/nis/domain/log/NtcBGPLog.java
+++ b/src/main/java/com/nis/domain/log/NtcBGPLog.java
@@ -4,7 +4,7 @@ public class NtcBGPLog extends BaseLogEntity<NtcBGPLog> {
 
 	private static final long serialVersionUID = 4597407682545926823L;
 	private Integer type;
-	private String as;
+	private String asNum;
 	private String route;
 	public Integer getType() {
 		return type;
@@ -12,11 +12,11 @@ public class NtcBGPLog extends BaseLogEntity<NtcBGPLog> {
 	public void setType(Integer type) {
 		this.type = type;
 	}
-	public String getAs() {
-		return as;
+	public String getAsNum() {
+		return asNum;
 	}
-	public void setAs(String as) {
-		this.as = as;
+	public void setAsNum(String asNum) {
+		this.asNum = asNum;
 	}
 	public String getRoute() {
 		return route;
diff --git a/src/main/resources/sql/20181010/add_bgp_message_type.sql b/src/main/resources/sql/20181010/add_bgp_message_type.sql
new file mode 100644
index 000000000..7d17405e2
--- /dev/null
+++ b/src/main/resources/sql/20181010/add_bgp_message_type.sql
@@ -0,0 +1,2 @@
+INSERT INTO sys_data_dictionary_name (`id`,`module_name`,`mark`,`remark`,`revision`,`create_time`,`modify_time`,`status`) VALUES(115,'BGP消息类型','BGP_MESSAGE_TYPE','','','2018-10-10 16:28:05','2018-10-10 16:28:05',1);
+insert into sys_data_dictionary_item (`id`,`item_code`,`item_value`,`item_desc`,`item_sort`,`status`,`type`,`dictionary_id`) values (2602,1,'open','',0,1,1,115),(2603,2,'keepalive','',0,1,1,115),(2604,3,'update','',0,1,1,115),(2605,4,'notification','',0,1,1,115)
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 87018298a..5112cc9df 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
@@ -248,8 +248,12 @@
 									<td>${log.dAsn}</td>
 									<td>${log.sSubscribeId}</td>
 									<td>${log.dSubscribeId}</td>
-									<td>${log.type}</td>
-									<td>${log.as}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('BGP_MESSAGE_TYPE')}" var="type">
+											<c:if test="${type.itemCode eq log.type}">${type.itemValue}</c:if>
+					                	</c:forEach>
+									</td>
+									<td>${log.asNum}</td>
 									<td>${log.route}</td>
 								</tr>
 							</c:forEach>

From ef2896e234228887e16fc83c9137a7dd066ab08e Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Wed, 10 Oct 2018 17:09:55 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=8F=9C=E5=8D=95ID=EF=BC=8C=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3common.js=E4=B8=AD=E7=9A=84=E5=AD=97=E6=AE=B5=E7=9C=81?=
 =?UTF-8?q?=E7=95=A5=E5=A4=84=E7=90=86=E5=AF=B9=E4=BF=AE=E6=94=B9=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=9A=84=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/sys/dictList.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/sys/dictList.jsp b/src/main/webapp/WEB-INF/views/sys/dictList.jsp
index 48e643e72..4486905e6 100644
--- a/src/main/webapp/WEB-INF/views/sys/dictList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/dictList.jsp
@@ -274,7 +274,7 @@
 	
 	<sys:message content="${message}"  />
 	
-	<table id="contentTable" class="table table-striped table-bordered table-condensed">
+	<table id="contentTable1" class="table table-striped table-bordered table-condensed">
 		<thead>
 			<tr>
 				<th class="sort-column module_name" width="15%"><spring:message code="module_name"/></th>

From 9f0f87b7453334d68ed649396716fbe5ecc22c56 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Wed, 10 Oct 2018 17:21:03 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp | 2 +-
 src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
index ec84cb3e6..c05132b6c 100644
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
@@ -10,7 +10,7 @@
 <div class="page-content">
 	<div class="row">
  	<h3 class="page-title">
-		<spring:message code="special_task"/>
+		<spring:message code="special_tasks"/>
 	</h3>
 		<div class="col-md-12">
 			<div class="portlet box blue">
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
index 5eb9aee46..c1ccf53b3 100644
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
@@ -19,7 +19,7 @@
 	</div>
 	</shiro:hasPermission>
 	<h3 class="page-title">
-		<spring:message code="special_task"></spring:message>
+		<spring:message code="special_tasks"></spring:message>
 	</h3>
 	
 	<h5 class="page-header"></h5>

From a763e92aaf8ed49e2c5c0b0e375ad34ab80a8595 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@nismail.iie.ac.cn>
Date: Wed, 10 Oct 2018 17:50:36 +0800
Subject: [PATCH 5/9] =?UTF-8?q?app=E7=9A=84=E6=97=A5=E5=BF=97=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2=E6=94=B9=E4=B8=BA=E6=9F=A5ntcAppLogs=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=B1=9E=E6=80=A7=E6=9C=89=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties  |  8 ++++-
 .../resources/messages/message_ru.properties  |  8 ++++-
 .../messages/message_zh_CN.properties         |  8 ++++-
 .../views/log/manipulation/dkBehaviorList.jsp | 30 +++++++++++++------
 4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 932c8a8bb..2a2ca1c3a 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1200,4 +1200,10 @@ dnat_policy=DNAT Reuse Policy
 report_total=Total
 message_type=Message Type
 as=AS
-route=Route
\ No newline at end of file
+route=Route
+transport_layer_protocol=TLS Protocol
+av_voip_monit=VoIP Monit
+av_voip_reject=VoIP Reject
+label_proto_source=Protocol Source
+label_behav_source=Behavior Source
+label_app_source=APP Source
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index eeba48c6b..62e909d1f 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1202,4 +1202,10 @@ dnat_policy=DNAT Reuse Policy
 report_total=Total
 message_type=\u6D88\u606F\u7C7B\u578B
 as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7
-route=\u8DEF\u7531\u4FE1\u606F
\ No newline at end of file
+route=\u8DEF\u7531\u4FE1\u606F
+transport_layer_protocol=TLS Protocol
+av_voip_monit=VoIP\u76D1\u6D4B
+av_voip_reject=VoIP\u7BA1\u63A7
+label_proto_source=Protocol Source
+label_behav_source=Behavior Source
+label_app_source=APP Source
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index bed04829f..4a4e23593 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1194,4 +1194,10 @@ dnat_policy=DNAT\u590D\u7528\u7B56\u7565
 report_total=\u5408\u8BA1
 message_type=\u6D88\u606F\u7C7B\u578B
 as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7
-route=\u8DEF\u7531\u4FE1\u606F
\ No newline at end of file
+route=\u8DEF\u7531\u4FE1\u606F
+transport_layer_protocol=\u4F20\u8F93\u5C42\u534F\u8BAE
+av_voip_monit=VoIP\u76D1\u6D4B
+av_voip_reject=VoIP\u7BA1\u63A7
+label_proto_source=\u534F\u8BAE\u6765\u6E90
+label_behav_source=\u884C\u4E3A\u6765\u6E90
+label_app_source=\u5E94\u7528\u6765\u6E90
\ No newline at end of file
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 443517053..b90f2407b 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -111,7 +111,7 @@ $(document).ready(function(){
 								<div class="row">
 									<div class="col-md-2">
 										<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>
@@ -184,17 +184,20 @@ $(document).ready(function(){
 									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='basic_protocol'/></th>
-									<th><spring:message code='os_type'/></th>
-									<th><spring:message code='browser_type'/></th>
+									<th><spring:message code='label_proto_source'/></th>
+									<%-- <th><spring:message code='os_type'/></th>
+									<th><spring:message code='browser_type'/></th> --%>
 									<th><spring:message code='behaviour_type'/></th>
+									<th><spring:message code='label_behav_source'/></th>
 									<th><spring:message code='social_app'/></th>
-									<th><spring:message code='c2s_pkt_num'/></th>
+									<th><spring:message code='label_app_source'/></th>
+									<%-- <th><spring:message code='c2s_pkt_num'/></th>
 									<th><spring:message code='s2c_pkt_num'/></th>
 									<th><spring:message code='c2s_byte_num'/></th>
-									<th><spring:message code='s2c_byte_num'/></th>
+									<th><spring:message code='s2c_byte_num'/></th> --%>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='transport_layer_protocol'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></th>
@@ -241,6 +244,9 @@ $(document).ready(function(){
 										</c:forEach>
 									</td>
 									<td>
+												${log.labelProtoSource}
+									</td>
+									<%-- <td>
 										<c:forEach items="${osList}" var="dict">
 											<c:if test="${dict.code eq log.labelOsId}">
 												<spring:message code="${dict.item}"/>
@@ -253,7 +259,7 @@ $(document).ready(function(){
 												<spring:message code="${dict.item}"/>
 											</c:if>
 										</c:forEach>
-									</td>
+									</td> --%>
 									<td>
 										<c:forEach items="${behaviorList}" var="dict">
 											<c:if test="${dict.code eq log.labelBehavId}">
@@ -261,6 +267,9 @@ $(document).ready(function(){
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+												${log.labelBehavSource}
+									</td>
 									<td>
 										<c:forEach items="${appList}" var="dict">
 											<c:if test="${dict.code eq log.labelAppId}">
@@ -268,10 +277,13 @@ $(document).ready(function(){
 											</c:if>
 										</c:forEach>
 									</td>
-									<td>${log.c2sPktNum}</td>
+									<td>
+												${log.labelAppSource}
+									</td>
+									<%-- <td>${log.c2sPktNum}</td>
 									<td>${log.s2cPktNum}</td>
 									<td>${log.c2sByteNum}</td>
-									<td>${log.s2cByteNum}</td>
+									<td>${log.s2cByteNum}</td> --%>
 									
 									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 									<td>${log.transProto}</td>

From 9b53712d3ed5cbf9b1c84aea158bf8d884e15cda Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Wed, 10 Oct 2018 17:53:28 +0800
Subject: [PATCH 6/9] =?UTF-8?q?snat/dnat=E5=A4=8D=E7=94=A8=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ipmulitiplex/dnatPolicyForm.jsp             |  4 ++--
 .../ipmulitiplex/dnatPolicyList.jsp             | 17 ++++++++++++++---
 .../ipmulitiplex/snatPolicyList.jsp             |  8 +++++---
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm.jsp
index efce906b0..c416b17ac 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm.jsp
@@ -167,7 +167,7 @@ $(function(){
 									    </div>
 									    <div class="col-md-6">
 									        <div class="form-group ">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
 									            <div class="col-md-6">
 									                 <input class="form-control required ipCheck" type="text" name="destIpAddress" value="${_cfg.destIpAddress}">
 									            </div>
@@ -242,7 +242,7 @@ $(function(){
 										</div>
 									     <div class="col-md-6">
 									        <div class="form-group ">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port"/></label>
 									            <div class="col-md-6">
 									                 <input class="form-control required portCheck" type="text" name="destPort" value="${_cfg.destPort}">
 									            </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp
index fbd5da063..0f2e799c4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp
@@ -88,7 +88,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
@@ -274,6 +274,9 @@
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="ip"/></th>
+									<th><spring:message code="port"/></th>
+									<th><spring:message code="protocol"/></th>
 									<%-- <th><spring:message code="do_log"/></th> --%>
 									<%-- <th><spring:message code="whether_area_block"/></th> --%>
 									<th><spring:message code="letter"/></th>
@@ -282,7 +285,7 @@
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -306,6 +309,14 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>${indexCfg.destIpAddress }</td>
+									<td>${indexCfg.destPort }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="dict">
+											<c:if test="${indexCfg.protocol eq dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
+										</c:forEach>
+									</td>
+									
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -393,7 +404,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp
index a37de124a..74b05f940 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp
@@ -88,7 +88,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
@@ -274,6 +274,7 @@
 									<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
+									<th><spring:message code="ip"/></th>
 									<%-- <th><spring:message code="do_log"/></th> --%>
 									<%-- <th><spring:message code="whether_area_block"/></th> --%>
 									<th><spring:message code="letter"/></th>
@@ -282,7 +283,7 @@
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -306,6 +307,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>${indexCfg.srcIpAddress }</td>
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -393,7 +395,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

From a0bb2e5fffcf009ebb72fba8ae773638429979b2 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@nismail.iie.ac.cn>
Date: Wed, 10 Oct 2018 17:57:26 +0800
Subject: [PATCH 7/9] =?UTF-8?q?app=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/log/DkBehaviorLog.java     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/main/java/com/nis/domain/log/DkBehaviorLog.java b/src/main/java/com/nis/domain/log/DkBehaviorLog.java
index e5017979f..bb37a1a61 100644
--- a/src/main/java/com/nis/domain/log/DkBehaviorLog.java
+++ b/src/main/java/com/nis/domain/log/DkBehaviorLog.java
@@ -19,6 +19,9 @@ public class DkBehaviorLog  extends BaseLogEntity<DkBehaviorLog> {
 	protected Integer labelBsId; //浏览器id
 	protected Integer labelBehavId; //行为id
 	protected Integer labelAppId; //应用id
+	protected Integer labelProtoSource; //应用id
+	protected Integer labelBehavSource; //应用id
+	protected Integer labelAppSource; //应用id
 	
     @ApiModelProperty(value = "c2s包数", required = true)
     protected String c2sPktNum;
@@ -84,6 +87,25 @@ public class DkBehaviorLog  extends BaseLogEntity<DkBehaviorLog> {
 	public void setS2cByteNum(String s2cByteNum) {
 		this.s2cByteNum = s2cByteNum;
 	}
+	public Integer getLabelAppSource() {
+		return labelAppSource;
+	}
+	public void setLabelAppSource(Integer labelAppSource) {
+		this.labelAppSource = labelAppSource;
+	}
+	public Integer getLabelProtoSource() {
+		return labelProtoSource;
+	}
+	
+	public void setLabelProtoSource(Integer labelProtoSource) {
+		this.labelProtoSource = labelProtoSource;
+	}
+	public Integer getLabelBehavSource() {
+		return labelBehavSource;
+	}
+	public void setLabelBehavSource(Integer labelBehavSource) {
+		this.labelBehavSource = labelBehavSource;
+	}
  
     
 }

From c8dfee79706799ca5669c4529b52f53cc35b12f8 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Wed, 10 Oct 2018 18:30:54 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp      | 2 +-
 src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp          | 2 +-
 src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp      | 2 +-
 src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp    | 2 +-
 src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp         | 2 +-
 src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp        | 2 +-
 src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp      | 2 +-
 src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp         | 2 +-
 src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp          | 2 +-
 src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp        | 2 +-
 src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp         | 2 +-
 src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp             | 2 +-
 src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp            | 2 +-
 src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp             | 2 +-
 src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp              | 2 +-
 src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp | 2 +-
 .../webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp    | 2 +-
 src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp      | 2 +-
 src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp      | 2 +-
 src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp   | 2 +-
 src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp  | 2 +-
 src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp                 | 2 +-
 src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp             | 2 +-
 src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp             | 2 +-
 .../WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp       | 2 +-
 .../WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp      | 2 +-
 .../WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp  | 2 +-
 src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp           | 2 +-
 src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp             | 2 +-
 src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp            | 2 +-
 .../webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp | 2 +-
 .../WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp      | 2 +-
 .../WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp      | 2 +-
 src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp             | 2 +-
 src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp           | 2 +-
 src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp          | 2 +-
 src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp           | 2 +-
 src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp      | 2 +-
 src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp          | 2 +-
 39 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index 2dba7d4f3..3e9c88729 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -154,7 +154,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
index 4271e4598..f7b0b9cfd 100644
--- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
@@ -135,7 +135,7 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
index 53e327c26..754d7e7ae 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
@@ -151,7 +151,7 @@
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="srcIpAddress"><spring:message code="client_ip"></spring:message></form:option>
 												<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
index d3c0e000d..ddca26f93 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -148,7 +148,7 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgKeywords"><spring:message code="URL"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
index e0d8381a8..b327db315 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
@@ -97,7 +97,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
index 1f5ae62f3..3fb574b8a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
@@ -151,7 +151,7 @@
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="srcIpAddress"><spring:message code="client_ip"></spring:message></form:option>
 												<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
index 5dd3ca497..11954d3fb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -149,7 +149,7 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgKeywords"><spring:message code="URL"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
index 30e1c587e..b8b80a21f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
@@ -106,7 +106,7 @@
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="description"><spring:message code="sample_sign"></spring:message></form:option>
 												<form:option value="level"><spring:message code="harm_level"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
index 28d83fdc3..6ac6ddc31 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -157,7 +157,7 @@
 												<form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="av_voip_account_control"/></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
index f4852604c..aa8c1e28f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -157,7 +157,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="APP_SUBSCRIBE_ID"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
index 16e97b555..e1c352900 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
@@ -100,7 +100,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
                                         		<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
index 9dec4f315..e799ee998 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -158,7 +158,7 @@
 													<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
 													<form:option value="destPort"><spring:message code="server_port"></spring:message></form:option>
 													<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-													<form:option value="action"><spring:message code="action"></spring:message></form:option>
+													<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 													<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index af0a60bd3..6b2e2983a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -102,7 +102,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
                                         		<form:option value="keywords"><spring:message code="key_word"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
index d3fdf547d..d7e5a7c38 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
@@ -108,7 +108,7 @@
 												<form:option value="destIpAddress"><spring:message code="server_ip"></spring:message></form:option>
 												<form:option value="destPort"><spring:message code="server_port"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index 151bf7ce0..f52dd280c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -103,7 +103,7 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="destIpAddress"><spring:message code="IP"></spring:message></form:option>
 												<%-- <form:option value="destPort"><spring:message code="port"></spring:message></form:option> --%>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index c62827cd6..f95c39120 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -155,7 +155,7 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="APP_SUBSCRIBE_ID"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
index ed1f6f4e3..0c2cd9f55 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
@@ -135,7 +135,7 @@
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfdsLevel"><spring:message code="cfds_level"/></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
index 9da3e2a70..c1f0bebfe 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
@@ -141,7 +141,7 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
index 359dc6a31..2fccc4e25 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
@@ -132,7 +132,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index cf28e930c..55722feba 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -144,7 +144,7 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
index 54daeab07..c657ddb4e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
@@ -84,7 +84,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="keyring_name"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<%-- <form:option value="action"><spring:message code="block_type"></spring:message></form:option> --%>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index 5fdf8455c..ba3eaa18f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -99,7 +99,7 @@
 													<form:option value="srcIp"><spring:message code="client_ip"></spring:message></form:option>
 													<form:option value="dstIp"><spring:message code="server_ip"></spring:message></form:option>
 													<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-													<form:option value="action"><spring:message code="action"></spring:message></form:option>
+													<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 													<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
index 9e634473d..971111110 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -132,7 +132,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
index 0386bc4d2..15db80da6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
@@ -137,7 +137,7 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
index 0a71c944a..9faec4bff 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
@@ -88,7 +88,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="policy_name"></spring:message></form:option>
 												<form:option value="group1Name"><spring:message code="group"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
index 78e07b957..25c1ab9c0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
@@ -89,7 +89,7 @@
                                         		<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="destIpAddress"><spring:message code="ip"></spring:message></form:option>
 												<form:option value="groupName"><spring:message code="group"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
index 90188fe15..3da22e4f1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
@@ -89,7 +89,7 @@
                                         		<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="destIpAddress"><spring:message code="ip"></spring:message></form:option>
 												<form:option value="groupName"><spring:message code="group"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
index f3304d9d3..83538734b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
@@ -141,7 +141,7 @@
 														<form:option value="complexCfg.keywords"><spring:message code="key_word"></spring:message></form:option>
 													</c:if>
 													
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
index 2bcca89a0..8de6113a9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -138,7 +138,7 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
index a6ef80955..737177410 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
@@ -138,7 +138,7 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
index cd8498592..1f83a817c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
@@ -323,7 +323,7 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
index 0ef4498c8..f163712bf 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
@@ -85,7 +85,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
index 1737b894b..0b0583be0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
@@ -86,7 +86,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index ff149453f..da4e54b51 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -101,7 +101,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
                                         		<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
index 89be6f1b9..d4de293de 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -136,7 +136,7 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index 8c94a4e88..740f9da39 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -294,7 +294,7 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
index 37e0c04c6..6097bdc1a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
@@ -135,7 +135,7 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
index 5185501c6..d5dab3e75 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -136,7 +136,7 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
index 09b9a556d..ce5c52e09 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -135,7 +135,7 @@
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
 												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
-												<form:option value="action"><spring:message code="action"></spring:message></form:option>
+												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									

From 49b4af58adc4cb38128ad855b0dd987b51bce230 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.11.87>
Date: Thu, 11 Oct 2018 11:31:36 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=A0=B7=E4=BE=8Blevel=E8=8C=83=E5=9B=B475?=
 =?UTF-8?q?-99.block=E9=BB=98=E8=AE=A4=E4=B8=BA0=20=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
index c48181289..7c1d42078 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -91,7 +91,7 @@ function hiddenlevel(){
 		$("input[name='level']").val(0);
 	}else {
 		$(".leveL").removeClass("hidden");
-// 		$("input[name='level']").val('');
+		$("input[name='level']").val(0);
 	}
 }
 </script>
@@ -215,7 +215,7 @@ function hiddenlevel(){
 							        <div class="form-group ">
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
 							            <div class="col-md-6">
-							            	 <input class="form-control required number" range="[0,100]" type="text" name="level" value="${_cfg.level }">
+							            	 <input class="form-control required number" range="[75,99]" type="text" name="level" value="${_cfg.level }">
 							            </div>
 							            <div for="level"></div>
 							        </div>