diff options
| author | shizhendong <[email protected]> | 2020-10-13 09:32:05 +0800 |
|---|---|---|
| committer | shizhendong <[email protected]> | 2020-10-13 09:32:05 +0800 |
| commit | 9129859d7ab8ea55ece886c45eb5ff815d316eac (patch) | |
| tree | 5e49b9dff753c24e88eec02ef5a3270ea0baef97 | |
| parent | aaeba10c82f9755332a188c19cfd801b9ab919d5 (diff) | |
fix: 修改 sysConfig paramValue 字段为 null 时，stream转Map空指针问题
| -rw-r--r-- | src/main/java/com/nis/job/ConfagentJob.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/nis/util/SnmpUtil.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/nis/job/ConfagentJob.java b/src/main/java/com/nis/job/ConfagentJob.java index 0ba573f..7e3b6ab 100644 --- a/src/main/java/com/nis/job/ConfagentJob.java +++ b/src/main/java/com/nis/job/ConfagentJob.java @@ -554,7 +554,7 @@ public class ConfagentJob extends QuartzJobBean { Map trafficTragets =new HashMap(); - Map<String, String> configsParamMap = sysConfigs.stream().collect(Collectors.toMap(SysConfig::getParamKey, SysConfig::getParamValue)); + Map<String, String> configsParamMap = sysConfigs.stream().filter(sysConfig -> sysConfig.getParamValue() != null).collect(Collectors.toMap(SysConfig::getParamKey, SysConfig::getParamValue)); // confagentApi 格式 ip:port // String confagentApi = configsParamMap.get(AlertManagerEnum.CONFAGENT_API.getValue()); String confagentPort = configsParamMap.get(AlertManagerEnum.CONFAGENT_PORT.getValue()); diff --git a/src/main/java/com/nis/util/SnmpUtil.java b/src/main/java/com/nis/util/SnmpUtil.java index 6f018e7..af47808 100644 --- a/src/main/java/com/nis/util/SnmpUtil.java +++ b/src/main/java/com/nis/util/SnmpUtil.java @@ -26,8 +26,8 @@ public class SnmpUtil { // 默认版本 v2 private static final int DEFAULT_VERSION = SnmpConstants.version2c; private static final String DEFAULT_PROTOCOL = "udp"; - private static final long DEFAULT_TIMEOUT = 10000L; - private static final int DEFAULT_RETRY = 3; + private static final long DEFAULT_TIMEOUT = 1000L; + // private static final int DEFAULT_RETRY = 3; // 默认团体名 private static final String DEFAULT_COMMUNITY = "public"; @@ -106,7 +106,7 @@ public class SnmpUtil { // 超时时间 timeout in milliseconds before a confirmed request is resent or timed out. target.setTimeout(DEFAULT_TIMEOUT); // 重试次数 - target.setRetries(DEFAULT_RETRY); + // target.setRetries(DEFAULT_RETRY); Address address = GenericAddress.parse(DEFAULT_PROTOCOL + ":" + ip + "/" + port); target.setAddress(address); |