From 39bb58eedd7bfecdc10e8bdb1a534dd389af6bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AF=BB=E6=AC=A2?= <1101766085@qq.com>
Date: Fri, 27 Aug 2021 11:49:34 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E4=BD=8E=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/dreamlu/iot/mqtt/core/server/MqttServer.java   | 10 +++++-----
 .../iot/mqtt/core/server/MqttServerCreator.java        |  5 +++++
 .../src/main/java/net/dreamlu/iot/mqtt/biz/Server.java |  1 -
 .../net/dreamlu/iot/mqtt/server/MqttServerTest.java    |  1 -
 .../java/net/dreamlu/iot/mqtt/mica/MqttServerTest.java |  1 -
 .../iot/mqtt/spring/server/MqttServerLauncher.java     |  3 +--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServer.java b/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServer.java
index 578d443..bbc568f 100644
--- a/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServer.java
+++ b/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServer.java
@@ -49,9 +49,9 @@ public final class MqttServer {
 	private final ScheduledThreadPoolExecutor executor;
 
 	MqttServer(TioServer tioServer,
-					  MqttWebServer webServer,
-					  MqttServerCreator serverCreator,
-					  ScheduledThreadPoolExecutor executor) {
+			   MqttWebServer webServer,
+			   MqttServerCreator serverCreator,
+			   ScheduledThreadPoolExecutor executor) {
 		this.tioServer = tioServer;
 		this.webServer = webServer;
 		this.serverCreator = serverCreator;
@@ -244,7 +244,7 @@ public final class MqttServer {
 		return true;
 	}
 
-	public MqttServer start() {
+	public boolean start() {
 		// 1. 启动 mqtt tcp
 		try {
 			tioServer.start(this.serverCreator.getIp(), this.serverCreator.getPort());
@@ -259,7 +259,7 @@ public final class MqttServer {
 				throw new IllegalStateException("Mica mqtt http/websocket server start fail.", e);
 			}
 		}
-		return this;
+		return true;
 	}
 
 	public boolean stop() {
diff --git a/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerCreator.java b/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerCreator.java
index e2e23bb..afa96f2 100644
--- a/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerCreator.java
+++ b/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerCreator.java
@@ -413,4 +413,9 @@ public class MqttServerCreator {
 		return mqttServer;
 	}
 
+	public MqttServer start() {
+		MqttServer mqttServer = this.build();
+		mqttServer.start();
+		return mqttServer;
+	}
 }
diff --git a/mica-mqtt-example/src/main/java/net/dreamlu/iot/mqtt/biz/Server.java b/mica-mqtt-example/src/main/java/net/dreamlu/iot/mqtt/biz/Server.java
index f6aec7d..e954b0d 100644
--- a/mica-mqtt-example/src/main/java/net/dreamlu/iot/mqtt/biz/Server.java
+++ b/mica-mqtt-example/src/main/java/net/dreamlu/iot/mqtt/biz/Server.java
@@ -55,7 +55,6 @@ public class Server {
 			.messageDispatcher(messageDispatcher)
 			.messageListener(messageListener)
 			.debug()
-			.build()
 			.start();
 	}
 }
diff --git a/mica-mqtt-example/src/main/java/net/dreamlu/iot/mqtt/server/MqttServerTest.java b/mica-mqtt-example/src/main/java/net/dreamlu/iot/mqtt/server/MqttServerTest.java
index ce65acc..4bddc7f 100644
--- a/mica-mqtt-example/src/main/java/net/dreamlu/iot/mqtt/server/MqttServerTest.java
+++ b/mica-mqtt-example/src/main/java/net/dreamlu/iot/mqtt/server/MqttServerTest.java
@@ -50,7 +50,6 @@ public class MqttServerTest {
 				logger.info("clientId:{} topic:{} mqttQoS:{} message:{}", clientId, topic, mqttQoS, ByteBufferUtil.toString(payload));
 			})
 			.debug() // 开启 debug 信息日志
-			.build()
 			.start();
 
 		Timer timer = new Timer();
diff --git a/mica-mqtt-spring-boot-example/src/main/java/net/dreamlu/iot/mqtt/mica/MqttServerTest.java b/mica-mqtt-spring-boot-example/src/main/java/net/dreamlu/iot/mqtt/mica/MqttServerTest.java
index 7fbb63b..bfc754a 100644
--- a/mica-mqtt-spring-boot-example/src/main/java/net/dreamlu/iot/mqtt/mica/MqttServerTest.java
+++ b/mica-mqtt-spring-boot-example/src/main/java/net/dreamlu/iot/mqtt/mica/MqttServerTest.java
@@ -49,7 +49,6 @@ public class MqttServerTest {
 				logger.info("clientId:{} topic:{} mqttQoS:{} message:{}", clientId, topic, mqttQoS, ByteBufferUtil.toString(payload));
 			})
 			.debug() // 开启 debug 信息日志
-			.build()
 			.start();
 
 		Timer timer = new Timer();
diff --git a/mica-mqtt-spring-boot-starter/src/main/java/net/dreamlu/iot/mqtt/spring/server/MqttServerLauncher.java b/mica-mqtt-spring-boot-starter/src/main/java/net/dreamlu/iot/mqtt/spring/server/MqttServerLauncher.java
index b26a17c..842eb0a 100644
--- a/mica-mqtt-spring-boot-starter/src/main/java/net/dreamlu/iot/mqtt/spring/server/MqttServerLauncher.java
+++ b/mica-mqtt-spring-boot-starter/src/main/java/net/dreamlu/iot/mqtt/spring/server/MqttServerLauncher.java
@@ -35,8 +35,7 @@ public class MqttServerLauncher implements SmartLifecycle, Ordered {
 
 	@Override
 	public void start() {
-		mqttServer.start();
-		running = true;
+		running = mqttServer.start();
 	}
 
 	@Override
-- 
GitLab