mqtt协议包修改

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

@@ -119,7 +119,8 @@ public class JetLinksMqttDeviceMessageCodec implements DeviceMessageCodec {
                     CustomWriteMessage.Header header = new CustomWriteMessage.Header();
                     CustomWriteMessage.Header header = new CustomWriteMessage.Header();
                     header.setTimestamp(deviceMessage.getTimestamp());
                     header.setTimestamp(deviceMessage.getTimestamp());
                     header.setVersion(1);
                     header.setVersion(1);
-                    header.setUuid(deviceMessage.getMessageId());                    customSendMessage.setHeader(header);
+                    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();
@@ -181,8 +182,12 @@ public class JetLinksMqttDeviceMessageCodec implements DeviceMessageCodec {
             Set<String> keySet = jsonObject.keySet();
             Set<String> keySet = jsonObject.keySet();
             Map<String,Object> propertiesMap = new HashMap<>();
             Map<String,Object> propertiesMap = new HashMap<>();
             for (String key : keySet) {
             for (String key : keySet) {
+                if (key.equals("usrServerInfo")) {
+                    propertiesMap.put(key, JSON.toJSONString(jsonObject.get(key)));
+                } else {
                     propertiesMap.put(key, ((JSONObject) jsonObject.get(key)).get("value"));
                     propertiesMap.put(key, ((JSONObject) jsonObject.get(key)).get("value"));
                 }
                 }
+            }
             map.put("properties", propertiesMap);
             map.put("properties", propertiesMap);
             map.put("success",true);
             map.put("success",true);
             map.put("messageId",messageId);
             map.put("messageId",messageId);