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

(1)复用类型Ip导入验证修复

Browse Source 
(2)隧道类配置IP导入模板修改
(3)IP拦截配置导入模板修改
(4)IPSCIP配置导入验证逻辑修改，当action为drop的时候，输入50或者51,监测的时候为0
(5)IP拦截配置导入模板修改
This commit is contained in:
wangxin
2018-07-31 12:18:34 +08:00
parent 1a94c225bc
commit 8b3efbcfbf
14 changed files with 205 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -16,6 +16,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.template.IpAddrTemplate;
import com.nis.web.controller.configuration.CommonController;
/**
@@ -104,7 +105,7 @@ public class InterceptController extends CommonController{
@RequestMapping(value = "/ip/import", method=RequestMethod.POST)
public String importIp(String cfgName,RedirectAttributes redirectAttributes,
@RequestParam("file") MultipartFile file,IpPortCfg cfg) {
this._importIp(cfgName,redirectAttributes, file,cfg);
this._importIp(cfgName,redirectAttributes, file,cfg,IpAddrTemplate.class);
redirectAttributes.addAttribute("urlPrefix","/proxy/intercept/ip");
redirectAttributes.addAttribute("requiresPermissionPrefix","intercept:ip");
return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+cfg.getFunctionId();
@@ -112,7 +113,7 @@ public class InterceptController extends CommonController{
@RequestMapping(value = "/ip/import/template")
public void importFileTemplate(HttpServletRequest request,HttpServletResponse response,
RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode) {
this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode);
this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,IpAddrTemplate.class);
}
//ip配置导出
@RequestMapping(value = "/ip/export")