From c6c6fb665f0bf2eebc85b2569c974ef156f2ef6c Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Thu, 13 Sep 2018 10:56:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A3=80=E7=B4=A2=EF=BC=9Aac?=
 =?UTF-8?q?tion=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6drop=E3=80=81loop?=
 =?UTF-8?q?=E3=80=81whitelist=E4=B8=8D=E5=B1=95=E7=A4=BA=20=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E7=BB=9F=E8=AE=A1=E5=8F=B3=E4=B8=8A=E8=A7=92=E7=9A=84?=
 =?UTF-8?q?=E5=90=84=E4=B8=AA=E5=8A=A8=E4=BD=9C=E6=97=A5=E5=BF=97=E6=80=BB?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E8=BF=87=E6=BB=A4drop=E3=80=81loop=E3=80=81w?=
 =?UTF-8?q?hitelist=20anti-DDOS=20drop=E7=89=B9=E6=AE=8A=EF=BC=8C=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=20=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8=20=E5=90=88?=
 =?UTF-8?q?=E8=AE=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/log/manipulation/dkBehaviorList.jsp |  6 +++---
 .../webapp/WEB-INF/views/log/ntc/appList.jsp  | 13 +++++++-----
 .../webapp/WEB-INF/views/log/ntc/bgpList.jsp  |  2 +-
 .../webapp/WEB-INF/views/log/ntc/dnsList.jsp  |  9 +++++---
 .../webapp/WEB-INF/views/log/ntc/ftpList.jsp  | 13 +++++++-----
 .../webapp/WEB-INF/views/log/ntc/httpList.jsp |  9 +++++---
 .../webapp/WEB-INF/views/log/ntc/ipList.jsp   |  2 +-
 .../WEB-INF/views/log/ntc/l2tpLogList.jsp     | 21 +++++++++++--------
 .../webapp/WEB-INF/views/log/ntc/mailList.jsp |  9 +++++---
 .../WEB-INF/views/log/ntc/mmAvIpList.jsp      | 13 +++++++-----
 .../WEB-INF/views/log/ntc/mmAvUrlList.jsp     | 13 +++++++-----
 .../WEB-INF/views/log/ntc/mmPicIpList.jsp     | 17 ++++++++-------
 .../views/log/ntc/mmPornAudioSampleList.jsp   | 17 ++++++++-------
 .../views/log/ntc/mmPornVideoSampleList.jsp   | 17 ++++++++-------
 .../views/log/ntc/mmSampleAudioList.jsp       | 15 +++++++------
 .../WEB-INF/views/log/ntc/mmSamplePicList.jsp | 17 ++++++++-------
 .../views/log/ntc/mmSampleVideoList.jsp       | 17 ++++++++-------
 .../views/log/ntc/mmSampleVoipList.jsp        | 17 ++++++++-------
 .../views/log/ntc/mmVoipAccountList.jsp       | 13 +++++++-----
 .../WEB-INF/views/log/ntc/mmVoipIpList.jsp    | 13 +++++++-----
 .../WEB-INF/views/log/ntc/openVpnList.jsp     | 13 +++++++-----
 .../webapp/WEB-INF/views/log/ntc/p2pList.jsp  |  6 ++----
 .../WEB-INF/views/log/ntc/pptpLogList.jsp     | 17 ++++++++-------
 .../webapp/WEB-INF/views/log/ntc/sshList.jsp  | 13 +++++++-----
 .../WEB-INF/views/log/ntc/sslLogList.jsp      | 19 ++++++++++-------
 src/main/webapp/WEB-INF/views/report/list.jsp | 18 +++++++++-------
 26 files changed, 202 insertions(+), 137 deletions(-)

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 b6a66a19f..f8c6f7cd9 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -62,11 +62,11 @@ $(document).ready(function(){
 							<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"
+									<%-- <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)}">  
+											<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>
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 502710f0d..ff04cec2d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -54,14 +54,17 @@ $(document).ready(function(){
 							<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="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${(dict.itemValue eq 'action_monit') or (dict.itemValue eq 'action_reject')}">
+									<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>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 905043774..3037e03e7 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
@@ -53,7 +53,7 @@
 									<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)}">  
+											<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>
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 15e6c537d..5cc377f72 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
@@ -48,12 +48,15 @@
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
 							<div class="pull-left">
-								<form:select path="action" class="selectpicker select2 input-small">
+									<form:select path="action" class="selectpicker select2 input-small">
 									<form:option value=""><spring:message code="action"/></form:option>
