diff --git a/src/main/resources/sql/20190112/function_service_dict_add_do_log.sql b/src/main/resources/sql/20190112/function_service_dict_add_do_log.sql index 6e2043749..dc6ef48f2 100644 --- a/src/main/resources/sql/20190112/function_service_dict_add_do_log.sql +++ b/src/main/resources/sql/20190112/function_service_dict_add_do_log.sql @@ -63,6 +63,10 @@ UPDATE function_service_dict SET config_do_log='1;1,2;2' WHERE service_id=132 AN UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=20 AND function_id=37; #Mail WhiteList UPDATE function_service_dict SET config_do_log='0;0;0' WHERE service_id=66 AND function_id=37; +#Mail advanced Monitor +UPDATE function_service_dict SET config_do_log='1;1,2;2' WHERE service_id=132 AND function_id=35; +#Mail advanced Block +UPDATE function_service_dict SET config_do_log='1;0,2;2' WHERE service_id=20 AND function_id=35; #FTP Monitor UPDATE function_service_dict SET config_do_log='1;1,2;2' WHERE service_id=133 AND function_id=51; #FTP Block 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 f8d94a82c..ee76ee2d5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -451,7 +451,7 @@ - + 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 102091528..ce7c02538 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 @@ -199,6 +199,7 @@ checked> 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 031fb57de..fef644d19 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 @@ -199,6 +199,7 @@ checked> 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 36a25bfac..58bb67dc9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -451,7 +451,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 41361e7c4..5d58920d4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -448,7 +448,7 @@ - + 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 f2724bdee..41229617f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp @@ -203,6 +203,7 @@ serviceId="${service.serviceId }" protocolId="${service.protocolId }" regionCode="${service.regionCode }" + configDoLog="${service.configDoLog }" value="${service.action }" class="required action" checked> @@ -219,7 +220,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp index c93109aa0..f91bdfafb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp @@ -174,9 +174,10 @@ varStatus="satus">
-
+
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 ac5b21f0b..5606d49cf 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -409,14 +409,14 @@ --%> - <%-- --%> - <%-- --%> + + @@ -552,13 +552,6 @@ - <%-- - - - - - - --%> @@ -631,7 +624,14 @@ - <%--
--%> + + + + + + + +
${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 cd0b8264d..6469267f7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -422,7 +422,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp index 66dbe66f0..1931395fe 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp @@ -206,6 +206,7 @@ serviceId="${service.serviceId }" protocolId="${service.protocolId }" regionCode="${service.regionCode }" + configDoLog="${service.configDoLog }" value="${service.action }" class="required action" checked> @@ -222,7 +223,7 @@
-
+
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 48c6a01b8..bf3c933fb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -416,7 +416,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp index b7548e56d..48851bb2e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp @@ -170,6 +170,7 @@ checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp index fff8b3634..8db06ae5b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp @@ -184,6 +184,7 @@ checked> @@ -199,7 +200,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp index fb27b1522..caea103a6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp @@ -244,6 +244,7 @@ serviceId="${service.serviceId }" protocolId="${service.protocolId }" regionCode="${service.regionCode }" + configDoLog="${service.configDoLog }" value="${service.action }" class="required action" checked> @@ -260,7 +261,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp index dfd5a6712..0d2ee645b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp @@ -188,6 +188,7 @@ serviceId="${service.serviceId }" protocolId="${service.protocolId }" regionCode="${service.regionCode }" + configDoLog="${service.configDoLog }" value="${service.action }" class="required action" checked> @@ -204,7 +205,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp index ecb6dc728..d4fb3a943 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp @@ -175,6 +175,7 @@ serviceId="${service.serviceId }" protocolId="${service.protocolId }" regionCode="${service.regionCode }" + configDoLog="${service.configDoLog }" value="${service.action }" class="required action" checked> 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 19d64b3a5..380cdc460 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -393,7 +393,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp index 4bdb73418..3e724e8e0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp @@ -198,7 +198,7 @@ varStatus="satus"> <%-- - - - - - - - @@ -489,7 +482,14 @@ - <%--
--%> + + + + + + + +
${indexCfg.creatorName } ${indexCfg.editorName } diff --git a/src/main/webapp/static/global/scripts/doLog.js b/src/main/webapp/static/global/scripts/doLog.js index 4389b1097..6a78427d9 100644 --- a/src/main/webapp/static/global/scripts/doLog.js +++ b/src/main/webapp/static/global/scripts/doLog.js @@ -30,7 +30,7 @@ var processDoLog=function(doLog){ if(dologOptionValues.length==1){ $(".doLog").find("[name='doLog']").each(function(){ if($(this).val()==dologObj.options){ - $(this).attr("checked",true); + $(this).prop("checked",true); $(this).parents(".radio-inline").removeClass("hidden"); }else{ $(this).removeAttr("checked"); @@ -52,10 +52,10 @@ var processDoLog=function(doLog){ $(this).parents(".radio-inline").addClass("hidden"); } }); - if($(".doLog").find("[name$='doLog'] [value='"+doLogValue+"']:visible")){ - $(".doLog").find("[name$='doLog'] [value='"+doLogValue+"']:visible").attr("checked",true); - }else if($(".doLog").find("[name$='doLog'] [value='"+defaults+"']:visible")){//默认值为2 - $(".doLog").find("[name$='doLog'] [value='2']:visible").attr("checked",true); + if($("input[name$='doLog'][value='"+doLogValue+"']:visible").length>0){ + $("input[name$='doLog'][value='"+doLogValue+"']:visible").prop("checked",true); + }else if($("input[name$='doLog'][value='"+defaults+"']:visible").length>0){//默认值为2 + $("input[name$='doLog'][value='"+defaults+"']:visible").prop("checked",true); } }