From 8d8a6dc97edc0eb508e4aa018e298969050737eb Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Sun, 27 Jan 2019 16:44:03 +0600
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8=E7=9A=84=E4=B8=9A=E5=8A=A1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=88=97=E8=A1=A8=EF=BC=8C=E8=B0=83=E6=95=B4=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E6=A0=87=E8=AF=86=EF=BC=88is=5Fvalid)=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AE=9A=E6=97=B6=E5=99=A8?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86=E6=98=BE=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Conflicts:
	src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
---
 .../views/cfg/app/appPolicyCfgList.jsp        | 27 ++++++++++----
 .../views/cfg/av/contUrl/contUrlList.jsp      | 29 +++++++++++----
 .../WEB-INF/views/cfg/av/voip/voipList.jsp    | 26 ++++++++++----
 .../WEB-INF/views/cfg/basicprotocol/list.jsp  | 27 ++++++++++----
 .../views/cfg/encryptedtunnelbehav/list.jsp   | 27 ++++++++++----
 .../views/cfg/fileTransfer/ftpList.jsp        | 27 ++++++++++----
 .../views/cfg/fileTransfer/p2pList.jsp        | 26 ++++++++++----
 .../views/cfg/intercept/interceptList.jsp     | 36 +++++++++++++------
 .../WEB-INF/views/cfg/ipaddr/ipList.jsp       |  3 +-
 .../WEB-INF/views/cfg/mail/mailList.jsp       | 27 ++++++++++----
 .../WEB-INF/views/cfg/other/bgpList.jsp       | 27 ++++++++++----
 .../cfg/proxy/control/httpRedirectList.jsp    | 28 ++++++++++-----
 .../cfg/proxy/control/httpReqReplaceList.jsp  | 27 ++++++++++----
 .../cfg/proxy/control/httpResReplaceList.jsp  | 27 ++++++++++----
 .../WEB-INF/views/cfg/website/dnsList.jsp     | 26 ++++++++++----
 .../WEB-INF/views/cfg/website/httpList.jsp    | 26 ++++++++++----
 .../WEB-INF/views/cfg/website/sslList.jsp     | 26 ++++++++++----
 .../views/cfg/whitelist/domainList.jsp        |  8 ++---
 .../WEB-INF/views/cfg/whitelist/ipList.jsp    | 30 +++++++++++-----
 19 files changed, 355 insertions(+), 125 deletions(-)

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 3e99e112a..18ded5bc4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -390,6 +390,8 @@
  									<th column="social_app" ><spring:message code="social_app"/></th>
 								    <th column="behaviour_type" ><spring:message code="behaviour_type"/></th>
 								    <th column="is_audit" ><spring:message code="is_audit"/></th>
+								    <th class="sort-column r.is_valid" column="valid_identifier" ><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="whether_area_block" ><spring:message code="whether_area_block"/></th>
@@ -397,7 +399,6 @@
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
-									<th class="sort-column r.is_valid" column="valid_identifier" ><spring:message code="valid_identifier"/></th>
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time" column="config_time" ><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -455,6 +456,24 @@
 											<span indexTable="${cfg.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="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty cfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
@@ -532,11 +551,7 @@
 										</a>
 									</td>
 									
-								    <td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
+								   
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
index 2bd49ceb2..60b883acb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -385,6 +385,8 @@
 								    <th class="sort-column r.cfg_desc cfgDesc" column="config_describe" ><spring:message code="config_describe"/></th>
 									<th class="sort-column r.action" column="block_type" ><spring:message code="block_type"/></th>
 									<th column="is_audit" ><spring:message code="is_audit"/></th>
+									<th class="sort-column r.is_valid" column="valid_identifier" ><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="do_blacklist"  ><spring:message code="do_blacklist"/></th>
 									<th column="log_total" ><spring:message code="log_total"/></th>
