v1.1.2025.0305

NewLifeX · Mar 5, 2025 · fa41727 · fa41727
1 parent dba0ee9
commit fa41727
Show file tree

Hide file tree

Showing 21 changed files with 193 additions and 158 deletions.
diff --git a/Zero.Agent/Zero.Agent.csproj b/Zero.Agent/Zero.Agent.csproj
@@ -24,9 +24,9 @@
 
   <ItemGroup>
     <PackageReference Include="NewLife.Agent" Version="10.11.2025.201" />
-    <PackageReference Include="NewLife.Core" Version="11.4.2025.201" />
-    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.202" />
-    <PackageReference Include="NewLife.XCode" Version="11.18.2025.201" />
+    <PackageReference Include="NewLife.Core" Version="11.4.2025.301" />
+    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.301" />
+    <PackageReference Include="NewLife.XCode" Version="11.18.2025.301" />
   </ItemGroup>
 
 </Project>
diff --git a/Zero.Agent2/Zero.Agent2.csproj b/Zero.Agent2/Zero.Agent2.csproj
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="NewLife.Extensions.Hosting.AgentService" Version="10.11.2025.201" />
-    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.3.2025.202" />
+    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.3.2025.301" />
   </ItemGroup>
 
 </Project>
diff --git a/Zero.AntJob/Zero.AntJob.csproj b/Zero.AntJob/Zero.AntJob.csproj
@@ -28,11 +28,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.AntJob" Version="4.0.2025.204" />
-    <PackageReference Include="NewLife.AntJob.Extensions" Version="3.4.2025.204" />
-    <PackageReference Include="NewLife.Core" Version="11.4.2025.201" />
-    <PackageReference Include="NewLife.Redis" Version="6.1.2025.202" />
-    <PackageReference Include="NewLife.XCode" Version="11.18.2025.201" />
+    <PackageReference Include="NewLife.AntJob" Version="4.0.2025.305" />
+    <PackageReference Include="NewLife.AntJob.Extensions" Version="3.4.2025.305" />
+    <PackageReference Include="NewLife.Core" Version="11.4.2025.301" />
+    <PackageReference Include="NewLife.Redis" Version="6.1.2025.301" />
+    <PackageReference Include="NewLife.XCode" Version="11.18.2025.301" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Zero.Client/Zero.Client.csproj b/Zero.Client/Zero.Client.csproj
@@ -20,9 +20,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.4.2025.201" />
-    <PackageReference Include="NewLife.MQTT" Version="2.0.2024.1212" />
-    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.202" />
+    <PackageReference Include="NewLife.Core" Version="11.4.2025.301" />
+    <PackageReference Include="NewLife.MQTT" Version="2.0.2025.301" />
+    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.301" />
   </ItemGroup>
 
 </Project>
diff --git a/Zero.Console/Zero.Console.csproj b/Zero.Console/Zero.Console.csproj
@@ -25,10 +25,10 @@
     <Using Include="NewLife.Reflection" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.MQTT" Version="2.0.2024.1212" />
-    <PackageReference Include="NewLife.Redis" Version="6.1.2025.202" />
+    <PackageReference Include="NewLife.MQTT" Version="2.0.2025.301" />
+    <PackageReference Include="NewLife.Redis" Version="6.1.2025.301" />
     <PackageReference Include="NewLife.RocketMQ" Version="2.7.2025.202" />
-    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.202" />
+    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.301" />
   </ItemGroup>
 
 </Project>
diff --git a/Zero.Data/Zero.Data.csproj b/Zero.Data/Zero.Data.csproj
@@ -27,9 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.4.2025.201" />
-    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.202" />
-    <PackageReference Include="NewLife.XCode" Version="11.18.2025.201" />
+    <PackageReference Include="NewLife.Core" Version="11.4.2025.301" />
+    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.301" />
+    <PackageReference Include="NewLife.XCode" Version="11.18.2025.301" />
   </ItemGroup>
 
 </Project>
