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

build: 10.11.99

Browse Source
This commit is contained in:
2248356998 qq.com
2025-10-13 22:11:05 +08:00
parent 301beda2a2
commit 5ee8b50a92
2 changed files with 7 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>
<PropertyGroup>
<PluginVersion>10.11.98</PluginVersion>
<ProPluginVersion>10.11.98</ProPluginVersion>
<DefaultVersion>10.11.98</DefaultVersion>
<PluginVersion>10.11.99</PluginVersion>
<ProPluginVersion>10.11.99</ProPluginVersion>
<DefaultVersion>10.11.99</DefaultVersion>
<AuthenticationVersion>10.11.6</AuthenticationVersion>
<SourceGeneratorVersion>10.11.6</SourceGeneratorVersion>
<NET8Version>8.0.20</NET8Version>

6
src/Foundation/ThingsGateway.Foundation/Device/DeviceBase.cs
View File

@@ -553,9 +553,9 @@ public abstract class DeviceBase : AsyncAndSyncDisposableObject, IDevice
return waitData.CompletedData;
var reusableTimeout = _reusableTimeouts.Get();
var cts = reusableTimeout.GetTokenSource(timeout, cancellationToken, Channel.ClosedToken);
try
{
var cts = reusableTimeout.GetTokenSource(timeout, cancellationToken, Channel.ClosedToken);
await waitData.WaitAsync(cts.Token).ConfigureAwait(false);
@@ -583,7 +583,9 @@ public abstract class DeviceBase : AsyncAndSyncDisposableObject, IDevice
else
{
var operResult = waitData.Check(reusableTimeout.TimeoutStatus);
return new MessageBase(operResult) { ErrorMessage = $"{operResult.ErrorMessage}, sign: {sign}" };
waitData.CompletedData.ErrorMessage = $"{operResult.ErrorMessage}, sign: {sign}";
return waitData.CompletedData;
//return new MessageBase(operResult) { ErrorMessage = $"{operResult.ErrorMessage}, sign: {sign}" };
}
}
catch (Exception ex)