From c49bf6985e90683f0b72e0c1f0553c7941bc80ce Mon Sep 17 00:00:00 2001 From: duandongmei Date: Thu, 13 Sep 2018 18:14:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=81=E5=85=AD=E8=BF=9B=E5=88=B6=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=8E=BB=E6=8E=89=E5=85=B3=E9=94=AE=E5=AD=97=E7=9A=84?= =?UTF-8?q?=E9=97=B4=E9=9A=94=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sql/20180913/update-sys_menu-voip.sql | 7 +++- .../WEB-INF/views/basics/taskInfoList.jsp | 32 +++---------------- .../views/cfg/app/appPolicyCfgForm.jsp | 1 + .../views/cfg/av/contUrl/contUrlForm.jsp | 1 + .../views/cfg/av/picUrl/picUrlForm.jsp | 1 + .../views/cfg/av/voip/voipAccountForm.jsp | 3 +- .../WEB-INF/views/cfg/av/voip/voipForm.jsp | 3 +- .../WEB-INF/views/cfg/basicprotocol/form.jsp | 3 +- .../views/cfg/encryptedtunnelbehav/form.jsp | 3 +- .../views/cfg/fileTransfer/fileDigestForm.jsp | 3 +- .../views/cfg/fileTransfer/ftpForm.jsp | 3 +- .../views/cfg/intercept/interceptForm.jsp | 29 ++--------------- .../views/cfg/intercept/interceptList.jsp | 6 ++-- .../WEB-INF/views/cfg/ipaddr/ipForm.jsp | 3 +- .../WEB-INF/views/cfg/mail/mailForm.jsp | 3 +- .../WEB-INF/views/cfg/other/bgpForm.jsp | 3 +- .../WEB-INF/views/cfg/other/xmppForm.jsp | 3 +- .../cfg/proxy/control/httpRedirectForm.jsp | 3 +- .../webapp/WEB-INF/views/cfg/requestList.jsp | 31 +++--------------- .../WEB-INF/views/cfg/website/dnsForm.jsp | 3 +- .../WEB-INF/views/cfg/website/httpForm.jsp | 3 +- .../WEB-INF/views/cfg/website/sslForm.jsp | 3 +- .../views/cfg/whitelist/domainForm.jsp | 3 +- .../WEB-INF/views/cfg/whitelist/ipForm.jsp | 3 +- .../plugins/bootstrap/css/bootstrap.css | 2 +- .../1.11.0/localization/messages_en.js | 4 +-- 26 files changed, 59 insertions(+), 103 deletions(-) diff --git a/src/main/resources/sql/20180913/update-sys_menu-voip.sql b/src/main/resources/sql/20180913/update-sys_menu-voip.sql index a9080ac42..e574f076e 100644 --- a/src/main/resources/sql/20180913/update-sys_menu-voip.sql +++ b/src/main/resources/sql/20180913/update-sys_menu-voip.sql @@ -3,4 +3,9 @@ UPDATE sys_menu set permission='avVoipAccount:config',href='/ntc/av/voipAccountL UPDATE sys_menu set permission='avVoipIp:confirm',href='/ntc/av/voipList' where id=662; UPDATE sys_menu set permission='avVoipAccount:confirm',href='/ntc/av/voipAccountList' where id=663; UPDATE sys_menu set permission='avVoipIp:audit',href='/ntc/av/voipList' where id=832; -UPDATE sys_menu set permission='avVoipAccount:audit',href='/ntc/av/voipAccountList' where id=833; \ No newline at end of file +UPDATE sys_menu set permission='avVoipAccount:audit',href='/ntc/av/voipAccountList' where id=833; +#修改来函和专项权限标识 +update sys_menu set permission='cfg:requestInfo:confirm',name='审核',code='confirm' where id=222; +update sys_menu set permission='cfg:requestInfo:config',name='操作',code='config' where id=221; +update sys_menu set permission='basics:taskInfo:config',name='操作',code='config' where id=223; +update sys_menu set permission='basics:taskInfo:confirm',name='审核',code='confirm' where id=224; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp index 1e0911f2a..d30c47343 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp @@ -9,34 +9,14 @@
- - - - - - - - - - - - - - - - - - - - - + + -

