更新logo

README.zh-CN.md

@@ -1,4 +1,7 @@
-# ThingsGateway
+
+<p align="center">
+<img src="logo.svg" width = "400" height = "200" alt="The name of the image" align=center />
+</p>
 
 [![star](https://gitee.com/ThingsGateway/ThingsGateway/badge/star.svg?theme=gvp)](https://gitee.com/ThingsGateway/ThingsGateway/stargazers) 
 [![star](https://img.shields.io/github/stars/ThingsGateway/ThingsGateway?logo=github)](https://github.com/ThingsGateway/ThingsGateway)

src/Admin/ThingsGateway.NewLife.X/ThingsGateway.NewLife.X.csproj

@@ -4,7 +4,7 @@
 	<Import Project="..\..\PackNuget.props" />
 
 	<PropertyGroup>
-		<TargetFrameworks>net47;netstandard2.0;net6.0;net6.0-windows;net8.0;$(OtherTargetFrameworks);net8.0-windows;</TargetFrameworks>
+		<TargetFrameworks>net462;netstandard2.0;net6.0;net6.0-windows;net8.0;$(OtherTargetFrameworks);net8.0-windows;</TargetFrameworks>
 		<AssemblyName>ThingsGateway.NewLife.X</AssemblyName>
 		<RootNamespace>ThingsGateway.NewLife</RootNamespace>
 		<AssemblyTitle>工具核心库</AssemblyTitle>
@@ -12,9 +12,10 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<SignAssembly>True</SignAssembly>
 		<AssemblyOriginatorKeyFile>newlife.snk</AssemblyOriginatorKeyFile>
+	</PropertyGroup>
 
-
-
+	<PropertyGroup>
+		<RestoreEnablePackagePruning Condition="'$(TargetFramework)' == 'net462' "> false</RestoreEnablePackagePruning>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -24,7 +25,7 @@
 		<None Remove="..\..\..\README.zh-CN.md" Pack="false" PackagePath="\" />
 	</ItemGroup>
 
-	<PropertyGroup Condition="'$(TargetFramework)'=='net47' or '$(TargetFramework)'=='net5.0-windows' or '$(TargetFramework)'=='net6.0-windows' or '$(TargetFramework)'=='net7.0-windows' or '$(TargetFramework)'=='net8.0-windows'">
+	<PropertyGroup Condition="'$(TargetFramework)'=='net462' or '$(TargetFramework)'=='net5.0-windows' or '$(TargetFramework)'=='net6.0-windows' or '$(TargetFramework)'=='net7.0-windows' or '$(TargetFramework)'=='net8.0-windows'">
 		<DefineConstants>__WIN__</DefineConstants>
 	</PropertyGroup>
 
@@ -35,11 +36,12 @@
 	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
 		<PackageReference Include="System.Memory" Version="4.6.3" />
 	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)'=='net47'">
+	<ItemGroup Condition="'$(TargetFramework)'=='net462'">
 		<PackageReference Include="System.Memory" Version="4.6.3" />
+		<PackageReference Include="System.ValueTuple" Version="4.6.1" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='net47'">
+	<ItemGroup Condition="'$(TargetFramework)'=='net462'">
 		<Using Include="System.Net.Http" />
 		<Reference Include="Microsoft.VisualBasic" />
 		<Reference Include="System.Management" />
@@ -54,10 +56,10 @@
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
 	</ItemGroup>
 
-	<PropertyGroup Condition="$(TargetFramework)=='net6.0'">
+	<PropertyGroup Condition="$(TargetFramework)=='net6.0' OR $(TargetFramework)=='net6.0-windows'">
 		<DefineConstants>$(DefineConstants);PLAT_THREADPOOLWORKITEM;PLAT_MRVTSC</DefineConstants>
 	</PropertyGroup>
-	<PropertyGroup Condition="$(TargetFramework)=='net8.0'">
+	<PropertyGroup Condition="$(TargetFramework)=='net8.0' OR $(TargetFramework)=='net8.0-windows'">
 		<DefineConstants>$(DefineConstants);PLAT_THREADPOOLWORKITEM;PLAT_MRVTSC</DefineConstants>
 	</PropertyGroup>
 
@@ -66,7 +68,7 @@
 		<IncludeAsyncInterfaces>true</IncludeAsyncInterfaces>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="$(TargetFramework)=='net47'">
+	<PropertyGroup Condition="$(TargetFramework)=='net462'">
 		<DefineConstants>$(DefineConstants);PLAT_MRVTSC</DefineConstants>
 		<IncludeAsyncInterfaces>true</IncludeAsyncInterfaces>
 	</PropertyGroup>

src/Admin/ThingsGateway.Photino.Blazor/ThingsGateway.Photino.Blazor.csproj

@@ -7,7 +7,6 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 		<PackageReference Include="Photino.NET" Version="4.0.16" />
 	</ItemGroup>
 

src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj

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

src/Directory.Build.props

@@ -1,9 +1,9 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.12.23</PluginVersion>
-		<ProPluginVersion>10.12.23</ProPluginVersion>
-		<DefaultVersion>10.12.23</DefaultVersion>
+		<PluginVersion>10.12.24</PluginVersion>
+		<ProPluginVersion>10.12.24</ProPluginVersion>
+		<DefaultVersion>10.12.24</DefaultVersion>
 		<AuthenticationVersion>10.11.7</AuthenticationVersion>
 		<SourceGeneratorVersion>10.11.7</SourceGeneratorVersion>
 		<NET8Version>8.0.21</NET8Version>

src/Gateway/ThingsGateway.Gateway.Application/Services/Alarm/AlarmTask.cs

@@ -509,34 +509,16 @@ internal sealed class AlarmTask : IDisposable
             {
                 scheduledTask.Change(100, 100);
             }
-
+            ParallelOptions.CancellationToken = cancellation;
             // 遍历设备变量列表
             if (!GlobalData.AlarmEnableIdVariables.IsEmpty)
             {
                 // 使用 Parallel.ForEach 执行指定的操作
-                Parallel.ForEach(GlobalData.AlarmEnableIdVariables, ParallelOptions, (item, state, index) =>
-            {
-                // 如果取消请求已经被触发，则结束任务
-                if (cancellation.IsCancellationRequested)
-                    return;
-
-                // 如果该变量的报警功能未启用，则跳过该变量
-                if (!item.Value.AlarmEnable)
-                    return;
-
-                // 如果该变量离线，则跳过该变量
-                if (!item.Value.IsOnline)
-                    return;
-
-                // 对该变量进行报警分析
-                AlarmAnalysis(item.Value);
-            });
+                Parallel.ForEach(GlobalData.AlarmEnableIdVariables, ParallelOptions, Analysis);
             }
 
             else
             {
-                //if (scheduledTask.Period != 5000)
-                //    scheduledTask.Change(0, 5000); // 如果没有启用报警的变量，则设置下次执行时间为5秒后
                 scheduledTask.SetNext(5000); // 如果没有启用报警的变量，则设置下次执行时间为5秒后
             }
 
@@ -552,6 +534,21 @@ internal sealed class AlarmTask : IDisposable
         }
     }
 
+    private static void Analysis(KeyValuePair<long, VariableRuntime> item, ParallelLoopState state, long index)
+    {
+        // 如果取消请求已经被触发，则结束任务
+        if (state.ShouldExitCurrentIteration)
+            return;
 
+        // 如果该变量的报警功能未启用，则跳过该变量
+        if (!item.Value.AlarmEnable)
+            return;
 
+        // 如果该变量离线，则跳过该变量
+        if (!item.Value.IsOnline)
+            return;
+
+        // 对该变量进行报警分析
+        AlarmAnalysis(item.Value);
+    }
 }