leftyer/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-12-06 08:38:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: ixcom29s插件在超出512字节时 缓冲区会改变，导致数据写入错误，改为最大值4096

Browse Source
This commit is contained in:
2248356998 qq.com
2025-10-31 12:27:15 +08:00
parent 694437c7d5
commit ce5fa0f37d
8 changed files with 11 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Admin/ThingsGateway.Common/ThingsGateway.Common.csproj
View File

@@ -14,7 +14,7 @@
<ItemGroup>
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.7" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
<PackageReference Include="BootstrapBlazor" Version="9.11.4" />
<PackageReference Include="BootstrapBlazor" Version="9.12.0" />
</ItemGroup>
<ItemGroup>

29
src/Admin/ThingsGateway.NewLife.X/PooledAwait/PooledAwait.csproj
View File

@@ -1,29 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\Foundation.props" />
<PropertyGroup>
<IncludeAsyncInterfaces>false</IncludeAsyncInterfaces>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework)=='net6.0'">
<DefineConstants>$(DefineConstants);PLAT_THREADPOOLWORKITEM;PLAT_MRVTSC</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework)=='net8.0'">
<DefineConstants>$(DefineConstants);PLAT_THREADPOOLWORKITEM;PLAT_MRVTSC</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework)=='netstandard2.0'">
<DefineConstants>$(DefineConstants);PLAT_MRVTSC</DefineConstants>
<IncludeAsyncInterfaces>true</IncludeAsyncInterfaces>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework)=='net462'">
<DefineConstants>$(DefineConstants);PLAT_MRVTSC</DefineConstants>
<IncludeAsyncInterfaces>true</IncludeAsyncInterfaces>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" Condition="$(IncludeAsyncInterfaces)=='true'" />
</ItemGroup>
</Project>

5
src/Admin/ThingsGateway.NewLife.X/PooledAwait/Properties/AssemblyInfo.cs
View File

@@ -1,5 +0,0 @@
using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Benchmark, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d136a87a0c11ded39332f7ead1f2ce53256a42a350ee847df1dc520bc781210a5f1fe73b3f91a4001fdcfa35340a212e70443de46e6928510f57a55f4ab9b95257f5067d4de4be8cdad460781866b20a6ca20f66302df61b52e55e16c080cad95aae8b94ffdd54718b9963d0240b0d0d5afe655b05c91771f7dc8a314387d3c3")]
[assembly: InternalsVisibleTo("PooledAwait.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d136a87a0c11ded39332f7ead1f2ce53256a42a350ee847df1dc520bc781210a5f1fe73b3f91a4001fdcfa35340a212e70443de46e6928510f57a55f4ab9b95257f5067d4de4be8cdad460781866b20a6ca20f66302df61b52e55e16c080cad95aae8b94ffdd54718b9963d0240b0d0d5afe655b05c91771f7dc8a314387d3c3")]

5
src/Admin/ThingsGateway.NewLife.X/ThingsGateway.NewLife.X.csproj
View File

@@ -52,10 +52,7 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
</ItemGroup>
<PropertyGroup Condition="$(TargetFramework)=='net6.0' OR $(TargetFramework)=='net6.0-windows'">
<DefineConstants>$(DefineConstants);PLAT_THREADPOOLWORKITEM;PLAT_MRVTSC</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework)=='net8.0' OR $(TargetFramework)=='net8.0-windows'">
<PropertyGroup Condition="$(TargetFramework)=='net6.0' OR $(TargetFramework)=='net6.0-windows' OR $(TargetFramework)=='net8.0' OR $(TargetFramework)=='net8.0-windows' OR $(TargetFramework)=='net10.0' OR $(TargetFramework)=='net10.0-windows'">
<DefineConstants>$(DefineConstants);PLAT_THREADPOOLWORKITEM;PLAT_MRVTSC</DefineConstants>
</PropertyGroup>

2
src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj
View File

@@ -24,7 +24,7 @@
<ItemGroup>
<PackageReference Include="SqlSugarCore.Dm" Version="8.8.2" />
<PackageReference Include="SqlSugarCore.Kdbndp" Version="9.3.7.1030" />
<PackageReference Include="SqlSugarCore.Kdbndp" Version="9.3.7.1031" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.20" />
<!--<PackageReference Include="Microsoft.Data.Sqlite" Version="$(NET10Version)" />-->
<PackageReference Include="MySqlConnector" Version="2.4.0" />

8
src/Directory.Build.props
View File

@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<PluginVersion>10.12.24</PluginVersion>
<ProPluginVersion>10.12.24</ProPluginVersion>
<DefaultVersion>10.12.24</DefaultVersion>
<PluginVersion>10.12.26</PluginVersion>
<ProPluginVersion>10.12.26</ProPluginVersion>
<DefaultVersion>10.12.26</DefaultVersion>
<AuthenticationVersion>10.11.7</AuthenticationVersion>
<SourceGeneratorVersion>10.11.7</SourceGeneratorVersion>
<NET8Version>8.0.21</NET8Version>
@@ -12,7 +12,7 @@
<IsTrimmable>false</IsTrimmable>
<ManagementProPluginVersion>10.11.87</ManagementProPluginVersion>
<ManagementPluginVersion>10.11.87</ManagementPluginVersion>
<TSVersion>4.0.0-rc.5</TSVersion>
<TSVersion>4.0.0-rc.10</TSVersion>
</PropertyGroup>

5
src/Foundation/ThingsGateway.Foundation/Extensions/ByteBlockExtension.cs
View File

@@ -428,8 +428,9 @@ where TWriter : IByteBlockWriter
}
public static int WriteNormalString(this Span<byte> span, string value, Encoding encoding)
public static int WriteNormalString(this Span<byte> span, string value, Encoding encoding=null)
{
encoding ??= Encoding.UTF8;
var maxSize = encoding.GetMaxByteCount(value.Length);
var chars = value.AsSpan();
@@ -439,7 +440,7 @@ where TWriter : IByteBlockWriter
{
fixed (byte* p1 = &span[0])
{
var len = Encoding.UTF8.GetBytes(p, chars.Length, p1, maxSize);
var len = encoding.GetBytes(p, chars.Length, p1, maxSize);
return len;
}
}

2
src/Plugin/ThingsGateway.Foundation.Benchmark/ThingsGateway.Foundation.Benchmark.csproj
View File

@@ -41,7 +41,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.15.4" />
<PackageReference Include="BenchmarkDotNet" Version="0.15.5" />
<PackageReference Include="NModbus" Version="3.0.81" />
<PackageReference Include="S7netplus" Version="0.20.0" />
<!--<PackageReference Include="ThingsGateway.Foundation.Modbus" Version="$(DefaultVersion)" />