CommandInModel增加StartTime，指定命令开始执行的未来时间

PeiKeSmart · Sep 25, 2024 · 377232c · 377232c
1 parent 0939876
commit 377232c
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 23 deletions.
diff --git a/DH.NRemoting.Extensions/WebHelper.cs b/DH.NRemoting.Extensions/WebHelper.cs
@@ -49,7 +49,7 @@ private static Uri GetRawUrl(Uri uri, Func<String, String> headers)
         if (port > 0 && port != 80 && port != 443)
         {
             uriInfo.Port = port;
-            uri = new Uri(uriInfo.ToString());
+            uri = new Uri(uriInfo.ToString()!);
         }
 
         return uri;

diff --git a/DH.NRemoting/ApiClient.cs b/DH.NRemoting/ApiClient.cs
@@ -189,7 +189,7 @@ protected virtual ICluster<String, ISocketClient> InitCluster()
         }
         finally
         {
-            Cluster.Put(client);
+            Cluster.Return(client);
         }
     }
 

diff --git a/DH.NRemoting/ClientPoolCluster.cs b/DH.NRemoting/ClientPoolCluster.cs
@@ -35,11 +35,11 @@ public class ClientPoolCluster<T> : ICluster<String, T> where T : class
 
     /// <summary>归还</summary>
     /// <param name="value"></param>
-    public virtual Boolean Put(T value)
+    public virtual Boolean Return(T value)
     {
         if (value == null) return false;
 
-        return Pool.Put(value);
+        return Pool.Return(value);
     }
 
     /// <summary>Round-Robin 负载均衡</summary>
@@ -98,6 +98,10 @@ public MyPool(ClientPoolCluster<T> cluster)
         }
 
         protected override T OnCreate() => Host.CreateClient();
+
+        /// <summary>释放时，返回是否有效。无效对象将会被抛弃</summary>
+        /// <param name="value"></param>
+        protected override Boolean OnReturn(T value) => value != null && (value is not IDisposable2 ds || !ds.Disposed);
     }
 
     #region 日志

diff --git a/DH.NRemoting/ClientSingleCluster.cs b/DH.NRemoting/ClientSingleCluster.cs
@@ -53,7 +53,7 @@ public virtual T Get()
 
     /// <summary>归还</summary>
     /// <param name="value"></param>
-    public virtual Boolean Put(T value) => true;
+    public virtual Boolean Return(T value) => true;
 
     /// <summary>Round-Robin 负载均衡</summary>
     private Int32 _index = -1;

diff --git a/DH.NRemoting/DH.NRemoting.csproj b/DH.NRemoting/DH.NRemoting.csproj
@@ -62,7 +62,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DH.NCore" Version="3.91.2024.923-beta0110" />
+    <PackageReference Include="DH.NCore" Version="3.91.2024.925-beta0627" />
   </ItemGroup>
 
 </Project>
diff --git a/DH.NRemoting/ICluster.cs b/DH.NRemoting/ICluster.cs
@@ -25,7 +25,7 @@ public interface ICluster<TKey, TValue>
 
     /// <summary>归还</summary>
     /// <param name="value"></param>
-    Boolean Put(TValue value);
+    Boolean Return(TValue value);
 }
 
 /// <summary>集群助手</summary>
@@ -47,7 +47,7 @@ public static TResult Invoke<TKey, TValue, TResult>(this ICluster<TKey, TValue>
         }
         finally
         {
-            cluster.Put(item);
+            cluster.Return(item);
         }
     }
 
@@ -67,7 +67,7 @@ public static async Task<TResult> InvokeAsync<TKey, TValue, TResult>(this IClust
         }
         finally
         {
-            cluster.Put(item);
+            cluster.Return(item);
         }
     }
 }
diff --git a/DH.NRemoting/Models/CommandInModel.cs b/DH.NRemoting/Models/CommandInModel.cs
@@ -12,6 +12,9 @@ public class CommandInModel
     /// <summary>参数</summary>
     public String? Argument { get; set; }
 
