From 900b1e5d867dec13be032447a4d1054e83840e47 Mon Sep 17 00:00:00 2001
From: luxurong <luxurong520@hellobike.com>
Date: Thu, 23 Dec 2021 23:03:44 +0800
Subject: [PATCH 1/2] version

---
 config/config.yaml                              | 4 ++--
 smqtt-bootstrap/src/test/java/ClusterNode1.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/config.yaml b/config/config.yaml
index ef1618b3..f0562066 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -22,7 +22,7 @@ smqtt:
       key: /user/server.key # 指定ssl文件 默认系统生成
       crt: /user/server.crt # 指定ssl文件 默认系统生成
   http: # http相关配置 端口固定60000
-    enable: false # 开关
+    enable: true # 开关
     accessLog: true # http访问日志
     ssl: # ssl配置
       enable: false
@@ -31,7 +31,7 @@ smqtt:
       username: smqtt # 访问用户名
       password: smqtt # 访问密码
   ws: # websocket配置
-    enable: false # 开关
+    enable: true # 开关
     port: 8999 # 端口
     path: /mqtt # ws 的访问path mqtt.js请设置此选项
   cluster: # 集群配置
diff --git a/smqtt-bootstrap/src/test/java/ClusterNode1.java b/smqtt-bootstrap/src/test/java/ClusterNode1.java
index cf2d7159..a07301fe 100644
--- a/smqtt-bootstrap/src/test/java/ClusterNode1.java
+++ b/smqtt-bootstrap/src/test/java/ClusterNode1.java
@@ -15,14 +15,14 @@ public class ClusterNode1 {
                                 .builder()
                                 .enable(false)
                                 .path("/mqtt")
-                                .port(8880)
+                                .port(8888)
                                 .build()
                 )
                 .tcpConfig(
                         BootstrapConfig
                                 .TcpConfig
                                 .builder()
-                                .port(8888)
+                                .port(8889)
                                 .username("smqtt")
                                 .password("smqtt")
                                 .build())
@@ -30,7 +30,7 @@ public class ClusterNode1 {
                         BootstrapConfig
                                 .HttpConfig
                                 .builder()
-                                .enable(true)
+                                .enable(false)
                                 .accessLog(true)
                                 .admin(BootstrapConfig.HttpAdmin.builder().enable(true).username("smqtt").password("smqtt").build())
                                 .build())
-- 
Gitee


From f8ba2a7c3f59072a00dc577bec8906ef0ecb536a Mon Sep 17 00:00:00 2001
From: luxurong <luxurong520@hellobike.com>
Date: Fri, 24 Dec 2021 15:48:20 +0800
Subject: [PATCH 2/2] version

---
 smqtt-bootstrap/src/test/java/ClusterNode1.java              | 2 +-
 .../io/github/quickmsg/common/channel/MockMqttChannel.java   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/smqtt-bootstrap/src/test/java/ClusterNode1.java b/smqtt-bootstrap/src/test/java/ClusterNode1.java
index a07301fe..924481d2 100644
--- a/smqtt-bootstrap/src/test/java/ClusterNode1.java
+++ b/smqtt-bootstrap/src/test/java/ClusterNode1.java
@@ -22,7 +22,7 @@ public class ClusterNode1 {
                         BootstrapConfig
                                 .TcpConfig
                                 .builder()
-                                .port(8889)
+                                .port(8882)
                                 .username("smqtt")
                                 .password("smqtt")
                                 .build())
diff --git a/smqtt-common/src/main/java/io/github/quickmsg/common/channel/MockMqttChannel.java b/smqtt-common/src/main/java/io/github/quickmsg/common/channel/MockMqttChannel.java
index 8fe0595c..4b870fb3 100644
--- a/smqtt-common/src/main/java/io/github/quickmsg/common/channel/MockMqttChannel.java
+++ b/smqtt-common/src/main/java/io/github/quickmsg/common/channel/MockMqttChannel.java
@@ -34,4 +34,9 @@ public class MockMqttChannel extends MqttChannel {
     }
 
 
+    @Override
+    public String toString() {
+        return "MockMqttChannel{" +
+                ", clientIdentifier='" + getClientIdentifier() + '\'' + '}';
+    }
 }
-- 
Gitee