gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加定时器

Browse Source 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
This commit is contained in:
zhangwei
2019-01-26 19:01:41 +06:00
parent 87e07376fa
commit 9b304e3c13
38 changed files with 303 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
View File

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

28
src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
View File

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

14
src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
View File

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

3
src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
View File

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

14
src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
View File

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