mqtt协议包修改

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

@@ -182,12 +182,8 @@ 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);

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

@@ -2,11 +2,12 @@ package org.jetlinks.protocol.official.entity;
 
 
 import lombok.Data;
 import lombok.Data;
 import org.jetlinks.core.message.property.ReadPropertyMessage;
 import org.jetlinks.core.message.property.ReadPropertyMessage;
+import org.jetlinks.core.message.property.WritePropertyMessage;
 
 
 import java.util.Map;
 import java.util.Map;
 
 
 @Data
 @Data
-public class CustomWriteMessage extends ReadPropertyMessage {
+public class CustomWriteMessage extends WritePropertyMessage {
 
 
     private Header header;
     private Header header;
     private PayLoad payload;
     private PayLoad payload;