业务配置->流 和 日志检索->流内的模块 "阻断"显示更改为"封堵(丢弃)"

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>