v11.4.2025.0201 修改Utility类命名空间；改进Excel读取

NewLifeX · Feb 1, 2025 · 4d3ba5b · 4d3ba5b
1 parent 6668078
commit 4d3ba5b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/NewLife.Core/IO/ExcelReader.cs b/NewLife.Core/IO/ExcelReader.cs
@@ -190,7 +190,9 @@ private void Parse()
             if (val is String str)
             {
                 // 暂时不明白为何要减2，实际上这么做就对了
-                val = _1900.AddDays(str.ToDouble() - 2);
+                //val = _1900.AddDays(str.ToDouble() - 2);
+                // 取整，剔除毫秒部分
+                val = _1900.AddSeconds(Math.Round((str.ToDouble() - 2) * 24 * 3600));
                 //var ss = str.Split('.');
                 //var dt = _1900.AddDays(ss[0].ToInt() - 2);
                 //dt = dt.AddSeconds(ss[1].ToLong() / 115740);

diff --git a/NewLife.Core/NewLife.Core.csproj b/NewLife.Core/NewLife.Core.csproj
@@ -7,7 +7,7 @@
     <Description>Core basic components: log (file / network), configuration (XML / JSON / HTTP), cache, network (TCP / UDP / HTTP /WebSocket), serialization (binary / XML / JSON), APM performance tracking. 核心基础组件，日志（文件/网络）、配置（XML/Json/Http）、缓存、网络（Tcp/Udp/Http/WebSocket）、序列化（Binary/XML/Json）、APM性能追踪。</Description>
     <Company>新生命开发团队</Company>
     <Copyright>©2002-2025 NewLife</Copyright>
-    <VersionPrefix>11.3</VersionPrefix>
+    <VersionPrefix>11.4</VersionPrefix>
     <VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
     <Version>$(VersionPrefix).$(VersionSuffix)</Version>
     <FileVersion>$(Version)</FileVersion>
@@ -32,7 +32,7 @@
     <RepositoryUrl>https://github.com/NewLifeX/X</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>新生命团队;X组件;NewLife;$(AssemblyName)</PackageTags>
-    <PackageReleaseNotes>新增消息总线IEventBus</PackageReleaseNotes>
+    <PackageReleaseNotes>修改Utility类命名空间；改进Excel读取</PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>

diff --git a/NewLife.Security/NewLife.Security.csproj b/NewLife.Security/NewLife.Security.csproj
@@ -6,7 +6,7 @@
     <Description>扩展加密算法</Description>
     <Company>新生命开发团队</Company>
     <Copyright>©2002-2025 NewLife</Copyright>
-    <VersionPrefix>11.3</VersionPrefix>
+    <VersionPrefix>11.4</VersionPrefix>
     <VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
     <Version>$(VersionPrefix).$(VersionSuffix)</Version>
     <FileVersion>$(Version)</FileVersion>

diff --git a/XUnitTest.Core/IO/ExcelReaderTests.cs b/XUnitTest.Core/IO/ExcelReaderTests.cs
@@ -1,6 +1,5 @@
-using System;
-using System.Linq;
-using System.Text;
+using System.Text;
+using NewLife;
 using NewLife.IO;
 using Xunit;
 
@@ -32,7 +31,10 @@ public void Test1()
         Assert.Equal(values.Length, row1.Length);
         for (var i = 0; i < values.Length; i++)
         {
-            Assert.Equal(values[i], row1[i]);
+            if (row1[i] is DateTime dt)
+                Assert.Equal(values[i].ToDateTime(), dt);
+            else
+                Assert.Equal(values[i], row1[i]);
         }
     }