同步feature-traffic-log分支修改的增加定时器插件策略表单

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

38 files changed, 294 insertions, 24 deletions

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 0b7457499..2dfc31763 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1496,4 +1496,5 @@ on=On
 validate_error=Unexpected error occurred while validating

 Is_schduler=Scheduler

 v4_num=IPv4 Number

-v6_num=IPv6 Number
\ No newline at end of file
+v6_num=IPv6 Number

+is_schduler=Scheduler
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index d152a1ba8..68793e06f 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1497,4 +1497,6 @@ everyWeek=\u0415\u0436\u0435\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u043E
 everyMonth=\u0415\u0436\u0435\u043C\u0435\u0441\u044F\u0447\u043D\u043E

 validate_error=Unexpected error occurred while validating

 v4_num=IPv4 Number

-v6_num=IPv6 Number
\ No newline at end of file
+v6_num=IPv6 Number

+on=On

+is_schduler=Scheduler
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
index 9c977be73..2af5c1188 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -481,6 +481,8 @@ var delContent = function(contentClassName, addBtnClassName) {
 							</c:forEach>

                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>

                            <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>

+                           <br>

+						   <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

                           </div>

                           <div class="form-actions">

                               <div class="row">

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp
index dc86168ad..bfe9d0160 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp
@@ -36,7 +36,13 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:forEach>

-

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 <c:forEach items="${tabList}" var="region">

 	<c:if test="${region[0] eq 1 }">

@@ -240,4 +246,10 @@
 		</c:forEach>

 	</c:if>

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contSubList.jsp
index bcb73ceb1..530f3cc07 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contSubList.jsp
@@ -18,7 +18,13 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:forEach>

-

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 <c:forEach items="${tabList}" var="region">

 	<c:if test="${region[0] eq 1 }">

@@ -325,4 +331,10 @@
 		</c:forEach>

 	</c:if>

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
index 8b3bac4e8..0c105a652 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
@@ -359,6 +359,8 @@
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>

 								<br>

 								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>

+								<br>

+						   		<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

 								<div class="form-actions">

 									<div class="row">

 										<div class="col-md-6">

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
index e3a580387..e835c98ce 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
@@ -382,6 +382,8 @@
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>

 								<br>

 								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>

+								<br>

+						   		<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

 								<div class="form-actions">

 									<div class="row">

 										<div class="col-md-6">

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp
index 383a36eb5..d707b2fd6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp
@@ -19,6 +19,13 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:forEach>

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 <c:forEach items="${tabList}" var="region">

 	<c:if test="${region[0] eq 1 }">

@@ -327,4 +334,10 @@
 		</c:forEach>

 	</c:if>

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp
index 4adbf8a99..79f02f9b8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp
@@ -36,7 +36,13 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:forEach>

-

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 <c:forEach items="${tabList}" var="region">

 	<c:if test="${region[0] eq 1 }">

@@ -239,4 +245,10 @@
 		</c:forEach>

 	</c:if>

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
index e5a078a4d..ce256091d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
@@ -430,6 +430,8 @@ var switchRateLimitType=function(){
 							</c:forEach>

                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>

                            <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>

+                          <br>

+						   <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

                           </div>

                           <div class="form-actions">

                               <div class="row">

diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp
index dc86168ad..bfe9d0160 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp
@@ -36,7 +36,13 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:forEach>

-

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 <c:forEach items="${tabList}" var="region">

 	<c:if test="${region[0] eq 1 }">

@@ -240,4 +246,10 @@
 		</c:forEach>

 	</c:if>

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
index ca66ac2d9..e82e9ed12 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
@@ -462,6 +462,8 @@ var switchRateLimitType=function(){
 							</c:forEach>

                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>

                            <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>

+                           <br>

+						   <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

                           </div>

                           <div class="form-actions">

                               <div class="row">

diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
index 41229617f..08ec2ebd3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
@@ -4,7 +4,7 @@
 <head>

 <title><spring:message code="${cfgName}"></spring:message></title>

 

-<style type="text/css">

+<style type="text/css">"src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp"

 .boxSolid {

 	border: 1px solid #eeeeee

 }

@@ -421,6 +421,8 @@
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>

 								<br>

 								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>

+								<br>

+						   <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

 								<div class="form-actions">

 									<div class="row">

 										<div class="col-md-6">

diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
index eed75b246..7f9402f7e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
@@ -18,7 +18,13 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:forEach>

-

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 <c:forEach items="${tabList}" var="region">

 	<c:if test="${region[0] eq 1 }">

@@ -370,4 +376,10 @@
 		</c:forEach>

 	</c:if> --%>

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
index 4b17b8ed6..755380351 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
@@ -399,6 +399,8 @@
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>

 								<br>

 								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>

+								<br>

+						   		<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

 								<div class="form-actions">

 									<div class="row">

 										<div class="col-md-6">

diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp
index 829491f4f..a5760a3e5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp
@@ -18,7 +18,13 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:forEach>

-

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 <c:forEach items="${tabList}" var="region">

 	<c:if test="${region[0] eq 1 }">

@@ -454,4 +460,10 @@
 	</c:if>

 	

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
index 2c5d432bd..714ed758e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -918,6 +918,8 @@
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>

 								<br>

 								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>

+								<br>

+								<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

 								<div class="form-actions">

 									<div class="row">

 										<div class="col-md-6">

diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp
index 461683af3..98f4d66a4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp
@@ -18,7 +18,13 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:forEach>

-

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 <c:forEach items="${tabList}" var="region">

 	<c:if test="${region[0] eq 1 }">

@@ -283,4 +289,10 @@
 		</c:forEach>

 	</c:if>

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
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..424466755 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -370,8 +370,8 @@
 									<th column="block_type"  class="sort-column a.action"><spring:message code="block_type"/></th>

 									<th column="userregion2" ><spring:message code="ratelimit"/></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="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>

@@ -441,6 +441,25 @@
 										

 									</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="fa fa-clock-o" style="color:#d9534f;font-size:20px"></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 and indexCfg.action!=32}">

 												<spring:message code="${dict.itemValue }"/>

diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
index 1931395fe..96ac2ac6f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
@@ -423,6 +423,8 @@
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>

 								<br>

 								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>

+								<br>

+						   <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

 								<div class="form-actions">

 									<div class="row">

 										<div class="col-md-6">

diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
index 429d3a513..3aa3b57a8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
@@ -19,6 +19,13 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:forEach>

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 <c:forEach items="${tabList}" var="region">

 	<c:if test="${region[0] eq 1 }">

@@ -383,4 +390,10 @@
 		</c:forEach>

 	</c:if>

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
index 48851bb2e..3d3a9249e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
@@ -390,6 +390,8 @@
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>

 								<br>

 								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>

+								<br>

+						       <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

 								<div class="form-actions">

 									<div class="row">

 										<div class="col-md-6">

diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp
index 2a0f84755..5ee04bd06 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp
@@ -18,7 +18,13 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:forEach>

-

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 <c:forEach items="${tabList}" var="region">

 	<c:if test="${region[0] eq 1 }">

@@ -327,4 +333,10 @@
 		</c:forEach>

 	</c:if>

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
index 98339270d..c247aa4ca 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
@@ -390,6 +390,8 @@
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>

 								<br>

 								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>

+								<br>

+								<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

 								<div class="form-actions">

 									<div class="row">

 										<div class="col-md-6">

diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
index 0f0d376a3..2d5322b46 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
@@ -60,6 +60,13 @@
 		<i id="resBody${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:if>

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 

 <c:forEach items="${_cfg.ipPortList}" var="cfg">

@@ -780,4 +787,10 @@
 	</div>

 

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
index 516c3c943..1e908a9ee 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
@@ -124,6 +124,8 @@ $(function(){
                            <%@include file="/WEB-INF/include/form/stringInfo.jsp" %>

                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>

                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>

+                            <br>

+							<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

                           </div>

                           <div class="form-actions">

                               <div class="row">

diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
index c1b4ca866..090883f4f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
@@ -124,6 +124,8 @@ $(function(){
                            <%@include file="/WEB-INF/include/form/stringInfo.jsp" %>

                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>

                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>

+                            <br>

+							<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

                           </div>

                           <div class="form-actions">

                               <div class="row">

diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
index 68c3b2efc..6442a254e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -376,6 +376,8 @@
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>

 								<br>

 								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>

+								<br>

+						   <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

 								<div class="form-actions">

 									<div class="row">

 										<div class="col-md-6">

diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
index 45d25edca..964e0604f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
@@ -18,7 +18,13 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:forEach>

-

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 <c:forEach items="${tabList}" var="region">

 	<c:if test="${region[0] eq 1 }">

@@ -338,4 +344,10 @@
 		</c:forEach>

 	</c:if>

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
index 729f8fa49..930e0e323 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
@@ -468,6 +468,8 @@
 													<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>

 													<br>

 													<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>

+													<br>

+													<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

 													<div class="form-actions">

 														<div class="row">

 															<div class="col-md-6">

diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
index f17ff9564..cdd7ca07e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
@@ -60,6 +60,13 @@
 		<i id="resBody${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:if>

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 

 <c:forEach items="${_cfg.ipPortList}" var="cfg">

@@ -782,5 +789,10 @@
 	</div>

 

 </c:forEach>

-

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
index 0d2ee645b..49dfa7105 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
@@ -376,6 +376,8 @@
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>

 								<br>

 								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>

+								<br>

+						   <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

 								<div class="form-actions">

 									<div class="row">

 										<div class="col-md-6">

diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp
index a38dd34d1..67d0567fd 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp
@@ -18,7 +18,13 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:forEach>

-

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 <c:forEach items="${tabList}" var="region">

 	<c:if test="${region[0] eq 1 }">

@@ -325,4 +331,10 @@
 		</c:forEach>

 	</c:if>

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
index d4fb3a943..b78839b79 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
@@ -330,6 +330,8 @@
 								<br>

 								<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>

                            		<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>

+                           		<br>

+								<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

 								<div class="form-actions">

 									<div class="row">

 										<div class="col-md-6">

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 380cdc460..4456e56a0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -349,6 +349,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> 

@@ -357,7 +359,7 @@
 									<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>

@@ -392,6 +394,24 @@
 										</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="fa fa-clock-o" style="color:#d9534f;font-size:20px"></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}">

 												<spring:message code="${dict.itemValue }"/>

@@ -473,11 +493,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/whitelist/domianSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
index fb13116e1..3fbe6cfa4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
@@ -18,7 +18,13 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:forEach>

-

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 <c:forEach items="${tabList}" var="region">

 	<c:if test="${region[0] eq 1 }">

@@ -333,4 +339,10 @@
 		</c:forEach>

 	</c:if>

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
index 3e724e8e0..f32e4e221 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
@@ -334,6 +334,9 @@
 								<input type="hidden" name="lable" value="0"/>

 								<%--@include file="/WEB-INF/include/form/areaInfo.jsp"--%>

 								<%--@include file="/WEB-INF/include/form/basicInfo.jsp"--%>

+								<br>

+								<%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>

+								

 								<div class="form-actions">

 									<div class="row">

 										<div class="col-md-6">

diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
index 667c37574..26eaf22d3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
@@ -18,7 +18,13 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>

 	</div>

 </c:forEach>

-

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleTitle${index}" onclick="switchSubCfgTabInfo('schedule',${index})"

+		class="col-md-1 tabInfo" name="tabTitle${index }">

+			<spring:message code='schedule' />

+			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>

+	</div>

+</c:if>

 </div>

 <c:forEach items="${tabList}" var="region">

 	<c:if test="${region[0] eq 1 }">

@@ -219,4 +225,10 @@
 		</c:forEach>

 	</c:if>

 </c:forEach>

+<!-- 显示 定时任务信息 -->

+<c:if test="${not empty _cfg.schedule }">

+	<div id="scheduleInfo${index}" class="content" name="subCfg${index}">

+			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>

+	</div>

+</c:if>

 </html>
\ No newline at end of file