diff --git a/src/main/java/com/nis/domain/configuration/AreaIpCfg.java b/src/main/java/com/nis/domain/configuration/AreaIpCfg.java index 635a45e66..cf8951dcd 100644 --- a/src/main/java/com/nis/domain/configuration/AreaIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/AreaIpCfg.java @@ -63,7 +63,14 @@ public class AreaIpCfg extends BaseIpCfg { this.srcPort="0"; this.destPort="0"; this.direction=0; - this.destIpAddress="0.0.0.0"; + if(this.ipType!=null && (this.ipType==4||this.ipType==46)){ + this.destIpAddress="0.0.0.0"; + }else if(this.ipType!=null && (this.ipType==6 || this.ipType==64)){ + this.destIpAddress="::"; + }else{ + this.destIpAddress="0.0.0.0"; + } + } /** diff --git a/src/main/java/com/nis/domain/maat/MaatCfg.java b/src/main/java/com/nis/domain/maat/MaatCfg.java index 8d80d8315..56db87813 100644 --- a/src/main/java/com/nis/domain/maat/MaatCfg.java +++ b/src/main/java/com/nis/domain/maat/MaatCfg.java @@ -537,6 +537,8 @@ public class MaatCfg implements Serializable { public void setAreaEffectiveIds(String areaEffectiveIds) { if(StringUtils.isEmpty(areaEffectiveIds)){ areaEffectiveIds="0"; + }else if(areaEffectiveIds.contains(":")){ + areaEffectiveIds = areaEffectiveIds.replace(":", ""); } this.areaEffectiveIds = areaEffectiveIds; } diff --git a/src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java b/src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java index 72e5911b7..0ec34e46c 100644 --- a/src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java +++ b/src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java @@ -82,63 +82,63 @@ public class SpecificServiceHostCfg extends BaseEntity{ public void setSpecServiceId(Integer specServiceId) { this.specServiceId = specServiceId; } - @ExcelField(title="ip_type",align=2,sort=20) + @ExcelField(title="ip_type",align=2,sort=20,fieldType=Integer.class) public Integer getIpType() { return ipType; } public void setIpType(Integer ipType) { this.ipType = ipType; } - @ExcelField(title="client_ip",align=2,sort=30) + @ExcelField(title="client_ip",align=2,sort=30,fieldType=String.class) public String getSrcIp() { return srcIp; } public void setSrcIp(String srcIp) { this.srcIp = srcIp; } - @ExcelField(title="client_address_mask",align=2,sort=40) + @ExcelField(title="client_address_mask",align=2,sort=40,fieldType=String.class) public String getSrcIpMask() { return srcIpMask; } public void setSrcIpMask(String srcIpMask) { this.srcIpMask = srcIpMask; } - @ExcelField(title="client_port",align=2,sort=50) + @ExcelField(title="client_port",align=2,sort=50,fieldType=String.class) public String getSrcPort() { return srcPort; } public void setSrcPort(String srcPort) { this.srcPort = srcPort; } - @ExcelField(title="client_port_mask",align=2,sort=60) + @ExcelField(title="client_port_mask",align=2,sort=60,fieldType=String.class) public String getSrcPortMask() { return srcPortMask; } public void setSrcPortMask(String srcPortMask) { this.srcPortMask = srcPortMask; } - @ExcelField(title="server_ip",align=2,sort=70) + @ExcelField(title="server_ip",align=2,sort=70,fieldType=String.class) public String getDstIp() { return dstIp; } public void setDstIp(String dstIp) { this.dstIp = dstIp; } - @ExcelField(title="server_address_mask",align=2,sort=80) + @ExcelField(title="server_address_mask",align=2,sort=80,fieldType=String.class) public String getDstIpMask() { return dstIpMask; } public void setDstIpMask(String dstIpMask) { this.dstIpMask = dstIpMask; } - @ExcelField(title="server_port",align=2,sort=90) + @ExcelField(title="server_port",align=2,sort=90,fieldType=String.class) public String getDstPort() { return dstPort; } public void setDstPort(String dstPort) { this.dstPort = dstPort; } - @ExcelField(title="server_port_mask",align=2,sort=100) + @ExcelField(title="server_port_mask",align=2,sort=100,fieldType=String.class) public String getDstPortMask() { return dstPortMask; } @@ -159,7 +159,7 @@ public class SpecificServiceHostCfg extends BaseEntity{ public void setProtocol(Integer protocol) { this.protocol = protocol; } - @ExcelField(title="valid_identifier",type=1,align=2,sort=130) + @ExcelField(title="valid_identifier",type=1,align=2,sort=130,fieldType=Integer.class) public Integer getIsValid() { return isValid; } diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java index 4c9dd4b96..bdaa228ec 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java @@ -191,7 +191,7 @@ public class SpecificServiceHostCfgController extends BaseController { if(errorInfos!=null && errorInfos.size()>0){ addMessage(redirectAttributes, msgProp.getProperty("import_failed")+errorInfos); }else{ - addMessage(redirectAttributes, "success"); + addMessage(redirectAttributes, "import_success"); } return "redirect:"+adminPath+"/specific/specificServiceHostCfg/list"; // return renderString(response,errorInfos); diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java index 6c28c261b..d10ef53c4 100644 --- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java @@ -29,7 +29,7 @@ public interface FileTransferCfgDao extends CrudDao { public void saveFtpKeywordCfg(BaseStringCfg entity); public void deleteFtpIpCfg(CfgIndexInfo entity); public void deleteFtpKeywordCfg(CfgIndexInfo entity); - public void deleteFtpFileDigestCfg(CfgIndexInfo entity); + public void deleteFileDigestCfg(CfgIndexInfo entity); public void updateCfgIndex(CfgIndexInfo entity); public void updateCfgValid(BaseCfg entity); public void auditCfg(BaseCfg entity); diff --git a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml index c337f7190..744496790 100644 --- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml @@ -329,12 +329,12 @@ + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp index 8e0b594a9..29922dc9b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp @@ -233,7 +233,7 @@ - +
@@ -256,7 +256,7 @@
- +
@@ -278,7 +278,7 @@
- +
@@ -301,7 +301,7 @@ - +
@@ -323,7 +323,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp index 09a8cc02e..dc1e092c1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp @@ -35,7 +35,7 @@
- +