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

分类性质标签、地域运营商作用域：融合自定义显示，添加排序，优化代码，

Browse Source 
特定服务器管理：修正列表分页显示，条件查询，添加自定义显示，添加排序，新增修改页面添加表单校验，
协议ip配置：修正条件查询，添加自定义显示，添加排序，新增修改页面添加表单校验（ipV4\ipV6地址及掩码校验，端口校验）
This commit is contained in:
zhangshilin
2018-03-21 13:43:43 +08:00
parent d5d708a492
commit f92ae2dda4
28 changed files with 710 additions and 1000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/domain/specific/SpecificServiceCfg.java
View File

@@ -101,8 +101,10 @@ public class SpecificServiceCfg extends BaseEntity<SpecificServiceCfg>{
for(int i=0;i<allList.size();i++){
SpecificServiceCfg ss = allList.get(i);
if(ss!=null&&ss.getParent()!=null&&ss.getParent().getSpecServiceId()!=null&&ss.getParent().getSpecServiceId()==parentId){
System.out.println("处理"+ss.getSpecServiceName()+"id:"+ss.getSpecServiceId()+"父ID:"+ss.getParent().getSpecServiceId()+"条件》》"+parentId);
if(ss!=null&&ss.getParent()!=null&&ss.getParent().getSpecServiceId()!=null&&ss.getParent().getSpecServiceId().equals(parentId)){
list.add(ss);
System.out.println("list加入"+ss.getSpecServiceName()+"id:"+ss.getSpecServiceId()+"父ID:"+ss.getParent().getSpecServiceId());
if(cascade){
for(int j=0;j<allList.size();j++){
SpecificServiceCfg child = allList.get(j);

7
src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java
View File

@@ -18,6 +18,7 @@ public class SpecificServiceHostCfg extends BaseEntity<SpecificServiceHostCfg>{
private Integer hostId; //host_id 配置ID bigint N 主键，自增
private Integer specServiceId; //spec_service_id 协议id int N protocol_info_cfg.protocol_id
private Integer ipType; //ip地址类型 ipV4=4 ipV6=6
private String srcIp; //src_ip 源IP地址 varchar(64) N 缺省0.0.0.0值表示任意
private String srcIpMask; //src_ip_mask 源地址掩码 varchar(64) N IPV4:255.255.255.255表示无掩码，即精确IP匹配，0.0.0.0值表示任意；
//IPV6：FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF表示无掩码，::（两个半角冒号）表示任意。非0掩码值必须是2的指数幂，下同。
@@ -61,6 +62,12 @@ public class SpecificServiceHostCfg extends BaseEntity<SpecificServiceHostCfg>{
public void setSpecServiceId(Integer specServiceId) {
this.specServiceId = specServiceId;
}
public Integer getIpType() {
return ipType;
}
public void setIpType(Integer ipType) {
this.ipType = ipType;
}
public String getSrcIp() {
return srcIp;
}