修复空指针问题

pull/156/head
weihu 3 years ago
parent f99d44207e
commit e746353296

@ -1,9 +1,12 @@
package cn.hippo4j.core.starter.config; package cn.hippo4j.core.starter.config;
import cn.hippo4j.common.notify.ThreadPoolNotifyAlarm; import cn.hippo4j.common.notify.ThreadPoolNotifyAlarm;
import com.google.common.collect.Maps;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.util.Map;
/** /**
* Executor properties. * Executor properties.
* *
@ -69,4 +72,9 @@ public class ExecutorProperties {
*/ */
private ThreadPoolNotifyAlarm notify; private ThreadPoolNotifyAlarm notify;
public Map<String, String> receives() {
return this.notify.getReceives() == null ? Maps.newHashMap() : this.notify.getReceives();
}
} }

@ -61,7 +61,7 @@ public class CoreNotifyConfigBuilder implements NotifyConfigBuilder {
notifyConfig.setType("ALARM"); notifyConfig.setType("ALARM");
notifyConfig.setSecretKey(platformProperties.getSecretKey()); notifyConfig.setSecretKey(platformProperties.getSecretKey());
notifyConfig.setInterval(executor.getNotify().getInterval()); notifyConfig.setInterval(executor.getNotify().getInterval());
Map<String, String> receives = executor.getNotify().getReceives(); Map<String, String> receives = executor.receives();
String receive = receives.get(platformProperties.getPlatform()); String receive = receives.get(platformProperties.getPlatform());
if (StrUtil.isBlank(receive)) { if (StrUtil.isBlank(receive)) {
receive = platformProperties.getReceives(); receive = platformProperties.getReceives();
@ -82,7 +82,7 @@ public class CoreNotifyConfigBuilder implements NotifyConfigBuilder {
notifyConfig.setType("CONFIG"); notifyConfig.setType("CONFIG");
notifyConfig.setSecretKey(platformProperties.getSecretKey()); notifyConfig.setSecretKey(platformProperties.getSecretKey());
Map<String, String> receives = executor.getNotify().getReceives(); Map<String, String> receives = executor.receives();
String receive = receives.get(platformProperties.getPlatform()); String receive = receives.get(platformProperties.getPlatform());
if (StrUtil.isBlank(receive)) { if (StrUtil.isBlank(receive)) {
receive = platformProperties.getReceives(); receive = platformProperties.getReceives();

Loading…
Cancel
Save