From 0daf08eb3d2008ef3e1b76cb8a0b004a126ce6f7 Mon Sep 17 00:00:00 2001
From: huangxianguo <huangxianguo@haijumasstransfer.com>
Date: Fri, 6 Sep 2024 17:20:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E6=96=B9=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MasstransferCommon/Model/Entity/Entity.cs             |  7 ++++---
 MasstransferExporter/DataExporter/Model/ConfigData.cs | 10 ++++++----
 MasstransferExporter/Program.cs                       |  7 -------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/MasstransferCommon/Model/Entity/Entity.cs b/MasstransferCommon/Model/Entity/Entity.cs
index 11e3c22..52ed938 100644
--- a/MasstransferCommon/Model/Entity/Entity.cs
+++ b/MasstransferCommon/Model/Entity/Entity.cs
@@ -1,4 +1,5 @@
-using SQLite;
+using Newtonsoft.Json;
+using SQLite;
 
 namespace MasstransferCommon.Model.Entity;
 
@@ -9,7 +10,7 @@ public class Entity
 {
     [PrimaryKey] public string? Id { get; set; }
 
-    [Column("create_time")] public DateTime CreateTime { get; set; } = DateTime.Now;
+    [Column("create_time"), JsonIgnore] public DateTime CreateTime { get; set; } = DateTime.Now;
 
-    [Column("update_time")] public DateTime UpdateTime { get; set; } = DateTime.Now;
+    [Column("update_time"), JsonIgnore] public DateTime UpdateTime { get; set; } = DateTime.Now;
 }
\ No newline at end of file
diff --git a/MasstransferExporter/DataExporter/Model/ConfigData.cs b/MasstransferExporter/DataExporter/Model/ConfigData.cs
index f895096..e18adb1 100644
--- a/MasstransferExporter/DataExporter/Model/ConfigData.cs
+++ b/MasstransferExporter/DataExporter/Model/ConfigData.cs
@@ -1,13 +1,15 @@
-namespace MasstransferExporter.DataExporter.Model;
+using Newtonsoft.Json;
+
+namespace MasstransferExporter.DataExporter.Model;
 
 /// <summary>
 /// 配置数据
 /// </summary>
 public class ConfigData
 {
-    public string Name { get; set; }
+    [JsonProperty("name")] public string Name { get; set; }
 
-    public string Type { get; set; }
+    [JsonProperty("type")] public string Type { get; set; }
 
-    public object Param { get; set; }
+    [JsonProperty("param")] public object Param { get; set; }
 }
\ No newline at end of file
diff --git a/MasstransferExporter/Program.cs b/MasstransferExporter/Program.cs
index 4664f89..5231f48 100644
--- a/MasstransferExporter/Program.cs
+++ b/MasstransferExporter/Program.cs
@@ -1,17 +1,10 @@
 using MasstransferCommon.Events;
 using MasstransferCommon.Model.Entity;
 using MasstransferCommon.Scheduler;
-using MasstransferCommon.Utils;
 using MasstransferCommunicate.Mqtt.Client;
-using MasstransferCommunicate.Mqtt.Model;
 using MasstransferCommunicate.Process.Client;
 using MasstransferExporter.DataExporter;
 using MasstransferExporter.Init;
-using MasstransferExporter.LogExporter;
-using MasstransferExporter.LogExporter.Model;
-using MasstransferExporter.RemoteControl.Model;
-using MasstransferExporter.Stat;
-using MasstransferExporter.StatExporter;
 using MasstransferInfrastructure.Database.Sqlite;
 using MasstransferInfrastructure.Mqtt.Model;