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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
zhanghongqing
2018-09-12 17:36:49 +08:00
parent 745713979b 4ecbbf0dc2
commit 76e692f72d
45 changed files with 137 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java
View File

@@ -36,6 +36,7 @@ import com.nis.web.controller.configuration.CommonController;
*/
@Controller ///manipulation/ratelimit/domain/list?cfgName=domain_ratelimit
@RequestMapping("${adminPath}/manipulation/ratelimit")
@Deprecated
public class RatelimitController extends CommonController {
@RequestMapping(value = {"/ip/list"})
// @RequiresPermissions(value={"ip:ratelimit:config","ip:ratelimit:confirm"},logical=Logical.OR)

1
src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java
View File

@@ -35,6 +35,7 @@ import com.nis.web.controller.configuration.CommonController;
*/
@Controller
@RequestMapping("${adminPath}/proxy/control")
@Deprecated
public class ControlController extends CommonController {
@RequestMapping(value = {"/ip/list"})
// @RequiresPermissions(value={"control:ip:config","control:ip:confirm"},logical=Logical.OR)

9
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -13,22 +13,13 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.InterceptPktBin;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.PxyObjKeyring;
import com.nis.domain.configuration.template.IpAddrTemplate;
import com.nis.exceptions.MaatConvertException;
import com.nis.web.controller.configuration.CommonController;
import com.nis.web.security.UserUtils;

4
src/main/resources/nis.properties
View File

@@ -358,8 +358,8 @@ user_region_placeholder=0
#\u7528\u6237\u81EA\u5B9A\u4E49\u57DF\u5206\u9694\u7B26
user_region_split=;
#IP\u76F8\u5173\u9A8C\u8BC1\u6B63\u5219
ipv4_ip_subnet_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|[1-2][0-9]|[0-9])$
ipv6_ip_subnet_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))/(0|2|4|8|16|32|64|128)$
ipv4_ip_subnet_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[6-9]|2[0-9])$
ipv6_ip_subnet_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))/(128)$
ipv4_ip_range_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$
ipv6_ip_range_regexp=^((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))-((::)|(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}(:[0-9A-Fa-f]{1,4}){1,2})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){1,3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){1,4})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){1,5})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){1,6})|(:(:[0-9A-Fa-f]{1,4}){1,7})|(([0-9A-Fa-f]{1,4}:){6}(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|([0-9A-Fa-f]{1,4}:(:[0-9A-Fa-f]{1,4}){0,4}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3})|(:(:[0-9A-Fa-f]{1,4}){0,5}:(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}))$
ipv4_ip_regexp=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$

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

@@ -269,8 +269,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none;"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="social_app"/></th>
<th><spring:message code="bytes"/></th>
<th><spring:message code="is_hex"/></th>
@@ -283,7 +283,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> --%>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="creator"/></th>

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

@@ -269,8 +269,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none;"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="social_app"/></th>
<th><spring:message code="domain"/></th>
<th><spring:message code="is_hex"/></th>
@@ -283,7 +283,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> --%>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="creator"/></th>

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

@@ -269,8 +269,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none;"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="social_app"/></th>
<th><spring:message code="layer"/></th>
<th><spring:message code="header"/></th>
@@ -284,7 +284,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> --%>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="creator"/></th>

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

@@ -270,8 +270,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none;"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="social_app"/></th>
<th><spring:message code="district"/></th>
<th><spring:message code="keywords"/></th>
@@ -285,7 +285,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> --%>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="creator"/></th>

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

@@ -274,8 +274,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none;"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="social_app"/></th>
<th>IP <spring:message code="type"/></th>
<%-- <th><spring:message code="client_ip"/></th>
@@ -289,7 +289,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> --%>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="creator"/></th>

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

@@ -315,8 +315,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="social_app"/></th>
<th><spring:message code="behaviour_type"/></th>
<%-- <th><spring:message code="ratelimit"/></th>
@@ -327,7 +327,7 @@
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="do_log"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -269,8 +269,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none;"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="social_app"/></th>
<th><spring:message code="district"/></th>
<th><spring:message code="keywords"/></th>
@@ -284,7 +284,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> --%>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="creator"/></th>

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

@@ -267,8 +267,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none;"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="social_app"/></th>
<th><spring:message code="min_tcp"/></th>
<th><spring:message code="max_tcp"/></th>
@@ -283,7 +283,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> --%>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th>
--%> <th><spring:message code="creator"/></th>

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

@@ -266,8 +266,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none;"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="topic"/></th>
<th><spring:message code="website_server"/></th>
<th><spring:message code="domain"/></th>
@@ -282,7 +282,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> --%>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="creator"/></th>

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

