From a54be935d4b5e4181ff3b2392089c69cb40fe2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=81=E5=A4=A7=E6=89=8D=E5=AD=90=E4=B9=8B=E9=A6=96?= <48643103+pizihao@users.noreply.github.com> Date: Mon, 5 Sep 2022 22:04:22 +0800 Subject: [PATCH] Revert "change @Log4j2 to @Slf4j (#655)" This reverts commit 12ecbada8d35dcfb800145f097be7c9b3b8b55ea. --- .../refresher/event/AbstractRefreshListener.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AbstractRefreshListener.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AbstractRefreshListener.java index 268cd3d7..bf5e9d8a 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AbstractRefreshListener.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/AbstractRefreshListener.java @@ -22,7 +22,7 @@ import cn.hippo4j.common.toolkit.Assert; import cn.hippo4j.common.toolkit.StringUtil; import cn.hippo4j.core.toolkit.inet.InetUtils; import lombok.Data; -import lombok.extern.slf4j.Slf4j; +import lombok.extern.log4j.Log4j2; import org.springframework.boot.web.context.WebServerInitializedEvent; import org.springframework.context.event.EventListener; @@ -32,7 +32,7 @@ import java.util.Objects; /** * Refresh listener abstract base class. */ -@Slf4j +@Log4j2 public abstract class AbstractRefreshListener implements RefreshListener { protected static final String ALL = "*"; @@ -95,10 +95,10 @@ public abstract class AbstractRefreshListener implements RefreshListener i.check(ipSegment, port)); + .distinct() + .map(IpAndPort::build) + .filter(Objects::nonNull) + .anyMatch(i -> i.check(ipSegment, port)); } /** @@ -123,7 +123,7 @@ public abstract class AbstractRefreshListener implements RefreshListener