From c68a1cd80cb8f9ea70b2a715a4d8aa99418d5cd1 Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Sat, 25 Aug 2018 13:51:13 +0800 Subject: [PATCH 1/8] =?UTF-8?q?APP=E7=89=B9=E5=BE=81=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp | 6 ------ .../webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp | 6 ------ .../webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp | 10 ++-------- .../webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp | 6 ------ src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp | 8 -------- .../webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp | 6 ------ .../webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp | 6 ------ 7 files changed, 2 insertions(+), 46 deletions(-) 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 5b4821dfc..a6341eeba 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp @@ -276,7 +276,6 @@ - <%-- @@ -315,11 +314,6 @@ - - - - - <%-- 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 98f295caf..b7339e131 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp @@ -276,7 +276,6 @@ - <%-- @@ -315,11 +314,6 @@ - - - - - <%-- 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 4de55c4fb..a537971a0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp @@ -272,12 +272,11 @@ - - + + - <%-- @@ -322,11 +321,6 @@ - - - - - <%-- 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 253ed1dae..d7ae91553 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp @@ -278,7 +278,6 @@ - <%-- @@ -323,11 +322,6 @@ - - - - - <%-- diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp index 988d7f235..6346e5aa6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp @@ -283,7 +283,6 @@ - <%-- --%> <%-- --%> <%-- @@ -323,13 +322,6 @@ - - - - - - - <%-- 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 273c7000f..7424452e2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp @@ -277,7 +277,6 @@ - <%-- @@ -323,11 +322,6 @@ - - - - - <%-- 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 93dcfa362..50accad77 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp @@ -273,7 +273,6 @@ - <%-- @@ -314,11 +313,6 @@ - - - - - From 54264d3bf5d689439e0d56cbb324af4f571ef9ad Mon Sep 17 00:00:00 2001 From: wangxin Date: Sat, 25 Aug 2018 13:57:35 +0800 Subject: [PATCH 2/8] =?UTF-8?q?ip=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0doLog?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp index bf8cd13a9..df5efbe25 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp @@ -263,7 +263,7 @@ -
+
From eebdb41cf53acc1bbc86348ff2e2b6cb982fd809 Mon Sep 17 00:00:00 2001 From: wangxin Date: Sat, 25 Aug 2018 14:05:11 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=9E=E8=B0=83IP?= =?UTF-8?q?=E8=B0=83=E7=94=A8put=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/web/service/configuration/IpCfgService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index 3d46f87b5..9ac778361 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -627,7 +627,7 @@ public class IpCfgService extends CrudService { logger.info("IP配置下发配置参数："+json); //调用服务接口下发配置 try { - ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json); + ToMaatResult result = ConfigServiceUtil.put(json, 2); if(result!=null){ logger.info("IP配置配置下发响应信息："+result.getMsg()); } From 1ff5251341693afb73d436672dba9f2f2650cbb5 Mon Sep 17 00:00:00 2001 From: wangxin Date: Sat, 25 Aug 2018 15:15:20 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=80=BB=E9=87=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/cfg/app/appByteCfgList.jsp | 2 +- .../views/cfg/app/appDomainCfgList.jsp | 2 +- .../views/cfg/app/appHeaderCfgList.jsp | 2 +- .../WEB-INF/views/cfg/app/appHttpCfgList.jsp | 2 +- .../WEB-INF/views/cfg/app/appIpCfgList.jsp | 2 +- .../views/cfg/app/appPolicyCfgForm.jsp | 2 +- .../views/cfg/app/appPolicyCfgList.jsp | 4 +- .../WEB-INF/views/cfg/app/appSslCfgList.jsp | 2 +- .../WEB-INF/views/cfg/app/appTcpCfgList.jsp | 2 +- .../views/cfg/app/appTopicDomainCfgList.jsp | 2 +- .../views/cfg/av/contIp/contIpList.jsp | 2 +- .../views/cfg/av/contUrl/contUrlList.jsp | 2 +- .../WEB-INF/views/cfg/av/fileSampleList.jsp | 2 +- .../WEB-INF/views/cfg/av/picIp/picIpList.jsp | 2 +- .../views/cfg/av/picUrl/picUrlList.jsp | 2 +- .../WEB-INF/views/cfg/av/signSampleList.jsp | 2 +- .../views/cfg/av/voip/voipAccountList.jsp | 2 +- .../WEB-INF/views/cfg/av/voip/voipList.jsp | 2 +- .../WEB-INF/views/cfg/basicprotocol/list.jsp | 2 +- .../WEB-INF/views/cfg/common/ipForm.jsp | 5 +++ .../WEB-INF/views/cfg/common/ipList.jsp | 2 +- .../WEB-INF/views/cfg/ddosIpCfgList.jsp | 2 +- .../webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp | 2 +- .../views/cfg/encryptedtunnelbehav/list.jsp | 2 +- .../views/cfg/fileTransfer/fileDigestList.jsp | 2 +- .../views/cfg/fileTransfer/ftpList.jsp | 2 +- .../views/cfg/fileTransfer/p2pList.jsp | 2 +- .../views/cfg/intercept/interceptList.jsp | 2 +- .../WEB-INF/views/cfg/ipaddr/ipList.jsp | 2 +- .../WEB-INF/views/cfg/mail/mailList.jsp | 2 +- .../WEB-INF/views/cfg/other/bgpList.jsp | 2 +- .../cfg/proxy/control/httpRedirectList.jsp | 2 +- .../cfg/proxy/control/httpReqReplaceList.jsp | 2 +- .../cfg/proxy/control/httpResReplaceList.jsp | 2 +- .../WEB-INF/views/cfg/website/dnsList.jsp | 2 +- .../WEB-INF/views/cfg/website/httpList.jsp | 2 +- .../WEB-INF/views/cfg/website/sslList.jsp | 2 +- .../views/cfg/whitelist/domainList.jsp | 2 +- .../WEB-INF/views/cfg/whitelist/ipList.jsp | 2 +- .../views/specific/specificServiceCfgForm.jsp | 44 ++++++++++++++++--- .../webapp/static/global/scripts/common.js | 4 +- 41 files changed, 83 insertions(+), 48 deletions(-) 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 a6341eeba..ad428df0a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp @@ -403,7 +403,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } 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 b7339e131..59ff6dc46 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp @@ -403,7 +403,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } 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 a537971a0..5a9aa4c83 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp @@ -410,7 +410,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } 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 d7ae91553..5842bb2b3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp @@ -411,7 +411,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp index 6346e5aa6..a9a2dfd47 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp @@ -409,7 +409,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp index 24eaef2d3..3fc214879 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp @@ -162,7 +162,7 @@ var delContent = function(contentClassName, addBtnClassName) {

- +

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 b4f203932..15c40f50e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -99,7 +99,7 @@

- +

@@ -441,7 +441,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } 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 7424452e2..0d5ce4024 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp @@ -410,7 +410,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } 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 50accad77..472763dab 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp @@ -325,7 +325,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } 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 0587bc18b..1e4b564f1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp @@ -412,7 +412,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } 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 9daad0873..35cd55091 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 @@ -424,7 +424,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } 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 3272f4721..f9e2a7c9a 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 @@ -333,7 +333,7 @@ -
+
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 8ddeef599..378e36383 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -385,7 +385,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } 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 7a7fe8d80..ad10e8185 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 @@ -424,7 +424,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } 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 47a5ed4d8..9b43274e0 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 @@ -334,7 +334,7 @@ -
+
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 1fb9b2e32..813c5809d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp @@ -387,7 +387,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } 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 e52212c12..5ea0ea20c 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 @@ -658,7 +658,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } 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 220986840..3b1ce06e3 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 @@ -725,7 +725,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } 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 3c0f67483..7f6a2efd9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -447,7 +447,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp index 954cf7777..75d8e2d33 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp @@ -9,6 +9,11 @@ $(function(){ $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); } + var action=$(".action:checked"); + if(!action){ + action=$("input[name='action']"); + } + var regionCode=action.attr("regionCode"); //initCommIpVal(); var serviceType=$("input[name='cfgRegionCode']").attr("serviceType"); if(serviceType){ diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp index dbcaaf6a9..bc4c1be46 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp @@ -537,7 +537,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp index 16c72fcca..141aa2273 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp @@ -430,7 +430,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index e4e22b792..b57887aaa 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -405,7 +405,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } 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 60311ce00..fc35ae60a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -447,7 +447,7 @@ -
+
${cfg.creatorName } ${cfg.editorName } 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 cd699b878..83ea33699 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -446,7 +446,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } 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 68870ed99..b06027058 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp @@ -435,7 +435,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } 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 e5a0e0d68..04d8eafa3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp @@ -424,7 +424,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } 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 1c15a5e45..ff89ae68f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -467,7 +467,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp index b013ce3c7..4c867d1a2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -430,7 +430,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } 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 a9f3390a2..8e7e00ab9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -431,7 +431,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } 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 82353e08a..2e6a03a26 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -433,7 +433,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } 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 297137cae..8546cb30a 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 @@ -692,7 +692,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } 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 75837244e..559ab71c0 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 @@ -321,7 +321,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 164d36ff2..18c8350f4 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 @@ -322,7 +322,7 @@ -
+
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 f3dd01911..e5425739f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -436,7 +436,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } 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 7bad1eed4..2ea06613b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -586,7 +586,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } 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 300b2d9aa..f75d4bb41 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -430,7 +430,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } 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 c05c55378..2d9a2c93f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -430,7 +430,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp index eae562de0..64945cc5d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp @@ -430,7 +430,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp index f175ef565..7472a716c 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp @@ -82,6 +82,7 @@ $(this).find("[name='parent.specServiceId']").removeAttr("name"); $(this).find("[name='parent.specServiceName']").removeAttr("name"); $(this).find("[name='businessType']").removeAttr("name"); + $(this).find("[name='specServiceCode']").removeAttr("name"); }else{ var cfgType=$(this).attr("cfgType"); if("${specificServiceCfg.parent.specServiceId}"&& "${specificServiceCfg.parent.specServiceId}"!="0"){ @@ -91,7 +92,7 @@ } } }); - $(".protocol_code").html('*:'); + //$(".protocol_code").html('*:'); $(".protocol_name").html('*:'); $(".protocol_desc").html(':'); }else{ @@ -101,6 +102,7 @@ $(this).find("[name='parent.specServiceId']").removeAttr("name"); $(this).find("[name='parent.specServiceName']").removeAttr("name"); $(this).find("[name='businessType']").removeAttr("name"); + $(this).find("[name='specServiceCode']").removeAttr("name"); }else{ var cfgType=$(this).attr("cfgType"); if("${specificServiceCfg.parent.specServiceId}"&& "${specificServiceCfg.parent.specServiceId}"!="0"){ @@ -112,15 +114,15 @@ } }); if($("[name='cfgType']").val()==1){ - $(".protocol_code").html('*:'); + //$(".protocol_code").html('*:'); $(".protocol_name").html('*:'); $(".protocol_desc").html(':'); }else if($("[name='cfgType']").val()==2){ - $(".protocol_code").html('*:'); + //$(".protocol_code").html('*:'); $(".protocol_name").html('*:'); $(".protocol_desc").html(':'); }else{ - $(".protocol_code").html('*:'); + //$(".protocol_code").html('*:'); $(".protocol_name").html('*:'); $(".protocol_desc").html(':'); } @@ -133,6 +135,7 @@ $("#specificServiceCfg"+cfgType+"Id").attr("name","parent.specServiceId"); $("#specificServiceCfg"+cfgType+"Name").attr("name","parent.specServiceName"); $("#businessType"+cfgType).attr("name","businessType"); + $("#specServiceCode"+cfgType).attr("name","specServiceCode"); if($(this).hasClass("businessType")){ var parentId=$("#specificServiceCfg"+cfgType+"Id").val(); if(parentId!=0){ @@ -152,15 +155,15 @@ } }); if(cfgType==1){ - $(".protocol_code").html('*:'); + //$(".protocol_code").html('*:'); $(".protocol_name").html('*:'); $(".protocol_desc").html(':'); }else if(cfgType==2){ - $(".protocol_code").html('*:'); + //$(".protocol_code").html('*:'); $(".protocol_name").html('*:'); $(".protocol_desc").html(':'); }else{ - $(".protocol_code").html('*:'); + //$(".protocol_code").html('*:'); $(".protocol_name").html('*:'); $(".protocol_desc").html(':'); } @@ -278,6 +281,33 @@
+ +
+ +
+ +
+
+
+ + +
+ +
+ +
+
+
+ + +
+ +
+ +
+
+
+
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 86981373a..603c8d7ba 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -344,8 +344,8 @@ $(function(){ td需要配置属性有，functionId，compileId，action */ $("td[compileId]").each(function(){ - var audit=$(this).prev().find("span").data("audit"); - if(audit == "approved"){ + var audit=$(this).attr("audit"); + if(audit == 1){ var data={}; data.date=new Date(); data.compileId=$(this).attr("compileId"); From 1130cee1525b81d5e8b666f30b147e9bef3c7713 Mon Sep 17 00:00:00 2001 From: wangxin Date: Sat, 25 Aug 2018 15:29:25 +0800 Subject: [PATCH 5/8] =?UTF-8?q?xmppList=E5=8A=A0=E5=85=A5=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=80=BB=E9=87=8F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp | 2 ++ 1 file changed, 2 insertions(+) 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 5c17a4baf..39fe8a711 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp @@ -320,6 +320,7 @@ + @@ -431,6 +432,7 @@ +
${indexCfg.creatorName } ${indexCfg.editorName } From 4233142304a216ee8b93bf38a1f9cfe8eab377da Mon Sep 17 00:00:00 2001 From: wangxin Date: Sat, 25 Aug 2018 15:31:32 +0800 Subject: [PATCH 6/8] =?UTF-8?q?bgp=20=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=80=BB=E9=87=8Fcfg=E4=B8=BAindexCfg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2e6a03a26..aabce352b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -433,7 +433,7 @@ -
+
${indexCfg.creatorName } ${indexCfg.editorName } From 0354487dc85057f39db59d86378c565cf253f45c Mon Sep 17 00:00:00 2001 From: wangxin Date: Sat, 25 Aug 2018 16:37:39 +0800 Subject: [PATCH 7/8] =?UTF-8?q?ratelimit=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=94=B9=E4=B8=BAvarchar,pojo=E6=94=B9=E4=B8=BAString?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/domain/configuration/AppByteCfg.java | 6 +-- .../domain/configuration/AppDomainCfg.java | 6 +-- .../domain/configuration/AppHeaderCfg.java | 6 +-- .../nis/domain/configuration/AppHttpCfg.java | 6 +-- .../domain/configuration/AppInnerRuleCfg.java | 6 +-- .../nis/domain/configuration/AppIpCfg.java | 6 +-- .../domain/configuration/AppPolicyCfg.java | 6 +-- .../domain/configuration/AppSslCertCfg.java | 6 +-- .../domain/configuration/AppStringCfg.java | 6 +-- .../nis/domain/configuration/AppTcpCfg.java | 6 +-- .../configuration/AppTopicDomainCfg.java | 6 +-- .../nis/domain/configuration/BaseIpCfg.java | 6 +-- .../nis/domain/configuration/HttpUrlCfg.java | 6 +-- .../template/IpAddrTemplate.java | 2 +- .../configuration/template/IpCfgTemplate.java | 6 +-- .../template/IpMultiplexPolicyTemplate.java | 2 +- .../configuration/template/IpsecTemplate.java | 2 +- .../template/TunnelIpTemplate.java | 2 +- .../template/WhiteListIpTemplate.java | 2 +- .../nis/web/controller/BaseController.java | 12 ++++-- .../nis/web/dao/configuration/AppCfgDao.xml | 42 +++++++++---------- .../nis/web/dao/configuration/DomainDao.xml | 10 ++--- .../nis/web/dao/configuration/IpCfgDao.xml | 10 ++--- .../web/dao/configuration/StringCfgDao.xml | 10 ++--- .../resources/sql/alter_ratelimit_varchar.sql | 10 +++++ 25 files changed, 101 insertions(+), 87 deletions(-) create mode 100644 src/main/resources/sql/alter_ratelimit_varchar.sql diff --git a/src/main/java/com/nis/domain/configuration/AppByteCfg.java b/src/main/java/com/nis/domain/configuration/AppByteCfg.java index 1587b9f47..785586f3b 100644 --- a/src/main/java/com/nis/domain/configuration/AppByteCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppByteCfg.java @@ -28,7 +28,7 @@ public class AppByteCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -93,11 +93,11 @@ public class AppByteCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppDomainCfg.java b/src/main/java/com/nis/domain/configuration/AppDomainCfg.java index 30e24f777..f0db9a873 100644 --- a/src/main/java/com/nis/domain/configuration/AppDomainCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppDomainCfg.java @@ -28,7 +28,7 @@ public class AppDomainCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -92,11 +92,11 @@ public class AppDomainCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppHeaderCfg.java b/src/main/java/com/nis/domain/configuration/AppHeaderCfg.java index f33e086f6..ede2b6489 100644 --- a/src/main/java/com/nis/domain/configuration/AppHeaderCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppHeaderCfg.java @@ -27,7 +27,7 @@ public class AppHeaderCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -92,11 +92,11 @@ public class AppHeaderCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppHttpCfg.java b/src/main/java/com/nis/domain/configuration/AppHttpCfg.java index 5f775cd35..61b60d52b 100644 --- a/src/main/java/com/nis/domain/configuration/AppHttpCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppHttpCfg.java @@ -28,7 +28,7 @@ public class AppHttpCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -93,11 +93,11 @@ public class AppHttpCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppInnerRuleCfg.java b/src/main/java/com/nis/domain/configuration/AppInnerRuleCfg.java index 44ca43c9e..1f9cf9981 100644 --- a/src/main/java/com/nis/domain/configuration/AppInnerRuleCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppInnerRuleCfg.java @@ -28,7 +28,7 @@ public class AppInnerRuleCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -92,11 +92,11 @@ public class AppInnerRuleCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppIpCfg.java b/src/main/java/com/nis/domain/configuration/AppIpCfg.java index 921aaaf66..22e93fefe 100644 --- a/src/main/java/com/nis/domain/configuration/AppIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppIpCfg.java @@ -20,7 +20,7 @@ public class AppIpCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -213,11 +213,11 @@ public class AppIpCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java index 2873bfd98..a2dfa5366 100644 --- a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java @@ -34,7 +34,7 @@ public class AppPolicyCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -145,11 +145,11 @@ public class AppPolicyCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppSslCertCfg.java b/src/main/java/com/nis/domain/configuration/AppSslCertCfg.java index 0d4af4a17..ecc4d1510 100644 --- a/src/main/java/com/nis/domain/configuration/AppSslCertCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppSslCertCfg.java @@ -27,7 +27,7 @@ public class AppSslCertCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -92,11 +92,11 @@ public class AppSslCertCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppStringCfg.java b/src/main/java/com/nis/domain/configuration/AppStringCfg.java index f61ef011e..1c55cd66f 100644 --- a/src/main/java/com/nis/domain/configuration/AppStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppStringCfg.java @@ -30,7 +30,7 @@ public class AppStringCfg extends BaseStringCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; /* (non-Javadoc) * @see com.nis.domain.configuration.BaseCfg#initDefaultValue() @@ -53,11 +53,11 @@ public class AppStringCfg extends BaseStringCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } diff --git a/src/main/java/com/nis/domain/configuration/AppTcpCfg.java b/src/main/java/com/nis/domain/configuration/AppTcpCfg.java index 40270b491..37bd61bfc 100644 --- a/src/main/java/com/nis/domain/configuration/AppTcpCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppTcpCfg.java @@ -27,7 +27,7 @@ public class AppTcpCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -121,11 +121,11 @@ public class AppTcpCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java b/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java index 9fb349789..105d2b631 100644 --- a/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java @@ -26,7 +26,7 @@ public class AppTopicDomainCfg extends BaseCfg { @Expose private Integer compileId; @Expose - private Integer ratelimit; + private String ratelimit; // private Integer appCode;//specific_service_cfg表一级节点的spec_service_code private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code private Integer specServiceId; @@ -101,11 +101,11 @@ public class AppTopicDomainCfg extends BaseCfg { return tableName; } - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } // public Integer getAppCode() { diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index 7e565231f..cc50d83dc 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -109,20 +109,20 @@ public class BaseIpCfg extends BaseCfg { /** * 限速比例 */ - protected Integer ratelimit ; + protected String ratelimit ; /** * ratelimit * @return ratelimit */ - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } /** * @param ratelimit the ratelimit to set */ - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } /** diff --git a/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java b/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java index 17564f535..2fb7b43a9 100644 --- a/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java @@ -20,19 +20,19 @@ import com.nis.util.Constants; */ public class HttpUrlCfg extends BaseStringCfg { private static final String tableName="http_url_cfg"; - private Integer ratelimit; + private String ratelimit; /** * ratelimit * @return ratelimit */ - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } /** * @param ratelimit the ratelimit to set */ - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } /** diff --git a/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java index d3e48df2f..91417546c 100644 --- a/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java @@ -22,7 +22,7 @@ public class IpAddrTemplate extends IpCfgTemplate { } @Override - public Integer getRatelimit() { + public String getRatelimit() { // TODO Auto-generated method stub return super.getRatelimit(); } diff --git a/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java index caaf60321..dd08bbfe9 100644 --- a/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java @@ -44,7 +44,7 @@ public class IpCfgTemplate { private String attributeName;//18 private String lableName;//19 private String areaEffectiveIds;//20 - private Integer ratelimit;//21 + private String ratelimit;//21 private Integer dnsStrategyId;//22 private Integer irType;//23 private String userRegion1;//77 @@ -128,13 +128,13 @@ public class IpCfgTemplate { * @return ratelimit */ @ExcelField(title="ratelimit",align=2,sort=74) - public Integer getRatelimit() { + public String getRatelimit() { return ratelimit; } /** * @param ratelimit the ratelimit to set */ - public void setRatelimit(Integer ratelimit) { + public void setRatelimit(String ratelimit) { this.ratelimit = ratelimit; } /** diff --git a/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java index 29ba68dc0..06e489d15 100644 --- a/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java @@ -28,7 +28,7 @@ public class IpMultiplexPolicyTemplate extends IpCfgTemplate { } @Override - public Integer getRatelimit() { + public String getRatelimit() { // TODO Auto-generated method stub return super.getRatelimit(); } diff --git a/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java index de667fa22..c4515e7c4 100644 --- a/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java @@ -22,7 +22,7 @@ public class IpsecTemplate extends IpCfgTemplate { } @Override - public Integer getRatelimit() { + public String getRatelimit() { // TODO Auto-generated method stub return super.getRatelimit(); } diff --git a/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java b/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java index 277564871..b94bc7841 100644 --- a/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java @@ -22,7 +22,7 @@ public class TunnelIpTemplate extends IpCfgTemplate { } @Override - public Integer getRatelimit() { + public String getRatelimit() { // TODO Auto-generated method stub return super.getRatelimit(); } diff --git a/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java b/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java index 910b77bb1..337f0413c 100644 --- a/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java @@ -57,7 +57,7 @@ public class WhiteListIpTemplate extends IpCfgTemplate { } @Override - public Integer getRatelimit() { + public String getRatelimit() { // TODO Auto-generated method stub return super.getRatelimit(); } diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 08cd1bc25..900c541ce 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -54,7 +54,6 @@ import com.nis.util.DictUtils; import com.nis.util.JsonMapper; import com.nis.util.StringUtil; import com.nis.util.excel.ExportExcel; -import com.nis.web.dao.configuration.InterceptCfgDao; import com.nis.web.service.ArchiveServcie; import com.nis.web.service.AreaService; import com.nis.web.service.DictService; @@ -1064,13 +1063,18 @@ public class BaseController { } } if("ipratelimit".equals(specialItem)) { - Integer ratelimit=value.getRatelimit(); + String ratelimit=value.getRatelimit(); if(ratelimit==null) { errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("ratelimit"))+";"); }else { - if(ratelimit.intValue()<0||ratelimit.intValue()>100) { - errInfo.append(prop.getProperty("ratelimit_limit")+";"); + try { + if(Double.parseDouble(ratelimit)<0||Double.parseDouble(ratelimit)>1) { + errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("ratelimit_limit"))+";"); + } + }catch (Exception e) { + errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("ratelimit_limit"))+";"); } + } } //attribute check end diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml index 309954269..5d0adadbc 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -27,7 +27,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -195,7 +195,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -292,7 +292,7 @@ - + @@ -324,7 +324,7 @@ - + @@ -356,7 +356,7 @@ - + @@ -435,7 +435,7 @@ #{auditorId,jdbcType=INTEGER},#{auditTime,jdbcType=TIMESTAMP},#{serviceId,jdbcType=INTEGER}, #{requestId,jdbcType=INTEGER},#{compileId,jdbcType=INTEGER},#{isAreaEffective,jdbcType=INTEGER}, #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR}, - #{areaEffectiveIds,jdbcType=VARCHAR},#{ratelimit,jdbcType=INTEGER},#{functionId,jdbcType=INTEGER}, + #{areaEffectiveIds,jdbcType=VARCHAR},#{ratelimit,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER}, #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER} @@ -446,7 +446,7 @@ #{auditorId,jdbcType=INTEGER},#{auditTime,jdbcType=TIMESTAMP},#{serviceId,jdbcType=INTEGER}, #{requestId,jdbcType=INTEGER},#{compileId,jdbcType=INTEGER},#{isAreaEffective,jdbcType=INTEGER}, #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR}, - #{areaEffectiveIds,jdbcType=VARCHAR},#{ratelimit,jdbcType=INTEGER},#{functionId,jdbcType=INTEGER}, + #{areaEffectiveIds,jdbcType=VARCHAR},#{ratelimit,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER}, #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER} @@ -1951,7 +1951,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2060,7 +2060,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2173,7 +2173,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2274,7 +2274,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2373,7 +2373,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2472,7 +2472,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2584,7 +2584,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2685,7 +2685,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, @@ -2806,7 +2806,7 @@ function_id = #{functionId,jdbcType=INTEGER}, - RATELIMIT=#{ratelimit,jdbcType=INTEGER}, + RATELIMIT=#{ratelimit,jdbcType=VARCHAR}, CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/dao/configuration/DomainDao.xml b/src/main/java/com/nis/web/dao/configuration/DomainDao.xml index 68c8ae8f3..8c2fff8ea 100644 --- a/src/main/java/com/nis/web/dao/configuration/DomainDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DomainDao.xml @@ -28,7 +28,7 @@ - + @@ -77,7 +77,7 @@ #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR}, #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}, #{areaEffectiveIds,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER},#{cfgRegionCode,jdbcType=INTEGER} - ,#{ratelimit,jdbcType=INTEGER} + ,#{ratelimit,jdbcType=VARCHAR} SELECT @@ -253,7 +253,7 @@ AND ${page.alias}.CFG_REGION_CODE =#{cfgRegionCode,jdbcType=INTEGER} - AND ${page.alias}.RATELIMIT =#{ratelimit,jdbcType=INTEGER} + AND ${page.alias}.RATELIMIT =#{ratelimit,jdbcType=VARCHAR} @@ -339,7 +339,7 @@ AND r.CFG_REGION_CODE =#{cfgRegionCode,jdbcType=INTEGER} - AND r.RATELIMIT =#{ratelimit,jdbcType=INTEGER} + AND r.RATELIMIT =#{ratelimit,jdbcType=VARCHAR} @@ -468,7 +468,7 @@ cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER}, - ratelimit = #{ratelimit,jdbcType=INTEGER}, + ratelimit = #{ratelimit,jdbcType=VARCHAR}, diff --git a/src/main/resources/sql/alter_ratelimit_varchar.sql b/src/main/resources/sql/alter_ratelimit_varchar.sql new file mode 100644 index 000000000..6cd4ae953 --- /dev/null +++ b/src/main/resources/sql/alter_ratelimit_varchar.sql @@ -0,0 +1,10 @@ +ALTER TABLE app_byte_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE app_domain_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE app_http_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE app_layer_header_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE app_policy_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE app_ssl_cert_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE area_ip_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE dns_domain_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE http_url_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; +ALTER TABLE ip_port_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间'; From 015a5811c9035ee863640c40e1c552df54cca93a Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Sat, 25 Aug 2018 17:07:34 +0800 Subject: [PATCH 8/8] =?UTF-8?q?APP=E7=AD=96=E7=95=A5=E4=BF=AE=E6=94=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/dao/configuration/AppCfgDao.java | 1 + .../nis/web/dao/configuration/AppCfgDao.xml | 4 ++++ .../service/configuration/AppCfgService.java | 18 +++++++----------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java index 26307a96e..a5d4f8037 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java @@ -93,4 +93,5 @@ public interface AppCfgDao { public void auditCfg(BaseCfg entity); //修改配置状态 public void updateCfgValid(BaseCfg entity); + public void deleteSubscribeIdCfg(AppPolicyCfg entity); } diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml index 5d0adadbc..8d97ef21e 100644 --- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml @@ -2840,6 +2840,10 @@ delete from ip_port_cfg where compile_id=#{compileId} and function_id=#{functionId} + + + + delete from ntc_subscribe_id_cfg where compile_id=#{compileId} and function_id=#{functionId}