(1)dns策略Id类型修复,解决不能copy value

(2)导入模板验证是否合法,根据title判断,如果不同语言的导入模板,也会被判定不合法。
(3)注掉部分废弃导入方法
This commit is contained in:
wangxin
2018-10-24 13:32:30 +08:00
parent 068e1e696e
commit 92b389914d
12 changed files with 101 additions and 41 deletions

View File

@@ -413,7 +413,7 @@ public class WebsiteController extends BaseController{
this.importCfgTemplate(request, response, redirectAttributes, functionId, cfgRegionCode);
}
//http配置导入
@RequestMapping(value = "importHttp", method=RequestMethod.POST)
/*@RequestMapping(value = "importHttp", method=RequestMethod.POST)
public String importHttpFile(HttpServletRequest request,Model model,HttpServletResponse response, RedirectAttributes redirectAttributes,
@RequestParam("file") MultipartFile file,CfgIndexInfo cfgIndex,Integer protocolId) {
try {
@@ -518,7 +518,7 @@ public class WebsiteController extends BaseController{
}
return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+cfgIndex.getFunctionId();
}
}*/

View File

@@ -234,12 +234,12 @@ public class WhiteListController extends CommonController{
return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+functionId;
}
//ip配置导入
@RequestMapping(value = "ip/import", method=RequestMethod.POST)
/*@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,WhiteListIpTemplate.class);
return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+cfg.getFunctionId();
}
}*/
//ip模板下载
@RequestMapping(value = "ip/import/template")
public void importFileTemplate(HttpServletRequest request,HttpServletResponse response,