-									<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${(dict.itemValue eq 'action_monit') or (dict.itemValue eq 'action_reject')}">
+									<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>
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 3ba2e2577..ead92fc94 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -54,14 +54,17 @@ $(document).ready(function(){
 							<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="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${(dict.itemValue eq 'action_monit') or (dict.itemValue eq 'action_reject')}">
+									<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>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 5245b6fba..4b9f9706d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -48,12 +48,15 @@
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
 							<div class="pull-left">
-								<form:select path="action" class="selectpicker select2 input-small">
+									<form:select path="action" class="selectpicker select2 input-small">
 									<form:option value=""><spring:message code="action"/></form:option>
-									<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${(dict.itemValue eq 'action_monit') or (dict.itemValue eq 'action_reject')}">
+									<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>
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 3093fe5bb..fd387f7cd 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -53,7 +53,7 @@
 									<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)}">  
+											<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>
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 ea024cb17..827f72fda 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -51,15 +51,18 @@
 								<!-- 搜索内容与操作按钮栏 -->
 								<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="${fns:getDictList('SERVICE_ACTION')}" var="action">
-												<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
-													<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-												</c:if>		
-											</c:forEach>
-						             	</form:select>
-									</div>
+									<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">
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 ae2e4e2bf..d0a135c16 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -48,12 +48,15 @@
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
 							<div class="pull-left">
-								<form:select path="action" class="selectpicker select2 input-small">
+									<form:select path="action" class="selectpicker select2 input-small">
 									<form:option value=""><spring:message code="action"/></form:option>
