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

1.是否表达式->匹配方式修改 2.去除"取消审核通过"状态查询条件 3.配置列表界面增加列表根据action排序

Browse Source
This commit is contained in:
zhangwenqing
2018-09-11 19:16:15 +08:00
parent 66f1ff33f1
commit 0e9110602b
49 changed files with 55 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
View File

@@ -83,7 +83,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>

1
src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
View File

@@ -83,7 +83,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>

1
src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
View File

@@ -83,7 +83,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>

1
src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
View File

@@ -83,7 +83,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>

1
src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
View File

@@ -86,7 +86,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>

3
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
View File

@@ -128,7 +128,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -321,7 +320,7 @@
<th><spring:message code="social_app"/></th> <th><spring:message code="social_app"/></th>
<th><spring:message code="behaviour_type"/></th> <th><spring:message code="behaviour_type"/></th>
<%-- <th><spring:message code="ratelimit"/></th> <%-- <th><spring:message code="ratelimit"/></th>
--%> <th><spring:message code="block_type"/></th> --%> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th> <th><spring:message code="classification"/></th>

1
src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
View File

@@ -83,7 +83,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>

1
src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
View File

@@ -81,7 +81,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>

1
src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
View File

@@ -80,7 +80,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>

1
src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
View File

@@ -101,7 +101,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
<div class="pull-left"> <div class="pull-left">

1
src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp
View File

@@ -121,7 +121,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>

2
src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
View File

@@ -289,7 +289,7 @@
<th><spring:message code="port_pattern"/></th> <th><spring:message code="port_pattern"/></th>
<th><spring:message code="direction"/></th> <th><spring:message code="direction"/></th>
<th><spring:message code="protocol"/></th> <th><spring:message code="protocol"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

2
src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
View File

@@ -281,7 +281,7 @@
<th><spring:message code="is_case_insenstive"/></th> <th><spring:message code="is_case_insenstive"/></th>
<th><spring:message code="expression_type"/></th> <th><spring:message code="expression_type"/></th>
<th><spring:message code="match_method"/></th> <th><spring:message code="match_method"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="is_audit"/></th> <th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th> <th><spring:message code="log_total"/></th>

3
src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
View File

@@ -87,7 +87,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -274,7 +273,7 @@
<%-- <th><spring:message code="seq"/></th> --%> <%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="src_file"/></th> <th><spring:message code="src_file"/></th>
<th><spring:message code="sample_file"/></th> <th><spring:message code="sample_file"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="harm_level"/></th> <th><spring:message code="harm_level"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th> <th><spring:message code="classification"/></th>

2
src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
View File

@@ -289,7 +289,7 @@
<th><spring:message code="port_pattern"/></th> <th><spring:message code="port_pattern"/></th>
<th><spring:message code="direction"/></th> <th><spring:message code="direction"/></th>
<th><spring:message code="protocol"/></th> <th><spring:message code="protocol"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

2
src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
View File

@@ -283,7 +283,7 @@
<th><spring:message code="is_case_insenstive"/></th> <th><spring:message code="is_case_insenstive"/></th>
<th><spring:message code="expression_type"/></th> <th><spring:message code="expression_type"/></th>
<th><spring:message code="match_method"/></th> <th><spring:message code="match_method"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="is_audit"/></th> <th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th> <th><spring:message code="log_total"/></th>

2
src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
View File

@@ -282,7 +282,7 @@
<th><spring:message code="sample_sign"/></th> <th><spring:message code="sample_sign"/></th>
<th><spring:message code="harm_level"/></th> <th><spring:message code="harm_level"/></th>
<th><spring:message code="config_describe"/></th> <th><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th> <th><spring:message code="classification"/></th>

3
src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
View File

@@ -446,7 +446,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -633,7 +632,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

3
src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
View File

@@ -458,7 +458,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -646,7 +645,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

3
src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
View File

@@ -131,7 +131,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -325,7 +324,7 @@
<th><spring:message code="basic_protocol"/></th> <th><spring:message code="basic_protocol"/></th>
<%-- <th><spring:message code="behaviour_type"/></th> --%> <%-- <th><spring:message code="behaviour_type"/></th> --%>
<%-- <th><spring:message code="ratelimit"/></th> --%> <%-- <th><spring:message code="ratelimit"/></th> --%>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

2
src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
View File

