From d9110dfa143e0ed4a89e2a05a3dff8b97f0e8638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= <liguilong@iie.ac.cn>
Date: Thu, 9 May 2019 16:36:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=85=8D=E7=BD=AE->=E6=B5=81?=
 =?UTF-8?q?=20=E5=92=8C=20=E6=97=A5=E5=BF=97=E6=A3=80=E7=B4=A2->=E6=B5=81?=
 =?UTF-8?q?=E5=86=85=E7=9A=84=E6=A8=A1=E5=9D=97=20"=E9=98=BB=E6=96=AD"?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9B=B4=E6=94=B9=E4=B8=BA"=E5=B0=81?=
 =?UTF-8?q?=E5=A0=B5(=E4=B8=A2=E5=BC=83)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/util/excel/ExcelCsv.java     |  7 +++++++
 .../java/com/nis/util/excel/ExportExcel.java  |  7 +++++++
 .../views/cfg/app/appPolicyCfgList.jsp        |  9 +++++++-
 .../WEB-INF/views/cfg/basicprotocol/list.jsp  | 11 +++++++++-
 .../views/cfg/encryptedtunnelbehav/list.jsp   |  9 +++++++-
 .../views/log/manipulation/dkBehaviorList.jsp | 21 ++++++++++++++++---
 6 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java
index 05c3125fa..77cca0d9f 100644
--- a/src/main/java/com/nis/util/excel/ExcelCsv.java
+++ b/src/main/java/com/nis/util/excel/ExcelCsv.java
@@ -306,6 +306,13 @@ public class ExcelCsv {
 									dict="block_drop";
 									val = msgProp.getProperty(dict,dict);
 								}
+								if ("action".equals(ef.title()) && dict.equals("action_reject")
+										&& (Reflections.invokeGetter(e, "service").toString().equals("35")
+										|| Reflections.invokeGetter(e, "service").toString().equals("33")
+										|| Reflections.invokeGetter(e, "service").toString().equals("36"))) {
+									dict="block_drop";
+									val = msgProp.getProperty(dict,dict);
+								}
 								//ip spoofing redirect动作修改为Spoofing
 								if(ef.title().equals("block_type") 
 										&& (Reflections.invokeGetter(e, "serviceId").toString().equals("518"))) {
diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java
index ff8f78446..67b0667a8 100644
--- a/src/main/java/com/nis/util/excel/ExportExcel.java
+++ b/src/main/java/com/nis/util/excel/ExportExcel.java
@@ -2308,6 +2308,13 @@ public class ExportExcel {
 									dict="block_drop";
 									val = msgProp.getProperty(dict,dict);
 								}
+								if ("action".equals(ef.title()) && dict.equals("action_reject")
+										&& (Reflections.invokeGetter(e, "service").toString().equals("35")
+										|| Reflections.invokeGetter(e, "service").toString().equals("33")
+										|| Reflections.invokeGetter(e, "service").toString().equals("36"))) {
+									dict="block_drop";
+									val = msgProp.getProperty(dict,dict);
+								}
 								//ip spoofing redirect动作修改为Spoofing
 								if(ef.title().equals("block_type") 
 										&& (Reflections.invokeGetter(e, "serviceId").toString().equals("518"))) {
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 e55faa7bc..93717a179 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -195,7 +195,14 @@
 	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
 													<form:option value=""><spring:message code="select"/></form:option>
 													<c:forEach items="${serviceList}" var="service">
-														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+														<c:choose>
+															<c:when test="${service.action eq 16}">
+																<form:option value="${service.action }"><spring:message code="block_drop"/></form:option>
+															</c:when>
+															<c:otherwise>
+																<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+															</c:otherwise>
+														</c:choose>
 													</c:forEach>
 											 </form:select>
 											 <form:select path="isValid" class="selectpicker select2 input-small" >
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 9059a983e..3508f7c84 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -199,7 +199,16 @@
 	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
 													<form:option value=""><spring:message code="select"/></form:option>
 													<c:forEach items="${serviceList}" var="service">
-														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+													
+														<c:choose>
+															<c:when test="${service.action eq 16}">
+																<form:option value="${service.action }"><spring:message code="block_drop"/></form:option>
+															</c:when>
+															<c:otherwise>
+																<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+															</c:otherwise>
+														</c:choose>
+														
 													</c:forEach>
 											 </form:select>
 											 <form:select path="isValid" class="selectpicker select2 input-small" >
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 9febca607..b1dff9c18 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -196,7 +196,14 @@
 	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
 													<form:option value=""><spring:message code="select"/></form:option>
 													<c:forEach items="${serviceList}" var="service">
-														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+														<c:choose>
+															<c:when test="${service.action eq 16}">
+																<form:option value="${service.action }"><spring:message code="block_drop"/></form:option>
+															</c:when>
+															<c:otherwise>
+																<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+															</c:otherwise>
+														</c:choose>
 													</c:forEach>
 											 </form:select>
 											 <form:select path="isValid" class="selectpicker select2 input-small" >
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 eaa50d9c7..e0b7df49c 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -109,8 +109,15 @@ $(document).ready(function(){
 									<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="${service.serviceId}"><spring:message code="${dict.itemValue}"/></form:option>
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96)  }">
+												<c:choose>
+													<c:when test="${service.action eq 16}">
+														<form:option value="${service.serviceId }"><spring:message code="block_drop"/></form:option>
+													</c:when>
+													<c:otherwise>
+														<form:option value="${service.serviceId}"><spring:message code="${dict.itemValue}"/></form:option>
+													</c:otherwise>
+												</c:choose>  
 											</c:if>
 										</c:forEach>
 									</c:forEach>
@@ -305,10 +312,18 @@ $(document).ready(function(){
 										<c:set var="actions">${log.action }</c:set>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
 											<c:if test="${dict.itemCode eq log.action}">
+												<c:choose>
+													<c:when test="${log.action eq 16}">
+														<spring:message code="block_drop"/>
+													</c:when>
+													<c:otherwise>
+														<spring:message code="${actions}"/>
+													</c:otherwise>
+												</c:choose>
+												
 												<c:set var="actions">${dict.itemValue}</c:set>
 											</c:if>
 										</c:forEach>
-										<spring:message code="${actions}"/>
 									</td>
 									<td>${log.foundTime }</td>
 									<td>${log.recvTime }</td>