🐛解决DynamicObjectExt动态对象中DateTime数据序列化反序列化问题

softwaiter · Jan 16, 2024 · 0d7c882 · 0d7c882
1 parent 2a71656
commit 0d7c882
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -19,25 +19,25 @@ Xmtool是一个基于.NetCore的常用功能集成工具类库，目的是做成
 ##### Package Manager
 
 ```shell
-Install-Package Xmtool -Version 2.1.1
+Install-Package Xmtool -Version 2.1.2
 ```
 
 ##### .NET CLI
 
 ```shell
-dotnet add package Xmtool --version 2.1.1
+dotnet add package Xmtool --version 2.1.2
 ```
 
 ##### PackageReference
 
 ```xml
-<PackageReference Include="Xmtool" Version="2.1.1" />
+<PackageReference Include="Xmtool" Version="2.1.2" />
 ```
 
 ##### Paket CLI
 
 ```shell
-paket add Xmtool --version 2.1.1
+paket add Xmtool --version 2.1.2
 ```
 
 

diff --git a/Source/DateTimeTool.cs b/Source/DateTimeTool.cs
@@ -21,12 +21,24 @@ public long GetUtcTimestamp10()
             return (long)ts.TotalSeconds;
         }
 
+        public long GetUtcTimestamp10(DateTime datetime)
+        {
+            TimeSpan ts = datetime.ToUniversalTime() - new DateTime(1970, 1, 1, 0, 0, 0);
+            return (long)ts.TotalSeconds;
+        }
+
         public long GetUtcTimestamp13()
         {
             TimeSpan ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0);
             return (long)ts.TotalMilliseconds;
         }
 
+        public long GetUtcTimestamp13(DateTime datetime)
+        {
+            TimeSpan ts = datetime.ToUniversalTime() - new DateTime(1970, 1, 1, 0, 0, 0);
+            return (long)ts.TotalMilliseconds;
+        }
+
         public DateTime GetUtcDateTimeFromUtcTimestamp10(long ts)
         {
             DateTime st = new DateTime(1970, 1, 1, 0, 0, 0);

diff --git a/Source/DynamicObject/DynamicObjectExt.cs b/Source/DynamicObject/DynamicObjectExt.cs
@@ -278,6 +278,10 @@ private string SerializeValue(dynamic value)
                 {
                     sbResult.Append(value.ToString().ToLower());
                 }
+                else if (_typ == typeof(DateTime))
+                {
+                    sbResult.Append(string.Concat("\"", value.ToString("s"), "\""));
+                }
                 else
                 {
                     sbResult.Append(value.ToString());

diff --git a/Source/Json/JsonConfigParser.cs b/Source/Json/JsonConfigParser.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Text;
 using System.Text.Json;
+using System.Text.RegularExpressions;
 
 namespace CodeM.Common.Tools.Json
 {
@@ -56,6 +57,7 @@ public dynamic Parse(string jsonStr = null)
             return result;
         }
 
+        private static Regex reDateTime = new Regex("^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}$");
         private void BindConfigObject(DynamicObjectExt configObj, JsonElement element, string key = null)
         {
             if (configObj == null)
@@ -138,7 +140,15 @@ private void BindConfigObject(DynamicObjectExt configObj, JsonElement element, s
                 case JsonValueKind.String:
                     if (!string.IsNullOrWhiteSpace(key))
                     {
-                        configObj.TrySetValue(key, element.GetString());
+                        string value = element.GetString();
+                        if (reDateTime.IsMatch(value))
+                        {
+                            configObj.TrySetValue(key, DateTime.Parse(value));
+                        }
+                        else
+                        {
+                            configObj.TrySetValue(key, value);
+                        }
                     }
                     break;
                 case JsonValueKind.Number:

diff --git a/Source/Source.csproj b/Source/Source.csproj
@@ -8,7 +8,7 @@
     <AssemblyName>Xmtool</AssemblyName>
     <RootNamespace>CodeM.Common.Tools</RootNamespace>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <Version>2.1.1</Version>
+    <Version>2.1.2</Version>
     <AssemblyVersion></AssemblyVersion>
     <FileVersion></FileVersion>
     <Authors>softwaiter</Authors>