@@ -263,7 +263,7 @@
<%-- <th><spring:message code="seq"/></th> --%> <%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th> <th><spring:message code="config_describe"/></th>
<th><spring:message code="domain_name"/></th> <th><spring:message code="domain_name"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="expression_type"/></th> <th><spring:message code="expression_type"/></th>
<th><spring:message code="match_method"/></th> <th><spring:message code="match_method"/></th>
<th><spring:message code="is_hex"/></th> <th><spring:message code="is_hex"/></th>

8
src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
View File

@@ -145,7 +145,11 @@
<form:select path="isAudit" class="selectpicker select2 input-small"> <form:select path="isAudit" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="all_states"/></form:option> <form:option value=""><spring:message code="all_states"/></form:option>
<c:forEach items="${fns:getDictList('AUDIT_STATUS')}" var="auditC"> <c:forEach items="${fns:getDictList('AUDIT_STATUS')}" var="auditC">
<form:option value="${auditC.itemCode}"><spring:message code="${auditC.itemValue}"></spring:message></form:option> <c:if test="${auditC.itemCode ne 3}">
<form:option value="${auditC.itemCode}">
<spring:message code="${auditC.itemValue}"/>
</form:option>
</c:if>
</c:forEach> </c:forEach>
</form:select> </form:select>
</div> </div>
@@ -345,7 +349,7 @@
<th exportColumn="client_ip"><spring:message code="IP"/></th> <th exportColumn="client_ip"><spring:message code="IP"/></th>
<th exportColumn="client_port"><spring:message code="port"/></th> <th exportColumn="client_port"><spring:message code="port"/></th>
</c:if> </c:if>
<th exportColumn="block_type"><spring:message code="block_type"/></th> <th exportColumn="block_type" class="sort-column r.action"><spring:message code="block_type"/></th>
<th exportColumn="direction"><spring:message code="direction"/></th> <th exportColumn="direction"><spring:message code="direction"/></th>
<th exportColumn="protocol"><spring:message code="protocol"/></th> <th exportColumn="protocol"><spring:message code="protocol"/></th>
<c:if test="${specialFunctionId ne 'ipmulitiplex'}"> <c:if test="${specialFunctionId ne 'ipmulitiplex'}">

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

@@ -92,7 +92,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -285,7 +284,7 @@
<%-- <th><spring:message code="seq"/></th> --%> <%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th> <th><spring:message code="config_describe"/></th>
<th><spring:message code="key_word"/></th> <th><spring:message code="key_word"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th> <th><spring:message code="classification"/></th>

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

@@ -290,7 +290,7 @@
<th><spring:message code="port_pattern"/></th> <th><spring:message code="port_pattern"/></th>
<th><spring:message code="direction"/></th> <th><spring:message code="direction"/></th>
<th><spring:message code="protocol"/></th> <th><spring:message code="protocol"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th> <th><spring:message code="classification"/></th>

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

@@ -282,7 +282,7 @@
<%-- <th><spring:message code="port"/></th> --%> <%-- <th><spring:message code="port"/></th> --%>
<th><spring:message code="ip_pattern"/></th> <th><spring:message code="ip_pattern"/></th>
<%-- <th><spring:message code="port_pattern"/></th> --%> <%-- <th><spring:message code="port_pattern"/></th> --%>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th> <th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th> <th><spring:message code="attribute"/></th>

3
src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
View File

@@ -131,7 +131,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -325,7 +324,7 @@
<th><spring:message code="encrypted_tunnel_behavior"/></th> <th><spring:message code="encrypted_tunnel_behavior"/></th>
<th><spring:message code="behaviour_type"/></th> <th><spring:message code="behaviour_type"/></th>
<%-- <th><spring:message code="ratelimit"/></th> --%> <%-- <th><spring:message code="ratelimit"/></th> --%>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

3
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
View File

@@ -123,7 +123,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -311,7 +310,7 @@
<th><spring:message code="raw_len"/></th> <th><spring:message code="raw_len"/></th>
<th><spring:message code="cfds_level"/></th> <th><spring:message code="cfds_level"/></th>
<th><spring:message code="file_url"/></th> <th><spring:message code="file_url"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th> <th><spring:message code="classification"/></th>

3
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
View File

@@ -125,7 +125,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -313,7 +312,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

3
src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
View File

@@ -121,7 +121,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -304,7 +303,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

3
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -128,7 +128,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -323,7 +322,7 @@
<th><spring:message code="replaced_content"/></th> <th><spring:message code="replaced_content"/></th>
<th><spring:message code="replace_content"/></th> <th><spring:message code="replace_content"/></th>
</c:if> </c:if>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<%-- <th><spring:message code="do_log"/></th> --%> <%-- <th><spring:message code="do_log"/></th> --%>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

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

