From b60ad674f3773f1246ee202c4d7ef115f08d8af3 Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Thu, 4 Dec 2025 10:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/mqtt/ThingOperationHandler.cs       | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/OpenAuth.WebApi/Model/mqtt/ThingOperationHandler.cs b/OpenAuth.WebApi/Model/mqtt/ThingOperationHandler.cs
index 4dcef4d..17a8bc1 100644
--- a/OpenAuth.WebApi/Model/mqtt/ThingOperationHandler.cs
+++ b/OpenAuth.WebApi/Model/mqtt/ThingOperationHandler.cs
@@ -1,6 +1,5 @@
 using Infrastructure.Cache;
 using Infrastructure.CloudSdk.mqttmessagecenter;
-using Newtonsoft.Json;
 using OpenAuth.App.ServiceApp;
 using OpenAuth.Repository.Domain;
 using System.Text.Json.Nodes;
@@ -24,26 +23,27 @@ namespace OpenAuth.WebApi.Model.mqtt
         {
             var root = JsonNode.Parse(payload)?.AsObject();
 
-            string dataJson = JsonConvert.SerializeObject(root["Data"],new JsonSerializerSettings
+            var dataNode = root?["Data"];
+            string dataJson = string.Empty;
+            if (dataNode != null)
             {
-                StringEscapeHandling = StringEscapeHandling.Default
-            });
+                dataJson = System.Text.Json.JsonSerializer.Serialize(
+                    dataNode,
+                    new System.Text.Json.JsonSerializerOptions
+                    {
+                        Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+                    });
+            }
+
             await _app.AddOperationLog(new LasaControlOperation
             {
                 Id = Guid.NewGuid().ToString(),
-                DeviceSn = root["DeviceSn"]?.ToString() ?? "",
-                TaskId = root["TaskId"]?.ToString() ?? "",
+                DeviceSn = root?["DeviceSn"]?.ToString() ?? "",
+                TaskId = root?["TaskId"]?.ToString() ?? "",
                 CreateTime = DateTime.Now,
-                CreateId = long.Parse((root["CreateId"]?.ToString() ?? "0")),
-                //Data = root["Data"]?.ToJsonString() ?? ""
+                CreateId = long.Parse(root?["CreateId"]?.ToString() ?? "0"),
                 Data = dataJson
             });
-            //var info = Newtonsoft.Json.JsonConvert.DeserializeObject<LasaControlOperation>(payload);
-            //info.Id = Guid.NewGuid().ToString();
-            //info.CreateTime = DateTime.Now;
-            //await _app.AddOperationLog(info);
-            // 自定义处理逻辑
-            //return Task.CompletedTask;
         }
     }
 }