diff --git a/Zero.Desktop/Zero.Desktop.csproj b/Zero.Desktop/Zero.Desktop.csproj
@@ -26,9 +26,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.4.2025.201" />
-    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.202" />
-    <PackageReference Include="NewLife.XCode" Version="11.18.2025.201" />
+    <PackageReference Include="NewLife.Core" Version="11.4.2025.301" />
+    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.301" />
+    <PackageReference Include="NewLife.XCode" Version="11.18.2025.301" />
     <PackageReference Include="System.Speech" Version="8.0.0" />
   </ItemGroup>
 

diff --git a/Zero.GtkForm/Zero.GtkForm.csproj b/Zero.GtkForm/Zero.GtkForm.csproj
@@ -27,9 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.4.2025.201" />
-    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.202" />
-    <PackageReference Include="NewLife.XCode" Version="11.18.2025.201" />
+    <PackageReference Include="NewLife.Core" Version="11.4.2025.301" />
+    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.301" />
+    <PackageReference Include="NewLife.XCode" Version="11.18.2025.301" />
     <PackageReference Include="GtkSharp" Version="3.24.24.95" />
   </ItemGroup>
 

diff --git a/Zero.HttpServer/Zero.HttpServer.csproj b/Zero.HttpServer/Zero.HttpServer.csproj
@@ -20,10 +20,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.4.2025.201" />
-    <PackageReference Include="NewLife.Redis" Version="6.1.2025.202" />
-    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.202" />
-    <PackageReference Include="NewLife.XCode" Version="11.18.2025.201" />
+    <PackageReference Include="NewLife.Core" Version="11.4.2025.301" />
+    <PackageReference Include="NewLife.Redis" Version="6.1.2025.301" />
+    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.301" />
+    <PackageReference Include="NewLife.XCode" Version="11.18.2025.301" />
   </ItemGroup>
 
 </Project>
diff --git a/Zero.RpcServer/Zero.RpcServer.csproj b/Zero.RpcServer/Zero.RpcServer.csproj
@@ -20,10 +20,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.4.2025.201" />
-    <PackageReference Include="NewLife.Redis" Version="6.1.2025.202" />
-    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.202" />
-    <PackageReference Include="NewLife.XCode" Version="11.18.2025.201" />
+    <PackageReference Include="NewLife.Core" Version="11.4.2025.301" />
+    <PackageReference Include="NewLife.Redis" Version="6.1.2025.301" />
+    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.301" />
+    <PackageReference Include="NewLife.XCode" Version="11.18.2025.301" />
   </ItemGroup>
 
 </Project>
diff --git a/Zero.Server/Zero.Server.csproj b/Zero.Server/Zero.Server.csproj
@@ -20,10 +20,10 @@
 
   <ItemGroup>
     <PackageReference Include="NewLife.Agent" Version="10.11.2025.201" />
-    <PackageReference Include="NewLife.Core" Version="11.4.2025.201" />
-    <PackageReference Include="NewLife.Redis" Version="6.1.2025.202" />
-    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.202" />
-    <PackageReference Include="NewLife.XCode" Version="11.18.2025.201" />
+    <PackageReference Include="NewLife.Core" Version="11.4.2025.301" />
+    <PackageReference Include="NewLife.Redis" Version="6.1.2025.301" />
+    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.301" />
+    <PackageReference Include="NewLife.XCode" Version="11.18.2025.301" />
   </ItemGroup>
 
 </Project>
diff --git a/Zero.TcpServer/Zero.TcpServer.csproj b/Zero.TcpServer/Zero.TcpServer.csproj
@@ -20,10 +20,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.4.2025.201" />
-    <PackageReference Include="NewLife.Redis" Version="6.1.2025.202" />
-    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.202" />
-    <PackageReference Include="NewLife.XCode" Version="11.18.2025.201" />
+    <PackageReference Include="NewLife.Core" Version="11.4.2025.301" />
+    <PackageReference Include="NewLife.Redis" Version="6.1.2025.301" />
+    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.301" />
+    <PackageReference Include="NewLife.XCode" Version="11.18.2025.301" />
   </ItemGroup>
 
 </Project>
