From 479d5c5ac59beab63664e02b2c15d8ca22bb3bfd Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Thu, 14 Mar 2024 22:12:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=203.1.1=201.=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=87=8D=E8=BF=9E=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=202.=20=E6=96=B0=E5=A2=9Enetty=E9=87=8D=E8=BF=9E=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E3=80=81=E7=B3=BB=E7=BB=9F=E5=90=AF=E5=8A=A8=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E4=BA=8B=E4=BB=B6=E3=80=81=E7=B3=BB=E7=BB=9F=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E5=AE=8C=E6=88=90=E4=BA=8B=E4=BB=B6=E3=80=81=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=BC=80=E5=A7=8B=E5=85=B3=E9=97=AD=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E3=80=81=E7=B3=BB=E7=BB=9F=E5=85=B3=E9=97=AD=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/event/ChannelReconnectEvent.java   | 15 +++++
 .../common/event/EasyRetryClosedEvent.java    | 16 +++++
 .../common/event/EasyRetryClosingEvent.java   | 16 +++++
 .../common/event/EasyRetryStartedEvent.java   | 16 +++++
 .../common/event/EasyRetryStartingEvent.java  | 16 +++++
 ...tener.java => EasyRetryCloseListener.java} |  8 ++-
 .../common/init/EasyRetryStartListener.java   |  6 +-
 .../client/common/netty/NettyChannel.java     | 59 +++++++++++++++++--
 .../common/netty/NettyHttpClientHandler.java  |  4 ++
 .../common/netty/NettyHttpConnectClient.java  |  9 ++-
 pom.xml                                       |  2 +-
 11 files changed, 155 insertions(+), 12 deletions(-)
 create mode 100644 easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/ChannelReconnectEvent.java
 create mode 100644 easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryClosedEvent.java
 create mode 100644 easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryClosingEvent.java
 create mode 100644 easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryStartedEvent.java
 create mode 100644 easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryStartingEvent.java
 rename easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/init/{EasyRetryEndListener.java => EasyRetryCloseListener.java} (65%)

