diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java index 6678f646a..adcc1f375 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java @@ -134,7 +134,7 @@ public class DdosCfgController extends BaseController { Page page = ddosCfgService.findPage(pageInfo, entity); titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), DdosIpCfg.class); - String cfgIndexInfoNoExport=",client_ip,client_port,server_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String cfgIndexInfoNoExport=",client_ip,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport); dataMap.put(entity.getMenuNameCode(), page.getList()); /*}*/ diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index 40fef4f2c..ef8f157b6 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -563,7 +563,7 @@ public class AvContentController extends BaseController { ,HttpServletResponse response ,@ModelAttribute("cfg")CfgIndexInfo entity ,RedirectAttributes redirectAttributes){ - if(entity.getIpPort()== null){ + /*if(entity.getIpPort()== null){ entity.setIpPort(new IpPortCfg()); } if(entity.getAvContUrlCfgList()== null){ @@ -571,7 +571,7 @@ public class AvContentController extends BaseController { } if(entity.getNtcSubscribeIdCfg()==null){ entity.setNtcSubscribeIdCfg(new NtcSubscribeIdCfg()); - } + }*/ Page page = avContentCfgService.findPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); initPageCondition(model,entity); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java index 849b1f44c..53364d9c5 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java @@ -308,7 +308,7 @@ public class HttpRedirectPolicyController extends BaseController{ }else if(entity.getFunctionId()==208){ cfgIndexInfoNoExport=",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:redirect_response_code-userregion2:redirect_url-"; }else if(entity.getFunctionId()==209){ - cfgIndexInfoNoExport=",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:replace_zone-userregion2:replaced_content-userregion3:replace_content-"; + cfgIndexInfoNoExport=",policy_name,group_name,userregion4,userregion5,&userregion1:replace_zone-userregion2:replaced_content-userregion3:replace_content-"; }else if(entity.getFunctionId()==211){ cfgIndexInfoNoExport=",do_log,log_total,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; } diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml index e087e38f5..3ed3b863c 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml @@ -387,11 +387,11 @@ ) - - AND r.compile_id in (SELECT s.compile_id FROM av_voip_account_cfg s + + AND r.compile_id in (SELECT s.compile_id FROM av_cont_url_cfg s - - REPLACE(s.cfg_keywords,'***and***','|') LIKE concat(concat('%',#{voipAccount.cfgKeywords,jdbcType=VARCHAR}),'%') + + REPLACE(s.cfg_keywords,'***and***','|') LIKE concat(concat('%',#{avContUrlCfg.cfgKeywords,jdbcType=VARCHAR}),'%') ) 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 836841a81..e47b07d13 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 @@ -28,6 +28,8 @@ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ $("#intype").val("${cfg.ipPort.destIpAddress}"); + }else if("${cfg.avContUrlCfg.cfgKeywords}"){ + $("#intype").val("${cfg.avContUrlCfg.cfgKeywords}"); }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -178,7 +180,7 @@ - <%-- --%> + diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp index c16f1d5c0..88c9bf5d8 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 @@ -15,6 +15,8 @@ $("#intype").val("${cfg.ipPort.srcIpAddress}"); }else if("${cfg.ipPort.destIpAddress}"){ $("#intype").val("${cfg.ipPort.destIpAddress}"); + }else if("${cfg.httpUrl.cfgKeywords}"){ + $("#intype").val("${cfg.httpUrl.cfgKeywords}"); }else if("${cfg.httpReqHdr.cfgKeywords}"){ $("#intype").val("${cfg.httpReqHdr.cfgKeywords}"); }else if("${cfg.httpResHdr.cfgKeywords}"){ @@ -341,6 +343,7 @@ + diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp index e38a42101..4fbb7b1f7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -11,6 +11,8 @@ $("#intype").val("${cfg.cfgDesc}"); }else if("${cfg.compileId}"){ $("#intype").val("${cfg.compileId}"); + }else if("${cfg.httpUrl.cfgKeywords}"){ + $("#intype").val("${cfg.httpUrl.cfgKeywords}"); }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } @@ -143,6 +145,7 @@ +