diff --git a/Zero.Web/Areas/Nodes/Controllers/NodeOnlineController.cs b/Zero.Web/Areas/Nodes/Controllers/NodeOnlineController.cs
@@ -1,19 +1,12 @@
-using Microsoft.AspNetCore.Mvc;
-using Zero.Data.Nodes;
+using System.ComponentModel;
+using Microsoft.AspNetCore.Mvc;
 using NewLife;
 using NewLife.Cube;
-using NewLife.Cube.Extensions;
-using NewLife.Cube.ViewModels;
-using NewLife.Log;
-using NewLife.Web;
-using XCode.Membership;
-using static Zero.Data.Nodes.NodeOnline;
-using Stardust;
-using System.ComponentModel;
 using NewLife.Remoting.Extensions.Services;
 using NewLife.Remoting.Models;
-using NewLife.Serialization;
-using Zero.Web.Areas.Nodes;
+using NewLife.Web;
+using XCode.Membership;
+using Zero.Data.Nodes;
 
 namespace Zero.Web.Areas.Nodes.Controllers;
 
@@ -74,19 +67,15 @@ public async Task<ActionResult> CheckUpgrade()
         var ts = new List<Task>();
         foreach (var item in SelectKeys)
         {
-            var online = FindById(item.ToInt());
+            var online = NodeOnline.FindById(item.ToInt());
             if (online?.Node != null)
             {
-                //ts.Add(_starFactory.SendNodeCommand(online.Node.Code, "node/upgrade", null, 600, 0));
-                var code = online.Node.Code;
                 var cmd = new CommandModel
                 {
-                    //Code = online.Node.Code,
                     Command = "node/upgrade",
-                    Expire = DateTime.Now.AddSeconds(600),
+                    Expire = DateTime.UtcNow.AddSeconds(600),
                 };
-                var queue = _deviceService.GetQueue(code);
-                queue.Add(cmd.ToJson());
+                ts.Add(_deviceService.SendCommand(online.Node, cmd, HttpContext.RequestAborted));
             }
         }
 
@@ -105,20 +94,16 @@ public async Task<ActionResult> Execute(String command, String argument)
         var ts = new List<Task<Int32>>();
         foreach (var item in SelectKeys)
         {
-            var online = FindById(item.ToInt());
+            var online = NodeOnline.FindById(item.ToInt());
             if (online != null && online.Node != null)
             {
-                //ts.Add(_starFactory.SendNodeCommand(online.Node.Code, command, argument, 30, 0));
                 var cmd = new CommandModel
                 {
-                    //Code = online.Node.Code,
                     Command = command,
                     Argument = argument,
-                    Expire = DateTime.Now.AddSeconds(30),
+                    Expire = DateTime.UtcNow.AddSeconds(30),
                 };
-                var queue = _deviceService.GetQueue(online.Node.Code);
-                queue.Add(cmd.ToJson());
-                ts.Add(Task.FromResult(1));
+                ts.Add(_deviceService.SendCommand(online.Node, cmd, HttpContext.RequestAborted));
             }
         }
 

diff --git a/Zero.Web/Services/NodeService.cs b/Zero.Web/Services/NodeService.cs
@@ -1,12 +1,12 @@
 using System.Reflection;
 using NewLife;
 using NewLife.Caching;
-using NewLife.Caching.Queues;
 using NewLife.Log;
 using NewLife.Remoting;
 using NewLife.Remoting.Extensions.Models;
 using NewLife.Remoting.Extensions.Services;
 using NewLife.Remoting.Models;
+using NewLife.Remoting.Services;
 using NewLife.Security;
 using NewLife.Serialization;
 using NewLife.Web;
