diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index 0e6c35509..c4f7f31f8 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -141,7 +141,7 @@ public class AppCfgController extends BaseController { model.addAttribute("_cfg", cfg); model.addAttribute("index", index); model.addAttribute("tabList", tabList); - return "/cfg/app/appPolicyIpList"; + return "/cfg/app/appPolicySubList"; } /** * 策略配置表单 diff --git a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java index 246898de5..707b91367 100644 --- a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java +++ b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java @@ -86,7 +86,7 @@ public class BasicProtocolController extends BaseController { model.addAttribute("_cfg", cfg); model.addAttribute("index", index); model.addAttribute("tabList", tabList); - return "/cfg/basicprotocol/ipList"; + return "/cfg/basicprotocol/basicProtocolSubList"; } /** * 策略配置表单 diff --git a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java index d859fbdf2..3f08acd68 100644 --- a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java +++ b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java @@ -110,7 +110,7 @@ public class EncryptedTunnelBehaviorController extends BaseController { model.addAttribute("_cfg", cfg); model.addAttribute("index", index); model.addAttribute("tabList", tabList); - return "/cfg/encryptedtunnelbehav/ipList"; + return "/cfg/encryptedtunnelbehav/encrypedTunnelSubList"; } /** * 策略配置表单 diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index 42e621c49..ee268ea92 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -246,16 +246,17 @@ public class FileTransferCfgController extends BaseController{ fileMap.put("checksum", md5); result = ConfigServiceUtil.getFileDigest(null, uploadFile, JsonMapper.toJsonString(fileMap)); if((result.getData().getRawLen() == null) || (result.getData().getDigest() == null)) { - logger.info("文件摘要信息获取有误！"); - throw new MaatConvertException(":"+null); + logger.error("文件摘要信息获取有误！"); + throw new MaatConvertException(""); } logger.info("获取文件摘要响应信息："+result); } fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result,areaCfgIds); + addMessage(redirectAttributes, "save_success"); } catch (MaatConvertException e) { - addMessage(redirectAttributes, e.getMessage()); + addMessage(redirectAttributes, "request_service_failed"); } catch (IOException e) { - e.printStackTrace(); + addMessage(redirectAttributes, "save_failed"); } return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+entity.getFunctionId(); } diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp index 52890078c..f0a4958dc 100644 --- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp @@ -3,12 +3,12 @@ - - - - - + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp index 4a1aa23f4..137100f2f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp @@ -269,7 +269,8 @@ - + + <%-- @@ -298,11 +299,18 @@ ${cfg.cfgDesc } ${cfg.appName } ${cfg.bytes } - - - - - + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp index 519a9fd40..0b117ade6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp @@ -269,7 +269,8 @@ - + + <%-- @@ -298,11 +299,18 @@ ${cfg.cfgDesc } ${cfg.appName } ${cfg.domain } - - - - - + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp index b1e0272c2..b88ef892c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp @@ -270,7 +270,8 @@ - + + <%-- @@ -305,11 +306,18 @@ ${fns:abbr(fn:replace(cfg.cfgKeywords, "***and***", " "),20)} - - - - - + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp index 44f215d17..56c7c0a83 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp @@ -271,7 +271,8 @@ - + + <%-- @@ -306,11 +307,18 @@ ${fns:abbr(fn:replace(cfg.cfgKeywords, "***and***", " "),20)} - - - - - + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp index 33357e642..2f71fdbbf 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp @@ -54,6 +54,8 @@
+ +
@@ -89,18 +91,20 @@
+
+
-
-
+
+
@@ -165,18 +169,72 @@
-
-
-
- - + +
+
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp index f6e6d001e..77252b082 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp @@ -270,7 +270,8 @@ - + + <%-- @@ -305,11 +306,18 @@ ${fns:abbr(fn:replace(cfg.cfgKeywords, "***and***", " "),20)} - - - - - + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp index 1ff57b08f..b3d5c8386 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp @@ -268,7 +268,8 @@ - <%-- + <%-- + --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp index 702f7af00..dd99dfbf9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp @@ -272,7 +272,8 @@ - + + <%-- @@ -316,11 +317,18 @@ ${cfg.domain } - - - - - + + + + + + + + + + + + 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 aad2fadf5..76cc73130 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 @@ -277,7 +277,8 @@ - + + @@ -310,11 +311,18 @@ ${fns:abbr(fn:replace(cfg.cfgKeywords, "***and***", " "),20)} - - - - - + + + + + + + + + + + + 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 0c0730407..9ce9b1369 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 @@ -279,7 +279,8 @@ - + + @@ -312,11 +313,18 @@ ${fns:abbr(fn:replace(cfg.cfgKeywords, "***and***", " "),20)} - - - - - + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp index a1550054c..371f129bd 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp @@ -121,24 +121,6 @@ html+="
"; html+="
"; html+="
"; - html+=""; - html+=""; - html+="
"; - html+="
"; - html+="
"; - html+="
"; - html+="
"; - html+="
"; html+=""; html+="
"; html+="
"; html+="
"; + if(item.isHexbin==0){ + html+="
"; + html+="
"; + html+="
"; + html+=""; + html+=""; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+=""; + html+=""; + html+="
"; + html+="
"; + html+="
"; + } + if(item.isHexbin==1){ + html+="
"; + html+="
"; + html+="
"; + html+=""; + html+=""; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+=""; + html+=""; + html+="
"; + html+="
"; + html+="
"; + } + if(item.isHexbin==2){ + html+="
"; + html+="
"; + html+="
"; + html+=""; + html+=""; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+=""; + html+=""; + html+="
"; + html+="
"; + html+="
"; + } /* if(index < (data.ip.length-1) && index != 0){ alert("下一行"); } @@ -196,24 +244,6 @@ html+="
"; html+="
"; html+="
"; - html+=""; - html+=""; - html+="
"; - html+="
"; - html+="
"; - html+="
"; - html+="
"; - html+="
"; html+=""; html+="
"; html+="
"; html+="
"; + if(item.isHexbin==0){ + html+="
"; + html+="
"; + html+="
"; + html+=""; + html+=""; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+=""; + html+=""; + html+="
"; + html+="
"; + html+="
"; + } + if(item.isHexbin==1){ + html+="
"; + html+="
"; + html+="
"; + html+=""; + html+=""; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+=""; + html+=""; + html+="
"; + html+="
"; + html+="
"; + } + if(item.isHexbin==2){ + html+="
"; + html+="
"; + html+="
"; + html+=""; + html+=""; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+="
"; + html+=""; + html+=""; + html+="
"; + html+="
"; + html+="
"; + } /* if(index < (data.ip.length-1) && index != 0){ alert("下一行"); } 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 4c9041669..6dbf952b3 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 @@ -116,24 +116,74 @@ html+="
"; html+=""; html+=""; - html+="
"; - html+="
"; - html+="
"; - html+=""; - html+=""; - html+="
"; - html+="
"; - html+="
"; + html+="
"; html+="
"; html+="
"; @@ -222,8 +272,6 @@ html+=""; html+="
"; html+="
"; - html+="
"; - html+="
"; html+="
"; html+="
"; html+=""; @@ -247,8 +295,6 @@ html+=""; html+="
"; html+="
"; - html+="
"; - html+="
"; html+="
"; html+="
"; html+=""; @@ -267,8 +313,6 @@ html+=""; html+="
"; html+="
"; - html+="
"; - html+="
"; html+="
"; html+="
"; html+=""; @@ -295,8 +339,6 @@ html+=""; html+="
"; html+="
"; - html+="
"; - html+="
"; html+="
"; html+="
"; html+=""; diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp index b7e08ef9e..a7ca90877 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/basicProtocolSubList.jsp @@ -54,6 +54,8 @@
+
+
@@ -89,18 +91,20 @@
+
+
-
-
+
+
@@ -164,18 +168,72 @@
-
-
-
- - + +
+
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
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 e99da4236..c7a11ff67 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp @@ -266,7 +266,8 @@ - + + diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp index 33357e642..2f71fdbbf 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp @@ -54,6 +54,8 @@
+ +
@@ -89,18 +91,20 @@
+
+
-
-
+
+
@@ -165,18 +169,72 @@
-
-
-
- - + +
+
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp index 39f54cbad..a5655f218 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp @@ -36,7 +36,7 @@
- +
@@ -48,8 +48,6 @@
-
-
@@ -70,29 +68,25 @@
-
-
-
+
-
-
-
+
@@ -103,8 +97,6 @@
-
-
@@ -166,18 +158,72 @@
-
-
-
- - + +
+
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
@@ -218,18 +264,72 @@
-
-
-
- - + +
+
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp index b3e025f00..ff6f5e8c7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pSubList.jsp @@ -180,18 +180,72 @@
-
-
-
- - + +
+
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
@@ -232,18 +286,72 @@
-
-
-
- - + +
+
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
@@ -284,18 +392,72 @@
-
-
-
- - + +
+
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp index f40096135..7d9503ce9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptSubList.jsp @@ -36,8 +36,8 @@
- -
+
+
@@ -48,8 +48,6 @@
-
-
@@ -70,22 +68,18 @@
-
-
-
-
+
+
-
-
@@ -103,8 +97,6 @@
-
-
@@ -159,18 +151,72 @@
+
-
-
- - +
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
@@ -212,18 +258,72 @@ +
-
-
- - +
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp index 79296b282..9aa73d943 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp @@ -37,7 +37,7 @@ -
+
@@ -48,8 +48,6 @@
-
-
@@ -70,29 +68,25 @@
-
-
-
+
-
-
-
-
+
+
@@ -103,8 +97,6 @@
-
-
@@ -144,7 +136,7 @@
-
+
@@ -156,18 +148,72 @@
+
-
-
- - +
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp index 87d449a6c..6997d460f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp @@ -167,18 +167,72 @@
-
-
-
- - + +
+
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
@@ -269,18 +323,72 @@
-
-
-
- - + +
+
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp index 35c5ee807..acad83ed3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpSubList.jsp @@ -36,7 +36,7 @@
- +
@@ -48,8 +48,6 @@
-
-
@@ -70,29 +68,25 @@
-
-
-
+
-
-
-
+
@@ -103,8 +97,6 @@
-
-
@@ -116,18 +108,6 @@
-
-
-
- - -
-
-
@@ -169,18 +149,72 @@
-
-
-
- - + +
+
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
@@ -222,18 +256,72 @@
-
-
-
- - + +
+
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp index ee5700462..a1dc0740b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp @@ -158,18 +158,72 @@
-
-
-
- - + +
+
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
@@ -221,18 +275,72 @@
+
-
-
- - +
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp index 01148083d..7183f3af1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp @@ -66,94 +66,88 @@
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- -
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
@@ -190,18 +184,72 @@ -
-
-
- - -
-
-
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ @@ -246,18 +294,72 @@ -
-
-
- - -
-
-
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ @@ -294,18 +396,72 @@ -
-
-
- - -
-
-
+ < +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ @@ -350,18 +506,72 @@ -
-
-
- - -
-
-
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ @@ -399,18 +609,72 @@ -
-
-
- - -
-
-
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ @@ -448,18 +712,72 @@ -
-
-
- - -
-
-
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ 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 c0bed3f2c..d03d107e7 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 @@ -258,7 +258,8 @@ - + + @@ -291,11 +292,18 @@ ${fns:abbr(fn:replace(cfg.cfgKeywords, "***and***", " "),20)} - - - - - + + + + + + + + + + + + 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 a479ff2c1..57e8026c1 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 @@ -259,7 +259,8 @@ - + + @@ -292,11 +293,18 @@ ${fns:abbr(fn:replace(cfg.cfgKeywords, "***and***", " "),20)} - - - - - + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp index ae10f6ef1..afcc83cf5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp @@ -36,8 +36,8 @@ - -
+
+
@@ -48,8 +48,6 @@
-
-
@@ -70,22 +68,18 @@
-
-
-
-
+
+
-
-
@@ -103,8 +97,6 @@
-
-
@@ -168,18 +160,72 @@
+
-
-
- - +
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
@@ -223,18 +269,72 @@ +
-
-
- - +
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp index 3bfd0e204..469090953 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp @@ -65,96 +65,88 @@
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
@@ -192,18 +184,72 @@ -
-
-
- - -
-
-
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ @@ -248,18 +294,72 @@ -
-
-
- - -
-
-
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ @@ -296,18 +396,72 @@ -
-
-
- - -
-
-
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ @@ -353,18 +507,72 @@ -
-
-
- - -
-
-
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ @@ -402,18 +610,72 @@ -
-
-
- - -
-
-
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ @@ -451,18 +713,72 @@ -
-
-
- - -
-
-
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp index 1eebb9e1c..24b51acdc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp @@ -156,18 +156,72 @@ +
-
-
- - +
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp index 797772d37..97b81ab21 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp @@ -37,7 +37,7 @@ -
+
@@ -48,8 +48,6 @@
-
-
@@ -70,29 +68,25 @@
-
-
-
+
-
-
-
-
+
+
@@ -103,8 +97,6 @@
-
-
@@ -208,18 +200,72 @@
+
-
-
- - +
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp index 46d7897ca..eab4744cb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp @@ -37,7 +37,7 @@
-
+
@@ -48,8 +48,6 @@
-
-
@@ -70,29 +68,25 @@
-
-
-
+
-
-
-
- <%--
+
+ --%> - <%--
@@ -115,7 +107,7 @@
-
--%> +
@@ -156,18 +148,72 @@ +
-
-
- - +
+
+ + +
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css index 0721860fb..17b942263 100644 --- a/src/main/webapp/static/global/css/components.css +++ b/src/main/webapp/static/global/css/components.css @@ -22563,7 +22563,7 @@ transition: background-color .1s ease-in-out; width:auto; } .content { - width: 80%; + width: 60%; background-color: #f6f3f3; border: 1px solid #c2cad8; padding: 5px; diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 143d12743..8637698cc 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -758,12 +758,12 @@ var switchIpInfo=function(obj){ var srcIpV6Default=new Array(); - srcIpV6Default[0]="::/64"; //subnet + srcIpV6Default[0]="::/128"; //subnet srcIpV6Default[1]="::-::";//ip_range srcIpV6Default[2]="::"; //ip var destIpV6Default=new Array(); - destIpV6Default[0]="::/64"; //subnet + destIpV6Default[0]="::/128"; //subnet destIpV6Default[1]="::-::";//ip_range destIpV6Default[2]="::"; //ip @@ -988,6 +988,60 @@ var switchIpInfo=function(obj){ } } } + if(10==ipType){ + if(!$(srcIp).val()){ + if(ipPattern==1){ + $(srcIp).val(srcIpV4Default[0]); + }else if(ipPattern==2){ + $(srcIp).val(srcIpV4Default[1]); + }else if(ipPattern==3){ + $(srcIp).val(srcIpV4Default[2]); + }else{ + $(srcIp).val(srcIpV4Default[2]); + } + }else{ + if($.inArray($(srcIp).val(),srcIpV4Default) > -1 + || $.inArray($(srcIp).val(),destIpV4Default) > -1 + || $.inArray($(srcIp).val(),srcIpV6Default) > -1 + || $.inArray($(srcIp).val(),destIpV6Default) > -1){ //是ipV4的默认值其中一个 + if(ipPattern==1){ + $(srcIp).val(srcIpV4Default[0]); + }else if(ipPattern==2){ + $(srcIp).val(srcIpV4Default[1]); + }else if(ipPattern==3){ + $(srcIp).val(srcIpV4Default[2]); + }else{ + $(srcIp).val(srcIpV4Default[2]); + } + } + } + if(!$(destIp).val()){ + if(ipPattern==1){ + $(destIp).val(destIpV4Default[0]); + }else if(ipPattern==2){ + $(destIp).val(destIpV4Default[1]); + }else if(ipPattern==3){ + $(destIp).val(destIpV4Default[2]); + }else{ + $(destIp).val(destIpV4Default[2]); + } + }else{ + if($.inArray($(destIp).val(),srcIpV4Default) > -1 + || $.inArray($(destIp).val(),destIpV4Default) > -1 + || $.inArray($(destIp).val(),srcIpV6Default) > -1 + || $.inArray($(destIp).val(),destIpV6Default) > -1){ + if(ipPattern==1){ + $(destIp).val(destIpV4Default[0]); + }else if(ipPattern==2){ + $(destIp).val(destIpV4Default[1]); + }else if(ipPattern==3){ + $(destIp).val(destIpV4Default[2]); + }else{ + $(destIp).val(destIpV4Default[2]); + } + } + } + } //设置源端口默认值 if(!$(srcPort).val()){ if(portPattern==1){