From 5ee8b50a92b7760f7ea84edd1154ff4fbc8cd30c Mon Sep 17 00:00:00 2001
From: "2248356998 qq.com" <2248356998@qq.com>
Date: Mon, 13 Oct 2025 22:11:05 +0800
Subject: [PATCH] build: 10.11.99

---
 src/Directory.Build.props                                   | 6 +++---
 .../ThingsGateway.Foundation/Device/DeviceBase.cs           | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 29468617f..60f7e961d 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -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>
diff --git a/src/Foundation/ThingsGateway.Foundation/Device/DeviceBase.cs b/src/Foundation/ThingsGateway.Foundation/Device/DeviceBase.cs
index a056a783a..24cea1a84 100644
--- a/src/Foundation/ThingsGateway.Foundation/Device/DeviceBase.cs
+++ b/src/Foundation/ThingsGateway.Foundation/Device/DeviceBase.cs
@@ -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)