-									<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${(dict.itemValue eq 'action_monit') or (dict.itemValue eq 'action_reject')}">
+									<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>
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 73dc401c1..c039cc741 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -53,14 +53,17 @@ $(document).ready(function(){
 							<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="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${(dict.itemValue eq 'action_monit') or (dict.itemValue eq 'action_reject')}">
+									<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>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 7796f250c..15b0281b5 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -54,14 +54,17 @@ $(document).ready(function(){
 							<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="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${(dict.itemValue eq 'action_monit') or (dict.itemValue eq 'action_reject')}">
+									<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>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 7ca1e9686..9a02073a2 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -54,14 +54,17 @@ $(document).ready(function(){
 							<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="${fns:getDictList('SERVICE_ACTION')}" var="action">
-											<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
-												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-											</c:if>		
+									<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>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 644015d59..8d66efb47 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
@@ -54,14 +54,17 @@ $(document).ready(function(){
 							<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="${fns:getDictList('SERVICE_ACTION')}" var="action">
-											<c:if test="${action.itemValue eq 'action_reject' or action.itemValue eq 'action_monit' }">
-												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-											</c:if>		
+									<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>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 f48710757..0f7325907 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -54,14 +54,17 @@ $(document).ready(function(){
 							<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="${fns:getDictList('SERVICE_ACTION')}" var="action">
-											<c:if test="${action.itemValue eq 'action_reject' or action.itemValue eq 'action_monit' }">
-												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-											</c:if>		
+									<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>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 a2b4bb81b..c8393ae76 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -68,12 +68,15 @@
 								<!-- 搜索内容与操作按钮栏 -->
 								<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="${fns:getDictList('SERVICE_ACTION')}" var="action">
-												<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
-													<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-												</c:if>		
+									<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>
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 6a6f89c2f..403c152ba 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -54,14 +54,17 @@ $(document).ready(function(){
 							<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="${fns:getDictList('SERVICE_ACTION')}" var="action">
-											<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
-												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-											</c:if>		
+									<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>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 4e616a933..301cf5273 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -54,14 +54,17 @@ $(document).ready(function(){
 							<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="${fns:getDictList('SERVICE_ACTION')}" var="action">
-											<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
-												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-											</c:if>		
+									<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>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 7b1ac7609..3f5d2d0b2 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -54,14 +54,17 @@ $(document).ready(function(){
 							<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="${fns:getDictList('SERVICE_ACTION')}" var="action">
-											<c:if test="${action.itemValue eq 'action_reject' or action.itemValue eq 'action_monit' }">
-												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-											</c:if>		
+									<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>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 afb0aca65..22a12b53a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -54,14 +54,17 @@ $(document).ready(function(){
 							<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="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${(dict.itemValue eq 'action_monit') or (dict.itemValue eq 'action_reject')}">
+									<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>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 4aafe5346..69da740fa 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -54,14 +54,17 @@ $(document).ready(function(){
 							<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="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${(dict.itemValue eq 'action_monit') or (dict.itemValue eq 'action_reject')}">
+									<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>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 0e9e52d27..fca37062e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -54,14 +54,17 @@ $(document).ready(function(){
 							<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="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${(dict.itemValue eq 'action_monit') or (dict.itemValue eq 'action_reject')}">
+									<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>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 dc3f3c2bc..1933b767f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
@@ -54,7 +54,7 @@
 								<c:set var="actionIndex" value="0"></c:set>
 								<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)}"> 
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96)}"> 
 												<c:set var="actionIndex" value="${actionIndex+1}"></c:set>
 											</c:if>
 										</c:forEach>
@@ -62,11 +62,9 @@
 								   <c:if test="${ (actionIndex > 1) || (actionIndex == 0) }">
 								    <option value=""><spring:message code="action"/></option>
 								   </c:if>
-								   
-								   
 									<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)}"> 
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)  && (service.action ne 96)}"> 
 												<option value="${dict.itemCode}"    
 													<c:if test="${log.action eq dict.itemCode}">
 														 selected="selected"
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 9aacb786b..4a8987d61 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -51,14 +51,17 @@
 								<!-- 搜索内容与操作按钮栏 -->
 								<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="${fns:getDictList('SERVICE_ACTION')}" var="action">
-												<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
-													<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-												</c:if>		
+									<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>
+										</form:select>
 									</div>
 	                        		<div class="pull-left">
 										<div class="input-group">
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 69d4b04f0..324120c06 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -54,14 +54,17 @@ $(document).ready(function(){
 							<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="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${(dict.itemValue eq 'action_monit') or (dict.itemValue eq 'action_reject')}">
+									<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>
-									</form:select>
-								</div>
+									</c:forEach>
+								</form:select>
+							</div>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
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 6c5f197f6..8007ccdaf 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -52,15 +52,18 @@
 								<!-- 搜索内容与操作按钮栏 -->
 								<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="${fns:getDictList('SERVICE_ACTION')}" var="action">
-												<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
-													<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
-												</c:if>		
-											</c:forEach>
+									  <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>
 									<div class="pull-left">
 										<div class="input-group">
 											<div class="input-group-btn">
diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index 9dc31f1ad..df87244a5 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -286,16 +286,16 @@ function customColumnClick(){
  	   if(rows.length  > 1){
  		 var trtotal="";
  		if(reportBusinessType=="src_ip_report"){
-		    trtotal+="<td colspan='2' style='text-align: center;' ><spring:message code='report_total' />：</td>";
+		    trtotal+="<td colspan='2' style='text-align: left;' ><spring:message code='report_total' /></td>";
  		}else{
- 			 trtotal+="<td style='text-align: center;'><spring:message code='report_total' />：</td>";
+ 			 trtotal+="<td style='text-align: left;'><spring:message code='report_total' /></td>";
  		} 
 	 	for (var k = 0; k < list.length; k++) {
 			trtotal+="<td>"+list[k]+"</td>";
 		}
 		    trtotal+=""
 	 	$('#total').remove();
-		$('#'+tableId).append("<tr id='total'></tr>");
+		$('#'+tableId).prepend("<tr id='total'></tr>");
 		$('#total').html(trtotal);
  	  } 
 }	  
@@ -308,7 +308,7 @@ function customColumnClick(){
 			<c:forEach items="${serviceList}" var="service" varStatus="status">
 				<c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}">
 				    <c:if test="${service.serviceId ne 5}">
-				      <c:if test="${(service.action ne 128) && (service.action ne 32)}" >
+				      <c:if test="${(service.action ne 128) && (service.action ne 32) && (service.action ne 96)}" >
 					    <div data-service="${service.serviceId}" class="service btn 
 						<c:if test="${status.index%2==0}">btn-primary</c:if>
 						<c:if test="${status.index%2!=0}">btn-default</c:if>">
@@ -319,13 +319,15 @@ function customColumnClick(){
 					</c:if>
 				    </c:if>
 					 <c:if test="${service.serviceId eq 5}">
+					   <c:if test="${(service.action ne 128) && (service.action ne 96)}" >
 					    <div data-service="${service.serviceId}" class="service btn 
 						<c:if test="${status.index%2==0}">btn-primary</c:if>
 						<c:if test="${status.index%2!=0}">btn-default</c:if>">
 							<spring:message code="${action.itemValue}"/>
 							<spring:message code="log_total"/>
 							<span>0</span>
-						</div>
+						 </div>
+						</c:if>
 				    </c:if>
 				</c:if>
 			</c:forEach>
@@ -359,13 +361,15 @@ function customColumnClick(){
 										<c:forEach items="${serviceList}" var="service" >
 										<c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}">
 										    <c:if test="${service.serviceId ne 5}">
-				    						 <c:if test="${(service.action ne 128) && (service.action ne 32)}" >
+				    						 <c:if test="${(service.action ne 128) && (service.action ne 32)  && (service.action ne 96) }" >
 											  <form:option value="${action.itemCode}" ><spring:message code="${action.itemValue}"/></form:option>
 											</c:if>
 										  </c:if>
 										   <c:if test="${service.serviceId  eq 5}">
+										      <c:if test="${(service.action ne 128) && (service.action ne 96) }" >
 											  <form:option value="${action.itemCode}" ><spring:message code="${action.itemValue}"/></form:option>
-										  </c:if>
+										     </c:if>
+										   </c:if>
 										</c:if>
 										</c:forEach>
 									</c:forEach>