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);
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());
/*}*/

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
,@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<CfgIndexInfo> page = avContentCfgService.findPage(new Page<CfgIndexInfo>(request, response,"r"), entity);
model.addAttribute("page", page);
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){
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,";
}

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

@@ -387,11 +387,11 @@
</where>
)
</if>
<if test="voipAccount != null">
AND r.compile_id in (SELECT s.compile_id FROM av_voip_account_cfg s
<if test="avContUrlCfg != null">
AND r.compile_id in (SELECT s.compile_id FROM av_cont_url_cfg s
<where>
<if test="voipAccount.cfgKeywords != null and voipAccount.cfgKeywords != ''">
REPLACE(s.cfg_keywords,'***and***','|') LIKE concat(concat('%',#{voipAccount.cfgKeywords,jdbcType=VARCHAR}),'%')
<if test="avContUrlCfg.cfgKeywords != null and avContUrlCfg.cfgKeywords != ''">
REPLACE(s.cfg_keywords,'***and***','|') LIKE concat(concat('%',#{avContUrlCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
</if>
</where>
)