g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-31 23:53:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

7.2.0.75

Browse Source
This commit is contained in:
Diego
2024-12-18 12:36:49 +08:00
parent 7e196e7aa6
commit 600a1bf201
11 changed files with 48 additions and 35 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>
<PropertyGroup>
<AdminVersion>7.2.0.50</AdminVersion>
<PluginVersion>9.0.2.50</PluginVersion>
<ProPluginVersion>9.0.2.73</ProPluginVersion>
<AdminVersion>7.2.0.51</AdminVersion>
<PluginVersion>9.0.2.51</PluginVersion>
<ProPluginVersion>9.0.2.74</ProPluginVersion>
</PropertyGroup>
<PropertyGroup>

4
src/Foundation/ThingsGateway.Foundation/Channel/IChannel.cs
View File

@@ -36,6 +36,10 @@ public interface IChannel : ISetupConfigObject, IDisposable, IClosableClient
/// </summary>
public bool Online { get; }
/// <summary>
/// MaxSign
/// </summary>
public int MaxSign { get; set; }
/// <summary>
/// 通道启动成功后
/// </summary>

1
src/Foundation/ThingsGateway.Foundation/Channel/SerialPortChannel.cs
View File

@@ -24,6 +24,7 @@ public class SerialPortChannel : SerialPortClient, IClientChannel
{
WaitHandlePool.MaxSign = ushort.MaxValue;
}
public int MaxSign { get => WaitHandlePool.MaxSign; set => WaitHandlePool.MaxSign = value; }
/// <inheritdoc/>
public ChannelReceivedEventHandler ChannelReceived { get; set; } = new();

1
src/Foundation/ThingsGateway.Foundation/Channel/TcpClientChannel.cs
View File

@@ -22,6 +22,7 @@ public class TcpClientChannel : TcpClient, IClientChannel
{
WaitHandlePool.MaxSign = ushort.MaxValue;
}
public int MaxSign { get => WaitHandlePool.MaxSign; set => WaitHandlePool.MaxSign = value; }
/// <inheritdoc/>
public ChannelReceivedEventHandler ChannelReceived { get; set; } = new();

6
src/Foundation/ThingsGateway.Foundation/Channel/TcpServiceChannel.cs
View File

@@ -188,9 +188,11 @@ public class TcpServiceChannel : TcpServiceChannelBase<TcpSessionClientChannel>,
/// <inheritdoc/>
protected override TcpSessionClientChannel NewClient()
{
return new TcpSessionClientChannel();
var data = new TcpSessionClientChannel();
data.WaitHandlePool.MaxSign = MaxSign;
return data;
}
public int MaxSign { get; set; }
/// <inheritdoc/>
protected override async Task OnTcpClosing(TcpSessionClientChannel socketClient, ClosingEventArgs e)
{

1
src/Foundation/ThingsGateway.Foundation/Channel/TcpSessionClientChannel.cs
View File

@@ -20,6 +20,7 @@ public class TcpSessionClientChannel : TcpSessionClient, IClientChannel
{
WaitHandlePool.MaxSign = ushort.MaxValue;
}
public int MaxSign { get => WaitHandlePool.MaxSign; set => WaitHandlePool.MaxSign = value; }
/// <inheritdoc/>
public ChannelReceivedEventHandler ChannelReceived { get; set; } = new();

3
src/Foundation/ThingsGateway.Foundation/Channel/UdpSessionChannel.cs
View File

@@ -22,6 +22,7 @@ public class UdpSessionChannel : UdpSession, IClientChannel
{
WaitHandlePool.MaxSign = ushort.MaxValue;
}
public int MaxSign { get => WaitHandlePool.MaxSign; set => WaitHandlePool.MaxSign = value; }
/// <inheritdoc/>
public ChannelReceivedEventHandler ChannelReceived { get; set; } = new();
@@ -52,7 +53,7 @@ public class UdpSessionChannel : UdpSession, IClientChannel
/// <summary>
/// 等待池
/// </summary>
public WaitHandlePool<MessageBase> WaitHandlePool { get; } = new();
public WaitHandlePool<MessageBase> WaitHandlePool { get; set; } = new();
/// <inheritdoc/>
public WaitLock WaitLock { get; } = new WaitLock();

2
src/FoundationVersion.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>9.0.2.36</Version>
<Version>9.0.2.37</Version>
</PropertyGroup>
<ItemGroup>

53
src/Gateway/ThingsGateway.Gateway.Application/ThingsGateway.Gateway.Application.csproj
View File

@@ -1,35 +1,38 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)Version.props" />
<Import Project="$(SolutionDir)PackNuget.props" />
<Import Project="$(SolutionDir)Version.props" />
<Import Project="$(SolutionDir)PackNuget.props" />
<ItemGroup>
<PackageReference Include="SqlSugar.TDengineCore" Version="4.18.0" />
<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SqlSugar.TDengineCore" Version="4.18.0" />
<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.8" />
<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.0.8" />
<ItemGroup>
<PackageReference Include="ThingsGateway.Admin.Application" Version="$(AdminVersion)" />
</ItemGroup>
</ItemGroup>
<ItemGroup>
<Content Remove="Locales\*.json" />
<EmbeddedResource Include="Locales\*.json">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="ThingsGateway.Admin.Application" Version="$(AdminVersion)" />
</ItemGroup>
<ItemGroup>
<Content Remove="SeedData\Gateway\*.json" />
<Content Include="SeedData\Gateway\*.json" Pack="true" PackagePath="\Content\SeedData\Gateway\">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Content Remove="Locales\*.json" />
<EmbeddedResource Include="Locales\*.json">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Content Remove="SeedData\Gateway\*.json" />
<Content Include="SeedData\Gateway\*.json" Pack="true" PackagePath="\Content\SeedData\Gateway\">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Foundation\ThingsGateway.CSScript\ThingsGateway.CSScript.csproj" />
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation\ThingsGateway.Foundation.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Foundation\ThingsGateway.CSScript\ThingsGateway.CSScript.csproj" />
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation\ThingsGateway.Foundation.csproj" />
</ItemGroup>
</Project>

4
src/Gateway/ThingsGateway.Gateway.Razor/ThingsGateway.Gateway.Razor.csproj
View File

@@ -4,8 +4,8 @@
<ItemGroup>
<ProjectReference Include="..\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj" />
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.5" />
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.7" />
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.1" />
<PackageReference Include="ThingsGateway.Admin.Razor" Version="$(AdminVersion)" />
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj" />
</ItemGroup>

2
src/Version.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>7.2.0.73</Version>
<Version>7.2.0.75</Version>
</PropertyGroup>
<ItemGroup>