+    /// <summary>开始时间。多久之后开始执行，单位秒</summary>
+    public Int32 StartTime { get; set; }
+
     /// <summary>有效期。多久之后指令过期，单位秒，未指定时表示不限制</summary>
     public Int32 Expire { get; set; }
 

diff --git a/DH.NRemoting/WsClient.cs b/DH.NRemoting/WsClient.cs
@@ -175,7 +175,7 @@ protected virtual ICluster<String, WebSocket> InitCluster()
         }
         finally
         {
-            Cluster.Put(client);
+            Cluster.Return(client);
         }
     }
 

diff --git a/Samples/IoTZero/IoTZero.csproj b/Samples/IoTZero/IoTZero.csproj
@@ -19,11 +19,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DH.NCube.Core" Version="3.7.2024.921-beta0351" />
-    <PackageReference Include="DH.NIoT" Version="3.9.2024.9210003" />
-    <PackageReference Include="DH.NMQTT" Version="3.9.2024.9210003" />
-    <PackageReference Include="DH.NRedis" Version="3.91.2024.922-beta0349" />
-    <PackageReference Include="DH.NStardust.Extensions" Version="3.9.2024.9210003" />
+    <PackageReference Include="DH.NCube.Core" Version="3.91.2024.923-beta0331" />
+    <PackageReference Include="DH.NIoT" Version="3.91.2024.923-beta0343" />
+    <PackageReference Include="DH.NMQTT" Version="3.91.2024.923-beta0411" />
+    <PackageReference Include="DH.NRedis" Version="3.91.2024.923-beta0226" />
+    <PackageReference Include="DH.NStardust.Extensions" Version="3.91.2024.923-beta0321" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/Zero.RpcServer/Zero.RpcServer.csproj b/Samples/Zero.RpcServer/Zero.RpcServer.csproj
@@ -20,9 +20,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DH.NCode" Version="3.9.2024.9210003" />
-    <PackageReference Include="DH.NRedis" Version="3.91.2024.922-beta0349" />
-    <PackageReference Include="DH.NStardust" Version="3.9.2024.9210003" />
+    <PackageReference Include="DH.NCode" Version="3.91.2024.924-beta1257" />
+    <PackageReference Include="DH.NRedis" Version="3.91.2024.923-beta0226" />
+    <PackageReference Include="DH.NStardust" Version="3.91.2024.923-beta0321" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/ZeroServer/ZeroServer.csproj b/Samples/ZeroServer/ZeroServer.csproj
@@ -19,9 +19,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DH.NCube.Core" Version="3.7.2024.921-beta0351" />
-    <PackageReference Include="DH.NRedis" Version="3.91.2024.922-beta0349" />
-    <PackageReference Include="DH.NStardust.Extensions" Version="3.9.2024.9210003" />
+    <PackageReference Include="DH.NCube.Core" Version="3.91.2024.923-beta0331" />
+    <PackageReference Include="DH.NRedis" Version="3.91.2024.923-beta0226" />
+    <PackageReference Include="DH.NStardust.Extensions" Version="3.91.2024.923-beta0321" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/XUnitTest/JsonEncoderTests.cs b/XUnitTest/JsonEncoderTests.cs
@@ -67,7 +67,7 @@ public void EncodeRequest()
             var len = reader.ReadInt32();
             Assert.Equal(value.Total, len);
             var buf = reader.ReadBytes(len);
-            Assert.Equal(value.ToHex(64), buf.ToHex(64));
+            Assert.Equal(value.ToHex(64), buf.ToHex(null, 0, 64));
         }
     }
 
@@ -129,7 +129,7 @@ public void EncodeResponse()
             Assert.Equal(value.ToArray(), span);
 
             var hex1 = value.ToHex(64);
-            var hex2 = span.ToHex(64);
+            var hex2 = span.ToHex();
             Assert.Equal(hex1, hex2);
             //Assert.Equal(value.Count, (Int32)pk.Slice(1 + name.Length, 4).ReadUInt32());
             //Assert.Equal(value.ToHex(), pk.Slice(1 + name.Length + 4, value.Count).ToHex());