diff --git a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/ChannelReconnectEvent.java b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/ChannelReconnectEvent.java
new file mode 100644
index 000000000..e62611c4b
--- /dev/null
+++ b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/ChannelReconnectEvent.java
@@ -0,0 +1,15 @@
+package com.aizuda.easy.retry.client.common.event;
+
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * @author xiaowoniu
+ * @date 2024-03-14 21:17:55
+ * @since 3.1.1
+ */
+public class ChannelReconnectEvent extends ApplicationEvent {
+    private static final String SOURCE = "ChannelReconnect";
+    public ChannelReconnectEvent() {
+        super(SOURCE);
+    }
+}
diff --git a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryClosedEvent.java b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryClosedEvent.java
new file mode 100644
index 000000000..aca097c08
--- /dev/null
+++ b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryClosedEvent.java
@@ -0,0 +1,16 @@
+package com.aizuda.easy.retry.client.common.event;
+
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * @author xiaowoniu
+ * @date 2024-03-14 21:23:29
+ * @since 3.1.0
+ */
+public class EasyRetryClosedEvent extends ApplicationEvent {
+    private static final String SOURCE = "EasyRetryClosed";
+
+    public EasyRetryClosedEvent() {
+        super(SOURCE);
+    }
+}
diff --git a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryClosingEvent.java b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryClosingEvent.java
new file mode 100644
index 000000000..95cfc65dd
--- /dev/null
+++ b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryClosingEvent.java
@@ -0,0 +1,16 @@
+package com.aizuda.easy.retry.client.common.event;
+
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * @author xiaowoniu
+ * @date 2024-03-14 21:23:29
+ * @since 3.1.0
+ */
+public class EasyRetryClosingEvent extends ApplicationEvent {
+    private static final String SOURCE = "EasyRetryClosing";
+
+    public EasyRetryClosingEvent() {
+        super(SOURCE);
+    }
+}
diff --git a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryStartedEvent.java b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryStartedEvent.java
new file mode 100644
index 000000000..f7cd1b000
--- /dev/null
+++ b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryStartedEvent.java
@@ -0,0 +1,16 @@
+package com.aizuda.easy.retry.client.common.event;
+
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * @author xiaowoniu
+ * @date 2024-03-14 21:23:29
+ * @since 3.1.0
+ */
+public class EasyRetryStartedEvent extends ApplicationEvent {
+    private static final String SOURCE = "EasyRetryStarted";
+
+    public EasyRetryStartedEvent() {
+        super(SOURCE);
+    }
+}
diff --git a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryStartingEvent.java b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryStartingEvent.java
new file mode 100644
index 000000000..6b95627a7
--- /dev/null
+++ b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/event/EasyRetryStartingEvent.java
@@ -0,0 +1,16 @@
+package com.aizuda.easy.retry.client.common.event;
+
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * @author xiaowoniu
+ * @date 2024-03-14 21:23:29
+ * @since 3.1.0
+ */
+public class EasyRetryStartingEvent extends ApplicationEvent {
+    private static final String SOURCE = "EasyRetryStarting";
+
+    public EasyRetryStartingEvent() {
+        super(SOURCE);
+    }
+}
diff --git a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/init/EasyRetryEndListener.java b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/init/EasyRetryCloseListener.java
similarity index 65%
rename from easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/init/EasyRetryEndListener.java
rename to easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/init/EasyRetryCloseListener.java
index b19254e0f..610cba7af 100644
--- a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/init/EasyRetryEndListener.java
+++ b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/init/EasyRetryCloseListener.java
@@ -1,6 +1,10 @@
 package com.aizuda.easy.retry.client.common.init;
 
 import com.aizuda.easy.retry.client.common.Lifecycle;
+import com.aizuda.easy.retry.client.common.event.EasyRetryClosedEvent;
+import com.aizuda.easy.retry.client.common.event.EasyRetryClosingEvent;
+import com.aizuda.easy.retry.client.common.event.EasyRetryStartingEvent;
+import com.aizuda.easy.retry.common.core.context.SpringContext;
 import com.aizuda.easy.retry.common.core.util.EasyRetryVersion;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +23,7 @@ import java.util.List;
  */
 @Component
 @Slf4j
