g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-29 14:43:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

10.11.17

Browse Source
This commit is contained in:
2248356998 qq.com
2025-08-28 17:15:08 +08:00
parent 2fabbd236b
commit 4e6be23aac
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Directory.Build.props
View File

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

2
src/Foundation/ThingsGateway.Foundation/Channel/Plugin/DtuPlugin.cs
View File

@@ -101,7 +101,7 @@ public class DtuPlugin : PluginBase, ITcpReceivingPlugin
if (len > 0) 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)) if (DateTimeOffset.Now - socket.LastSentTime < TimeSpan.FromMilliseconds(200))
{ {

2
src/Foundation/ThingsGateway.Foundation/Channel/Plugin/HeartbeatAndReceivePlugin.cs
View File

@@ -181,7 +181,7 @@ internal sealed class HeartbeatAndReceivePlugin : PluginBase, ITcpConnectedPlugi
var len = HeartbeatByte.Length; var len = HeartbeatByte.Length;
if (len > 0) 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.Reader.Advance((int)Math.Min(len, e.Reader.BytesRemaining));
e.Handled = true; e.Handled = true;