10.11.17

src/Directory.Build.props

@@ -1,9 +1,9 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.11.15</PluginVersion>
-		<ProPluginVersion>10.11.15</ProPluginVersion>
-		<DefaultVersion>10.11.15</DefaultVersion>
+		<PluginVersion>10.11.17</PluginVersion>
+		<ProPluginVersion>10.11.17</ProPluginVersion>
+		<DefaultVersion>10.11.17</DefaultVersion>
 		<AuthenticationVersion>10.11.2</AuthenticationVersion>
 		<SourceGeneratorVersion>10.11.2</SourceGeneratorVersion>
 		<NET8Version>8.0.19</NET8Version>

src/Foundation/ThingsGateway.Foundation/Channel/Plugin/DtuPlugin.cs

@@ -101,7 +101,7 @@ public class DtuPlugin : PluginBase, ITcpReceivingPlugin
 
             if (len > 0)
             {
-                if (HeartbeatByte.Span.SequenceEqual(e.Reader.TotalSequence.Slice(0, len).First.Span))
+                if (HeartbeatByte.Span.SequenceEqual(e.Reader.TotalSequence.Slice(0, (int)Math.Min(len, e.Reader.BytesRemaining + e.Reader.BytesRead)).First.Span))
                 {
                     if (DateTimeOffset.Now - socket.LastSentTime < TimeSpan.FromMilliseconds(200))
                     {

src/Foundation/ThingsGateway.Foundation/Channel/Plugin/HeartbeatAndReceivePlugin.cs

@@ -181,7 +181,7 @@ internal sealed class HeartbeatAndReceivePlugin : PluginBase, ITcpConnectedPlugi
             var len = HeartbeatByte.Length;
             if (len > 0)
             {
-                if (HeartbeatByte.Span.SequenceEqual(e.Reader.TotalSequence.Slice(0, len).First.Span))
+                if (HeartbeatByte.Span.SequenceEqual(e.Reader.TotalSequence.Slice(0, (int)Math.Min(len, e.Reader.BytesRemaining + e.Reader.BytesRead)).First.Span))
                 {
                     e.Reader.Advance((int)Math.Min(len, e.Reader.BytesRemaining));
                     e.Handled = true;

src/Plugin/ThingsGateway.Foundation.Dlt645/Dlt645/Core/Dlt645_2007Send.cs

@@ -189,7 +189,7 @@ public class Dlt645_2007Send : ISendMessage
         lenSpan.WriteValue<byte>((byte)(length - 1));//数据域长度
 
         int num = 0;
-        for (int index = 0; index < byteBlock.WrittenCount; ++index)
+        for (int index = 0; index < byteBlock.WrittenCount - SendHeadCodeIndex; ++index)
             num += span[index];
         WriterExtension.WriteValue(ref byteBlock, (byte)num);//校验码,总加和
         WriterExtension.WriteValue(ref byteBlock, (byte)0x16);//结束符