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

DNAT复用策略增加用户和用户类型

Browse Source 
调整SNAT地址池管理 配置IP的格式为：IP sql提交
This commit is contained in:
leijun
2019-01-16 18:49:44 +08:00
parent 98971a4c32
commit d7807f0009
11 changed files with 203 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
View File

@@ -343,6 +343,10 @@ public class IpMultiplexController extends CommonController {
Page<BaseIpCfg> page = ipMultiplexService.findPageDnat(new Page<BaseIpCfg>(request, response, "r"), cfg);
model.addAttribute("page", page);
// 获取用户信息 地址池信息
List<UserManage> users = userManageService.findUsers();
model.addAttribute("users", users);
initFormCondition(model, cfg);
return "/cfg/manipulation/ipmulitiplex/dnatPolicyList2";
@@ -363,6 +367,10 @@ public class IpMultiplexController extends CommonController {
} else {
initFormCondition(model, cfg);
}
// 获取用户信息 地址池信息
List<UserManage> users = userManageService.findUsers();
model.addAttribute("users", users);
model.addAttribute("_cfg", cfg);
return "/cfg/manipulation/ipmulitiplex/dnatPolicyForm2";
}
@@ -581,7 +589,14 @@ public class IpMultiplexController extends CommonController {
logTotal.put("sum",0L);
logTotals.add(logTotal);
}
IpReuseDnatPolicyCfg dnat=(IpReuseDnatPolicyCfg) cfg;
if(dnat.getTranslatedUserType().equals("VPN")){
dnat.setTranslatedUserType(msgProp.getProperty("policy_vpn_user","VPN"));
}else if(dnat.getTranslatedUserType().equals("SIPv4")){
dnat.setTranslatedUserType(msgProp.getProperty("policy_sipv4_user","SIPv4"));
}else if(dnat.getTranslatedUserType().equals("SIPv6")){
dnat.setTranslatedUserType(msgProp.getProperty("policy_sipv6_user","SIPv6"));
}
}
StringBuilder serviceIds=new StringBuilder(",");
for (Integer id : set) {