From dace2ab7985a5622332bd92a8d79f10b035b0c4c Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Mon, 10 Jun 2019 11:48:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4http=20monit=20=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=80=BB=E9=87=8F=E5=88=97=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?http=20=E6=93=8D=E6=8E=A7=E9=98=BB=E6=96=AD=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/HttpRedirectPolicyController.java       |  2 ++
 .../views/cfg/proxy/control/httpRedirectList.jsp  | 15 +++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
index f0765f627..d5e2d3a4e 100644
--- a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
@@ -412,6 +412,8 @@ public class HttpRedirectPolicyController extends BaseController {
 				cfgIndexInfoNoExport = ",policy_name,group_name,userregion4,userregion5,&userregion1:replace_zone-userregion2:replaced_content-userregion3:replace_content-";
 			} else if (entity.getFunctionId() == 211) {
 				cfgIndexInfoNoExport = ",do_log,log_total,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+			}else if (entity.getFunctionId() == 210) {
+				cfgIndexInfoNoExport = ",log_total,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 			}
 			String httpUrlCfgNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
 					+ ",config_time,editor,edit_time,auditor,audit_time"
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 e35796960..a32be61fb 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
@@ -598,7 +598,7 @@
 									<c:if test="${action ne 128}">
 										<th column="do_log" ><spring:message code="do_log"/></th>
 									</c:if>
-									<c:if test="${action ne 128 && action ne 16}">
+									<c:if test="${action ne 128 && action ne 16 && action ne 1}">
 										 <th column="log_total" ><spring:message code="log_total"/></th> 
 									</c:if>
 									<th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
@@ -620,8 +620,15 @@
 									<td>
 									<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 									<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
-									</td>
-									<td>${indexCfg.compileId }</td>
+									</td>									
+									<c:choose>
+									   <c:when test='${(action eq 16 || action eq 1) && (indexCfg.isAudit eq 1 || indexCfg.isAudit eq 3)}'>  
+									   		<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}">${indexCfg.compileId }</td>
+									   </c:when>
+									   <c:otherwise> 
+											<td>${indexCfg.compileId }</td>
+									   </c:otherwise>
+									</c:choose>
 								    <td>${indexCfg.cfgDesc }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -718,7 +725,7 @@
 											</c:forEach>
 										</td>
 									</c:if>
-									<c:if test="${action ne 128 && action ne 16}">
+									<c:if test="${action ne 128 && action ne 16 && action ne 1}">
 									 <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> 
 									</c:if>
 									<td>