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

(1)ip地址功能整个asn功能

Browse Source 
(2)ip域处理提到单独的js ipRegion.js中
This commit is contained in:
wangxin
2018-09-29 21:46:17 +08:00
parent a29c6367b3
commit 61b56958c6
10 changed files with 1044 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -20,12 +20,14 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.SysDataDictionaryItem;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.configuration.template.IpAddrTemplate;
import com.nis.domain.configuration.template.IpsecTemplate;
import com.nis.domain.configuration.template.TunnelIpTemplate;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.DictUtils;
import com.nis.web.controller.configuration.CommonController;
@@ -57,6 +59,8 @@ public class IpController extends CommonController{
}else{
initFormCondition(model,entity);
}
List<ConfigGroupInfo> policyGroups=asnPolicyCfgService.getConfigGroupInfoList(4);
model.addAttribute("policyGroups", policyGroups);
model.addAttribute("_cfg", entity);
return "/cfg/ipaddr/ipForm";
}
@@ -89,6 +93,9 @@ public class IpController extends CommonController{
}
}
}
if(StringUtils.isNotBlank(cfg.getUserRegion4())) {
tabList.add(new String[]{"3","ASN"});
}
model.addAttribute("_cfg", cfg);
model.addAttribute("index", index);
model.addAttribute("tabList", tabList);
@@ -114,11 +121,21 @@ public class IpController extends CommonController{
entity.setAuditTime(new Date());
entity.setFunctionId(functionId);
try {
ipCfgService.auditIpCfg(entity,isAudit);
} catch (MaatConvertException e) {
if(StringUtils.isNoneBlank(entity.getUserRegion4())) {
ipCfgService.auditAsnCfg(entity, isAudit);
}else {
ipCfgService.auditIpCfg(entity,isAudit);
}
} catch (Exception e) {
e.printStackTrace();
logger.info("ssl配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
logger.info("ip配置下发失败："+e.getMessage());
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes, e.getMessage());
}else {
addMessage(redirectAttributes, "audit_failed");
}
}
}
return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+functionId;