From a01497f0db5fd0cd7559b4bb4cf201fd77992580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B4=81?= <445990772@qq.com>
Date: Tue, 1 Aug 2023 17:45:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=E7=B1=BB=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=8A=A5=E6=96=87=E6=97=A0=E6=B3=95=E4=B8=8A=E7=BA=BF=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BE=93=E5=87=BA=E6=8A=A5=E6=96=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binary/BinaryMessageTypeTest.java         | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/test/java/org/jetlinks/protocol/official/binary/BinaryMessageTypeTest.java b/src/test/java/org/jetlinks/protocol/official/binary/BinaryMessageTypeTest.java
index 2acf2ea..6ddc53a 100644
--- a/src/test/java/org/jetlinks/protocol/official/binary/BinaryMessageTypeTest.java
+++ b/src/test/java/org/jetlinks/protocol/official/binary/BinaryMessageTypeTest.java
@@ -10,7 +10,6 @@ import org.jetlinks.core.message.function.FunctionInvokeMessageReply;
 import org.jetlinks.core.message.property.*;
 import org.junit.Assert;
 import org.junit.Test;
-import reactor.test.StepVerifier;
 
 import java.util.Collections;
 
@@ -27,11 +26,14 @@ public class BinaryMessageTypeTest {
         ByteBuf byteBuf = BinaryMessageType.write(message, Unpooled.buffer());
 
         System.out.println(ByteBufUtil.prettyHexDump(byteBuf));
+        ByteBuf buf = Unpooled
+                .buffer()
+                .writeInt(byteBuf.readableBytes())
+                .writeBytes(byteBuf);
 
-        System.out.println(ByteBufUtil.prettyHexDump(Unpooled
-                                                             .buffer()
-                                                             .writeInt(byteBuf.readableBytes())
-                                                             .writeBytes(byteBuf)));
+        System.out.println(ByteBufUtil.prettyHexDump(buf));
+        //登录报文
+        System.out.println(ByteBufUtil.hexDump(buf));
     }
 
     @Test
@@ -97,11 +99,19 @@ public class BinaryMessageTypeTest {
 
         ByteBuf data = BinaryMessageType.write(message, Unpooled.buffer());
 
-        System.out.println(ByteBufUtil.prettyHexDump(data));
-        DeviceMessage read = BinaryMessageType.read(data);
+//        System.out.println(ByteBufUtil.prettyHexDump(data));
+        ByteBuf buf = Unpooled.buffer()
+                                    .writeInt(data.readableBytes())
+                                    .writeBytes(data);
+        System.out.println(ByteBufUtil.prettyHexDump(buf));
+        System.out.println(ByteBufUtil.hexDump(buf));
+        //将长度字节读取后，直接解析报文正文
+        buf.readInt();
+        DeviceMessage read = BinaryMessageType.read(buf);
         if (null != read.getHeaders()) {
             read.getHeaders().forEach(message::addHeader);
         }
+
         System.out.println(read);
         Assert.assertEquals(read.toString(), message.toString());
     }