zhouzeyu 1 год назад
Родитель
Сommit
70d322ed56

+ 3 - 2
src/main/java/com/tuoren/forward/netty/MyServer.java

@@ -140,7 +140,9 @@ class MyServerHandler extends ChannelInboundHandlerAdapter {
             long duration = endTime - startTime;
 
             registLog.setWaste(String.valueOf(duration));
-            int maxLength = 500;
+            registLog.setResult(jsonString);//保存结果
+
+            int maxLength = 1000;
             if (jsonString != null && !jsonString.isEmpty()) {
                 if (jsonString.length() > maxLength) {
                     jsonString = jsonString.substring(0, maxLength);
@@ -150,7 +152,6 @@ class MyServerHandler extends ChannelInboundHandlerAdapter {
                 throw new IllegalArgumentException("jsonString is empty");
             }
 
-            registLog.setResult(jsonString);//保存结果
 
             int code = jsonObject.getIntValue("code");
             if (code == 200){

+ 1 - 1
src/main/java/com/tuoren/forward/netty/aliutil/Config.java

@@ -35,7 +35,7 @@ public class Config {
     
    // public static final String COAP_ADDRESS = "iot-060a0bgd.coap.iothub.aliyuncs.com";
     public static final String COAP_ADDRESS = ".coap.cn-shanghai.link.aliyuncs.com";
-    public static final String COAP_PORT = "5682";
+    public static final int COAP_PORT = 5682;
     
 
 	/*

+ 5 - 7
src/main/java/com/tuoren/forward/netty/common/JsonExtractor.java

@@ -29,7 +29,12 @@ public class JsonExtractor {
             newJson.put("productId", orginalObj.getString("productId"));
             newJson.put("userId", orginalObj.getString("userId"));
             newJson.put("deviceId", orginalObj.getString("deviceId"));
+            newJson.put("address", orginalObj.getString("address"));
+            newJson.put("port", orginalObj.getIntValue("port"));
             newJson.put("deviceSecret", orginalObj.getString("deviceSecret"));
+            //老版本兼容
+            newJson.put("deviceName", orginalObj.getString("deviceName"));
+            newJson.put("productKey", orginalObj.getString("productKey"));
             Object wifi = orginalObj.get("wifi");
             if (wifi instanceof String) {
                 // 如果 wifi 是字符串,尝试将其解析为 JSON 数组
@@ -37,13 +42,6 @@ public class JsonExtractor {
             }
             newJson.put("wifi", wifi);
 
-            //老版本
-            newJson.put("address", orginalObj.getString("address"));
-            newJson.put("port", orginalObj.getIntValue("port"));
-            newJson.put("deviceName", orginalObj.getString("deviceName"));
-            newJson.put("deviceSecret", orginalObj.getString("deviceSecret"));
-            newJson.put("productKey", orginalObj.getString("productKey"));
-
             //将新的JSON对象转换成字符串
             return newJson.toJSONString();
         } catch (Exception e) {