From ddf4cde068aea5257a540d3f2fdc029b30c54a77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AF=BB=E6=AC=A2?= <1101766085@qq.com>
Date: Wed, 18 Aug 2021 19:18:53 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E4=BC=98=E5=8C=96=E5=BF=83?=
 =?UTF-8?q?=E8=B7=B3=E8=B6=85=E6=97=B6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dreamlu/iot/mqtt/core/client/MqttClientCreator.java  | 9 ++++++---
 .../iot/mqtt/core/server/MqttServerAioListener.java      | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/MqttClientCreator.java b/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/MqttClientCreator.java
index 3bcf275..dc24bc0 100644
--- a/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/MqttClientCreator.java
+++ b/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/MqttClientCreator.java
@@ -32,6 +32,7 @@ import org.tio.utils.hutool.StrUtil;
 import org.tio.utils.thread.pool.DefaultThreadFactory;
 
 import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
 /**
@@ -54,7 +55,7 @@ public final class MqttClientCreator {
 	 */
 	private int port = 1883;
 	/**
-	 * 超时时间，t-io 配置，可为 null
+	 * 超时时间，t-io 配置，可为 null，默认为：5秒
 	 */
 	private Integer timeout;
 	/**
@@ -337,9 +338,11 @@ public final class MqttClientCreator {
 		// 4. tioConfig
 		ClientTioConfig tioConfig = new ClientTioConfig(clientAioHandler, clientAioListener, reconnConf);
 		tioConfig.setName(this.name);
-		// 5. mqtt 消息最大长度
+		// 5. 心跳超时时间
+		tioConfig.setHeartbeatTimeout(TimeUnit.SECONDS.toMillis(this.keepAliveSecs));
+		// 6. mqtt 消息最大长度
 		tioConfig.setReadBufferSize(this.readBufferSize);
-		// 6. tioClient
+		// 7. tioClient
 		try {
 			TioClient tioClient = new TioClient(tioConfig);
 			ClientChannelContext context = tioClient.connect(new Node(this.ip, this.port), this.timeout);
diff --git a/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerAioListener.java b/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerAioListener.java
index ff2426a..2918107 100644
--- a/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerAioListener.java
+++ b/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerAioListener.java
@@ -51,7 +51,7 @@ public class MqttServerAioListener extends DefaultAioListener {
 	public boolean onHeartbeatTimeout(ChannelContext context, Long interval, int heartbeatTimeoutCount) {
 		String clientId = context.getBsId();
 		logger.info("Mqtt HeartbeatTimeout clientId:{} interval:{} count:{}", clientId, interval, heartbeatTimeoutCount);
-		return true;
+		return false;
 	}
 
 	@Override
-- 
GitLab