-public class EasyRetryEndListener implements ApplicationListener<ContextClosedEvent> {
+public class EasyRetryCloseListener implements ApplicationListener<ContextClosedEvent> {
 
     @Autowired
     private List<Lifecycle> lifecycleList;
@@ -27,7 +31,9 @@ public class EasyRetryEndListener implements ApplicationListener<ContextClosedEv
     @Override
     public void onApplicationEvent(ContextClosedEvent event) {
         log.info("Easy-Retry client about to shutdown v{}", EasyRetryVersion.getVersion());
+        SpringContext.CONTEXT.publishEvent(new EasyRetryClosingEvent());
         lifecycleList.forEach(Lifecycle::close);
+        SpringContext.CONTEXT.publishEvent(new EasyRetryClosedEvent());
         log.info("Easy-Retry client closed successfully v{}", EasyRetryVersion.getVersion());
     }
 }
diff --git a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/init/EasyRetryStartListener.java b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/init/EasyRetryStartListener.java
index e842ce33b..c1af87fe9 100644
--- a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/init/EasyRetryStartListener.java
+++ b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/init/EasyRetryStartListener.java
@@ -1,10 +1,12 @@
 package com.aizuda.easy.retry.client.common.init;
 
 import com.aizuda.easy.retry.client.common.Lifecycle;
+import com.aizuda.easy.retry.client.common.event.EasyRetryStartedEvent;
+import com.aizuda.easy.retry.client.common.event.EasyRetryStartingEvent;
 import com.aizuda.easy.retry.common.core.constant.SystemConstants;
+import com.aizuda.easy.retry.common.core.context.SpringContext;
 import com.aizuda.easy.retry.common.core.util.EasyRetryVersion;
 import com.aizuda.easy.retry.common.log.EasyRetryLog;
-import lombok.extern.slf4j.Slf4j;
 import org.slf4j.helpers.MessageFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
@@ -30,7 +32,9 @@ public class EasyRetryStartListener implements ApplicationRunner {
         System.out.println(MessageFormatter.format(SystemConstants.LOGO, EasyRetryVersion.getVersion()).getMessage());
 
         EasyRetryLog.LOCAL.info("Easy-Retry client is preparing to start... v{}", EasyRetryVersion.getVersion());
+        SpringContext.CONTEXT.publishEvent(new EasyRetryStartingEvent());
         lifecycleList.forEach(Lifecycle::start);
+        SpringContext.CONTEXT.publishEvent(new EasyRetryStartedEvent());
         EasyRetryLog.LOCAL.info("Easy-Retry client started successfully v{}", EasyRetryVersion.getVersion());
     }
 
diff --git a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/netty/NettyChannel.java b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/netty/NettyChannel.java
index f4307875b..f9f335a58 100644
--- a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/netty/NettyChannel.java
+++ b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/netty/NettyChannel.java
@@ -31,20 +31,71 @@ import java.util.Optional;
  */
 @Slf4j
 public class NettyChannel {
-
     private NettyChannel() {
     }
 
+    private static Channel CHANNEL;
+
+    /**
+     * 服务端端口
+     */
+    private static final String EASY_RETRY_SERVER_PORT = "easy-retry.server.port";
+    /**
+     * 服务端host
+     */
+    private static final String EASY_RETRY_SERVER_HOST = "easy-retry.server.host";
+
+    /**
+     * 客户端端口
+     */
+    private static final String EASY_RETRY_CLIENT_PORT = "easy-retry.port";
+    /**
+     * 客户端host
+     */
+    private static final String EASY_RETRY_CLIENT_HOST = "easy-retry.host";
+
     private static final String HOST_ID = IdUtil.getSnowflake().nextIdStr();
     private static final int PORT;
     private static final String HOST;
 
     static {
-        PORT = Integer.parseInt(System.getProperty("easy-retry.port", String.valueOf(8080)));
-        HOST = System.getProperty("easy-retry.host", NetUtil.getLocalIpStr());
+        PORT = Integer.parseInt(System.getProperty(EASY_RETRY_CLIENT_PORT, String.valueOf(8080)));
+        HOST = System.getProperty(EASY_RETRY_CLIENT_HOST, NetUtil.getLocalIpStr());
     }
 
-    private static Channel CHANNEL;
+    /**
+     * 获取服务端端口
+     *
+     * @return port
+     */
+    public static int getServerPort() {
+        EasyRetryProperties easyRetryProperties = SpringContext.CONTEXT.getBean(EasyRetryProperties.class);
+        EasyRetryProperties.ServerConfig serverConfig = easyRetryProperties.getServer();
+
+        String port = System.getProperty(EASY_RETRY_SERVER_PORT);
+        if (StrUtil.isBlank(port)) {
+            System.setProperty(EASY_RETRY_SERVER_PORT, String.valueOf(serverConfig.getPort()));
+        }
+
+        return Integer.parseInt(System.getProperty(EASY_RETRY_SERVER_PORT));
+    }
+
+    /**
+     * 获取服务端host
+     *
+     * @return host
+     */
+    public static String getServerHost() {
+        EasyRetryProperties easyRetryProperties = SpringContext.CONTEXT.getBean(EasyRetryProperties.class);
+        EasyRetryProperties.ServerConfig serverConfig = easyRetryProperties.getServer();
+
+        String host = System.getProperty(EASY_RETRY_SERVER_HOST);
+        if (StrUtil.isBlank(host)) {
+            System.setProperty(EASY_RETRY_SERVER_HOST, serverConfig.getHost());
+        }
+
+        return System.getProperty(EASY_RETRY_SERVER_HOST);
+    }
 
     public static void setChannel(Channel channel) {
         NettyChannel.CHANNEL = channel;
diff --git a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/netty/NettyHttpClientHandler.java b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/netty/NettyHttpClientHandler.java
index c8725e0f3..e47ddd525 100644
--- a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/netty/NettyHttpClientHandler.java
+++ b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/netty/NettyHttpClientHandler.java
@@ -1,8 +1,10 @@
 package com.aizuda.easy.retry.client.common.netty;
 
+import com.aizuda.easy.retry.client.common.event.ChannelReconnectEvent;
 import com.aizuda.easy.retry.client.common.proxy.RequestBuilder;
 import com.aizuda.easy.retry.client.common.NettyClient;
 import com.aizuda.easy.retry.common.core.constant.SystemConstants.BEAT;
+import com.aizuda.easy.retry.common.core.context.SpringContext;
 import com.aizuda.easy.retry.common.log.EasyRetryLog;
 import com.aizuda.easy.retry.common.core.model.NettyResult;
 import com.aizuda.easy.retry.common.core.util.JsonUtil;
@@ -64,6 +66,8 @@ public class NettyHttpClientHandler extends SimpleChannelInboundHandler<FullHttp
         EasyRetryLog.LOCAL.debug("channelUnregistered");
         ctx.channel().eventLoop().schedule(() -> {
             try {
+                // 抛出重连事件
+                SpringContext.CONTEXT.publishEvent(new ChannelReconnectEvent());
                 nettyHttpConnectClient.reconnect();
             } catch (Exception e) {
                 EasyRetryLog.LOCAL.error("reconnect error ", e);
diff --git a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/netty/NettyHttpConnectClient.java b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/netty/NettyHttpConnectClient.java
index 4557c6f1f..cae6f6542 100644
--- a/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/netty/NettyHttpConnectClient.java
+++ b/easy-retry-client/easy-retry-client-common/src/main/java/com/aizuda/easy/retry/client/common/netty/NettyHttpConnectClient.java
@@ -42,13 +42,10 @@ public class NettyHttpConnectClient implements Lifecycle, ApplicationContextAwar
     public void start() {
 
         try {
-            EasyRetryProperties easyRetryProperties = applicationContext.getBean(EasyRetryProperties.class);
-
-            EasyRetryProperties.ServerConfig server = easyRetryProperties.getServer();
             final NettyHttpConnectClient thisClient = this;
             bootstrap.group(nioEventLoopGroup)
                     .channel(NioSocketChannel.class)
-                    .remoteAddress(server.getHost(), server.getPort())
+                    .remoteAddress(NettyChannel.getServerHost(), NettyChannel.getServerPort())
                     .handler(new ChannelInitializer<SocketChannel>() {
                         @Override
                         public void initChannel(SocketChannel channel) throws Exception {
@@ -108,7 +105,9 @@ public class NettyHttpConnectClient implements Lifecycle, ApplicationContextAwar
      * 重连
      */
     public void reconnect() {
-        ChannelFuture channelFuture = bootstrap.connect();
+        ChannelFuture channelFuture = bootstrap
+                .remoteAddress(NettyChannel.getServerHost(), NettyChannel.getServerPort())
+                .connect();
         channelFuture.addListener((ChannelFutureListener) future -> {
             Throwable cause = future.cause();
             if (cause != null) {
diff --git a/pom.xml b/pom.xml
index 5a2bc9aef..8f8a85d63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         <java.version>17</java.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <revision>3.1.0</revision>
+        <revision>3.1.1-SNAPSHOT</revision>
         <dingding-talk.version>1.0.0</dingding-talk.version>
         <netty-all.version>4.1.94.Final</netty-all.version>
         <hutool-all.version>5.8.25</hutool-all.version>