@@ -89,7 +89,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
<div class="pull-left"> <div class="pull-left">
@@ -287,7 +286,7 @@
<th><spring:message code="server_address_mask"/></th> <th><spring:message code="server_address_mask"/></th>
<th><spring:message code="server_port"/></th> <th><spring:message code="server_port"/></th>
<th><spring:message code="server_port_mask"/></th> <th><spring:message code="server_port_mask"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<c:choose> <c:choose>
<c:when test="${action==5}"> <c:when test="${action==5}">
</c:when> </c:when>

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

@@ -121,7 +121,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -133,10 +132,6 @@
<form:select path="seltype" class="selectpicker select2 input-small" > <form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option> <form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option> <form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<%-- <form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
</form:select> </form:select>
</div> </div>
@@ -308,7 +303,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

3
src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
View File

@@ -122,7 +122,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -309,7 +308,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

2
src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
View File

@@ -266,7 +266,7 @@
<th><spring:message code="res_group_num"/></th> <th><spring:message code="res_group_num"/></th>
<th><spring:message code="min_ttl"/></th> <th><spring:message code="min_ttl"/></th>
<th><spring:message code="max_ttl"/></th> <th><spring:message code="max_ttl"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="is_audit"/></th> <th><spring:message code="is_audit"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

2
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
View File

@@ -268,7 +268,7 @@
<th><spring:message code="direction"/></th> --%> <th><spring:message code="direction"/></th> --%>
<th><spring:message code="location"/></th> <th><spring:message code="location"/></th>
<th><spring:message code="ip_type"/></th> <th><spring:message code="ip_type"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="is_audit"/></th> <th><spring:message code="is_audit"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th> <th><spring:message code="classification"/></th>

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

@@ -114,7 +114,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
<div class="pull-left"> <div class="pull-left">
@@ -381,7 +380,7 @@
</c:if> </c:if>
</c:forEach> </c:forEach>
<%--遍历子表属性 --%> <%--遍历子表属性 --%>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="classification"/></th> <th><spring:message code="classification"/></th>

3
src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
View File

@@ -123,7 +123,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -311,7 +310,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

3
src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
View File

@@ -123,7 +123,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -310,7 +309,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

3
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
View File

@@ -311,7 +311,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -505,7 +504,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<c:if test="${action == 16}"> <c:if test="${action == 16}">
<th><spring:message code="response_code"/></th> <th><spring:message code="response_code"/></th>
<th><spring:message code="response_content"/></th> <th><spring:message code="response_content"/></th>

2
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
View File

@@ -262,7 +262,7 @@
<th><spring:message code="is_case_insenstive"/></th> <th><spring:message code="is_case_insenstive"/></th>
<th><spring:message code="expression_type"/></th> <th><spring:message code="expression_type"/></th>
<th><spring:message code="match_method"/></th> <th><spring:message code="match_method"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="is_audit"/></th> <th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th> <th><spring:message code="log_total"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>

2
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
View File

@@ -263,7 +263,7 @@
<th><spring:message code="is_case_insenstive"/></th> <th><spring:message code="is_case_insenstive"/></th>
<th><spring:message code="expression_type"/></th> <th><spring:message code="expression_type"/></th>
<th><spring:message code="match_method"/></th> <th><spring:message code="match_method"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="is_audit"/></th> <th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th> <th><spring:message code="log_total"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>

1
src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
View File

@@ -86,7 +86,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>

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

@@ -91,7 +91,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -267,7 +266,7 @@
<%-- <th><spring:message code="seq"/></th> --%> <%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th> <th><spring:message code="config_describe"/></th>
<th><spring:message code="key_word"/></th> <th><spring:message code="key_word"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column r.action"><spring:message code="block_type"/></th>
<c:choose> <c:choose>
<c:when test="${action==5}"> <c:when test="${action==5}">
</c:when> </c:when>

3
src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
View File

@@ -121,7 +121,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -309,7 +308,7 @@
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="policy_name"/></th> <th><spring:message code="policy_name"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

3
src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
View File

@@ -279,7 +279,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -466,7 +465,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

3
src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
View File

@@ -121,7 +121,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -308,7 +307,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

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

@@ -121,7 +121,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -308,7 +307,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<%-- <th><spring:message code="do_log"/></th> <%-- <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

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

@@ -121,7 +121,6 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select> </form:select>
</div> </div>
@@ -308,7 +307,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th class="sort-column a.action"><spring:message code="block_type"/></th>
<%-- <th><spring:message code="do_log"/></th> <%-- <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>