@@ -243,8 +243,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="group"/></th>
<th class="sort-column r.create_time"><spring:message code="block_type"/></th>
<%-- <th><spring:message code="do_log"/></th>
@@ -253,7 +253,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> --%>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="creator"/></th>

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

@@ -278,8 +278,8 @@
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
<th><spring:message code="ip_type"/></th>
<th><spring:message code="client_ip"/></th>
<th><spring:message code="client_port"/></th>
@@ -296,7 +296,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -274,8 +274,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
<th><spring:message code="URL"/></th>
<th><spring:message code="is_hex"/></th>
<th><spring:message code="is_case_insenstive"/></th>
@@ -290,7 +290,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>

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

@@ -268,8 +268,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc"><spring:message code="config_describe"/></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="src_file"/></th>
<th><spring:message code="sample_file"/></th>
@@ -279,7 +279,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -278,8 +278,8 @@
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc" ><spring:message code="config_describe"/></th>
<th><spring:message code="ip_type"/></th>
<th><spring:message code="client_ip"/></th>
<th><spring:message code="client_port"/></th>
@@ -296,7 +296,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid" ><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -276,8 +276,8 @@
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
<th><spring:message code="URL"/></th>
<th><spring:message code="is_hex"/></th>
<th><spring:message code="is_case_insenstive"/></th>
@@ -292,7 +292,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>

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