@@ -84,15 +64,14 @@

- - + - - + +
- href="javascript:;"> 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 b8005a74b..0e0033f86 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp @@ -66,6 +66,7 @@ $(function(){ var isHexbin=$(this).val(); if(isHexbin == 1){ //十六进制 var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); + keywords=keywords.replace("***and***","") if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".form-body").find( "div[for='" diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp index 6fdb70057..1ab972fea 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp @@ -40,6 +40,7 @@ $(function(){ var isHexbin=$(this).val(); if(isHexbin == 1){ //十六进制 var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); + keywords=keywords.replace("***and***","") if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".form-body").find( "div[for='" diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp index eae0cc0b9..9edc49df0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp @@ -32,6 +32,7 @@ $(function(){ var isHexbin=$(this).val(); if(isHexbin == 1){ //十六进制 var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); + keywords=keywords.replace("***and***","") if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".form-body").find( "div[for='" diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp index da2327ed4..30b72f562 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp @@ -62,7 +62,8 @@ var isHexbin=$(this).val(); if(isHexbin == 1){ //十六进制 var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); - if(keywords != ''){ + keywords=keywords.replace("***and***","") + if(keywords != ''){ if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".boxSolid").find( "div[for='" diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp index b61bab8ca..588f85cdb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp @@ -65,7 +65,8 @@ var isHexbin=$(this).val(); if(isHexbin == 1){ //十六进制 var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); - if(keywords != ''){ + keywords=keywords.replace("***and***","") + if(keywords != ''){ if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".boxSolid").find( "div[for='" diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp index 984d5978e..2919dee39 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp @@ -73,7 +73,8 @@ $(function(){ var isHexbin=$(this).val(); if(isHexbin == 1){ //十六进制 var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); - if(keywords != ''){ + keywords=keywords.replace("***and***","") + if(keywords != ''){ if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".boxSolid").find( "div[for='" diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp index cb56a16a1..c3ec903e0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp @@ -50,7 +50,8 @@ $(function(){ var isHexbin=$(this).val(); if(isHexbin == 1){ //十六进制 var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); - if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ + keywords=keywords.replace("***and***","") + if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".form-body").find( "div[for='" + $(this).attr("name").replace("isHexbin","cfgKeywords") diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp index 9f7e0dd44..0868ec894 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp @@ -45,7 +45,8 @@ var isHexbin=$(this).val(); if(isHexbin == 1){ //十六进制 var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); - if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ + keywords=keywords.replace("***and***","") + if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".form-body").find( "div[for='" + $(this).attr("name").replace("isHexbin","cfgKeywords") diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp index ee2ee4b38..87f763929 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp @@ -65,7 +65,8 @@ var isHexbin=$(this).val(); if(isHexbin == 1){ //十六进制 var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); - if(keywords != ''){ + keywords=keywords.replace("***and***","") + if(keywords != ''){ if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ $(this).parents(".boxSolid").find( "div[for='" diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp index bbdf68da6..2bcbf852f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp @@ -51,31 +51,8 @@ top.$.jBox.tip("", ""); return; } - $(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){ - if($(this).val()==''){ - $(this).parents(".form-group").find( - "div[for='" - + $(this).attr("name") - + "']").html(""); - flag = false; - } - }); - //keywords非空校验完成校验二进制字符串 - $(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){ - var isHexbin=$(this).val(); - if(isHexbin == 1){ //十六进制 - var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); - if(keywords != ''){ - if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ - $(this).parents(".boxSolid").find( - "div[for='" - + $(this).attr("name").replace("isHexbin","cfgKeywords") - + "']").html(""); - flag = false; - } - } - } - }); + //校验tagInput的空和十六进制 + flag=validateTagInputKeyword(); var flag1=validateInvisibleCharTag(); if(flag){ flag=flag1; @@ -237,7 +214,7 @@
-
+