20
src/main/webapp/static/global/scripts/common.js
View File

@@ -264,13 +264,16 @@ $(function(){
areaControlInit(); areaControlInit();
/*=====关键字与表达式处理 开始=====*/ /*=====关键字与表达式处理 开始=====*/
var tagsInputSettings="#tags"; var tagsInputSettings="#tags";
var options;
$("input[name$='cfgKeywords']").each(function(){ $("input[name$='cfgKeywords']").each(function(){
var tagsId = $(this).attr("id"); var tagsId = $(this).attr("id");
var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0]; var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];
var isTags = $(this).hasClass("tags");//有tags样式的关键字输入框才需处理 var isTags = $(this).hasClass("tags");//有tags样式的关键字输入框才需处理
if(typeof(tagsId)!=='undefined' && tagsId.indexOf("tags_")!=-1 && isTags){ if(typeof(tagsId)!=='undefined' && tagsId.indexOf("tags_")!=-1 && isTags){
if($("input:radio[name='"+objNamePrefix+"exprType']").val()==1){ if($("input:radio[name='"+objNamePrefix+"exprType']").val()==0){
$("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").attr("disabled",true); //$("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").attr("disabled",true);
options = $("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").clone();
$("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").remove();
} }
//表单中如果有关键字内容可能输入多个关键字的情况，根据输入关键字个数确定表达式选中情况，不允许手动选中 //表单中如果有关键字内容可能输入多个关键字的情况，根据输入关键字个数确定表达式选中情况，不允许手动选中
$("input:radio[name='"+objNamePrefix+"exprType']").attr("disabled",true); $("input:radio[name='"+objNamePrefix+"exprType']").attr("disabled",true);
@@ -296,7 +299,7 @@ $(function(){
keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim(); keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim();
}); });
$(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/ $(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/
exprTypeChecked(objNamePrefix,size); exprTypeChecked(objNamePrefix,size,options);
}, },
onRemoveTag:function(tag,size){ onRemoveTag:function(tag,size){
$(this).parents(".col-md-6").next("div").html(""); $(this).parents(".col-md-6").next("div").html("");
@@ -306,7 +309,7 @@ $(function(){
keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim(); keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim();
}); });
$(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/ $(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/
exprTypeChecked(objNamePrefix,size); exprTypeChecked(objNamePrefix,size,options);
} }
}); });
$(".tagsinput").popover({ $(".tagsinput").popover({
@@ -1417,17 +1420,20 @@ function isLicit(str,regStr) {//判断是否为合格字符 //s 包括空格回
//var re = "^[_0-9a-zA-Z\.@]*$"; //var re = "^[_0-9a-zA-Z\.@]*$";
return re.test(str); return re.test(str);
} }
function exprTypeChecked(objNamePrefix,size){ function exprTypeChecked(objNamePrefix,size,options){
if(size>1) { if(size>1) {
// 与表达式
$("input:radio[name='"+objNamePrefix+"exprType'][value=1]").prop("checked",true); //选中是 $("input:radio[name='"+objNamePrefix+"exprType'][value=1]").prop("checked",true); //选中是
$("select[name='"+objNamePrefix+"matchMethod']").append(options);
$("select[name='"+objNamePrefix+"matchMethod']").find("option").removeAttr("selected",false); $("select[name='"+objNamePrefix+"matchMethod']").find("option").removeAttr("selected",false);
$("select[name='"+objNamePrefix+"matchMethod']").find("option[value=0]").attr("selected",true); $("select[name='"+objNamePrefix+"matchMethod']").find("option[value=0]").attr("selected",true);
$("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").attr("disabled",true);
$("select[name='"+objNamePrefix+"matchMethod']").selectpicker("refresh"); $("select[name='"+objNamePrefix+"matchMethod']").selectpicker("refresh");
}else { }else {
// 无表达式
$("input:radio[name='"+objNamePrefix+"exprType'][value=0]").prop("checked",true); //选中否 $("input:radio[name='"+objNamePrefix+"exprType'][value=0]").prop("checked",true); //选中否
$("select[name='"+objNamePrefix+"matchMethod']").find("option").removeAttr("disabled"); $("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").remove();
$("select[name='"+objNamePrefix+"matchMethod']").selectpicker("refresh"); $("select[name='"+objNamePrefix+"matchMethod']").selectpicker("refresh");
} }
} }
function validateDataIsLicit(){ function validateDataIsLicit(){