From b51f497c355c82276d99511d272be836dd998093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=A2=A6=E6=8A=80=E6=9C=AF?= <596392912@qq.com>
Date: Fri, 27 Aug 2021 16:22:14 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=EF=BC=8Cwebsocket=20=E7=A7=BB=E5=88=B0=E5=88=B0=20htt?=
 =?UTF-8?q?p=20=E5=8C=85=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/mqtt/core/server/http/core/MqttWebServer.java       | 6 +++++-
 .../core/server/{ => http}/websocket/MqttWsMsgHandler.java  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
 rename mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/{ => http}/websocket/MqttWsMsgHandler.java (98%)

diff --git a/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/http/core/MqttWebServer.java b/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/http/core/MqttWebServer.java
index 4b01c9f..18f1011 100644
--- a/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/http/core/MqttWebServer.java
+++ b/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/http/core/MqttWebServer.java
@@ -199,7 +199,9 @@ import net.dreamlu.iot.mqtt.core.server.http.api.MqttHttpApi;
 import net.dreamlu.iot.mqtt.core.server.http.api.auth.BasicAuthFilter;
 import net.dreamlu.iot.mqtt.core.server.http.handler.MqttHttpRequestHandler;
 import net.dreamlu.iot.mqtt.core.server.http.handler.MqttHttpRoutes;
-import net.dreamlu.iot.mqtt.core.server.websocket.MqttWsMsgHandler;
+import net.dreamlu.iot.mqtt.core.server.http.websocket.MqttWsMsgHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.tio.core.intf.AioHandler;
 import org.tio.http.common.HttpConfig;
 import org.tio.http.common.HttpUuid;
@@ -222,6 +224,7 @@ import java.util.concurrent.ThreadPoolExecutor;
  * @author L.cm
  */
 public class MqttWebServer {
+	private static final Logger logger = LoggerFactory.getLogger(MqttWebServer.class);
 	private static final String TIO_SYSTEM_TIMER_PERIOD = "tio.system.timer.period";
 	private final MqttWebServerAioListener mqttWebServerAioListener;
 	private final HttpRequestHandler httpRequestHandler;
@@ -310,6 +313,7 @@ public class MqttWebServer {
 		// 1. 判断是否开启
 		boolean httpEnable = serverCreator.isHttpEnable();
 		boolean websocketEnable = serverCreator.isWebsocketEnable();
+		logger.info("Mica mqtt http api enable:{} websocket enable:{}", httpEnable, websocketEnable);
 		if (!httpEnable && !websocketEnable) {
 			return null;
 		}
diff --git a/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/websocket/MqttWsMsgHandler.java b/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/http/websocket/MqttWsMsgHandler.java
similarity index 98%
rename from mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/websocket/MqttWsMsgHandler.java
rename to mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/http/websocket/MqttWsMsgHandler.java
index c1fb39d..20c11e2 100644
--- a/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/websocket/MqttWsMsgHandler.java
+++ b/mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/http/websocket/MqttWsMsgHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.dreamlu.iot.mqtt.core.server.websocket;
+package net.dreamlu.iot.mqtt.core.server.http.websocket;
 
 import net.dreamlu.iot.mqtt.codec.ByteBufferUtil;
 import net.dreamlu.iot.mqtt.codec.MqttMessage;
-- 
GitLab