mqtt协议包修改

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

@@ -100,7 +100,8 @@ public class JetLinksMqttDeviceMessageCodec implements DeviceMessageCodec {
                     CustomReadMessage customSendMessage = new CustomReadMessage();
                     CustomReadMessage customSendMessage = new CustomReadMessage();
                     CustomReadMessage.Header header = new CustomReadMessage.Header();
                     CustomReadMessage.Header header = new CustomReadMessage.Header();
                     header.setTimestamp(deviceMessage.getTimestamp());
                     header.setTimestamp(deviceMessage.getTimestamp());
-                    header.setVersion(deviceMessage.getHeaders().get("_uid").toString());
+                    header.setVersion(1);
+                    header.setUuid(deviceMessage.getMessageId());
                     customSendMessage.setHeader(header);
                     customSendMessage.setHeader(header);
                     customSendMessage.setDeviceId(((DeviceMessage) message).getDeviceId());
                     customSendMessage.setDeviceId(((DeviceMessage) message).getDeviceId());
 
 
@@ -117,8 +118,8 @@ public class JetLinksMqttDeviceMessageCodec implements DeviceMessageCodec {
                     CustomWriteMessage customSendMessage = new CustomWriteMessage();
                     CustomWriteMessage customSendMessage = new CustomWriteMessage();
                     CustomWriteMessage.Header header = new CustomWriteMessage.Header();
                     CustomWriteMessage.Header header = new CustomWriteMessage.Header();
                     header.setTimestamp(deviceMessage.getTimestamp());
                     header.setTimestamp(deviceMessage.getTimestamp());
-                    header.setVersion(deviceMessage.getHeaders().get("_uid").toString());
-                    customSendMessage.setHeader(header);
+                    header.setVersion(1);
+                    header.setUuid(deviceMessage.getMessageId());                    customSendMessage.setHeader(header);
                     customSendMessage.setDeviceId(((DeviceMessage) message).getDeviceId());
                     customSendMessage.setDeviceId(((DeviceMessage) message).getDeviceId());
 
 
                     CustomWriteMessage.PayLoad payLoad = new CustomWriteMessage.PayLoad();
                     CustomWriteMessage.PayLoad payLoad = new CustomWriteMessage.PayLoad();

src/main/java/org/jetlinks/protocol/official/entity/CustomReadMessage.java

@@ -15,7 +15,7 @@ public class CustomReadMessage extends ReadPropertyMessage {
 
 
     @Data
     @Data
     public static class Header {
     public static class Header {
-        private String version;
+        private int version;
         private String uuid;
         private String uuid;
         private Long timestamp;
         private Long timestamp;
     }
     }

src/main/java/org/jetlinks/protocol/official/entity/CustomWriteMessage.java

@@ -15,7 +15,7 @@ public class CustomWriteMessage extends ReadPropertyMessage {
 
 
     @Data
     @Data
     public static class Header {
     public static class Header {
-        private String version;
+        private int version;
         private String uuid;
         private String uuid;
         private Long timestamp;
         private Long timestamp;
     }
     }