From 22bd75dd3a2b0ff16f40867f07fd3a9864ed7bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=A4=A7=E7=9F=B3=E5=A4=B4?= Date: Sun, 13 Oct 2024 23:44:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7IPacket.Slice=EF=BC=8C?= =?UTF-8?q?=E6=98=8E=E7=A1=AE=E6=98=AF=E5=90=A6=E8=A6=81=E8=BD=AC=E7=A7=BB?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NewLife.Remoting/Http/HttpMessage.cs | 6 +++--- NewLife.Remoting/IEncoder.cs | 2 +- NewLife.Remoting/NewLife.Remoting.csproj | 2 +- Samples/IoTZero/IoTZero.csproj | 6 +++--- Samples/Zero.RpcServer/Zero.RpcServer.csproj | 2 +- Samples/ZeroServer/ZeroServer.csproj | 4 ++-- Test/Test.csproj | 2 +- XUnitTest/XUnitTest.csproj | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NewLife.Remoting/Http/HttpMessage.cs b/NewLife.Remoting/Http/HttpMessage.cs index ae493eb..6684565 100644 --- a/NewLife.Remoting/Http/HttpMessage.cs +++ b/NewLife.Remoting/Http/HttpMessage.cs @@ -69,8 +69,8 @@ public virtual Boolean Read(IPacket pk) var p = pk.GetSpan().IndexOf(NewLine); if (p < 0) return false; - Header = pk.Slice(0, p); - Payload = pk.Slice(p + 4); + Header = pk.Slice(0, p, false); + Payload = pk.Slice(p + 4, -1, false); return true; } @@ -115,7 +115,7 @@ public virtual IPacket ToPacket() if (Header == null) throw new ArgumentNullException(nameof(Header)); // 使用子数据区，不改变原来的头部对象 - var pk = Header.Slice(0, -1); + var pk = Header.Slice(0, -1, false); pk.Append(NewLine); //pk.Next = new[] { (Byte)'\r', (Byte)'\n' }; diff --git a/NewLife.Remoting/IEncoder.cs b/NewLife.Remoting/IEncoder.cs index a3403f3..85d166f 100644 --- a/NewLife.Remoting/IEncoder.cs +++ b/NewLife.Remoting/IEncoder.cs @@ -97,7 +97,7 @@ public virtual IPacket Encode(String action, Int32? code, IPacket? value) // 参数或结果。长度部分定长4字节 if (value != null) writer.Write(value.Total); - var pk2 = pk.Slice(8, writer.Position - 8); + var pk2 = pk.Slice(8, writer.Position - 8, true); if (value != null) pk2.Next = value; return pk2; diff --git a/NewLife.Remoting/NewLife.Remoting.csproj b/NewLife.Remoting/NewLife.Remoting.csproj index c9a9111..e30b2f0 100644 --- a/NewLife.Remoting/NewLife.Remoting.csproj +++ b/NewLife.Remoting/NewLife.Remoting.csproj @@ -52,7 +52,7 @@ - + diff --git a/Samples/IoTZero/IoTZero.csproj b/Samples/IoTZero/IoTZero.csproj index 151f832..1906ff9 100644 --- a/Samples/IoTZero/IoTZero.csproj +++ b/Samples/IoTZero/IoTZero.csproj @@ -19,11 +19,11 @@ - + - + - + diff --git a/Samples/Zero.RpcServer/Zero.RpcServer.csproj b/Samples/Zero.RpcServer/Zero.RpcServer.csproj index 1b4e331..03364f2 100644 --- a/Samples/Zero.RpcServer/Zero.RpcServer.csproj +++ b/Samples/Zero.RpcServer/Zero.RpcServer.csproj @@ -21,7 +21,7 @@ - + diff --git a/Samples/ZeroServer/ZeroServer.csproj b/Samples/ZeroServer/ZeroServer.csproj index 156a0ce..4613eaa 100644 --- a/Samples/ZeroServer/ZeroServer.csproj +++ b/Samples/ZeroServer/ZeroServer.csproj @@ -19,9 +19,9 @@ - + - + diff --git a/Test/Test.csproj b/Test/Test.csproj index 62f9c7e..e3c8352 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -10,7 +10,7 @@ - + diff --git a/XUnitTest/XUnitTest.csproj b/XUnitTest/XUnitTest.csproj index 9a690ab..15f0e71 100644 --- a/XUnitTest/XUnitTest.csproj +++ b/XUnitTest/XUnitTest.csproj @@ -12,7 +12,7 @@ - +