@@ -392,8 +394,7 @@
 									<th column="letter" ><spring:message code="letter"/></th>
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
-									<th column="label" ><spring:message code="label"/></th>
-									<th class="sort-column r.is_valid" column="valid_identifier" ><spring:message code="valid_identifier"/></th>
+									<th column="label" ><spring:message code="label"/></th>									
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time" column="config_time" ><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -428,6 +429,24 @@
 											</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>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -509,11 +528,7 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</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>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
+								    
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
index de9b7d484..c35324542 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -377,6 +377,8 @@
 								    <th class="sort-column r.cfg_desc cfgDesc" column="config_describe" ><spring:message code="config_describe"/></th>
 									<th class="sort-column r.action" column="block_type" ><spring:message code="block_type"/></th>
 									<th column="is_audit" ><spring:message code="is_audit"/></th>
+									<th class="sort-column r.is_valid" column="valid_identifier" ><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="do_blacklist"  ><spring:message code="do_blacklist"/></th>
 									<th column="log_total" ><spring:message code="log_total"/></th>
@@ -385,7 +387,6 @@
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
-									<th class="sort-column r.is_valid" column="valid_identifier" ><spring:message code="valid_identifier"/></th>
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time" column="config_time" ><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -418,6 +419,24 @@
 											<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>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
@@ -500,11 +519,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</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>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
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 5858baaef..aaa0aafb8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -392,6 +392,8 @@
 								   	<th column="ratelimit" ><spring:message code="ratelimit"/></th>
 									<th column="basic_protocol" ><spring:message code="basic_protocol"/></th>
 									<th column="is_audit" ><spring:message code="is_audit"/></th>
+									<th column="valid_identifier"  class="sort-column r.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="whether_area_block" ><spring:message code="whether_area_block"/></th>
@@ -399,7 +401,6 @@
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
-									<th column="valid_identifier"  class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -455,7 +456,24 @@
 											<span indexTable="${cfg.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="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.doLog  and cfg.action!=64}">
@@ -531,11 +549,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td>
-								    <td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
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 f81660b64..dbc1538aa 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -390,6 +390,8 @@
 								    <th column="encrypted_tunnel_behavior" ><spring:message code="encrypted_tunnel_behavior"/></th>
 								    <th column="behaviour_type" ><spring:message code="behaviour_type"/></th>
 								   <th column="is_audit" ><spring:message code="is_audit"/></th>
+								   <th column="valid_identifier"  class="sort-column r.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="whether_area_block" ><spring:message code="whether_area_block"/></th>
@@ -397,7 +399,6 @@
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
-									<th column="valid_identifier"  class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -453,6 +454,24 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.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="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.doLog  and cfg.action!=64}">
@@ -528,12 +547,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td>
-								    <td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
-									
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
index ab48b12bf..2f764116e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
@@ -357,6 +357,8 @@
 								    <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>
 									<th column="is_audit" ><spring:message code="is_audit"/></th>
+									<th column="valid_identifier"  class="sort-column r.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="do_blacklist"  ><spring:message code="do_blacklist"/></th>
 									<th column="log_total" ><spring:message code="log_total"/></th> 
@@ -365,7 +367,6 @@
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
-									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -397,6 +398,24 @@
 											<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>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
@@ -480,12 +499,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</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>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
-									
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
index e9ee7b755..9f43c56b6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
@@ -371,6 +371,8 @@
 								    <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>
 								    <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>
 								    <th column="do_blacklist"  ><spring:message code="do_blacklist"/></th>
 								    <th column="log_total" ><spring:message code="log_total"/></th>
@@ -379,7 +381,6 @@
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
-									<th column="valid_identifier"  class="sort-column a.is_valid" ><spring:message code="valid_identifier"/></th>
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -412,6 +413,24 @@
 											<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>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -494,11 +513,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</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>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
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 a0f4fb4b7..644a47fd6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -409,14 +409,15 @@
 							    		<th column="userregion1" ><spring:message code="intercept_intensity"/></th>
 							    	</c:if> --%>
 							    	<th column="is_audit" ><spring:message code="is_audit"/></th>
-							    	<%-- <th column="do_log" ><spring:message code="do_log"/></th> --%>
-									<%-- <th column="log_total" ><spring:message code="log_total"/></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>
+									<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>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
-									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>									
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -552,14 +553,32 @@
 											<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.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</td>
