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 578d443ae28111d806691b3b6e252278b4f13816..bbc568f53cee0f08210cbd16924519a79ed807b1 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 e2e23bba7b6bbcab2c85c5663aeacfe2a3585d74..afa96f2deb5511ac8de177d6f3e00df76b7e0ea2 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 f6aec7deb88e68164bcf917b9484be0118f36a04..e954b0d20b5291f43255c2a9841d1a95b659457a 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 ce65acc6869f5e448042b26d7f1795f62272dcfd..4bddc7f843af4fdd357ec5b1829cb777a59b63ac 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 7fbb63b325d2cf6864bc6c8ecc5da623424722ae..bfc754a6365261d9975aa93d27209b7830ca4fef 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 b26a17c4c8c5a76378dff2c9fd4bbab9f635fafa..842eb0afc2e30e3c60b92f65da273cd65ac131d3 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