增加定时器

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

src/main/resources/messages/message_en.properties

@@ -1482,13 +1482,16 @@ intercep_domain_required_tip=Domain is required
 packets=packets
 GByte=GByte
 #\u5B9A\u65F6\u5668\u53C2\u6570
-interval=Interval
-month=Month
-day=Day
+interval=Recure every
+month=Months
+day=Days
+week=weeks
 startTime=Start Time
 endTime=End Time
-single=Single
-everyDay=Every Day
-everyWeek=Every Week
-everyMonth=Every Month
-validate_error=Unexpected error occurred while validating
+single=One Time
+everyDay=Daily
+everyWeek=Weekly
+everyMonth=Monthly
+on=On
+validate_error=Unexpected error occurred while validating
+is_schduler=Scheduler

src/main/resources/messages/message_ru.properties

@@ -1490,10 +1490,13 @@ GByte=GByte
 interval=\u041F\u0440\u043E\u043C\u0435\u0436\u0443\u0442\u043E\u043A
 month=\u041C\u0435\u0441\u044F\u0446\u044B
 day=\u0414\u043D\u0438
+week=weeks
 startTime=\u041D\u0430\u0447\u0430\u0442\u044C
 endTime=\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044C
 single=\u041E\u0434\u043D\u043E\u043A\u0440\u0430\u0442\u043D\u043E
 everyDay=\u0415\u0436\u0435\u0434\u043D\u0435\u0432\u043D\u043E
 everyWeek=\u0415\u0436\u0435\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u043E
 everyMonth=\u0415\u0436\u0435\u043C\u0435\u0441\u044F\u0447\u043D\u043E
+on=On
+is_schduler=Scheduler
 validate_error=Unexpected error occurred while validating

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">

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>

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>

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">

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">

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>

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>

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">

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>

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">

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">

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>

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">

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>

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">

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>

src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

@@ -370,6 +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="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>
@@ -420,6 +421,25 @@
 											</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="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}">
@@ -502,11 +522,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>

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">

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>

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">

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>

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">

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>

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">

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">

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">

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>

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">

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>

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">

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>

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">

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>
@@ -391,6 +393,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="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}">
@@ -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>

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>

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">

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>