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

DNS reject增加策略分组功能

Browse Source
This commit is contained in:
duandongmei
2018-06-22 15:59:47 +08:00
parent 41024e872c
commit b6d0ece058
22 changed files with 169 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ import com.nis.domain.Page;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.domain.configuration.ComplexStringCfgTemplate;
import com.nis.domain.configuration.IpCfgTemplate;
import com.nis.domain.configuration.StringCfgTemplate;
@@ -299,6 +300,9 @@ public class WebsiteController extends BaseController{
}else{
initFormCondition(model,entity);
}
//获取所有响应策略信息
List<DnsResStrategy> resStrategys=dnsResStrategyService.findDnsResStrategys(null, 1,1);
model.addAttribute("dnsResStrategys", resStrategys);
model.addAttribute("_cfg", entity);
return "/cfg/website/dnsForm";
}

6
src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java → src/main/java/com/nis/web/controller/configuration/proxy/DnsIpCfgController.java
View File

@@ -1,4 +1,4 @@
package com.nis.web.controller.configuration;
package com.nis.web.controller.configuration.proxy;
import java.util.Date;
import java.util.List;
@@ -48,7 +48,7 @@ public class DnsIpCfgController extends BaseController {
initFormCondition(model,cfg);
}
//获取所有响应策略信息
List<DnsResStrategy> resStrategys=dnsResStrategyService.findDnsResStrategys(null, -1);
List<DnsResStrategy> resStrategys=dnsResStrategyService.findDnsResStrategys(null, 1,1);
model.addAttribute("dnsResStrategys", resStrategys);
model.addAttribute("_cfg", cfg);
return "/cfg/dnsIpCfgForm";
@@ -77,7 +77,7 @@ public class DnsIpCfgController extends BaseController {
return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+functionId;
}
@RequestMapping(value = {"/audit"})
@RequiresPermissions(value={"dns:fake:ip:audit"})
//@RequiresPermissions(value={"dns:fake:ip:audit"})
public String audit(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");

3
src/main/java/com/nis/web/controller/configuration/ntc/DnsResStrategyController.java → src/main/java/com/nis/web/controller/configuration/proxy/DnsResStrategyController.java
View File

@@ -1,4 +1,4 @@
package com.nis.web.controller.configuration.ntc;
package com.nis.web.controller.configuration.proxy;
import java.util.ArrayList;
import java.util.Date;
@@ -72,6 +72,7 @@ public class DnsResStrategyController extends BaseController {
DnsResStrategy dns0=dnsResStrategyService.getDnsResStrategy(0l,null);
if(dns0 == null){
cfg.setCfgId(0l);
cfg.setCfgDesc("无策略");
}
initFormCondition(model, cfg);
model.addAttribute("isAdd", true);