build(maven): 升级依赖版本

# Conflicts:
#	package/jetlinks-official-protocol-3.1.0-SNAPSHOT.jar

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.jetlinks</groupId>
     <artifactId>jetlinks-official-protocol</artifactId>
-    <version>3.0.0</version>
+    <version>3.1.0-SNAPSHOT</version>
 
     <name>JetLinks</name>
     <url>https://jetlinks.org</url>
@@ -44,8 +44,7 @@
         <project.build.locales>zh_CN</project.build.locales>
         <java.version>1.8</java.version>
         <project.build.jdk>${java.version}</project.build.jdk>
-        <spring.boot.version>2.2.8.RELEASE</spring.boot.version>
+        <hsweb.framework.version>4.0.16</hsweb.framework.version>
-        <hsweb.framework.version>4.0.3</hsweb.framework.version>
         <hsweb.expands.version>3.0.2</hsweb.expands.version>
         <reactor.version>2020.0.6</reactor.version>
     </properties>
@@ -204,7 +203,7 @@
         <dependency>
             <groupId>org.jetlinks</groupId>
             <artifactId>jetlinks-supports</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1</version>
         </dependency>
 
         <dependency>
@@ -271,12 +270,12 @@
         <repository>
             <id>releases</id>
             <name>Nexus Release Repository</name>
-            <url>http://nexus.hsweb.me/content/repositories/releases/</url>
+            <url>https://nexus.jetlinks.cn/content/repositories/releases/</url>
         </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>Nexus Snapshot Repository</name>
-            <url>http://nexus.hsweb.me/content/repositories/snapshots/</url>
+            <url>https://nexus.jetlinks.cn/content/repositories/snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
 
@@ -285,7 +284,10 @@
         <repository>
             <id>hsweb-nexus</id>
             <name>Nexus Release Repository</name>
-            <url>https://nexus.hsweb.me/content/groups/public/</url>
+            <url>https://nexus.jetlinks.cn/content/groups/public/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
             <snapshots>
                 <enabled>true</enabled>
                 <updatePolicy>always</updatePolicy>

src/main/java/org/jetlinks/protocol/official/TopicMessageCodec.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;
 import org.hswebframework.web.bean.FastBeanCopier;
 import org.jetlinks.core.message.*;
+import org.jetlinks.core.message.collector.*;
 import org.jetlinks.core.message.event.EventMessage;
 import org.jetlinks.core.message.firmware.*;
 import org.jetlinks.core.message.function.FunctionInvokeMessage;
@@ -278,6 +279,35 @@ public enum TopicMessageCodec {
     //状态检查
     stateCheck("/*/state-check", DeviceStateCheckMessage.class),
     stateCheckReply("/*/state-check/reply", DeviceStateCheckMessageReply.class),
+
+    //数采相关
+    collector("/*/collector/report", ReportCollectorDataMessage.class
+            , builder -> builder
+            .upstream(true)
+            .group("数采网关")
+            .description("上报数采点位数据")),
+    collectorRead("/*/collector/read",
+                  ReadCollectorDataMessage.class,
+                  builder -> builder
+                          .downstream(true)
+                          .group("数采网关")
+                          .description("平台读取点位数据")),
+    collectorReadReply("/*/collector/read/reply",
+                       ReadCollectorDataMessageReply.class,
+                       builder -> builder
+                               .upstream(true)
+                               .group("数采网关")
+                               .description("平台读取点位数据结果回复")),
+    collectorWrite("/*/collector/write", WriteCollectorDataMessage.class,
+                   builder -> builder
+                           .downstream(true)
+                           .group("数采网关")
+                           .description("平台修改点位数据")),
+    collectorWriteReply("/*/collector/write/reply", WriteCollectorDataMessageReply.class,
+                        builder -> builder
+                                .upstream(true)
+                                .group("数采网关")
+                                .description("平台修改点位数据结果回复")),
     ;
 
     TopicMessageCodec(String topic,

src/test/java/org/jetlinks/protocol/official/binary/BinaryMessageTypeTest.java

@@ -97,12 +97,20 @@ public class BinaryMessageTypeTest {
 
         ByteBuf data = BinaryMessageType.write(message, Unpooled.buffer());
 
+        System.out.println("TCP报文: "+ByteBufUtil.hexDump(Unpooled
+                                                   .buffer()
+                                                   .writeInt(data.readableBytes())
+                                                   .writeBytes(data.duplicate())));
+
         System.out.println(ByteBufUtil.prettyHexDump(data));
+
         DeviceMessage read = BinaryMessageType.read(data);
         if (null != read.getHeaders()) {
             read.getHeaders().forEach(message::addHeader);
         }
         System.out.println(read);
+        //tcp时 发送的完整报文.
+
         Assert.assertEquals(read.toString(), message.toString());
     }