gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.列表增加URL检索 2.查漏补缺ddos,http(s)替换 导出列

Browse Source
This commit is contained in:
zhangwq
2018-11-07 17:15:08 +08:00
parent 9ae865e39a
commit 37dd47ef45
7 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java
View File

@@ -134,7 +134,7 @@ public class DdosCfgController extends BaseController {
Page<DdosIpCfg> page = ddosCfgService.findPage(pageInfo, entity); Page<DdosIpCfg> page = ddosCfgService.findPage(pageInfo, entity);
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), DdosIpCfg.class); 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); noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
dataMap.put(entity.getMenuNameCode(), page.getList()); dataMap.put(entity.getMenuNameCode(), page.getList());
/*}*/ /*}*/

4
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

@@ -563,7 +563,7 @@ public class AvContentController extends BaseController {
,HttpServletResponse response ,HttpServletResponse response
,@ModelAttribute("cfg")CfgIndexInfo entity ,@ModelAttribute("cfg")CfgIndexInfo entity
,RedirectAttributes redirectAttributes){ ,RedirectAttributes redirectAttributes){
if(entity.getIpPort()== null){ /*if(entity.getIpPort()== null){
entity.setIpPort(new IpPortCfg()); entity.setIpPort(new IpPortCfg());
} }
if(entity.getAvContUrlCfgList()== null){ if(entity.getAvContUrlCfgList()== null){
@@ -571,7 +571,7 @@ public class AvContentController extends BaseController {
} }
if(entity.getNtcSubscribeIdCfg()==null){ if(entity.getNtcSubscribeIdCfg()==null){
entity.setNtcSubscribeIdCfg(new NtcSubscribeIdCfg()); entity.setNtcSubscribeIdCfg(new NtcSubscribeIdCfg());
} }*/
Page<CfgIndexInfo> page = avContentCfgService.findPage(new Page<CfgIndexInfo>(request, response,"r"), entity); Page<CfgIndexInfo> page = avContentCfgService.findPage(new Page<CfgIndexInfo>(request, response,"r"), entity);
model.addAttribute("page", page); model.addAttribute("page", page);
initPageCondition(model,entity); initPageCondition(model,entity);

2
src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
View File

@@ -308,7 +308,7 @@ public class HttpRedirectPolicyController extends BaseController{
}else if(entity.getFunctionId()==208){ }else if(entity.getFunctionId()==208){
cfgIndexInfoNoExport=",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:redirect_response_code-userregion2:redirect_url-"; cfgIndexInfoNoExport=",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:redirect_response_code-userregion2:redirect_url-";
}else if(entity.getFunctionId()==209){ }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){ }else if(entity.getFunctionId()==211){
cfgIndexInfoNoExport=",do_log,log_total,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; cfgIndexInfoNoExport=",do_log,log_total,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
} }

8
src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
View File

@@ -387,11 +387,11 @@
</where> </where>
) )
</if> </if>
<if test="voipAccount != null"> <if test="avContUrlCfg != null">
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
<where> <where>
<if test="voipAccount.cfgKeywords != null and voipAccount.cfgKeywords != ''"> <if test="avContUrlCfg.cfgKeywords != null and avContUrlCfg.cfgKeywords != ''">
REPLACE(s.cfg_keywords,'***and***','|') LIKE concat(concat('%',#{voipAccount.cfgKeywords,jdbcType=VARCHAR}),'%') REPLACE(s.cfg_keywords,'***and***','|') LIKE concat(concat('%',#{avContUrlCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
</if> </if>
</where> </where>
) )

4
src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
View File

@@ -28,6 +28,8 @@
$("#intype").val("${cfg.ipPort.srcIpAddress}"); $("#intype").val("${cfg.ipPort.srcIpAddress}");
}else if("${cfg.ipPort.destIpAddress}"){ }else if("${cfg.ipPort.destIpAddress}"){
$("#intype").val("${cfg.ipPort.destIpAddress}"); $("#intype").val("${cfg.ipPort.destIpAddress}");
}else if("${cfg.avContUrlCfg.cfgKeywords}"){
$("#intype").val("${cfg.avContUrlCfg.cfgKeywords}");
}else{ }else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text()); $("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
} }
@@ -178,7 +180,7 @@
<form:option value="compileId"><spring:message code="cfg_id"/></form:option> <form:option value="compileId"><spring:message code="cfg_id"/></form:option>
<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option> <form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option> <form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
<%-- <form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option> --%> <form:option value="avContUrlCfg.cfgKeywords"><spring:message code="URL"></spring:message></form:option>
<form:option value="action"><spring:message code="block_type"></spring:message></form:option> <form:option value="action"><spring:message code="block_type"></spring:message></form:option>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option> <form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
</form:select> </form:select>

3
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
View File

@@ -15,6 +15,8 @@
$("#intype").val("${cfg.ipPort.srcIpAddress}"); $("#intype").val("${cfg.ipPort.srcIpAddress}");
}else if("${cfg.ipPort.destIpAddress}"){ }else if("${cfg.ipPort.destIpAddress}"){
$("#intype").val("${cfg.ipPort.destIpAddress}"); $("#intype").val("${cfg.ipPort.destIpAddress}");
}else if("${cfg.httpUrl.cfgKeywords}"){
$("#intype").val("${cfg.httpUrl.cfgKeywords}");
}else if("${cfg.httpReqHdr.cfgKeywords}"){ }else if("${cfg.httpReqHdr.cfgKeywords}"){
$("#intype").val("${cfg.httpReqHdr.cfgKeywords}"); $("#intype").val("${cfg.httpReqHdr.cfgKeywords}");
}else if("${cfg.httpResHdr.cfgKeywords}"){ }else if("${cfg.httpResHdr.cfgKeywords}"){
@@ -341,6 +343,7 @@
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option> <form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option> <form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option> <form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
<form:option value="httpUrl.cfgKeywords"><spring:message code="URL"></spring:message></form:option>
<form:option value="httpReqHdr.cfgKeywords"><spring:message code="http_req_hdr_keywords"></spring:message></form:option> <form:option value="httpReqHdr.cfgKeywords"><spring:message code="http_req_hdr_keywords"></spring:message></form:option>
<c:if test="${cfg.functionId ne 211}"> <c:if test="${cfg.functionId ne 211}">
<c:if test="${cfg.functionId ne 209}"> <c:if test="${cfg.functionId ne 209}">

3
src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
View File

@@ -11,6 +11,8 @@
$("#intype").val("${cfg.cfgDesc}"); $("#intype").val("${cfg.cfgDesc}");
}else if("${cfg.compileId}"){ }else if("${cfg.compileId}"){
$("#intype").val("${cfg.compileId}"); $("#intype").val("${cfg.compileId}");
}else if("${cfg.httpUrl.cfgKeywords}"){
$("#intype").val("${cfg.httpUrl.cfgKeywords}");
}else{ }else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text()); $("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
} }
@@ -143,6 +145,7 @@
<form:select path="seltype" class="selectpicker select2 input-small" > <form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option> <form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option> <form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="httpUrl.cfgKeywords"><spring:message code="URL"></spring:message></form:option>
<form:option value="action"><spring:message code="block_type"></spring:message></form:option> <form:option value="action"><spring:message code="block_type"></spring:message></form:option>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option> <form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
</form:select> </form:select>