diff --git a/README.md b/README.md index c43c1650dc06f9d63b6f7f40677f7801cc890011..b73f79ce632120351261eedc9a2cd62a34d8624d 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/config/config.yaml b/config/config.yaml index c86325e62139b4fa9db5b18ae848e1ae4e7f57ef..3f304d3ccee139ba2e062cb98cf0734f13eb9687 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -20,12 +20,13 @@ 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 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 diff --git a/smqtt-bootstrap/src/test/java/ClusterNode1.java b/smqtt-bootstrap/src/test/java/ClusterNode1.java index a61473c0e45a41ad93eb3ed841e48a0be40ffffd..f9f529d7638068aa505e16652638822971c23015 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/java/io/github/quickmsg/core/cluster/ClusterReceiver.java b/smqtt-core/src/main/java/io/github/quickmsg/core/cluster/ClusterReceiver.java index 1830de766ffa61a3c925867780b5d15665703d2c..28d13dcf26cdbf07034ea4bf2b74c665bd9b1e63 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), 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 fae9c1101bbd325cf5189c4cbcc4d6d44f826df5..ced9898a2c6fa7d41482d099ac29db5ed26b904e 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