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

合并develop分支定时器功能

Browse Source 
Conflicts:
	src/main/java/com/nis/domain/configuration/BaseCfg.java
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
This commit is contained in:
zhangwei
2019-01-26 18:02:44 +06:00
parent c1c5c8f5bb
commit 2db43e69d9
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,7 +371,7 @@
<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><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>
@@ -426,7 +426,7 @@
<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">
@@ -439,7 +439,7 @@
</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!=64 and indexCfg.action!=32}">