diff --git a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java index af0dc2d55..854ac2038 100644 --- a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java @@ -31,6 +31,7 @@ public class AppPolicyCfg extends BaseCfg { */ private static final long serialVersionUID = -5679998383250783571L; private static final String tableName="app_policy_cfg"; + private String indexTable="app_policy_cfg"; @Expose @ExcelField(title="cfg_id",sort=0) private Integer compileId; @@ -268,5 +269,13 @@ public class AppPolicyCfg extends BaseCfg { public void setUserRegion5(String userRegion5) { this.userRegion5 = userRegion5; } + + public String getIndexTable() { + return indexTable; + } + + public void setIndexTable(String indexTable) { + this.indexTable = indexTable; + } } diff --git a/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java b/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java index 1ea7c126c..446203897 100644 --- a/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java +++ b/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java @@ -9,6 +9,7 @@ public class AvFileSampleCfg extends BaseCfg { * */ private static final long serialVersionUID = -2356472662189941874L; + private String indexTable="av_file_sample_cfg"; @Expose @SerializedName("srcFile") @ExcelField(title="src_file",sort=2) @@ -94,5 +95,11 @@ public class AvFileSampleCfg extends BaseCfg { public void setResultPath(String resultPath) { this.resultPath = resultPath; } + public String getIndexTable() { + return indexTable; + } + public void setIndexTable(String indexTable) { + this.indexTable = indexTable; + } } diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index e261cd37b..17c0e6b98 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -37,6 +37,7 @@ public class BaseIpCfg extends BaseCfg { super(); // TODO Auto-generated constructor stub } + private String indexTable="ip_port_cfg"; /** * ip类型 */ @@ -307,5 +308,11 @@ public class BaseIpCfg extends BaseCfg { public void setNtcSubscribeIdCfg(NtcSubscribeIdCfg ntcsSubscribeIdCfg) { this.ntcSubscribeIdCfg = ntcsSubscribeIdCfg; } + public String getIndexTable() { + return indexTable; + } + public void setIndexTable(String indexTable) { + this.indexTable = indexTable; + } } diff --git a/src/main/java/com/nis/domain/configuration/DdosIpCfg.java b/src/main/java/com/nis/domain/configuration/DdosIpCfg.java index c1271858a..91200ff60 100644 --- a/src/main/java/com/nis/domain/configuration/DdosIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/DdosIpCfg.java @@ -22,6 +22,7 @@ public class DdosIpCfg extends BaseIpCfg { * */ private static final long serialVersionUID = -5446903784736960824L; + private String indexTable="ddos_ip_cfg"; @ExcelField(title="antiddos_protocol",sort=41) private String antiddosProtocol;//目前支持TCP_SYN, DNS, NTP, @ExcelField(title="bps_threadshold",sort=42) @@ -47,6 +48,12 @@ public class DdosIpCfg extends BaseIpCfg { public void setPpsThreadshold(Long ppsThreadshold) { this.ppsThreadshold = ppsThreadshold; } + public String getIndexTable() { + return indexTable; + } + public void setIndexTable(String indexTable) { + this.indexTable = indexTable; + } } diff --git a/src/main/java/com/nis/domain/configuration/DnsIpCfg.java b/src/main/java/com/nis/domain/configuration/DnsIpCfg.java index 9307dbf27..061bd05a3 100644 --- a/src/main/java/com/nis/domain/configuration/DnsIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/DnsIpCfg.java @@ -26,6 +26,7 @@ public class DnsIpCfg extends BaseIpCfg { * */ private static final long serialVersionUID = 8149437730819674317L; + private String indexTable="dns_ip_cfg"; private String dnsStrategyName; private Integer dnsStrategyId; @@ -41,5 +42,11 @@ public class DnsIpCfg extends BaseIpCfg { public void setDnsStrategyName(String dnsStrategyName) { this.dnsStrategyName = dnsStrategyName; } + public String getIndexTable() { + return indexTable; + } + public void setIndexTable(String indexTable) { + this.indexTable = indexTable; + } } diff --git a/src/main/java/com/nis/domain/configuration/DnsResStrategy.java b/src/main/java/com/nis/domain/configuration/DnsResStrategy.java index 8d4a6a9af..c2a07db69 100644 --- a/src/main/java/com/nis/domain/configuration/DnsResStrategy.java +++ b/src/main/java/com/nis/domain/configuration/DnsResStrategy.java @@ -12,6 +12,7 @@ public class DnsResStrategy extends BaseCfg { * */ private static final long serialVersionUID = -2720862431960415564L; + private String indexTable="dns_res_strategy"; private Integer resGroup1Id; private Integer resGroup1Num; private Integer resGroup2Id; @@ -114,4 +115,11 @@ public class DnsResStrategy extends BaseCfg { public void setGroup1Name(String group1Name) { this.group1Name = group1Name; } + public String getIndexTable() { + return indexTable; + } + public void setIndexTable(String indexTable) { + this.indexTable = indexTable; + } + } diff --git a/src/main/java/com/nis/domain/configuration/FileDigestCfg.java b/src/main/java/com/nis/domain/configuration/FileDigestCfg.java index 4b9905b63..8be421416 100644 --- a/src/main/java/com/nis/domain/configuration/FileDigestCfg.java +++ b/src/main/java/com/nis/domain/configuration/FileDigestCfg.java @@ -28,6 +28,7 @@ public class FileDigestCfg extends BaseCfg { */ private static final long serialVersionUID = 2796500715438264119L; private static final String tableName="file_digest_cfg"; + private String indexTable="file_digest_cfg"; @ExcelField(title="raw_len",sort=3) private Long rawLen; @ExcelField(title="digest",sort=2) @@ -82,5 +83,11 @@ public class FileDigestCfg extends BaseCfg { public void setNtcSubscribeIdCfgList(List ntcSubscribeIdCfgList) { this.ntcSubscribeIdCfgList = ntcSubscribeIdCfgList; } + public String getIndexTable() { + return indexTable; + } + public void setIndexTable(String indexTable) { + this.indexTable = indexTable; + } } diff --git a/src/main/java/com/nis/domain/configuration/IpMultiplexPoolCfg.java b/src/main/java/com/nis/domain/configuration/IpMultiplexPoolCfg.java index f8cb08dbd..aba76ae42 100644 --- a/src/main/java/com/nis/domain/configuration/IpMultiplexPoolCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpMultiplexPoolCfg.java @@ -17,6 +17,7 @@ public class IpMultiplexPoolCfg extends BaseCfg { * */ private static final long serialVersionUID = -5902468971425910528L; + private String indexTable="ip_multiplex_pool_cfg"; @Expose @SerializedName("cfgId") private Integer compileId; @@ -102,5 +103,11 @@ public class IpMultiplexPoolCfg extends BaseCfg { public void setGroupName(String groupName) { this.groupName = groupName; } + public String getIndexTable() { + return indexTable; + } + public void setIndexTable(String indexTable) { + this.indexTable = indexTable; + } } diff --git a/src/main/java/com/nis/domain/configuration/IpPortCfg.java b/src/main/java/com/nis/domain/configuration/IpPortCfg.java index 4dcfce294..1b5684027 100644 --- a/src/main/java/com/nis/domain/configuration/IpPortCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpPortCfg.java @@ -17,6 +17,7 @@ package com.nis.domain.configuration; */ public class IpPortCfg extends BaseIpCfg { private static final String tableName="ip_port_cfg"; + private String indexTable="ip_port_cfg"; /** * @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么) * @@ -53,6 +54,12 @@ public class IpPortCfg extends BaseIpCfg { public static String getTablename() { return tableName; } + public String getIndexTable() { + return indexTable; + } + public void setIndexTable(String indexTable) { + this.indexTable = indexTable; + } } diff --git a/src/main/java/com/nis/domain/configuration/PxyObjKeyring.java b/src/main/java/com/nis/domain/configuration/PxyObjKeyring.java index 7ce57a738..cc43962f9 100644 --- a/src/main/java/com/nis/domain/configuration/PxyObjKeyring.java +++ b/src/main/java/com/nis/domain/configuration/PxyObjKeyring.java @@ -13,7 +13,7 @@ public class PxyObjKeyring extends BaseCfg { * */ private static final long serialVersionUID = -2720862431960415564L; - + private String indexTable="pxy_obj_keyring"; private String keyringType; private String privateKeyFile; private String publicKeyFile; @@ -84,6 +84,12 @@ public class PxyObjKeyring extends BaseCfg { public void setSubject(String subject) { this.subject = subject; } + public String getIndexTable() { + return indexTable; + } + public void setIndexTable(String indexTable) { + this.indexTable = indexTable; + } } diff --git a/src/main/resources/sql/20181022/add_dictionary.sql b/src/main/resources/sql/20181022/add_dictionary.sql new file mode 100644 index 000000000..80055ef5e --- /dev/null +++ b/src/main/resources/sql/20181022/add_dictionary.sql @@ -0,0 +1,11 @@ +#取消审核时增加来函信息 数据库增加字段 +ALTER TABLE dns_ip_cfg ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函'; +ALTER TABLE dns_res_strategy ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函'; +ALTER TABLE ip_port_cfg ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函'; +ALTER TABLE ddos_ip_cfg ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函'; +ALTER TABLE av_file_sample_cfg ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函'; +ALTER TABLE cfg_index_info ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函'; +ALTER TABLE app_policy_cfg ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函'; +ALTER TABLE pxy_obj_keyring ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函'; +ALTER TABLE file_digest_cfg ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函'; +ALTER TABLE ip_multiplex_pool_cfg ADD cancel_request_id int(11) DEFAULT NULL COMMENT '取消审核来函'; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index f127aaea2..ecb020601 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -241,9 +241,7 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox"); }else if(url.indexOf("export") > 1){ closeTip(); } - //$("#searchForm").submit(); - top.$.jBox.tip("审核---"+(cancelRequestId), ""); } return true; diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp index e1a214d3d..fc294433a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -483,7 +483,9 @@ - + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp index 8b1307a52..a1414cc97 100644 --- a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp @@ -425,7 +425,7 @@ - + ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp index 754d7e7ae..deda71353 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp @@ -496,8 +496,9 @@ - - + + +
${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index fa8fbc4ea..09801894e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -463,7 +463,9 @@ - + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp index aa09e0cfa..d684904d7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -402,8 +402,9 @@ - - + + +
${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp index 3fb574b8a..6cd3c2e1c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp @@ -497,7 +497,9 @@ - + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp index 11954d3fb..89ecf5279 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp @@ -415,8 +415,9 @@ - - + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp index b8b80a21f..3077025b0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp @@ -412,8 +412,9 @@ - - + + +
${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp.bak b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp.bak deleted file mode 100644 index 98ade2dae..000000000 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp.bak +++ /dev/null @@ -1,335 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8"%> -<%@ include file="/WEB-INF/include/taglib.jsp"%> - - -<spring:message code="${cfgName}"></spring:message> - - - - - - - -
-

- -

-
-
-
-
-
- - - - - - - -
-
-
- -
- - - - - -
- - -
-
-
- -
- -
-
-
- -
-
- -
- - - -
-
-
-
- -
- -
-
-
- - - - - - - - - - - - -
-
-
- - - - - - - - -

- - -

- - <%-- --%> - - - - -
- <%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%> -
- -
-
-
- - - - -
- -
- - -

- - -

- - <%-- --%> - - - - - - -
- <%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%> -
- - -
-
-
- - - - -
- - - - -
-
-
-
- <%@include file="/WEB-INF/include/form/areaInfo.jsp"%> -
- <%@include file="/WEB-INF/include/form/basicInfo.jsp"%> -
-
-
-
-
- - -
-
-
-
-
-
- - -
-
- -
-
-
-
-
- - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index 895ef17be..844d3a491 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -463,8 +463,9 @@ - - + + +
${indexCfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp.bak b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp.bak deleted file mode 100644 index 22d7bbb97..000000000 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp.bak +++ /dev/null @@ -1,801 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8"%> -<%@ include file="/WEB-INF/include/taglib.jsp"%> - - -<spring:message code="${cfgName}"></spring:message> - - - - - - - - - - - - - - - - - - - - - -
- - -

- -

- -
-
-
-
- - - - - - - - - -
-
- - - - - - - -
- -
- -
-
- - - - - - - - - - - -
- - -
- - - - - - - - - - - -
- -
-
-
- - - -
-
- - - - - <%-- --%> - -
- - -
-
- href="javascript:;"> - - -
-
- - - -
-
- -
- -
- - - - - - - - -
- -
- -
- -
- - - - - - - -
- -
- -
- -
- - - - - - - - -
- -
- -
- -
- - - - - - - -
- -
- -
- -
-
-
- - -
-
- -
-
- - " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> - -
-
- -
-
- - " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> - -
-
- -
-
- - " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> - -
-
- -
-
- - " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> - -
-
- -
-
- - " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> - -
-
-
- - -
- - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 鈻� - - ${indexCfg.compileId }${indexCfg.cfgDesc } - - - - - - - - - - - - - - - - - - - ${indexCfg.requestName } - - - - - - - - - - - - - - - ${fns:abbr(classify,20)} - - - - - - - - - - - - - - - - - ${fns:abbr(attribute,20)} - - - - - - - - - - - - - - - - - ${fns:abbr(lableInfo,20)} - - - - - - - - - - - - -
${indexCfg.creatorName }${indexCfg.editorName }${indexCfg.auditorName }
-
${page}
-
- -
-
-
- - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp index c4cc86d01..0eac78251 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -486,8 +486,9 @@ - - + + +
${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp index e1c352900..2394db2f5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp @@ -425,7 +425,7 @@ - + ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp index 6b2e2983a..d5966e12f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp @@ -389,7 +389,7 @@ - + ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp index 922925417..0360ac543 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp @@ -449,7 +449,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index f52dd280c..2acb849b2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -418,7 +418,7 @@ - + <%--
--%> diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp index d9f961f98..107dbabc8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -483,7 +483,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp index 33f5dae3d..04b83af30 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -459,7 +459,7 @@ - + <%--
--%> diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp index 3ce09e941..792015d23 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp @@ -449,7 +449,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp index 04d0156d4..84dfbe02f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp @@ -437,7 +437,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp index 72b967612..cef5c27ea 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -528,7 +528,7 @@ - + <%--
--%> diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp index c657ddb4e..ff4411414 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp @@ -349,7 +349,7 @@ - + ${cfg.requestName } diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp index ba3eaa18f..9072da1f5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp @@ -417,7 +417,7 @@ - + ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp index 78560491b..3fa2cb5b1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -460,7 +460,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp index 9faec4bff..97ade0076 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp @@ -330,7 +330,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp index 25c1ab9c0..cbc3f1508 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp @@ -349,7 +349,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp index 3da22e4f1..173e3d400 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp @@ -351,7 +351,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp index 0f2e799c4..7f2a22f5c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp @@ -401,7 +401,7 @@ - + <%--
--%> diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp index 74b05f940..8c16193c9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp @@ -392,7 +392,7 @@ - + <%--
--%> diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp index 83538734b..a7de18ee8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp @@ -590,7 +590,7 @@ - + ${bean.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp index 79eb45c29..f4c5a5a61 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -444,7 +444,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp index 737177410..92164acfd 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp @@ -443,7 +443,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp index 1f83a817c..7b20abf74 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp @@ -707,7 +707,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp index f163712bf..65f2a2447 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp @@ -340,7 +340,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp index 0b0583be0..8b75dba4c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp @@ -343,7 +343,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp index ae5181b7b..3e9f000cd 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp @@ -381,7 +381,7 @@ - + ${indexCfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp index da4e54b51..ecc6ea515 100644 --- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp @@ -381,7 +381,7 @@ - + ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp index 0bfc81637..cfe76675b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -465,7 +465,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp index b2f83bbf8..fcbceee89 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -604,7 +604,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp index 479679950..7f9117281 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -441,7 +441,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp index 5e66b7cd6..ae334ad1c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -445,7 +445,7 @@ - + <%--
--%> diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index f3ad73883..e3effd964 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -3,7 +3,7 @@ $(function(){ $("#contentTable").not(".logTb").find("tbody tr").each(function(i){ if($(this).find("input[type='checkbox']").attr("value")==3){ - var ids = $(this).find("span").attr("cfgId"); + var ids = $(this).find("input").attr("id"); var resetLeff =$(this).find("span[class~='le-ca-fo']"); var indexTableName = $("#contentTable tbody tr td span[class~='le-ca-fo']").attr("indexTable"); var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.lastIndexOf("/nis")+4);