build: 10.9.22

src/Directory.Build.props

@@ -1,10 +1,11 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.9.19</PluginVersion>
+		<PluginVersion>10.9.22</PluginVersion>
-		<ProPluginVersion>10.9.19</ProPluginVersion>
+		<ProPluginVersion>10.9.22</ProPluginVersion>
-		<AuthenticationVersion>2.9.9</AuthenticationVersion>
+		<DefaultVersion>10.9.22</DefaultVersion>
-		<SourceGeneratorVersion>10.9.9</SourceGeneratorVersion>
+		<AuthenticationVersion>2.9.12</AuthenticationVersion>
+		<SourceGeneratorVersion>10.9.12</SourceGeneratorVersion>
 		<NET8Version>8.0.17</NET8Version>
 		<NET9Version>9.0.6</NET9Version>
 		<SatelliteResourceLanguages>zh-Hans;en-US</SatelliteResourceLanguages>

src/Gateway/ThingsGateway.Gateway.Application/Common/Tasks/TaskSchedulerLoop.cs

@@ -20,7 +20,7 @@ public class TaskSchedulerLoop
             task.Start();
         }
     }
-
+    public bool Stoped => Tasks.All(a => !a.Enable);
     public void Stop()
     {
         foreach (var task in Tasks)

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheAlarm.cs

@@ -78,6 +78,7 @@ public abstract class BusinessBaseWithCacheAlarm : BusinessBaseWithCache
     {
         if (CurrentDevice?.Pause != false)
             return;
+        if (TaskSchedulerLoop.Stoped) return;
 
         if (AlarmModelEnable) return;
         // 如果业务属性的缓存为间隔上传，则不执行后续操作

src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheInterval.cs

@@ -248,6 +248,7 @@ public abstract class BusinessBaseWithCacheInterval : BusinessBaseWithCache
     {
         if (CurrentDevice?.Pause != false)
             return;
+        if (TaskSchedulerLoop.Stoped) return;
 
         if (!AlarmModelEnable) return;
         // 如果业务属性的缓存为间隔上传，则不执行后续操作
@@ -304,6 +305,7 @@ public abstract class BusinessBaseWithCacheInterval : BusinessBaseWithCache
     {
         if (CurrentDevice?.Pause != false)
             return;
+        if (TaskSchedulerLoop.Stoped) return;
         if (!DevModelEnable) return;
         // 如果业务属性的缓存为间隔上传，则不执行后续操作
         //if (_businessPropertyWithCacheInterval?.IsInterval != true)
@@ -324,6 +326,8 @@ public abstract class BusinessBaseWithCacheInterval : BusinessBaseWithCache
         if (CurrentDevice?.Pause != false)
             return;
         if (!VarModelEnable) return;
+        if (TaskSchedulerLoop.Stoped) return;
+
         // 如果业务属性的缓存为间隔上传，则不执行后续操作
         //if (_businessPropertyWithCacheInterval?.IsInterval != true)
         {

src/Plugin/ThingsGateway.Plugin.Modbus/ModbusSlave/ModbusSlave.cs

@@ -248,6 +248,7 @@ public class ModbusSlave : BusinessBase
     {
         if (CurrentDevice?.Pause != false)
             return;
+        if (TaskSchedulerLoop.Stoped) return;
         var address = variableRuntime.GetPropertyValue(DeviceId, nameof(_variablePropertys.ServiceAddress));
         if (address != null && variableRuntime.Value != null)
         {

src/Plugin/ThingsGateway.Plugin.OpcDa/OpcDaMaster/OpcDaMaster.cs

@@ -219,6 +219,7 @@ public class OpcDaMaster : CollectBase
         {
             if (CurrentDevice.Pause)
                 return;
+            if (TaskSchedulerLoop.Stoped) return;
             if (DisposedValue)
                 return;
             LogMessage?.Trace($"{ToString()} Change:{Environment.NewLine} {values?.ToSystemTextJsonString()}");
@@ -227,6 +228,7 @@ public class OpcDaMaster : CollectBase
             {
                 if (CurrentDevice.Pause)
                     return;
+                if (TaskSchedulerLoop.Stoped) return;
                 if (DisposedValue)
                     return;
                 var type = data.Value.GetType();
@@ -240,6 +242,7 @@ public class OpcDaMaster : CollectBase
                 {
                     if (CurrentDevice.Pause)
                         return;
+                    if (TaskSchedulerLoop.Stoped) return;
                     if (DisposedValue)
                         return;
                     var value = data.Value;

src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaMaster/OpcUaMaster.cs

@@ -363,12 +363,9 @@ public class OpcUaMaster : CollectBase
                 return;
             if (DisposedValue)
                 return;
+            if (TaskSchedulerLoop.Stoped) return;
 
 
-            if (CurrentDevice.Pause)
-            {
-                return;
-            }
 
             LogMessage?.Trace($"Change: {Environment.NewLine} {data.monitoredItem.StartNodeId} : {data.jToken?.ToString()}");
 
@@ -390,6 +387,7 @@ public class OpcUaMaster : CollectBase
                     return;
                 if (DisposedValue)
                     return;
+                if (TaskSchedulerLoop.Stoped) return;
 
                 if (isGood)
                 {

src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/OpcUaServer.cs

@@ -397,6 +397,7 @@ public partial class OpcUaServer : BusinessBase
     {
         if (CurrentDevice.Pause)
             return;
+        if (TaskSchedulerLoop.Stoped) return;
         if (DisposedValue) return;
         if (IdVariableRuntimes.ContainsKey(variableData.Id))
             CollectVariableRuntimes.AddOrUpdate(variableData.Id, id => variableData, (id, addValue) => variableData);

src/Version.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>10.9.19</Version>
+    <Version>$(DefaultVersion)</Version>
   </PropertyGroup>
 
   <ItemGroup>