update: fro 1.4.0-netty

Wizzercn · Aug 14, 2023 · 30cc4ab · 30cc4ab
1 parent c014ee7
commit 30cc4ab
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 20 deletions.
diff --git 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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mqtt-wk</artifactId>
         <groupId>cn.wizzer</groupId>
-        <version>1.3.0-netty</version>
+        <version>1.4.0-netty</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/mqtt-broker/pom.xml b/mqtt-broker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mqtt-wk</artifactId>
         <groupId>cn.wizzer</groupId>
-        <version>1.3.0-netty</version>
+        <version>1.4.0-netty</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/mqtt-common/pom.xml b/mqtt-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mqtt-wk</artifactId>
         <groupId>cn.wizzer</groupId>
-        <version>1.3.0-netty</version>
+        <version>1.4.0-netty</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/mqtt-store/pom.xml b/mqtt-store/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mqtt-wk</artifactId>
         <groupId>cn.wizzer</groupId>
-        <version>1.3.0-netty</version>
+        <version>1.4.0-netty</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

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
@@ -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/...-store/src/main/java/cn/wizzer/iot/mqtt/server/store/cache/SubscribeNotWildcardCache.java b/...-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
@@ -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
@@ -4,11 +4,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <groupId>cn.wizzer</groupId>
     <artifactId>mqtt-test-kafka</artifactId>
-    <version>1.3.0-netty</version>
+    <version>1.4.0-netty</version>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
     <properties>
-        <mqttwk.version>1.3.0-netty</mqttwk.version>
+        <mqttwk.version>1.4.0-netty</mqttwk.version>
         <nutzboot.version>2.4.1.v20201014</nutzboot.version>
         <netty.version>4.1.77.Final</netty.version>
         <fastjson.version>2.0.4</fastjson.version>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>cn.wizzer</groupId>
     <artifactId>mqtt-wk</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.0-netty</version>
+    <version>1.4.0-netty</version>
     <name>MqttWk</name>
     <modules>
         <module>mqtt-common</module>
@@ -15,7 +15,7 @@
         <module>mqtt-store</module>
     </modules>
     <properties>
-        <mqttwk.version>1.3.0-netty</mqttwk.version>
+        <mqttwk.version>1.4.0-netty</mqttwk.version>
         <nutzboot.version>2.4.3-SNAPSHOT</nutzboot.version>
         <netty.version>4.1.77.Final</netty.version>
         <fastjson.version>2.0.4</fastjson.version>
@@ -26,7 +26,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
-    <url>https://wizzer.cn</url>
+    <url>https://budwk.com</url>
     <description>java MQTT broker, base on nutzboot and netty</description>
     <issueManagement>
         <system>Github Issue</system>
@@ -47,8 +47,8 @@
         <developer>
             <id>wizzercn</id>
             <name>Wizzer</name>
-            <email>wizzer@qq.com</email>
-            <url>https://wizzer.cn</url>
+            <email>wizzer.cn@gmail.com</email>
+            <url>https://budwk.com</url>
         </developer>
         <developer>
             <id>wendal</id>
@@ -75,14 +75,13 @@
     <repositories>
         <repository>
             <id>nutz</id>
-            <url>http://jfrog.nutz.cn/artifactory/libs-release</url>
+            <url>https://jfrog.nutz.cn/artifactory/libs-release</url>
         </repository>
         <repository>
             <id>nutz-snapshots</id>
-            <url>http://jfrog.nutz.cn/artifactory/snapshots</url>
+            <url>https://jfrog.nutz.cn/artifactory/snapshots</url>
             <snapshots>
                 <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
             </snapshots>
             <releases>
                 <enabled>false</enabled>
@@ -92,10 +91,9 @@
     <pluginRepositories>
         <pluginRepository>
             <id>nutz-snapshots</id>
-            <url>http://jfrog.nutz.cn/artifactory/snapshots</url>
+            <url>https://jfrog.nutz.cn/artifactory/snapshots</url>
             <snapshots>
                 <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
             </snapshots>
             <releases>
                 <enabled>false</enabled>