+									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog   and indexCfg.action!=64 }">
 												<spring:message code="${dict.itemValue }"/>
 											</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>
+									<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}">
@@ -626,11 +645,6 @@
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
 											${fns:abbr(lableInfo,20)}
 										</a>
-									</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>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>									
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
index 1bf9dda95..4ef3ad3c4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -430,7 +430,7 @@
 										<c:choose>
 											<c:when test="${not empty indexCfg.schedule }">
 												<span isScheduler="yes">
-													<i class="fa fa-clock-o" style="color:#d9534f;font-size:20px"></i>
+													<i class="icon-clock icon-state-danger"></i>
 												</span>
 											</c:when>
 											<c:otherwise>
@@ -438,7 +438,6 @@
 												</span>
 											</c:otherwise>
 										</c:choose>
-										
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
index bf3c933fb..2786a4b48 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
@@ -372,6 +372,8 @@
 								    <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>
 									<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>
 									<th column="do_blacklist"  ><spring:message code="do_blacklist"/></th>
 									<th column="log_total" ><spring:message code="log_total"/></th> 
@@ -380,7 +382,6 @@
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
-									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -413,7 +414,24 @@
 											<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>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog and indexCfg.action!=128}">
@@ -496,11 +514,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</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>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
index 87d6b929b..c2d505eb4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -371,6 +371,8 @@
 								    <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>
 									<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>
 									<%-- <th column="do_blacklist"  ><spring:message code="do_blacklist"/></th> --%>
 									<th column="log_total" ><spring:message code="log_total"/></th>
@@ -379,7 +381,6 @@
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
-									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -412,6 +413,24 @@
 											<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>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</td>
 									<td>
 									<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -494,12 +513,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</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>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
-									
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
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 7ca799c3a..f875bfd3c 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
@@ -593,6 +593,8 @@
 										<th column="userregion3" ><spring:message code="replace_content"/></th>
 									</c:if>
 									<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>
 									<c:if test="${action ne 128}">
 										<th column="do_log" ><spring:message code="do_log"/></th>
 									</c:if>
@@ -604,8 +606,6 @@
 									<th column="classification" ><spring:message code="classification"/></th>
 									<th column="attribute" ><spring:message code="attribute"/></th>
 									<th column="label" ><spring:message code="label"/></th>
-									<th column="valid_identifier"  class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
-									
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -691,7 +691,24 @@
 											<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>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</td>
 									<c:if test="${action ne 128}">
 										<td>
 											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
@@ -771,11 +788,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</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>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
index 316f86dda..a08bed364 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
@@ -279,13 +279,14 @@
 									<th><spring:message code="match_method"/></th>
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
+									<th><spring:message code="is_schduler"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -343,6 +344,24 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.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="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</td>
 									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
@@ -411,12 +430,6 @@
 										</a>
 									</td>
 									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
-									<td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
-									
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
index 1c5c5ceb5..39b7f0491 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
@@ -281,13 +281,14 @@
 									<th><spring:message code="match_method"/></th>
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
+									<th><spring:message code="is_schduler"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -346,6 +347,24 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.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="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</td>
 									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
@@ -414,12 +433,6 @@
 										</a>
 									</td>
 									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
-									<td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
-									
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
index 269495bb2..b6f689f79 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -370,6 +370,8 @@
 								    <th column="block_type"   class="sort-column a.action"><spring:message code="block_type"/></th>
 								    <th column="policy_name"  ><spring:message code="policy_name"/></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>
 									<%-- <th column="do_blacklist"  ><spring:message code="do_blacklist"/></th> --%>
 									<th column="log_total"  ><spring:message code="log_total"/></th> 
@@ -378,7 +380,6 @@
 									<th column="classification"  ><spring:message code="classification"/></th>
 									<th column="attribute"  ><spring:message code="attribute"/></th>
 									<th column="label"  ><spring:message code="label"/></th>
