From 194bf205586365b65d59b0790f2c6f0d40200fe6 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Mon, 10 Jun 2019 16:02:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E6=96=B0=E4=BB=A3=E7=90=86=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E8=8F=9C=E5=8D=95=20isAudit=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=8E=B0=E5=AE=9E=E9=A1=BA=E5=BA=8F=E3=80=81=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA=E7=AD=96=E7=95=A5=E6=97=A5=E5=BF=97=E6=80=BB?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/InterceptController.java            |  2 +-
 .../views/cfg/intercept/interceptList.jsp     | 26 +++++++++----------
 .../WEB-INF/views/cfg/proxy/cache/list.jsp    | 22 ++++++++--------
 .../cfg/proxy/control/httpRedirectList.jsp    | 22 ++++++++--------
 .../cfg/proxy/control/manipulatPolicyList.jsp | 21 ++++++++-------
 5 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
index 61159069d..502c7d3e4 100644
--- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
@@ -663,7 +663,7 @@ public class InterceptController extends CommonController {
 				dataMap.put("PXY_INTERCEPT_IP", ipList);
 				dataMap.put("PXY_INTERCEPT_PKT_BIN", pktBinList);
 			} else if (entity.getFunctionId() == 200) {// IP拦截
-				cfgIndexInfoNoExport = ",userRegion1,userRegion5,do_log,policy_name,group_name,userregion3,userregion4,block_type,&userregion2:ratelimit-userregion5:block_type";
+				cfgIndexInfoNoExport = ",total_log,userRegion1,userRegion5,do_log,policy_name,group_name,userregion3,userregion4,block_type,&userregion2:ratelimit-userregion5:block_type";
 				titleList.add("PXY_INTERCEPT_IP");
 				classMap.put("PXY_INTERCEPT_IP", IpPortCfg.class);
 				noExportMap.put("PXY_INTERCEPT_IP", ipPortInfoNoExport);
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 b26ae6022..a4bd9bb5c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -450,6 +450,7 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th column="cfg_id"  class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
+									<th column="is_audit" ><spring:message code="is_audit"/></th>
 								    <th column="config_describe"  class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th column="block_type"  class="sort-column a.action"><spring:message code="block_type"/></th>
 									<c:if test="${cfg.functionId eq 200 }">
@@ -488,12 +489,11 @@
 							    	</c:if>
 							    	<%-- <c:if test="${cfg.functionId eq 201 }">
 							    		<th column="userregion1" ><spring:message code="intercept_intensity"/></th>
-							    	</c:if> --%>
-							    	<th column="is_audit" ><spring:message code="is_audit"/></th>
+							    	</c:if> --%>							    	
 							    	<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 							    	<th><spring:message code="is_schduler"/></th>
 							    	<%-- <th column="do_log" ><spring:message code="do_log"/></th> --%>
-									<th column="log_total" ><spring:message code="log_total"/></th>
+									<%-- <th column="log_total" ><spring:message code="log_total"/></th> --%>
 									<th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
 									<th column="letter" ><spring:message code="letter"/></th>
 									<th column="classification" ><spring:message code="classification"/></th>
@@ -515,6 +515,14 @@
 									<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="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
 								    <td>${indexCfg.cfgDesc }</td>
 									<td>
 										<c:if test="${indexCfg.action eq 2}">
@@ -634,15 +642,7 @@
 												</c:forEach>
 											</c:if>
 										</td>
-							    	</c:if> --%>
-							    	<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
+							    	</c:if> --%>							    	
 									<td>
 										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
@@ -668,7 +668,7 @@
 											</c:if>
 										</c:forEach>
 									</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>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp
index 49cb578d2..f7e9e4290 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp
@@ -361,6 +361,7 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th column="cfg_id"  class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
+									<th column="is_audit"  class="sort-column a.is_audit"><spring:message code="is_audit"/></th>
 								    <th column="config_describe"  class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th column="action"  class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th column="ignore_query_string" ><spring:message code="ignore_query_string"/></th>
@@ -375,8 +376,7 @@
 									<th column="pinning_time" ><spring:message code="pinning_time"/></th>
 									<th column="max_cache_size" ><spring:message code="max_cache_size"/></th>
 									<th column="inactive_time" ><spring:message code="inactive_time"/></th>
-									<th column="max_cache_obj_size" ><spring:message code="max_cache_obj_size"/></th>
-									<th column="is_audit"  class="sort-column a.is_audit"><spring:message code="is_audit"/></th>
+									<th column="max_cache_obj_size" ><spring:message code="max_cache_obj_size"/></th>									
 									<th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
 									<th column="letter" ><spring:message code="letter"/></th>
 									<th column="classification" ><spring:message code="classification"/></th>
@@ -399,6 +399,14 @@
 									<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="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
 								    <td>${indexCfg.cfgDesc }</td>
 									<td>
 										<c:forEach items="${serviceList}" var="service"
@@ -470,15 +478,7 @@
 									</td>
 									<td>
 										${indexCfg.userRegion.max_cache_obj_size}
-									</td>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
+									</td>									
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
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 a32be61fb..1dd69a411 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
@@ -577,6 +577,7 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th column="cfg_id"  class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
+									<th column="is_audit" ><spring:message code="is_audit"/></th>
 								    <th column="config_describe"  class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th column="block_type"  class="sort-column a.action"><spring:message code="block_type"/></th>
 									<c:if test="${action == 16}">
@@ -591,8 +592,7 @@
 										<th column="userregion1" ><spring:message code="replace_zone"/></th>
 										<th column="userregion2" ><spring:message code="replaced_content"/></th>
 										<th column="userregion3" ><spring:message code="replace_content"/></th>
-									</c:if>
-									<th column="is_audit" ><spring:message code="is_audit"/></th>
+									</c:if>									
 									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_schduler"/></th>
 									<c:if test="${action ne 128}">
@@ -629,6 +629,14 @@
 											<td>${indexCfg.compileId }</td>
 									   </c:otherwise>
 									</c:choose>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
 								    <td>${indexCfg.cfgDesc }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -689,15 +697,7 @@
 										</td>
 										<td title="${indexCfg.userRegion2 }">${fns:abbr(indexCfg.userRegion2,20)}</td>
 										<td title="${indexCfg.userRegion3 }">${fns:abbr(indexCfg.userRegion3,20)}</td>
-									</c:if>
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
+									</c:if>									
 									<td>
 										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp
index a2a85fb1a..3310fb20a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp
@@ -393,6 +393,7 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th column="cfg_id"  class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
+									<th column="is_audit" ><spring:message code="is_audit"/></th>
 								    <th column="config_describe"  class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
 									<th column="block_type"  class="sort-column a.action"><spring:message code="block_type"/></th>
 									
@@ -404,8 +405,7 @@
 									<th><spring:message code="replaced_content"/></th>
 									<th><spring:message code="replace_content"/></th>
 									<th><spring:message code="profile_info"/></th>
-									
-									<th column="is_audit" ><spring:message code="is_audit"/></th>
+																		
 									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_schduler"/></th>
 									<th column="do_log" ><spring:message code="do_log"/></th>
@@ -438,6 +438,14 @@
 											<td>${indexCfg.compileId }</td>
 									   </c:otherwise>
 									</c:choose>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
+										</c:choose>
+									</td>
 								    <td>${indexCfg.cfgDesc }</td>
 								    <td><spring:message code="action_manipulate"/></td>
 								    
@@ -541,14 +549,7 @@
 										</td>
 									</c:if>
 									
-									<td>
-										<c:choose>
-											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
-										</c:choose>
-									</td>
+									
 									<td>
 										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>