From 1546de32950a105e600a50a6a5c8c487b7df7196 Mon Sep 17 00:00:00 2001 From: luxurong <1074455781@qq.com> Date: Sat, 28 May 2022 21:57:18 +0800 Subject: [PATCH 1/3] 1.1.4 --- config/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.yaml b/config/config.yaml index c86325e6..3c51eafd 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -25,7 +25,7 @@ smqtt: filePath: D:\smqtt\config\acl\basic_policy.csv # FILE时配置filePath jdbcAclConfig: driver: com.mysql.jdbc.Driver - url: jdbc:mysql://113.90.145.99:18889/smqtt + url: jdbc:mysql://127.0.0.1:3306/smqtt username: root password: 123 http: # http相关配置 端口固定60000 -- Gitee From 210a85b19ea041806993bce607b7d0505efa782a Mon Sep 17 00:00:00 2001 From: luxurong <1074455781@qq.com> Date: Sat, 28 May 2022 22:00:38 +0800 Subject: [PATCH 2/3] 1.1.4 --- config/config.yaml | 1 + .../java/io/github/quickmsg/core/cluster/ClusterReceiver.java | 1 + 2 files changed, 2 insertions(+) diff --git a/config/config.yaml b/config/config.yaml index 3c51eafd..3f304d3c 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -20,6 +20,7 @@ smqtt: enable: false # 开关 key: /user/server.key # 指定ssl文件 默认系统生成 crt: /user/server.crt # 指定ssl文件 默认系统生成 + ca: /user/server.ca # ca证书 双向加密配置 acl: aclPolicy: JDBC # NONE or FILE or JDBC filePath: D:\smqtt\config\acl\basic_policy.csv # FILE时配置filePath diff --git a/smqtt-core/src/main/java/io/github/quickmsg/core/cluster/ClusterReceiver.java b/smqtt-core/src/main/java/io/github/quickmsg/core/cluster/ClusterReceiver.java index 1830de76..28d13dcf 100644 --- a/smqtt-core/src/main/java/io/github/quickmsg/core/cluster/ClusterReceiver.java +++ b/smqtt-core/src/main/java/io/github/quickmsg/core/cluster/ClusterReceiver.java @@ -42,6 +42,7 @@ public class ClusterReceiver { clusterRegistry.registry(clusterConfig); //begin listen cluster message clusterRegistry.handlerClusterMessage() + .onErrorContinue((E,O)-> log.error(O.toString(),E)) .subscribe(clusterMessage -> protocolAdaptor .chooseProtocol(MockMqttChannel.wrapClientIdentifier(clusterMessage.getClientIdentifier()), getMqttMessage(clusterMessage), -- Gitee From b0e83d49fd911b8d562de3c12daa4f0eb98c2896 Mon Sep 17 00:00:00 2001 From: luxurong <1074455781@qq.com> Date: Thu, 9 Jun 2022 22:33:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 -- smqtt-bootstrap/src/test/java/ClusterNode1.java | 2 +- .../META-INF/services/io.github.quickmsg.common.http.HttpActor | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c43c1650..b73f79ce 100644 --- a/README.md +++ b/README.md @@ -66,8 +66,6 @@ SMQTT基于reactor-netty(spring-webflux底层依赖) | 113.90.145.99:18885 | mqtt端口 |用户名：smqtt 密码：smqtt | | 113.90.145.99:18888 | mqtt over websocket |用户名：smqtt 密码：smqtt | | http://113.90.145.99:60000/smqtt/admin | 管理后台 |用户名：smqtt 密码：smqtt | -## 商业化版本 -如果遇到接入性能问题，或者需要定制化开发的，我们提供商业化版本出售，请添加微信17512575402！ ## 商业化 diff --git a/smqtt-bootstrap/src/test/java/ClusterNode1.java b/smqtt-bootstrap/src/test/java/ClusterNode1.java index a61473c0..f9f529d7 100644 --- a/smqtt-bootstrap/src/test/java/ClusterNode1.java +++ b/smqtt-bootstrap/src/test/java/ClusterNode1.java @@ -31,7 +31,7 @@ public class ClusterNode1 { BootstrapConfig .HttpConfig .builder() - .enable(false) + .enable(true) .accessLog(true) .admin(BootstrapConfig.HttpAdmin.builder().enable(true).username("smqtt").password("smqtt").build()) .build()) diff --git a/smqtt-core/src/main/resources/META-INF/services/io.github.quickmsg.common.http.HttpActor b/smqtt-core/src/main/resources/META-INF/services/io.github.quickmsg.common.http.HttpActor index fae9c110..ced9898a 100644 --- a/smqtt-core/src/main/resources/META-INF/services/io.github.quickmsg.common.http.HttpActor +++ b/smqtt-core/src/main/resources/META-INF/services/io.github.quickmsg.common.http.HttpActor @@ -25,4 +25,5 @@ io.github.quickmsg.core.http.actors.PrometheusActor io.github.quickmsg.core.http.actors.EventHttpActor io.github.quickmsg.core.http.acl.AclAddPolicyActor io.github.quickmsg.core.http.acl.AclDeletePolicyActor -io.github.quickmsg.core.http.acl.AclQueryPolicyActor \ No newline at end of file +io.github.quickmsg.core.http.acl.AclQueryPolicyActor +io.github.quickmsg.core.http.actors.CloseConnectionActor \ No newline at end of file -- Gitee