-									<th column="valid_identifier"   class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="creator"  ><spring:message code="creator"/></th>
 									<th column="config_time"   class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th column="editor"  ><spring:message code="editor"/></th>
@@ -416,6 +417,24 @@
 											<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>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -498,11 +517,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</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>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index d955750be..038fe080a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -530,6 +530,8 @@
 								    <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>
 									<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>
 									<th column="do_blacklist"  ><spring:message code="do_blacklist"/></th>
 									<th column="log_total"  ><spring:message code="log_total"/></th>
@@ -538,7 +540,6 @@
 									<th column="classification"  ><spring:message code="classification"/></th>
 									<th column="attribute"  ><spring:message code="attribute"/></th>
 									<th column="label"  ><spring:message code="label"/></th>
-									<th column="valid_identifier"   class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="creator"  ><spring:message code="creator"/></th>
 									<th column="config_time"   class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th column="editor"  ><spring:message code="editor"/></th>
@@ -571,6 +572,24 @@
 											<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>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -653,11 +672,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</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>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
index 80a66efa1..1df1576c8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
@@ -368,6 +368,8 @@
 								    <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>
 									<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>
 									<th column="do_blacklist"  ><spring:message code="do_blacklist"/></th>
 									<th column="log_total"  ><spring:message code="log_total"/></th> 
@@ -376,7 +378,6 @@
 									<th column="classification"  ><spring:message code="classification"/></th>
 									<th column="attribute"  ><spring:message code="attribute"/></th>
 									<th column="label"  ><spring:message code="label"/></th>
-									<th column="valid_identifier"   class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="creator"  ><spring:message code="creator"/></th>
 									<th column="config_time"   class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th column="editor"  ><spring:message code="editor"/></th>
@@ -409,6 +410,24 @@
 											<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>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes">
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -491,11 +510,6 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</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>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
index 4456e56a0..d4b36260d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -350,7 +350,7 @@
 									<th column="block_type"   class="sort-column a.action"><spring:message code="block_type"/></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><spring:message code="is_schduler"/></th>
 									<th column="do_log"  ><spring:message code="do_log"/></th>
 									<th column="do_blacklist"  ><spring:message code="do_blacklist"/></th>
 									<th column="log_total"  ><spring:message code="log_total"/></th> 
@@ -398,11 +398,11 @@
 										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<%-- <td class="schedulerFlag">
+									<td class="schedulerFlag">
 										<c:choose>
 											<c:when test="${not empty indexCfg.schedule }">
 												<span isScheduler="yes">
-													<i class="fa fa-clock-o" style="color:#d9534f;font-size:20px"></i>
+													<i class="icon-clock icon-state-danger"></i>
 												</span>
 											</c:when>
 											<c:otherwise>
@@ -410,7 +410,7 @@
 												</span>
 											</c:otherwise>
 										</c:choose>
-									</td> --%>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog and indexCfg.action!=128}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
index da2b28a1e..b198df2e4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -374,10 +374,11 @@
 									<th column="attribute"  ><spring:message code="attribute"/></th>
 									<th column="label"  ><spring:message code="label"/></th> --%>
 									
-									<th column="is_audit"  ><spring:message code="is_audit"/></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>
 									<th column="log_total"  ><spring:message code="log_total"/></th>
-									<th column="valid_identifier"   class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th column="creator"  ><spring:message code="creator"/></th>
 									<th column="config_time"   class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th column="editor"  ><spring:message code="editor"/></th>
@@ -476,7 +477,25 @@
 											<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 class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
-									</td>									
+									</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>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td class="schedulerFlag">
+										<c:choose>
+											<c:when test="${not empty indexCfg.schedule }">
+												<span isScheduler="yes" >
+													<i class="icon-clock icon-state-danger"></i>
+												</span>
+											</c:when>
+											<c:otherwise>
+												<span isScheduler="no">
+												</span>
+											</c:otherwise>
+										</c:choose>
+									</td>								
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
@@ -485,11 +504,6 @@
 										</c:forEach>
 									</td>
 									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></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>
-										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>