@@ -21,6 +21,7 @@ public class NodeService : IDeviceService
 {
     private readonly ICacheProvider _cacheProvider;
     private readonly ICache _cache;
+    private readonly ISessionManager _sessionManager;
     private readonly IPasswordProvider _passwordProvider;
     private readonly ITokenSetting _setting;
     private readonly ITracer _tracer;
@@ -32,8 +33,9 @@ public class NodeService : IDeviceService
     /// <param name="cacheProvider"></param>
     /// <param name="setting"></param>
     /// <param name="tracer"></param>
-    public NodeService(IPasswordProvider passwordProvider, ICacheProvider cacheProvider, ITokenSetting setting, ITracer tracer)
+    public NodeService(ISessionManager sessionManager, IPasswordProvider passwordProvider, ICacheProvider cacheProvider, ITokenSetting setting, ITracer tracer)
     {
+        _sessionManager = sessionManager;
         _passwordProvider = passwordProvider;
         _cacheProvider = cacheProvider;
         _cache = cacheProvider.InnerCache;
@@ -84,7 +86,7 @@ public NodeService(IPasswordProvider passwordProvider, ICacheProvider cacheProvi
             }
         }
 
-        if (node == null) throw new ApiException(ApiCode.Unauthorized, "节点鉴权失败");
+        if (node == null) throw new ApiException(ApiCode.Unauthorized, "登录失败");
 
         node.Login(inf, ip);
 
@@ -93,7 +95,7 @@ public NodeService(IPasswordProvider passwordProvider, ICacheProvider cacheProvi
         olt.Save(inf, null, null, ip);
 
         // 登录历史
-        WriteHistory(node, source + "节点鉴权", true, $"[{node.Name}/{node.Code}]鉴权成功 " + inf.ToJson(false, false, false), ip);
+        WriteHistory(node, source + "登录", true, $"[{node.Name}/{node.Code}]登录成功 " + inf.ToJson(false, false, false), ip);
 
         var rs = new LoginResponse
         {
@@ -282,18 +284,11 @@ public Int32 RemoveOnline(Int32 deviceId, String ip)
     #endregion
 
     #region 下行通知
-    /// <summary>
-    /// 获取指定设备的命令队列
-    /// </summary>
-    /// <param name="deviceCode"></param>
+    /// <summary>发送命令</summary>
+    /// <param name="device"></param>
+    /// <param name="command"></param>
     /// <returns></returns>
-    public IProducerConsumer<String> GetQueue(String deviceCode)
-    {
-        var q = _cacheProvider.GetQueue<String>($"cmd:{deviceCode}");
-        if (q is QueueBase qb) qb.TraceName = "ServiceQueue";
-
-        return q;
-    }
+    public Task<Int32> SendCommand(IDeviceModel device, CommandModel command, CancellationToken cancellationToken) => _sessionManager.PublishAsync(device.Code, command, null, cancellationToken);
     #endregion
 
     #region 升级更新

diff --git a/Zero.Web/Zero.Web.csproj b/Zero.Web/Zero.Web.csproj
@@ -19,11 +19,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.4.2025.201" />
-    <PackageReference Include="NewLife.Cube.Core" Version="6.4.2025.203" />
-    <PackageReference Include="NewLife.Redis" Version="6.1.2025.202" />
-    <PackageReference Include="NewLife.Remoting.Extensions" Version="3.2.2025.201" />
-    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.3.2025.202" />
+    <PackageReference Include="NewLife.Core" Version="11.4.2025.301" />
+    <PackageReference Include="NewLife.Cube.Core" Version="6.4.2025.305" />
+    <PackageReference Include="NewLife.Redis" Version="6.1.2025.301" />
+    <PackageReference Include="NewLife.Remoting.Extensions" Version="3.3.2025.301" />
+    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.3.2025.301" />
   </ItemGroup>
 
   <ItemGroup>