设置全局定时调度器的时间提供者，借助服务器时间差，以获得更准确的时间。避免本地时间偏差导致定时任务执行时间不准确

NewLifeX · Jul 18, 2024 · 18b0ab3 · 18b0ab3
1 parent 50779b9
commit 18b0ab3
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 16 deletions.
diff --git a/Samples/TestA/TestA.csproj b/Samples/TestA/TestA.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.713-beta0409" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.718-beta0517" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/TestB/TestB.csproj b/Samples/TestB/TestB.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.713-beta0409" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.718-beta0517" />
   </ItemGroup>
 
 </Project>
diff --git a/Stardust.Server/Controllers/NodeController.cs b/Stardust.Server/Controllers/NodeController.cs
@@ -203,8 +203,7 @@ public Int32 PostEvents(EventModel[] events)
     [HttpPost(nameof(Report))]
     public async Task<Object> Report(Int32 id)
     {
-        var node = _node;
-        if (node == null) throw new ApiException(401, "节点未登录");
+        var node = _node ?? throw new ApiException(401, "节点未登录");
 
         var cmd = NodeCommand.FindById(id);
         if (cmd != null && cmd.NodeID == node.ID)
@@ -283,9 +282,7 @@ public async Task Notify()
     private async Task Handle(WebSocket socket, String token, String ip)
     {
         var (node, error) = _nodeService.DecodeToken(token, _setting.TokenSecret);
-        if (node == null) throw new ApiException(401, $"未登录！[ip={ip}]");
-
-        _node = node;
+        _node = node ?? throw new ApiException(401, $"未登录！[ip={ip}]");
         if (error != null) throw error;
 
         var sid = Rand.Next();

diff --git a/Stardust.Server/Services/NodeService.cs b/Stardust.Server/Services/NodeService.cs
@@ -191,8 +191,8 @@ private static Node CheckNode(Node node, NodeInfo di, String productCode, String
         // 网卡地址
         if (di.Macs != node.MACs)
         {
-            var dims = di.Macs?.Split(",") ?? new String[0];
-            var nodems = node.MACs?.Split(",") ?? new String[0];
+            var dims = di.Macs?.Split(",") ?? [];
+            var nodems = node.MACs?.Split(",") ?? [];
             // 任意网卡匹配则通过
             if (!nodems.Any(e => dims.Contains(e)))
             {

diff --git a/Stardust.Web/Areas/Registry/Controllers/AppController.cs b/Stardust.Web/Areas/Registry/Controllers/AppController.cs
@@ -113,7 +113,7 @@ protected override IEnumerable<App> Search(Pager p)
         if (id > 0)
         {
             var node = App.FindById(id);
-            if (node != null) return new[] { node };
+            if (node != null) return [node];
         }
 
         var projectId = p["projectId"].ToInt(-1);

diff --git a/Stardust/AppClient.cs b/Stardust/AppClient.cs
@@ -58,8 +58,6 @@ public class AppClient : ClientBase, IRegistry
     private readonly ConcurrentDictionary<String, ConsumeServiceInfo> _consumeServices = new();
     private readonly ConcurrentDictionary<String, ServiceModel[]> _consumes = new();
     private readonly ConcurrentDictionary<String, IList<Delegate>> _consumeEvents = new();
-    private readonly ConcurrentQueue<AppInfo> _fails = new();
-    private readonly ICache _cache = new MemoryCache();
     #endregion
 
     #region 构造
@@ -439,7 +437,7 @@ public PublishServiceInfo Register(String serviceName, Func<String?> addressCall
     /// <param name="callback">回调方法</param>
     public void Bind(String serviceName, ServiceChangedCallback callback)
     {
-        var list = _consumeEvents.GetOrAdd(serviceName, k => new List<Delegate>());
+        var list = _consumeEvents.GetOrAdd(serviceName, k => []);
         list.Add(callback);
 
         StartTimer();

diff --git a/Stardust/Services/StarTimeProvider.cs b/Stardust/Services/StarTimeProvider.cs
@@ -0,0 +1,12 @@
+using NewLife.Remoting.Clients;
+
+namespace Stardust.Services;
+
+#if !NET40
+internal class StarTimeProvider : TimeProvider
+{
+    public ClientBase Client { get; set; } = null!;
+
+    public override DateTimeOffset GetUtcNow() => Client != null ? Client.GetNow().ToUniversalTime() : base.GetUtcNow();
+}
+#endif
diff --git a/Stardust/StarFactory.cs b/Stardust/StarFactory.cs
@@ -14,10 +14,13 @@
 using NewLife.Remoting.Clients;
 using NewLife.Remoting.Models;
 using NewLife.Security;
+using NewLife.Threading;
 using Stardust.Configs;
 using Stardust.Models;
 using Stardust.Monitors;
 using Stardust.Registry;
+using Stardust.Services;
+
 #if NET45_OR_GREATER || NETCOREAPP || NETSTANDARD
 using TaskEx = System.Threading.Tasks.Task;
 #endif
@@ -290,6 +293,11 @@ private Boolean Valid()
                 Log = Log,
             };
 
+#if !NET40
+            // 设置全局定时调度器的时间提供者，借助服务器时间差，以获得更准确的时间。避免本地时间偏差导致定时任务执行时间不准确
+            TimerScheduler.GlobalTimeProvider = new StarTimeProvider { Client = client };
+#endif
+
             //var set = StarSetting.Current;
             //if (set.Debug) client.Log = XTrace.Log;
             client.WriteInfoEvent("应用启动", $"pid={Process.GetCurrentProcess().Id}");

diff --git a/Stardust/Stardust.csproj b/Stardust/Stardust.csproj
@@ -112,10 +112,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Remoting" Version="3.0.2024.710-beta1226" />
+    <PackageReference Include="NewLife.Remoting" Version="3.0.2024.717-beta0605" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'!='net40'">
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.0713-beta0409" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.0718-beta0517" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net40'">
     <PackageReference Include="NewLife.Core" Version="10.10.2024.0701-net40" />

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -30,7 +30,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Win32.SystemEvents" Version="8.0.0" />
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.713-beta0409" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.718-beta0517" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
   </ItemGroup>