@@ -278,17 +278,17 @@
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th><spring:message code="sample_sign"/></th>
<th><spring:message code="harm_level"/></th>
<th><spring:message code="config_describe"/></th>
<th class="sort-column a.cfg_desc"><spring:message code="config_describe"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th>
<th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -628,8 +628,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th>
@@ -637,7 +637,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -642,8 +642,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th>
@@ -651,7 +651,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -319,8 +319,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="basic_protocol"/></th>
<%-- <th><spring:message code="behaviour_type"/></th> --%>
<%-- <th><spring:message code="ratelimit"/></th> --%>
@@ -331,7 +331,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -41,11 +41,6 @@
</script>
</head>
<body>
<c:forEach items="${fns:getDictList('SPECIAL_FUNCTION_ID')}" var="sfi">
<c:if test="${sfi.itemCode==cfg.functionId}">
<c:set var="specialFunctionId" value="${sfi.itemValue}"/>
</c:if>
</c:forEach>
<div class="page-content">
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importIp.jsp" %>
@@ -335,42 +330,26 @@
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th exportColumn="config_describe" ><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" exportColumn="cfg_id" ><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc" exportColumn="config_describe" ><spring:message code="config_describe"/></th>
<th exportColumn="ip_type"><spring:message code="ip_type"/></th>
<th exportColumn="ip_pattern"><spring:message code="ip_pattern"/></th>
<th exportColumn="port_pattern"><spring:message code="port_pattern"/></th>
<c:if test="${specialFunctionId ne 'ipmulitiplex'}">
<th exportColumn="client_ip"><spring:message code="client_ip"/></th>
<th exportColumn="client_port"><spring:message code="client_port"/></th>
<th exportColumn="server_ip"><spring:message code="server_ip"/></th>
<th exportColumn="server_port"><spring:message code="server_port"/></th>
</c:if>
<c:if test="${specialFunctionId eq 'ipmulitiplex'}">
<th exportColumn="client_ip"><spring:message code="IP"/></th>
<th exportColumn="client_port"><spring:message code="port"/></th>
</c:if>
<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="protocol"><spring:message code="protocol"/></th>
<c:if test="${specialFunctionId ne 'ipmulitiplex'}">
<th exportColumn="whether_area_block"><spring:message code="whether_area_block"/></th>
</c:if>
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipmulitiplex'}">
<th exportColumn="group_name"><spring:message code="group"/></th>
<th exportColumn="ir_type"><spring:message code="ir_type"/></th>
</c:if>
<c:if test="${hasRatelimit==1}">
<th exportColumn="ratelimit"><spring:message code="ratelimit"/></th>
</c:if>
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'pxyIpControl'}">
<th exportColumn="userRegion1"><spring:message code="REDIRECT_RESPONSE_CODE"/></th>
<th exportColumn="userRegion2"><spring:message code="redirect_content"/></th>
</c:if>
<th exportColumn="letter"><spring:message code="letter"/></th>
<th exportColumn="classification"><spring:message code="classification"/></th>
<th exportColumn="attribute"><spring:message code="attribute"/></th>
<th exportColumn="label"><spring:message code="label"/></th>
<th exportColumn="valid_identifier"><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid" exportColumn="valid_identifier"><spring:message code="valid_identifier"/></th>
<th exportColumn="is_audit"><spring:message code="is_audit"/></th>
<%-- <th exportColumn="log_total"><spring:message code="log_total"/></th> --%>
<th exportColumn="creator"><spring:message code="creator"/></th>
@@ -387,7 +366,8 @@
<tr pId="${status.index}">
<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" compileId="${cfg.compileId}" value="${cfg.isAudit}"></td>
<%-- <td>${status.index+1 }</td> --%>
<td>${cfg.cfgDesc }</td>
<td>${cfg.compileId }</td>
<td class="sort-column r.cfg_desc">${cfg.cfgDesc }</td>
<td><c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
<c:if test="${ipType.itemCode==cfg.ipType}"><spring:message code="${ipType.itemValue}"/></c:if>
</c:forEach></td>
@@ -397,16 +377,8 @@
<td><c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPattern">
<c:if test="${portPattern.itemCode==cfg.portPattern}"><spring:message code="${portPattern.itemValue}"/></c:if>
</c:forEach></td>
<c:if test="${specialFunctionId ne 'ipmulitiplex'}">
<td title="${cfg.srcIpAddress }">${fns:abbr(cfg.srcIpAddress, 42)}</td>
<td>${cfg.srcPort }</td>
<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
<td>${cfg.destPort }</td>
</c:if>
<c:if test="${specialFunctionId eq 'ipmulitiplex'}">
<td title="${cfg.srcIpAddress }">${fns:abbr(cfg.srcIpAddress, 42)}</td>
<td>${cfg.srcPort }</td>
</c:if>
<td title="${cfg.srcIpAddress }">${fns:abbr(cfg.srcIpAddress, 42)}</td>
<td>${cfg.srcPort }</td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="serviceC">
<c:if test="${cfg.action eq serviceC.itemCode}"><spring:message code="${serviceC.itemValue }"/></c:if>
@@ -418,56 +390,22 @@
</c:forEach>
</td>
<td>
<c:if test="${specialFunctionId ne 'ipsec'}">
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
</c:forEach>
</c:if>
<c:if test="${specialFunctionId eq 'ipaddr'}">
<c:forEach items="${fns:getDictList('ICMP_PROTOCOL')}" var="icmp">
<c:if test="${cfg.protocol eq icmp.itemCode}"><spring:message code="${icmp.itemValue }"/></c:if>
</c:forEach>
</c:if>
<c:if test="${specialFunctionId eq 'ipsec'}">
<c:forEach items="${fns:getDictList('IPSEC_PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
</c:forEach>
</c:if>
</td>
<c:if test="${specialFunctionId ne 'ipmulitiplex'}">
<td>
<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
<c:if test="${cfg.isAreaEffective==1}">
<a href="javascript:viewAreaInfo('${ctx }','${cfg.areaEffectiveIds }','${cfg.compileId }')" >
<spring:message code="selective"/>
</a>
</c:if>
</td>
</c:if>
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipmulitiplex'}">
<td>${cfg.groupName }</td>
<td>
<c:forEach items="${fns:getDictList('IR_TYPE')}" var="irTypeC">
<c:if test="${cfg.irType==irTypeC.itemCode}"><spring:message code="${irTypeC.itemValue}"/></c:if>
</c:forEach>
</td>
</c:if>
<c:if test="${hasRatelimit==1}">
<td>
<c:if test="${cfg.ratelimit eq null and cfg.action==64}">0%</c:if>
<c:if test="${cfg.ratelimit ne null}">${cfg.ratelimit}%</c:if>
</td>
</c:if>
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'pxyIpControl'}">
<td>
<c:forEach items="${fns:getDictList('REDIRECT_RESPONSE_CODE')}" var="codeC">
<c:if test="${codeC.itemValue eq cfg.userRegion1}">
<spring:message code="${codeC.itemCode}" />
</c:if>
</c:forEach>
</td>
<td>${cfg.userRegion2 }</td>
</c:if>
<td>${cfg.requestName }</td>
<td>
<c:set var="classify"></c:set>

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

@@ -280,7 +280,8 @@
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
<th><spring:message code="ip_type"/></th>
<%-- <th><spring:message code="client_ip"/></th>
<th><spring:message code="client_port"/></th> --%>
@@ -296,7 +297,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>
@@ -312,6 +313,7 @@
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" compileId="${cfg.compileId}" value="${cfg.isAudit}"></td>
<td>${cfg.compileId }</td>
<td>${cfg.cfgDesc }</td>
<td>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">

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

@@ -275,7 +275,8 @@
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
<th><spring:message code="group"/></th>
<th><spring:message code="ip_type"/></th>
<th><spring:message code="IP"/></th>
@@ -287,7 +288,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="creator"/></th>
@@ -303,6 +304,7 @@
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" compileId="${cfg.compileId}" value="${cfg.isAudit}"></td>
<td>${cfg.compileId }</td>
<td>${cfg.cfgDesc }</td>
<td>${cfg.dnsStrategyName }
<c:if test="${empty cfg.dnsStrategyName}">

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

