From 8c2e1b8f6ce4c72e187c09531c4d723119054afb Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Fri, 2 Jun 2023 21:20:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=87=8D=E8=BF=9E?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../neutrinoproxy/client/core/ProxyClientService.java    | 9 +++++----
 neutrino-proxy-client/src/main/resources/app.yml         | 8 ++++----
 neutrino-proxy-server/src/main/resources/app.yml         | 2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyClientService.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyClientService.java
index 70186cb4..cf138ffa 100644
--- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyClientService.java
+++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyClientService.java
@@ -49,7 +49,7 @@ public class ProxyClientService {
 	/**
 	 * 重连间隔（秒）
 	 */
-	private static final long RECONNECT_INTERVAL_SECONDS = 8;
+	private static final long RECONNECT_INTERVAL_SECONDS = 5;
 	/**
 	 * 重连次数
 	 */
@@ -80,7 +80,7 @@ public class ProxyClientService {
 
 		bootstrap.group(workerGroup);
 		bootstrap.channel(NioSocketChannel.class);
-		bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000);
+		bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 3000);
 		bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
 		/**
 		 * TCP/IP协议中，无论发送多少数据，总是要在数据前面加上协议头，同时，对方接收到数据，也需要发送ACK表示确认。为了尽可能的利用网络带宽，TCP总是希望尽可能的发送足够大的数据。（一个连接会设置MSS参数，因此，TCP/IP希望每次都能够以MSS尺寸的数据块来发送数据）。
@@ -189,12 +189,13 @@ public class ProxyClientService {
 	}
 
 	protected synchronized void reconnect() {
-		if (!reconnectServiceEnable) {
+		if (!reconnectServiceEnable || null == channel) {
 			return;
 		}
-		if (null != channel && channel.isActive()) {
+		if (channel.isActive()) {
 			return;
 		}
+		channel.close();
 		log.info("客户端重连 seq:{}", ++reconnectCount);
 		try {
 			connectProxyServer();
diff --git a/neutrino-proxy-client/src/main/resources/app.yml b/neutrino-proxy-client/src/main/resources/app.yml
index cef79537..db8bfaf2 100644
--- a/neutrino-proxy-client/src/main/resources/app.yml
+++ b/neutrino-proxy-client/src/main/resources/app.yml
@@ -9,9 +9,9 @@ neutrino:
       length-field-length: 4
       initial-bytes-to-strip: 0
       length-adjustment: 0
-      read-idle-time: 40
-      write-idle-time: 5
-      all-idle-time-seconds: 45
+      read-idle-time: 8
+      write-idle-time: 3
+      all-idle-time-seconds: 8
     client:
       thread-count: 50
       key-store-password: ${STORE_PASS:123456}
@@ -20,4 +20,4 @@ neutrino:
       server-port: ${SERVER_PORT:9002}
       ssl-enable: ${SSL_ENABLE:true}
       obtain-license-interval: 5
-      license-key: ${LICENSE_KEY:b0a907332b474b25897c4dcb31fc7eb6}
+      license-key: ${LICENSE_KEY:}
diff --git a/neutrino-proxy-server/src/main/resources/app.yml b/neutrino-proxy-server/src/main/resources/app.yml
index 76a68f1d..d144ea42 100644
--- a/neutrino-proxy-server/src/main/resources/app.yml
+++ b/neutrino-proxy-server/src/main/resources/app.yml
@@ -9,7 +9,7 @@ neutrino:
       length-field-length: 4
       initial-bytes-to-strip: 0
       length-adjustment: 0
-      read-idle-time: 40
+      read-idle-time: 30
       write-idle-time: 5
       all-idle-time-seconds: 0
     tunnel: