diff --git a/README.md b/README.md index 9c78abc..e7d78b9 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ 1. 使用 netty 实现通信及协议解析 2. 使用 nutzboot 提供依赖注入及属性配置 3. 使用 redis 实现消息缓存,集群 -4. 使用 kafka 实现消息代理(可选) +4. 使用 kafka 实现消息转发(可选) #### 项目结构 ``` diff --git a/mqtt-auth/pom.xml b/mqtt-auth/pom.xml index 9842d2f..b6f7259 100644 --- a/mqtt-auth/pom.xml +++ b/mqtt-auth/pom.xml @@ -5,7 +5,7 @@ mqtt-wk cn.wizzer - 1.3.0-netty + 1.4.0-netty 4.0.0 jar diff --git a/mqtt-broker/pom.xml b/mqtt-broker/pom.xml index a6f72fd..1d54a8c 100644 --- a/mqtt-broker/pom.xml +++ b/mqtt-broker/pom.xml @@ -5,7 +5,7 @@ mqtt-wk cn.wizzer - 1.3.0-netty + 1.4.0-netty 4.0.0 jar diff --git a/mqtt-common/pom.xml b/mqtt-common/pom.xml index 5eeb77e..b722142 100644 --- a/mqtt-common/pom.xml +++ b/mqtt-common/pom.xml @@ -5,7 +5,7 @@ mqtt-wk cn.wizzer - 1.3.0-netty + 1.4.0-netty 4.0.0 diff --git a/mqtt-store/pom.xml b/mqtt-store/pom.xml index c6fdf91..96e3f99 100644 --- a/mqtt-store/pom.xml +++ b/mqtt-store/pom.xml @@ -5,7 +5,7 @@ mqtt-wk cn.wizzer - 1.3.0-netty + 1.4.0-netty 4.0.0 jar diff --git a/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/cache/RetainMessageCache.java b/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/cache/RetainMessageCache.java index 5c3dc1d..e80fa55 100644 --- a/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/cache/RetainMessageCache.java +++ b/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/cache/RetainMessageCache.java @@ -18,7 +18,7 @@ @IocBean public class RetainMessageCache { private final static String CACHE_PRE = "mqttwk:retain:"; - private final static String CACHE_TOPIC = "mqttwk:retain:topic:"; + private final static String CACHE_TOPIC = "mqttwk:retain_topic"; @Inject private RedisService redisService; @Inject diff --git a/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/cache/SubscribeNotWildcardCache.java b/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/cache/SubscribeNotWildcardCache.java index f048286..06b3e6a 100644 --- a/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/cache/SubscribeNotWildcardCache.java +++ b/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/cache/SubscribeNotWildcardCache.java @@ -18,7 +18,7 @@ public class SubscribeNotWildcardCache { private final static String CACHE_PRE = "mqttwk:subnotwildcard:"; private final static String CACHE_CLIENT_PRE = "mqttwk:client:"; - private final static String CACHE_TOPIC = "mqttwk:subnotwildcard:topic:"; + private final static String CACHE_TOPIC = "mqttwk:subnotwildcard_topic"; @Inject private RedisService redisService; @Inject diff --git a/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/cache/SubscribeWildcardCache.java b/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/cache/SubscribeWildcardCache.java index 103c9db..a59c3b3 100644 --- a/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/cache/SubscribeWildcardCache.java +++ b/mqtt-store/src/main/java/cn/wizzer/iot/mqtt/server/store/cache/SubscribeWildcardCache.java @@ -18,7 +18,7 @@ public class SubscribeWildcardCache { private final static String CACHE_PRE = "mqttwk:subwildcard:"; private final static String CACHE_CLIENT_PRE = "mqttwk:client:"; - private final static String CACHE_TOPIC = "mqttwk:subwildcard:topic:"; + private final static String CACHE_TOPIC = "mqttwk:subwildcard_topic"; @Inject private RedisService redisService; diff --git a/mqtt-zoo/mqtt-test-kafka/pom.xml b/mqtt-zoo/mqtt-test-kafka/pom.xml index 2b4a1fb..1ef9ef9 100644 --- a/mqtt-zoo/mqtt-test-kafka/pom.xml +++ b/mqtt-zoo/mqtt-test-kafka/pom.xml @@ -4,11 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> cn.wizzer mqtt-test-kafka - 1.3.0-netty + 1.4.0-netty 4.0.0 jar - 1.3.0-netty + 1.4.0-netty 2.4.1.v20201014 4.1.77.Final 2.0.4 diff --git a/pom.xml b/pom.xml index bb6f76c..fb1043d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.wizzer mqtt-wk pom - 1.3.0-netty + 1.4.0-netty MqttWk mqtt-common @@ -15,7 +15,7 @@ mqtt-store - 1.3.0-netty + 1.4.0-netty 2.4.3-SNAPSHOT 4.1.77.Final 2.0.4 @@ -26,7 +26,7 @@ UTF-8 UTF-8 - https://wizzer.cn + https://budwk.com java MQTT broker, base on nutzboot and netty Github Issue @@ -47,8 +47,8 @@ wizzercn Wizzer - wizzer@qq.com - https://wizzer.cn + wizzer.cn@gmail.com + https://budwk.com wendal @@ -75,14 +75,13 @@ nutz - http://jfrog.nutz.cn/artifactory/libs-release + https://jfrog.nutz.cn/artifactory/libs-release nutz-snapshots - http://jfrog.nutz.cn/artifactory/snapshots + https://jfrog.nutz.cn/artifactory/snapshots true - always false @@ -92,10 +91,9 @@ nutz-snapshots - http://jfrog.nutz.cn/artifactory/snapshots + https://jfrog.nutz.cn/artifactory/snapshots true - always false