@@ -319,8 +319,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="encrypted_tunnel_behavior"/></th>
<th><spring:message code="behaviour_type"/></th>
<%-- <th><spring:message code="ratelimit"/></th> --%>
@@ -331,7 +331,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -305,7 +305,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc"><spring:message code="config_describe"/></th>
<th><spring:message code="digest"/></th>
<th><spring:message code="raw_len"/></th>
<th><spring:message code="cfds_level"/></th>
@@ -317,7 +318,7 @@
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<%-- <th><spring:message code="do_log"/></th> --%>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="creator"/></th>
@@ -335,6 +336,7 @@
<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
</td>
<td>${indexCfg.compileId }</td>
<td>${indexCfg.cfgDesc }</td>
<td>
<a href="javascript:;" data-original-title="${indexCfg.digest}"

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

@@ -310,8 +310,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th>
@@ -319,7 +319,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -301,8 +301,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th>
@@ -310,7 +310,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid" ><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -312,8 +312,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="ratelimit"/></th>
<%-- <th><spring:message code="bandwith"/></th> --%>
<th><spring:message code="certificate"/></th>
@@ -329,7 +329,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="creator"/></th>

6
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
View File

@@ -256,7 +256,8 @@
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="keyring_name"/></th>
<th class="sort-column r.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc"><spring:message code="keyring_name"/></th>
<th><spring:message code="keyring_type"/></th>
<th><spring:message code="private_key_file"/></th>
<th><spring:message code="public_key_file"/></th>
@@ -271,7 +272,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
@@ -287,6 +288,7 @@
<td>
<input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}">
</td>
<td>${cfg.compileId }</td>
<td>${cfg.cfgDesc }</td>
<td>
<c:forEach items="${fns:getDictList('INTERCEPT_CERTIFICATE_TYPE') }" var="dict">

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

@@ -301,8 +301,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th>
@@ -310,7 +310,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -306,8 +306,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th>
@@ -315,7 +315,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -260,8 +260,8 @@
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="policy_number"/></th>
<th><spring:message code="policy_name"/></th>
<th class="sort-column r.cfg_id"><spring:message code="policy_number"/></th>
<th class="sort-column r.cfg_desc"><spring:message code="policy_name"/></th>
<th><spring:message code="group"/></th>
<th><spring:message code="res_group_num"/></th>
<th><spring:message code="min_ttl"/></th>
@@ -273,7 +273,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>

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

@@ -260,7 +260,8 @@
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th>
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
<th><spring:message code="group"/></th>
<th><spring:message code="ip"/></th>
<th><spring:message code="port"/></th>
@@ -274,7 +275,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
@@ -288,6 +289,7 @@
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td><input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
<td>${cfg.compileId}</td>
<td>
<a href="javascript:;" data-original-title="${cfg.cfgDesc}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">

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

@@ -308,8 +308,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th>
@@ -317,7 +317,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -307,8 +307,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th>
@@ -316,7 +316,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -502,8 +502,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<c:if test="${action == 16}">
<th><spring:message code="response_code"/></th>
@@ -526,7 +526,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<c:if test="${action ne 128}">
<th><spring:message code="log_total"/></th>

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

@@ -267,7 +267,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th><spring:message code="file_desc"/></th>
<th class="sort-column a.compile_id" style="display: none;"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc"><spring:message code="file_desc"/></th>
<th><spring:message code="content_type"/></th>
<th><spring:message code="content_length"/></th>
<%-- <th><spring:message code="block_type"/></th> --%>
@@ -275,7 +276,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
@@ -291,6 +292,7 @@
<td>
<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
</td>
<td>${indexCfg.compileId }</td>
<td><a href="${indexCfg.url }" target="_blank">${indexCfg.fileDesc }</a></td>
<td>${indexCfg.contentType }</td>
<td>${indexCfg.contentLength }</td>

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

@@ -305,8 +305,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="policy_name"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th>
@@ -315,7 +315,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -463,8 +463,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th>
@@ -472,7 +472,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -305,8 +305,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th>
@@ -314,7 +314,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="creator"/></th>

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

@@ -305,8 +305,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<%-- <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th>
@@ -314,7 +314,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> --%>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="creator"/></th>

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

@@ -305,8 +305,8 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<%-- <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th>
@@ -314,7 +314,7 @@
<th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> --%>
<th><spring:message code="valid_identifier"/></th>
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="log_total"/></th> --%>
<th><spring:message code="creator"/></th>