10.8.17

fix: 变量自动刷新运行态
修改插件过期提示
2025-10-26 13:25:18 +08:00 · 2025-06-22 21:11:37 +08:00 · 2025-06-20 16:58:45 +08:00 · 2025-06-20 14:43:13 +08:00 · 2025-06-20 13:52:42 +08:00
93 changed files with 447 additions and 286 deletions
--- a/src/Admin/BlazorSetParametersAsyncGenerator/BlazorSetParametersAsyncGenerator.csproj
+++ b/src/Admin/BlazorSetParametersAsyncGenerator/BlazorSetParametersAsyncGenerator.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;</TargetFrameworks>
 		<Version>$(SourceGeneratorVersion)</Version>
--- a/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/SetParametersAsyncGenerator.cs
+++ b/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/SetParametersAsyncGenerator.cs
@@ -2,7 +2,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;

-namespace BlazorSetParametersAsyncGenerator;
+namespace Microsoft.AspNetCore.Components;

 [Generator]
 public partial class SetParametersAsyncGenerator : ISourceGenerator
@@ -11,7 +11,7 @@ public partial class SetParametersAsyncGenerator : ISourceGenerator
    private string m_DoNotGenerateSetParametersAsyncAttribute = """
        
        using System;
-        namespace BlazorSetParametersAsyncGenerator
+        namespace Microsoft.AspNetCore.Components
        {
            [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
            internal sealed class DoNotGenerateSetParametersAsyncAttribute : Attribute
@@ -25,7 +25,7 @@ public partial class SetParametersAsyncGenerator : ISourceGenerator
    private string m_GenerateSetParametersAsyncAttribute = """
        
        using System;
-        namespace BlazorSetParametersAsyncGenerator
+        namespace Microsoft.AspNetCore.Components
        {
            [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
            internal sealed class GenerateSetParametersAsyncAttribute : Attribute
@@ -40,7 +40,7 @@ public partial class SetParametersAsyncGenerator : ISourceGenerator
    private string m_GlobalGenerateSetParametersAsyncAttribute = """
        
        using System;
-        namespace BlazorSetParametersAsyncGenerator
+        namespace Microsoft.AspNetCore.Components
        {
            [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
            internal sealed class GlobalGenerateSetParametersAsyncAttribute : Attribute
@@ -445,8 +445,8 @@ namespace {namespaceName}
    private static IEnumerable<INamedTypeSymbol> GetCandidateClasses(SyntaxReceiver receiver, GeneratorExecutionContext context)
    {
        var compilation = context.Compilation;
-        var positiveAttributeSymbol = compilation.GetTypeByMetadataName("BlazorSetParametersAsyncGenerator.GenerateSetParametersAsyncAttribute");
-        var negativeAttributeSymbol = compilation.GetTypeByMetadataName("BlazorSetParametersAsyncGenerator.DoNotGenerateSetParametersAsyncAttribute");
+        var positiveAttributeSymbol = compilation.GetTypeByMetadataName("Microsoft.AspNetCore.Components.GenerateSetParametersAsyncAttribute");
+        var negativeAttributeSymbol = compilation.GetTypeByMetadataName("Microsoft.AspNetCore.Components.DoNotGenerateSetParametersAsyncAttribute");

        // loop over the candidate methods, and keep the ones that are actually annotated

@@ -454,7 +454,7 @@ namespace {namespaceName}
        var assemblyAttributes = compilation.Assembly.GetAttributes();

        var enableAttr = assemblyAttributes.FirstOrDefault(attr =>
-            attr.AttributeClass?.ToDisplayString() == "BlazorSetParametersAsyncGenerator.GlobalGenerateSetParametersAsyncAttribute");
+            attr.AttributeClass?.ToDisplayString() == "Microsoft.AspNetCore.Components.GlobalGenerateSetParametersAsyncAttribute");

        var globalEnable = false;
        if (enableAttr != null)
--- a/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/SourceGeneratorContextExtension.cs
+++ b/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/SourceGeneratorContextExtension.cs
@@ -3,7 +3,7 @@ using Microsoft.CodeAnalysis.Text;

 using System.Text;

-namespace BlazorSetParametersAsyncGenerator
+namespace Microsoft.AspNetCore.Components
 {
    internal static class SourceGeneratorContextExtension
    {
--- a/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/StringExtension.cs
+++ b/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/StringExtension.cs
@@ -1,7 +1,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;

-namespace BlazorSetParametersAsyncGenerator
+namespace Microsoft.AspNetCore.Components
 {
    internal static class StringExtension
    {
--- a/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/TypeSymbolExtension.cs
+++ b/src/Admin/BlazorSetParametersAsyncGenerator/SourceGenerator/TypeSymbolExtension.cs
@@ -1,6 +1,6 @@
 using Microsoft.CodeAnalysis;

-namespace BlazorSetParametersAsyncGenerator
+namespace Microsoft.AspNetCore.Components
 {
    public static class TypeSymbolExtension
    {
--- a/src/Admin/ThingsGateway.Admin.Application/ThingsGateway.Admin.Application.csproj
+++ b/src/Admin/ThingsGateway.Admin.Application/ThingsGateway.Admin.Application.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />

 	<PropertyGroup>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
@@ -18,7 +18,7 @@
 	</ItemGroup>
 	
 	<ItemGroup>
-		<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
+		<PackageReference Include="Rougamo.Fody" Version="5.0.1" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
@@ -41,12 +41,20 @@
 	<ItemGroup>
 		<None Include="..\README.md" Pack="true" PackagePath="\" />
 		<None Include="..\README.zh-CN.md" Pack="true" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.md" Pack="false" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.zh-CN.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.zh-CN.md" Pack="false" PackagePath="\" />
 	</ItemGroup>

 	<ItemGroup>
 		<ProjectReference Include="..\ThingsGateway.DB\ThingsGateway.DB.csproj" />
 	</ItemGroup>

+
+	<!--<Target Name="Mapster" AfterTargets="AfterBuild">
+		<Exec WorkingDirectory="$(ProjectDir)" Command="dotnet tool restore" />
+		<Exec WorkingDirectory="$(ProjectDir)" Command="dotnet mapster extension -o MapsterGenerator -a &quot;$(TargetDir)$(ProjectName).dll&quot;" />
+		<Exec WorkingDirectory="$(ProjectDir)" Command="dotnet mapster mapper -o MapsterGenerator -a &quot;$(TargetDir)$(ProjectName).dll&quot;" />
+	</Target>-->
+
+	
 </Project>
--- a/src/Admin/ThingsGateway.Admin.Razor/GlobalUsings.cs
+++ b/src/Admin/ThingsGateway.Admin.Razor/GlobalUsings.cs
@@ -19,4 +19,4 @@ global using System.Diagnostics.CodeAnalysis;
 global using ThingsGateway.Razor;

 [assembly: SuppressMessage("Reliability", "CA2007", Justification = "<挂起>", Scope = "module")]
-[assembly: BlazorSetParametersAsyncGenerator.GlobalGenerateSetParametersAsync(true)]
+[assembly: GlobalGenerateSetParametersAsync(true)]
--- a/src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj
+++ b/src/Admin/ThingsGateway.Admin.Razor/ThingsGateway.Admin.Razor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">

-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />

 	<ItemGroup>
 		<ProjectReference Include="..\ThingsGateway.Admin.Application\ThingsGateway.Admin.Application.csproj" />
@@ -30,8 +30,8 @@
 	<ItemGroup>
 		<None Include="..\README.md" Pack="true" PackagePath="\" />
 		<None Include="..\README.zh-CN.md" Pack="true" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.md" Pack="false" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.zh-CN.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.zh-CN.md" Pack="false" PackagePath="\" />
 	</ItemGroup>


--- a/src/Admin/ThingsGateway.AdminServer/ThingsGateway.AdminServer.csproj
+++ b/src/Admin/ThingsGateway.AdminServer/ThingsGateway.AdminServer.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

-	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="..\..\Version.props" />


 	<PropertyGroup>
--- a/src/Admin/ThingsGateway.DB/ThingsGateway.DB.csproj
+++ b/src/Admin/ThingsGateway.DB/ThingsGateway.DB.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />

 	<PropertyGroup>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
@@ -17,8 +17,8 @@
 	<ItemGroup>
 		<None Include="..\README.md" Pack="true" PackagePath="\" />
 		<None Include="..\README.zh-CN.md" Pack="true" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.md" Pack="false" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.zh-CN.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.zh-CN.md" Pack="false" PackagePath="\" />
 	</ItemGroup>

 	<ItemGroup>
--- a/src/Admin/ThingsGateway.Furion/ObjectMapper/Extensions/ObjectMapperServiceCollectionExtensions.cs
+++ b/src/Admin/ThingsGateway.Furion/ObjectMapper/Extensions/ObjectMapperServiceCollectionExtensions.cs
@@ -46,6 +46,8 @@ public static class ObjectMapperServiceCollectionExtensions
        // 获取全局映射配置
        var config = TypeAdapterConfig.GlobalSettings;

+        //config.Compiler = exp => exp.CompileFast();
+
        // 扫描所有继承  IRegister 接口的对象映射配置
        if (assemblies?.Length > 0) config.Scan(assemblies);

--- a/src/Admin/ThingsGateway.Furion/ThingsGateway.Furion.csproj
+++ b/src/Admin/ThingsGateway.Furion/ThingsGateway.Furion.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />

 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
@@ -36,6 +36,7 @@

 	<ItemGroup>
 		<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
+		<!--<PackageReference Include="FastExpressionCompiler" Version="5.3.0" />-->
 		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 		<PackageReference Include="Mapster" Version="7.4.0" />
 		<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.5.4" />
@@ -61,8 +62,8 @@
 	<ItemGroup>
 		<None Include="README.md" Pack="true" PackagePath="\" />
 		<None Include="README.zh-CN.md" Pack="true" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.md" Pack="false" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.zh-CN.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.zh-CN.md" Pack="false" PackagePath="\" />
 	</ItemGroup>
 	
 </Project>
--- a/src/Admin/ThingsGateway.NewLife.X/ThingsGateway.NewLife.X.csproj
+++ b/src/Admin/ThingsGateway.NewLife.X/ThingsGateway.NewLife.X.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />

 	<PropertyGroup>
 		<TargetFrameworks>net462;netstandard2.0;net6.0;net6.0-windows;net8.0;net8.0-windows;</TargetFrameworks>
@@ -16,8 +16,8 @@
 	<ItemGroup>
 		<None Include="README.md" Pack="true" PackagePath="\" />
 		<None Include="README.zh-CN.md" Pack="true" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.md" Pack="false" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.zh-CN.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.zh-CN.md" Pack="false" PackagePath="\" />
 	</ItemGroup>

 	<PropertyGroup Condition="'$(TargetFramework)'=='net462' or '$(TargetFramework)'=='net5.0-windows' or '$(TargetFramework)'=='net6.0-windows' or '$(TargetFramework)'=='net7.0-windows' or '$(TargetFramework)'=='net8.0-windows'">
--- a/src/Admin/ThingsGateway.Photino.Blazor/ThingsGateway.Photino.Blazor.csproj
+++ b/src/Admin/ThingsGateway.Photino.Blazor/ThingsGateway.Photino.Blazor.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />

 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
--- a/src/Admin/ThingsGateway.Razor/BaseLayout.razor.cs
+++ b/src/Admin/ThingsGateway.Razor/BaseLayout.razor.cs
@@ -13,7 +13,7 @@ namespace ThingsGateway.Razor;
 /// <summary>
 /// 母版页基类
 /// </summary>
-[BlazorSetParametersAsyncGenerator.DoNotGenerateSetParametersAsync]
+[DoNotGenerateSetParametersAsync]
 public partial class BaseLayout
 {
 }
--- a/src/Admin/ThingsGateway.Razor/GlobalUsings.cs
+++ b/src/Admin/ThingsGateway.Razor/GlobalUsings.cs
@@ -21,4 +21,4 @@ global using System.Globalization;


 [assembly: SuppressMessage("Reliability", "CA2007", Justification = "<挂起>", Scope = "module")]
-[assembly: BlazorSetParametersAsyncGenerator.GlobalGenerateSetParametersAsync(true)]
+[assembly: GlobalGenerateSetParametersAsync(true)]
--- a/src/Admin/ThingsGateway.Razor/ThingsGateway.Razor.csproj
+++ b/src/Admin/ThingsGateway.Razor/ThingsGateway.Razor.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0</TargetFrameworks>
 	</PropertyGroup>
@@ -20,8 +20,8 @@
 	<ItemGroup>
 		<None Include="..\README.md" Pack="true" PackagePath="\" />
 		<None Include="..\README.zh-CN.md" Pack="true" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.md" Pack="false" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.zh-CN.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.zh-CN.md" Pack="false" PackagePath="\" />
 	</ItemGroup>

 	<ItemGroup>
--- a/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj
+++ b/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />

 	<PropertyGroup>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
@@ -13,8 +13,8 @@
 	<ItemGroup>
 		<None Include="..\README.md" Pack="true" PackagePath="\" />
 		<None Include="..\README.zh-CN.md" Pack="true" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.md" Pack="false" PackagePath="\" />
-		<None Remove="$(SolutionDir)..\README.zh-CN.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.md" Pack="false" PackagePath="\" />
+		<None Remove="..\..\..\README.zh-CN.md" Pack="false" PackagePath="\" />
 	</ItemGroup>

 	<ItemGroup>
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,12 +1,13 @@
 <Project>

 	<PropertyGroup>
-		<PluginVersion>10.8.10</PluginVersion>
-		<ProPluginVersion>10.8.10</ProPluginVersion>
-		<AuthenticationVersion>2.8.0</AuthenticationVersion>
-		<SourceGeneratorVersion>10.8.2</SourceGeneratorVersion>
+		<PluginVersion>10.8.17</PluginVersion>
+		<ProPluginVersion>10.8.17</ProPluginVersion>
+		<AuthenticationVersion>2.8.2</AuthenticationVersion>
+		<SourceGeneratorVersion>10.8.4</SourceGeneratorVersion>
 		<NET8Version>8.0.17</NET8Version>
 		<NET9Version>9.0.6</NET9Version>
+		<SatelliteResourceLanguages>zh-Hans;en-US</SatelliteResourceLanguages>
 	</PropertyGroup>

 	<PropertyGroup>
@@ -41,7 +42,7 @@
 	</PropertyGroup>

 	<ItemGroup>
-		<None Include="$(SolutionDir)Directory.Build.props" Pack="true" PackagePath="\" />
+		<None Include="$(MSBuildThisFileDirectory)Directory.Build.props" Pack="true" PackagePath="\" />
 	</ItemGroup>

 	<PropertyGroup>
--- a/src/Foundation.props
+++ b/src/Foundation.props
@@ -4,6 +4,6 @@
 	</PropertyGroup>

 	<ItemGroup>
-		<None Include="$(SolutionDir)Foundation.props" Pack="true" PackagePath="\" />
+		<None Include="$(MSBuildThisFileDirectory)Foundation.props" Pack="true" PackagePath="\" />
 	</ItemGroup>
 </Project>
--- a/src/Foundation/ThingsGateway.CSScript/ThingsGateway.CSScript.csproj
+++ b/src/Foundation/ThingsGateway.CSScript/ThingsGateway.CSScript.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)PackNuget.props" />
-	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="..\..\PackNuget.props" />
+	<Import Project="..\..\Version.props" />

 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;</TargetFrameworks>
--- a/src/Foundation/ThingsGateway.Foundation.Razor/GlobalUsings.cs
+++ b/src/Foundation/ThingsGateway.Foundation.Razor/GlobalUsings.cs
@@ -19,4 +19,4 @@ global using ThingsGateway.Razor;

 [assembly: SuppressMessage("Reliability", "CA2007", Justification = "<挂起>", Scope = "module")]

-[assembly: BlazorSetParametersAsyncGenerator.GlobalGenerateSetParametersAsync(true)]
+[assembly: GlobalGenerateSetParametersAsync(true)]
--- a/src/Foundation/ThingsGateway.Foundation.Razor/ThingsGateway.Foundation.Razor.csproj
+++ b/src/Foundation/ThingsGateway.Foundation.Razor/ThingsGateway.Foundation.Razor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">

-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 		<!--<UseRazorSourceGenerator>false</UseRazorSourceGenerator>-->
--- a/src/Foundation/ThingsGateway.Foundation.Variable/ThingsGateway.Foundation.Variable.csproj
+++ b/src/Foundation/ThingsGateway.Foundation.Variable/ThingsGateway.Foundation.Variable.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\PackNuget.props" />

 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;</TargetFrameworks>
--- a/src/Foundation/ThingsGateway.Foundation/Device/DeviceBase.cs
+++ b/src/Foundation/ThingsGateway.Foundation/Device/DeviceBase.cs
@@ -509,18 +509,11 @@ public abstract class DeviceBase : DisposableObject, IDevice
    }

    /// <inheritdoc/>
-    protected virtual async ValueTask<MessageBase> SendThenReturnMessageBaseAsync(ISendMessage command, IClientChannel clientChannel = default, CancellationToken cancellationToken = default)
+    protected virtual ValueTask<MessageBase> SendThenReturnMessageBaseAsync(ISendMessage command, IClientChannel clientChannel = default, CancellationToken cancellationToken = default)
    {
-        try
-        {

-            return await GetResponsedDataAsync(command, clientChannel, Timeout, cancellationToken).ConfigureAwait(false);
+        return GetResponsedDataAsync(command, clientChannel, Timeout, cancellationToken);

-        }
-        catch (Exception ex)
-        {
-            return new(ex);
-        }
    }

    /// <summary>
@@ -996,4 +989,6 @@ public abstract class DeviceBase : DisposableObject, IDevice
        }
        return a => { };
    }
+    public abstract ValueTask<OperResult<byte[]>> ReadAsync(object state, CancellationToken cancellationToken = default);
+
 }
--- a/src/Foundation/ThingsGateway.Foundation/Device/IDevice.cs
+++ b/src/Foundation/ThingsGateway.Foundation/Device/IDevice.cs
@@ -466,4 +466,5 @@ public interface IDevice : IDisposable
    /// <param name="channel">通道</param>
    /// <param name="deviceLog">单独设备日志</param>
    void InitChannel(IChannel channel, ILog? deviceLog = null);
+    ValueTask<OperResult<byte[]>> ReadAsync(object state, CancellationToken cancellationToken = default);
 }
--- a/src/Foundation/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj
+++ b/src/Foundation/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)Foundation.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
-	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="..\..\Foundation.props" />
+	<Import Project="..\..\PackNuget.props" />
+	<Import Project="..\..\Version.props" />

 	<PropertyGroup>
 		<Description>工业设备通讯协议-基础类库</Description>
--- a/src/Foundation/ThingsGateway.Foundation/Variable/IVariableSource.cs
+++ b/src/Foundation/ThingsGateway.Foundation/Variable/IVariableSource.cs
@@ -30,6 +30,11 @@ public interface IVariableSource
    /// </summary>
    string RegisterAddress { get; set; }

+    /// <summary>
+    /// 变量地址
+    /// </summary>
+    object AddressObject { get; set; }
+
    /// <summary>
    /// IntervalTime
    /// </summary>
--- a/src/Foundation/ThingsGateway.Foundation/Variable/VariableSourceClass.cs
+++ b/src/Foundation/ThingsGateway.Foundation/Variable/VariableSourceClass.cs
@@ -36,6 +36,8 @@ public class VariableSourceClass : IVariableSource
    /// </summary>
    public IEnumerable<IVariable> VariableRuntimes => _variableRuntimes;

+    public object AddressObject { get; set; }
+
    /// <inheritdoc/>
    public virtual void AddVariable(IVariable variable)
    {
--- a/src/Gateway/ThingsGateway.Blazor.Diagrams.Core/ThingsGateway.Blazor.Diagrams.Core.csproj
+++ b/src/Gateway/ThingsGateway.Blazor.Diagrams.Core/ThingsGateway.Blazor.Diagrams.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />

 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
@@ -8,8 +8,8 @@

 	<ItemGroup>

-		<None Remove="$(SolutionDir)..\README.md" />
-		<None Remove="$(SolutionDir)..\README.zh-CN.md" />
+		<None Remove="..\..\..\README.md" />
+		<None Remove="..\..\..\README.zh-CN.md" />

 		<None Include="README.md" Pack="true" PackagePath="\" />
 		<None Include="README.zh-CN.md" Pack="true" PackagePath="\" />
--- a/src/Gateway/ThingsGateway.Blazor.Diagrams/GlobalUsings.cs
+++ b/src/Gateway/ThingsGateway.Blazor.Diagrams/GlobalUsings.cs
@@ -11,4 +11,4 @@

 global using Microsoft.AspNetCore.Components;

-[assembly: BlazorSetParametersAsyncGenerator.GlobalGenerateSetParametersAsync(true)]
+[assembly: GlobalGenerateSetParametersAsync(true)]
--- a/src/Gateway/ThingsGateway.Blazor.Diagrams/ThingsGateway.Blazor.Diagrams.csproj
+++ b/src/Gateway/ThingsGateway.Blazor.Diagrams/ThingsGateway.Blazor.Diagrams.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />

 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
@@ -9,8 +9,8 @@

 	<ItemGroup>

-		<None Remove="$(SolutionDir)..\README.md" />
-		<None Remove="$(SolutionDir)..\README.zh-CN.md" />
+		<None Remove="..\..\..\README.md" />
+		<None Remove="..\..\..\README.zh-CN.md" />

 		<None Include="README.md" Pack="true" PackagePath="\" />
 		<None Include="README.zh-CN.md" Pack="true" PackagePath="\" />
--- a/src/Gateway/ThingsGateway.Gateway.Application/Common/Tasks/TaskSchedulerLoop.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Common/Tasks/TaskSchedulerLoop.cs
@@ -29,4 +29,13 @@ public class TaskSchedulerLoop
        }
    }

+    public void Add(IScheduledTask task)
+    {
+        Tasks.Add(task);
+    }
+    public void Remove(IScheduledTask task)
+    {
+        Tasks.Remove(task);
+    }
+
 }
--- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectBase.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectBase.cs
@@ -127,6 +127,24 @@ public abstract class CollectBase : DriverBase, IRpcDriver
            LogMessage?.LogWarning(ex, string.Format(AppResource.GetMethodError, ex.Message));
        }

+
+        if (VariableTasks.Count > 0)
+        {
+            foreach (var item in VariableTasks)
+            {
+                item.Stop();
+                TaskSchedulerLoop.Remove(item);
+            }
+
+            VariableTasks = AddVariableTask(cancellationToken);
+
+            foreach (var item in VariableTasks)
+            {
+                TaskSchedulerLoop.Add(item);
+                item.Start();
+            }
+        }
+
        // 根据标签获取方法信息的局部函数
        List<VariableMethod> GetMethod(IEnumerable<VariableRuntime> tag)
        {
@@ -165,16 +183,28 @@ public abstract class CollectBase : DriverBase, IRpcDriver
        return string.Empty;
    }
    protected virtual bool VariableSourceReadsEnable => true;
+
+    protected List<IScheduledTask> VariableTasks = new List<IScheduledTask>();
    protected override List<IScheduledTask> ProtectedGetTasks(CancellationToken cancellationToken)
    {
        var tasks = new List<IScheduledTask>();

-        var setDeviceStatusTask = new ScheduledSyncTask(3000, SetDeviceStatus, null, LogMessage, cancellationToken);
+        var setDeviceStatusTask = new ScheduledSyncTask(10000, SetDeviceStatus, null, LogMessage, cancellationToken);
        tasks.Add(setDeviceStatusTask);

        var testOnline = new ScheduledAsyncTask(30000, TestOnline, null, LogMessage, cancellationToken);
        tasks.Add(testOnline);

+        VariableTasks = AddVariableTask(cancellationToken);
+
+        tasks.AddRange(VariableTasks);
+        return tasks;
+
+    }
+
+    protected List<IScheduledTask> AddVariableTask(CancellationToken cancellationToken)
+    {
+        List<IScheduledTask> variableTasks = new();
        if (VariableSourceReadsEnable)
        {
            for (int i = 0; i < CurrentDevice.VariableSourceReads.Count; i++)
@@ -182,7 +212,7 @@ public abstract class CollectBase : DriverBase, IRpcDriver
                var variableSourceRead = CurrentDevice.VariableSourceReads[i];

                var executeTask = ScheduledTaskHelper.GetTask(variableSourceRead.IntervalTime, ReadVariableSource, variableSourceRead, LogMessage, cancellationToken);
-                tasks.Add(executeTask);
+                variableTasks.Add(executeTask);

            }
        }
@@ -192,7 +222,7 @@ public abstract class CollectBase : DriverBase, IRpcDriver
            var variableMethod = CurrentDevice.ReadVariableMethods[i];

            var executeTask = ScheduledTaskHelper.GetTask(variableMethod.IntervalTime, ReadVariableMed, variableMethod, LogMessage, cancellationToken);
-            tasks.Add(executeTask);
+            variableTasks.Add(executeTask);

        }

@@ -201,12 +231,11 @@ public abstract class CollectBase : DriverBase, IRpcDriver
            var variableScriptRead = CurrentDevice.VariableScriptReads[i];

            var executeTask = ScheduledTaskHelper.GetTask(variableScriptRead.IntervalTime, ScriptVariableRun, variableScriptRead, LogMessage, cancellationToken);
-            tasks.Add(executeTask);
+            variableTasks.Add(executeTask);

        }

-        return tasks;
-
+        return variableTasks;
    }

    private void SetDeviceStatus(object? state, CancellationToken cancellationToken)
@@ -220,7 +249,8 @@ public abstract class CollectBase : DriverBase, IRpcDriver
            }
            else
            {
-                CurrentDevice.SetDeviceStatus(TimerX.Now);
+                if (IdVariableRuntimes.All(a => !a.Value.IsOnline))
+                    CurrentDevice.SetDeviceStatus(TimerX.Now, true);
            }
        }
        else if (IsStarted)
--- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectFoundationBase.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectFoundationBase.cs
@@ -137,8 +137,9 @@ public abstract class CollectFoundationBase : CollectBase

            if (cancellationToken.IsCancellationRequested)
                return new(new OperationCanceledException());
+
            // 从协议读取数据
-            var read = await FoundationDevice.ReadAsync(variableSourceRead.RegisterAddress, variableSourceRead.Length, cancellationToken).ConfigureAwait(false);
+            var read = await FoundationDevice.ReadAsync(variableSourceRead.AddressObject, cancellationToken).ConfigureAwait(false);

            // 如果读取成功且有有效内容，则解析结构化内容
            if (read.IsSuccess)
--- a/src/Gateway/ThingsGateway.Gateway.Application/Driver/DriverBase.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Driver/DriverBase.cs
@@ -399,6 +399,7 @@ public abstract class DriverBase : DisposableObject, IDriver
            stringBuilder.Append("   ");
            if (expireTime.HasValue && (DateTime.Now - expireTime.Value).TotalHours > -72)
            {
+                stringBuilder.Append(',');
                stringBuilder.Append(Localizer["ExpireTime", expireTime.Value.ToString("yyyy-MM-dd HH")]);
            }

--- a/src/Gateway/ThingsGateway.Gateway.Application/Locales/en-US.json
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Locales/en-US.json
@@ -55,7 +55,7 @@
  "ThingsGateway.Management.Authentication": {
    "AuthName": "AuthName",
    "Authorized": "Authorized",
-    "ExpireTime": "ExpireTime",
+    "ExpireTime": "ExpireTime {0}",
    "Password": "Password",
    "Register": "Register",
    "RegisterStatus": "RegisterStatus",
@@ -373,7 +373,7 @@

  "ThingsGateway.Gateway.Application.DriverBase": {
    "Authorized": "Authorized",
-    "ExpireTime": "ExpireTime",
+    "ExpireTime": "ExpireTime {0}",
    "Unauthorized": "Unauthorized"
  },
  "ThingsGateway.Gateway.Application.ExportString": {
--- a/src/Gateway/ThingsGateway.Gateway.Application/Locales/zh-CN.json
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Locales/zh-CN.json
@@ -53,7 +53,7 @@
  "ThingsGateway.Management.Authentication": {
    "AuthName": "公司名称",
    "Authorized": "已授权",
-    "ExpireTime": "过期时间",
+    "ExpireTime": "过期时间 {0}",
    "Password": "注册码",
    "Register": "注册",
    "RegisterStatus": "注册状态",
@@ -374,7 +374,7 @@

  "ThingsGateway.Gateway.Application.DriverBase": {
    "Authorized": "已授权",
-    "ExpireTime": "过期时间",
+    "ExpireTime": "过期时间 {0}",
    "Unauthorized": "未授权"
  },
  "ThingsGateway.Gateway.Application.ExportString": {
--- a/src/Gateway/ThingsGateway.Gateway.Application/Model/VariableSourceRead.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Model/VariableSourceRead.cs
@@ -32,6 +32,7 @@ public class VariableSourceRead : IVariableSource
    /// 读取地址
    /// </summary>
    public string RegisterAddress { get; set; }
+    public object AddressObject { get; set; }

    public string IntervalTime { get; set; }

--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/DeviceManage/DeviceThreadManage.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/DeviceManage/DeviceThreadManage.cs
@@ -414,6 +414,12 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
                   }
               }

+
+               if (DriverTasks.TryRemove(deviceId, out var task))
+               {
+                   task.Stop();
+               }
+
               // 取消驱动程序的操作
               if (CancellationTokenSources.TryRemove(deviceId, out var token))
               {
@@ -424,10 +430,6 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
                   }
               }

-               if (DriverTasks.TryRemove(deviceId, out var task))
-               {
-                   task.Stop();
-               }

           });

--- a/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableRuntimeService.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableRuntimeService.cs
@@ -176,20 +176,20 @@ public class VariableRuntimeService : IVariableRuntimeService
            var datas = await GlobalData.VariableService.InsertTestDataAsync(testVariableCount, testDeviceCount, slaveUrl, businessEnable).ConfigureAwait(false);

            {
-                var newChannelRuntimes = (datas.Item1).Adapt<List<ChannelRuntime>>();
+                var newChannelRuntimes = datas.Item1.Adapt<List<ChannelRuntime>>();

                //批量修改之后，需要重新加载通道
                RuntimeServiceHelper.Init(newChannelRuntimes);

                {

-                    var newDeviceRuntimes = (datas.Item2).Adapt<List<DeviceRuntime>>();
+                    var newDeviceRuntimes = datas.Item2.Adapt<List<DeviceRuntime>>();

                    RuntimeServiceHelper.Init(newDeviceRuntimes);

                }
                {
-                    var newVariableRuntimes = (datas.Item3).Adapt<List<VariableRuntime>>();
+                    var newVariableRuntimes = datas.Item3.Adapt<List<VariableRuntime>>();
                    RuntimeServiceHelper.Init(newVariableRuntimes);

                }
--- a/src/Gateway/ThingsGateway.Gateway.Application/ThingsGateway.Gateway.Application.csproj
+++ b/src/Gateway/ThingsGateway.Gateway.Application/ThingsGateway.Gateway.Application.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
-		<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
+		<PackageReference Include="Rougamo.Fody" Version="5.0.1" />
 		<PackageReference Include="TouchSocket.Dmtp" Version="3.1.8" />
 		<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.1.8" />
 		<PackageReference Include="ThingsGateway.Authentication" Version="$(AuthenticationVersion)" />
--- a/src/Gateway/ThingsGateway.Gateway.Razor/GlobalUsings.cs
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/GlobalUsings.cs
@@ -20,4 +20,4 @@ global using ThingsGateway.Razor;

 [assembly: SuppressMessage("Reliability", "CA2007", Justification = "<挂起>", Scope = "module")]

-[assembly: BlazorSetParametersAsyncGenerator.GlobalGenerateSetParametersAsync(true)]
+[assembly: GlobalGenerateSetParametersAsync(true)]
--- a/src/Gateway/ThingsGateway.Gateway.Razor/ThingsGateway.Gateway.Razor.csproj
+++ b/src/Gateway/ThingsGateway.Gateway.Razor/ThingsGateway.Gateway.Razor.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />

 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
--- a/src/PackNuget.props
+++ b/src/PackNuget.props
@@ -3,7 +3,7 @@
 	<PropertyGroup>

 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
-		<PackageOutputPath>$(SolutionDir)..\..\nupkgs</PackageOutputPath>
+		<PackageOutputPath>$(MSBuildThisFileDirectory)..\..\nupkgs</PackageOutputPath>
 		<PackageVersion>$(Version)</PackageVersion>
 		<PackageTags>ThingsGateway;Diego;Blazor;IOT;设备采集;边缘网关;物联网</PackageTags>
 		<PackageProjectUrl>https://gitee.com/diego2098/ThingsGateway</PackageProjectUrl>
@@ -19,13 +19,13 @@


 	<ItemGroup>
-		<None Include="$(SolutionDir)PackNuget.props" Pack="true" PackagePath="\" />
+		<None Include="$(MSBuildThisFileDirectory)PackNuget.props" Pack="true" PackagePath="\" />
 	</ItemGroup>

 	<ItemGroup>
-		<None Include="$(SolutionDir)..\README.md" Pack="true" PackagePath="\" />
-		<None Include="$(SolutionDir)..\README.zh-CN.md" Pack="true" PackagePath="\" />
-		<None Include="$(SolutionDir)..\LICENSE" Pack="true" PackagePath="\" />
-		<None Include="$(SolutionDir)..\icon.png" Pack="true" PackagePath="\" />
+		<None Include="$(MSBuildThisFileDirectory)..\README.md" Pack="true" PackagePath="\" />
+		<None Include="$(MSBuildThisFileDirectory)..\README.zh-CN.md" Pack="true" PackagePath="\" />
+		<None Include="$(MSBuildThisFileDirectory)..\LICENSE" Pack="true" PackagePath="\" />
+		<None Include="$(MSBuildThisFileDirectory)..\icon.png" Pack="true" PackagePath="\" />
 	</ItemGroup>
 </Project>
--- a/src/Plugin/ThingsGateway.Debug.Photino/ThingsGateway.Debug.Photino.csproj
+++ b/src/Plugin/ThingsGateway.Debug.Photino/ThingsGateway.Debug.Photino.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="..\..\Version.props" />


 	<PropertyGroup>
--- a/src/Plugin/ThingsGateway.Debug.Razor/GlobalUsings.cs
+++ b/src/Plugin/ThingsGateway.Debug.Razor/GlobalUsings.cs
@@ -12,4 +12,4 @@ global using Microsoft.AspNetCore.Components;

 global using ThingsGateway.Razor;

-[assembly: BlazorSetParametersAsyncGenerator.GlobalGenerateSetParametersAsync(true)]
+[assembly: GlobalGenerateSetParametersAsync(true)]
--- a/src/Plugin/ThingsGateway.Debug.Razor/ThingsGateway.Debug.Razor.csproj
+++ b/src/Plugin/ThingsGateway.Debug.Razor/ThingsGateway.Debug.Razor.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 		<!--<UseRazorSourceGenerator>false</UseRazorSourceGenerator>-->
--- a/src/Plugin/ThingsGateway.Foundation.Dlt645/Dlt645/Dlt645_2007Master.cs
+++ b/src/Plugin/ThingsGateway.Foundation.Dlt645/Dlt645/Dlt645_2007Master.cs
@@ -44,7 +44,7 @@ public class Dlt645_2007Master : DtuServiceDeviceBase
    /// <param name="dateTime">时间</param>
    /// <param name="cancellationToken">取消令箭</param>
    /// <returns></returns>
-    public async ValueTask<OperResult> BroadcastTimeAsync(DateTime dateTime, CancellationToken cancellationToken = default)
+    public ValueTask<OperResult> BroadcastTimeAsync(DateTime dateTime, CancellationToken cancellationToken = default)
    {
        try
        {
@@ -53,40 +53,30 @@ public class Dlt645_2007Master : DtuServiceDeviceBase
            dAddress.Station = str.HexStringToBytes();
            dAddress.DataId = "999999999999".HexStringToBytes();

-            return await Dlt645SendAsync(dAddress, ControlCode.BroadcastTime, FEHead, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return Dlt645SendAsync(dAddress, ControlCode.BroadcastTime, FEHead, cancellationToken: cancellationToken);
        }
        catch (Exception ex)
        {
-            return new OperResult(ex);
+            return EasyValueTask.FromResult(new OperResult(ex));
        }
    }

    /// <inheritdoc/>
-    public async ValueTask<OperResult<byte[]>> Dlt645RequestAsync(Dlt645_2007Address dAddress, ControlCode controlCode, string feHead, byte[] codes = default, string[] datas = default, CancellationToken cancellationToken = default)
+    public ValueTask<OperResult<byte[]>> Dlt645RequestAsync(Dlt645_2007Address dAddress, ControlCode controlCode, string feHead, byte[] codes = default, string[] datas = default, CancellationToken cancellationToken = default)
    {
-        try
-        {
-            return await SendThenReturnAsync(GetSendMessage(dAddress, controlCode, feHead, codes, datas), cancellationToken).ConfigureAwait(false);
-        }
-        catch (Exception ex)
-        {
-            return new OperResult<byte[]>(ex);
-        }
+
+        return SendThenReturnAsync(GetSendMessage(dAddress, controlCode, feHead, codes, datas), cancellationToken);
+
    }

    /// <inheritdoc/>
-    public async ValueTask<OperResult> Dlt645SendAsync(Dlt645_2007Address dAddress, ControlCode controlCode, string feHead, byte[] codes = default, string[] datas = default, CancellationToken cancellationToken = default)
+    public ValueTask<OperResult> Dlt645SendAsync(Dlt645_2007Address dAddress, ControlCode controlCode, string feHead, byte[] codes = default, string[] datas = default, CancellationToken cancellationToken = default)
    {
-        try
-        {

-            return await SendAsync(GetSendMessage(dAddress, controlCode, feHead, codes, datas), cancellationToken).ConfigureAwait(false);

-        }
-        catch (Exception ex)
-        {
-            return new OperResult<byte[]>(ex);
-        }
+        return SendAsync(GetSendMessage(dAddress, controlCode, feHead, codes, datas), cancellationToken);
+
+
    }

    /// <summary>
@@ -147,7 +137,7 @@ public class Dlt645_2007Master : DtuServiceDeviceBase
    /// <inheritdoc/>
    public override List<T> LoadSourceRead<T>(IEnumerable<IVariable> deviceVariables, int maxPack, string defaultIntervalTime)
    {
-        return PackHelper.LoadSourceRead<T>(this, deviceVariables, maxPack, defaultIntervalTime);
+        return PackHelper.LoadSourceRead<T>(this, deviceVariables, maxPack, Station, defaultIntervalTime);
    }

    /// <inheritdoc/>
@@ -163,7 +153,19 @@ public class Dlt645_2007Master : DtuServiceDeviceBase
            return EasyValueTask.FromResult(new OperResult<byte[]>(ex));
        }
    }
+    public override ValueTask<OperResult<byte[]>> ReadAsync(object state, CancellationToken cancellationToken = default)
+    {

+        if (state is Dlt645_2007Address dlt645_2007Address)
+        {
+            return Dlt645RequestAsync(dlt645_2007Address, ControlCode.Read, FEHead, cancellationToken: cancellationToken);
+        }
+        else
+        {
+            return EasyValueTask.FromResult(new OperResult<byte[]>(new ArgumentException("State must be of type Dlt645_2007Address", nameof(state))));
+        }
+
+    }
    /// <summary>
    /// 读取通信地址
    /// </summary>
@@ -231,16 +233,16 @@ public class Dlt645_2007Master : DtuServiceDeviceBase
    }

    /// <inheritdoc/>
-    public override async ValueTask<OperResult> WriteAsync(string address, string value, IThingsGatewayBitConverter bitConverter = null, CancellationToken cancellationToken = default)
+    public override ValueTask<OperResult> WriteAsync(string address, string value, IThingsGatewayBitConverter bitConverter = null, CancellationToken cancellationToken = default)
    {
        try
        {
            string[] strArray = value.SplitStringBySemicolon();
-            return await WriteAsync(address, value, bitConverter, cancellationToken).ConfigureAwait(false);
+            return WriteAsync(address, value, bitConverter, cancellationToken);
        }
        catch (Exception ex)
        {
-            return new OperResult<byte[]>(ex);
+            return EasyValueTask.FromResult(new OperResult(ex));
        }
    }

--- a/src/Plugin/ThingsGateway.Foundation.Dlt645/Dlt645/Helper/PackHelper.cs
+++ b/src/Plugin/ThingsGateway.Foundation.Dlt645/Dlt645/Helper/PackHelper.cs
@@ -18,9 +18,10 @@ internal static class PackHelper
    /// <param name="device"></param>
    /// <param name="deviceVariables"></param>
    /// <param name="maxPack">最大打包长度</param>
+    /// <param name="station">station</param>
    /// <param name="defaultIntervalTime">默认间隔时间</param>
    /// <returns></returns>
-    public static List<T> LoadSourceRead<T>(IDevice device, IEnumerable<IVariable> deviceVariables, int maxPack, string defaultIntervalTime) where T : IVariableSource, new()
+    public static List<T> LoadSourceRead<T>(IDevice device, IEnumerable<IVariable> deviceVariables, int maxPack, string station, string defaultIntervalTime) where T : IVariableSource, new()
    {
        var byteConverter = device.ThingsGatewayBitConverter;
        var result = new List<T>();
@@ -42,6 +43,7 @@ internal static class PackHelper
            var r = new T()
            {
                RegisterAddress = item.Key!,
+                AddressObject = Dlt645_2007Address.ParseFrom(item.Key, station),
                Length = 1,
                IntervalTime = string.IsNullOrWhiteSpace(item.FirstOrDefault().IntervalTime) ? defaultIntervalTime : item.FirstOrDefault().IntervalTime,
            };
--- a/src/Plugin/ThingsGateway.Foundation.Dlt645/ThingsGateway.Foundation.Dlt645.csproj
+++ b/src/Plugin/ThingsGateway.Foundation.Dlt645/ThingsGateway.Foundation.Dlt645.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<Import Project="$(SolutionDir)Foundation.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
-	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="..\..\Foundation.props" />
+	<Import Project="..\..\PackNuget.props" />
+	<Import Project="..\..\Version.props" />
 	<PropertyGroup>
 		<Description>工业设备通讯协议-Dlt645协议</Description>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
--- a/src/Plugin/ThingsGateway.Foundation.Modbus/Helper/PackHelper.cs
+++ b/src/Plugin/ThingsGateway.Foundation.Modbus/Helper/PackHelper.cs
@@ -167,6 +167,7 @@ public static class PackHelper
                IntervalTime = intervalTime,
                // 将当前组打包地址中的起始地址作为实际打包报文中的起始地址
                RegisterAddress = startAddress.ToString(),
+                AddressObject = new ModbusAddress(startAddress) { Length = (ushort)sourceLen },
                Length = sourceLen.ToInt()
            };

--- a/src/Plugin/ThingsGateway.Foundation.Modbus/Master/ModbusMaster.cs
+++ b/src/Plugin/ThingsGateway.Foundation.Modbus/Master/ModbusMaster.cs
@@ -98,31 +98,64 @@ public partial class ModbusMaster : DtuServiceDeviceBase, IModbusAddress
        return PackHelper.LoadSourceRead<T>(this, deviceVariables, maxPack, defaultIntervalTime, Station);
    }

-    public async ValueTask<OperResult<byte[]>> ModbusRequestAsync(ModbusAddress mAddress, bool read, CancellationToken cancellationToken = default)
+    public override ValueTask<OperResult<byte[]>> ReadAsync(object state, CancellationToken cancellationToken = default)
    {
        try
        {
-            return await SendThenReturnAsync(GetSendMessage(mAddress, read),
-             cancellationToken).ConfigureAwait(false);
+            if (state is ModbusAddress mAddress)
+            {
+                return ModbusReadAsync(mAddress, cancellationToken);
+            }
+            else
+            {
+                return EasyValueTask.FromResult(new OperResult<byte[]>(new ArgumentException("State must be of type ModbusAddress", nameof(state))));
+            }
        }
        catch (Exception ex)
        {
-            return new OperResult<byte[]>(ex);
+            return EasyValueTask.FromResult(new OperResult<byte[]>(ex));
+        }
+    }
+
+    public ValueTask<OperResult<byte[]>> ModbusReadAsync(ModbusAddress mAddress, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            return SendThenReturnAsync(GetSendMessage(mAddress, true),
+             cancellationToken);
+        }
+        catch (Exception ex)
+        {
+            return EasyValueTask.FromResult(new OperResult<byte[]>(ex));
+        }
+    }
+
+
+    public ValueTask<OperResult<byte[]>> ModbusRequestAsync(ModbusAddress mAddress, bool read, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            return SendThenReturnAsync(GetSendMessage(mAddress, read),
+             cancellationToken);
+        }
+        catch (Exception ex)
+        {
+            return EasyValueTask.FromResult(new OperResult<byte[]>(ex));
        }
    }

    /// <inheritdoc/>
-    public override async ValueTask<OperResult<byte[]>> ReadAsync(string address, int length, CancellationToken cancellationToken = default)
+    public override ValueTask<OperResult<byte[]>> ReadAsync(string address, int length, CancellationToken cancellationToken = default)
    {
        try
        {
            var mAddress = GetModbusAddress(address, Station);
            mAddress.Length = (ushort)length;
-            return await ModbusRequestAsync(mAddress, true, cancellationToken).ConfigureAwait(false);
+            return ModbusRequestAsync(mAddress, true, cancellationToken);
        }
        catch (Exception ex)
        {
-            return new OperResult<byte[]>(ex);
+            return EasyValueTask.FromResult(new OperResult<byte[]>(ex));
        }
    }

--- a/src/Plugin/ThingsGateway.Foundation.Modbus/Slave/ModbusSlave.cs
+++ b/src/Plugin/ThingsGateway.Foundation.Modbus/Slave/ModbusSlave.cs
@@ -310,6 +310,34 @@ public class ModbusSlave : DeviceBase, IModbusAddress
            return EasyValueTask.FromResult(new OperResult<byte[]>(result));
        }
    }
+
+    public override ValueTask<OperResult<byte[]>> ReadAsync(object state, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            if (state is ModbusAddress mAddress)
+            {
+                var result = ModbusRequest(mAddress, true, cancellationToken);
+                if (result.IsSuccess)
+                {
+                    return EasyValueTask.FromResult(new OperResult<byte[]>() { Content = result.Content.ToArray() });
+                }
+                else
+                {
+                    return EasyValueTask.FromResult(new OperResult<byte[]>(result));
+                }
+            }
+            else
+            {
+                return EasyValueTask.FromResult(new OperResult<byte[]>(new ArgumentException("State must be of type ModbusAddress", nameof(state))));
+            }
+        }
+        catch (Exception ex)
+        {
+            return EasyValueTask.FromResult(new OperResult<byte[]>(ex));
+        }
+    }
+
    public virtual ModbusAddress GetModbusAddress(string address, byte? station, bool isCache = true)
    {
        var mAddress = ModbusAddress.ParseFrom(address, station, isCache);
--- a/src/Plugin/ThingsGateway.Foundation.Modbus/ThingsGateway.Foundation.Modbus.csproj
+++ b/src/Plugin/ThingsGateway.Foundation.Modbus/ThingsGateway.Foundation.Modbus.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<Import Project="$(SolutionDir)Foundation.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
-	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="..\..\Foundation.props" />
+	<Import Project="..\..\PackNuget.props" />
+	<Import Project="..\..\Version.props" />
 	<PropertyGroup>
 		<Description>工业设备通讯协议-Modbus协议</Description>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
--- a/src/Plugin/ThingsGateway.Foundation.OpcDa/ThingsGateway.Foundation.OpcDa.csproj
+++ b/src/Plugin/ThingsGateway.Foundation.OpcDa/ThingsGateway.Foundation.OpcDa.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<Import Project="$(SolutionDir)PackNuget.props" />
-	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="..\..\PackNuget.props" />
+	<Import Project="..\..\Version.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net462;netstandard2.0;net6.0;</TargetFrameworks>
 		<Description>工业设备通讯协议-OpcDa协议</Description>
--- a/src/Plugin/ThingsGateway.Foundation.OpcUa/ThingsGateway.Foundation.OpcUa.csproj
+++ b/src/Plugin/ThingsGateway.Foundation.OpcUa/ThingsGateway.Foundation.OpcUa.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">


-	<Import Project="$(SolutionDir)PackNuget.props" />
-	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="..\..\PackNuget.props" />
+	<Import Project="..\..\Version.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net48;netstandard2.1;net6.0;</TargetFrameworks>
 		<Description>工业设备通讯协议-OpcUa协议</Description>
--- a/src/Plugin/ThingsGateway.Foundation.SiemensS7/S7/Helper/PackHelper.cs
+++ b/src/Plugin/ThingsGateway.Foundation.SiemensS7/S7/Helper/PackHelper.cs
@@ -230,6 +230,7 @@ internal static class PackHelper
            {
                IntervalTime = intervalTime, // 设置时间戳
                RegisterAddress = tempAddresses.OrderBy(it => it.AddressStart).First().ToString(), // 获取地址并按地址排序
+                AddressObject = new SiemensS7Address(tempAddresses.OrderBy(it => it.AddressStart).First()) { Length = sourceLen },
                Length = sourceLen // 设置源长度
            };

--- a/src/Plugin/ThingsGateway.Foundation.SiemensS7/S7/SiemensS7Master.cs
+++ b/src/Plugin/ThingsGateway.Foundation.SiemensS7/S7/SiemensS7Master.cs
@@ -298,6 +298,26 @@ public partial class SiemensS7Master : DeviceBase
        }
    }

+    public override ValueTask<OperResult<byte[]>> ReadAsync(object state, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            if (state is SiemensS7Address sAddress)
+            {
+                return S7ReadAsync([sAddress], cancellationToken);
+            }
+            else
+            {
+                return EasyValueTask.FromResult(new OperResult<byte[]>(new ArgumentException("State must be of type SiemensS7Address", nameof(state))));
+            }
+        }
+        catch (Exception ex)
+        {
+            return EasyValueTask.FromResult(new OperResult<byte[]>(ex));
+        }
+    }
+
+
    /// <inheritdoc/>
    public override async ValueTask<OperResult> WriteAsync(string address, byte[] value, DataTypeEnum dataType, CancellationToken cancellationToken = default)
    {
--- a/src/Plugin/ThingsGateway.Foundation.SiemensS7/ThingsGateway.Foundation.SiemensS7.csproj
+++ b/src/Plugin/ThingsGateway.Foundation.SiemensS7/ThingsGateway.Foundation.SiemensS7.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<Import Project="$(SolutionDir)Foundation.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
-	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="..\..\Foundation.props" />
+	<Import Project="..\..\PackNuget.props" />
+	<Import Project="..\..\Version.props" />
 	<PropertyGroup>
 		<Description>工业设备通讯协议-SiemensS7协议</Description>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
--- a/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.cs
@@ -25,7 +25,7 @@ namespace ThingsGateway.Plugin.QuestDB;
 /// <summary>
 /// QuestDBProducer
 /// </summary>
-public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableModel<QuestDBHistoryValue>, IDBHistoryValueService
+public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableModel<VariableBasicData>, IDBHistoryValueService
 {
    internal readonly RealDBProducerProperty _driverPropertys = new();
    private readonly QuestDBProducerVariableProperty _variablePropertys = new();
--- a/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.other.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.other.cs
@@ -23,11 +23,11 @@ namespace ThingsGateway.Plugin.QuestDB;
 /// <summary>
 /// RabbitMQProducer
 /// </summary>
-public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableModel<QuestDBHistoryValue>
+public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableModel<VariableBasicData>
 {
    private TypeAdapterConfig _config;

-    protected override ValueTask<OperResult> UpdateVarModel(IEnumerable<CacheDBItem<QuestDBHistoryValue>> item, CancellationToken cancellationToken)
+    protected override ValueTask<OperResult> UpdateVarModel(IEnumerable<CacheDBItem<VariableBasicData>> item, CancellationToken cancellationToken)
    {
        return UpdateVarModel(item.Select(a => a.Value).OrderBy(a => a.Id), cancellationToken);
    }
@@ -41,7 +41,7 @@ public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableMode
        UpdateVariable(variableRuntime, variable);
        base.VariableChange(variableRuntime, variable);
    }
-    protected override ValueTask<OperResult> UpdateVarModels(IEnumerable<QuestDBHistoryValue> item, CancellationToken cancellationToken)
+    protected override ValueTask<OperResult> UpdateVarModels(IEnumerable<VariableBasicData> item, CancellationToken cancellationToken)
    {
        return UpdateVarModel(item, cancellationToken);
    }
@@ -56,18 +56,18 @@ public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableMode

            foreach (var group in varGroup)
            {
-                AddQueueVarModel(new CacheDBItem<List<QuestDBHistoryValue>>(group.Adapt<List<QuestDBHistoryValue>>(_config)));
+                AddQueueVarModel(new CacheDBItem<List<VariableBasicData>>(group.ToList()));
            }
            foreach (var variable in varList)
            {
-                AddQueueVarModel(new CacheDBItem<QuestDBHistoryValue>(variable.Adapt<QuestDBHistoryValue>(_config)));
+                AddQueueVarModel(new CacheDBItem<VariableBasicData>(variable));
            }
        }
        else
        {
            foreach (var variable in variables)
            {
-                AddQueueVarModel(new CacheDBItem<QuestDBHistoryValue>(variable.Adapt<QuestDBHistoryValue>(_config)));
+                AddQueueVarModel(new CacheDBItem<VariableBasicData>(variable));
            }
        }
    }
@@ -78,15 +78,15 @@ public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableMode
        if (_driverPropertys.GroupUpdate && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
        {

-            AddQueueVarModel(new CacheDBItem<List<QuestDBHistoryValue>>(variableRuntimeGroup.Adapt<List<QuestDBHistoryValue>>(_config)));
+            AddQueueVarModel(new CacheDBItem<List<VariableBasicData>>(variableRuntimeGroup.Adapt<List<VariableBasicData>>(_config)));

        }
        else
        {
-            AddQueueVarModel(new CacheDBItem<QuestDBHistoryValue>(variableRuntime.Adapt<QuestDBHistoryValue>(_config)));
+            AddQueueVarModel(new CacheDBItem<VariableBasicData>(variable));
        }
    }
-    private async ValueTask<OperResult> UpdateVarModel(IEnumerable<QuestDBHistoryValue> item, CancellationToken cancellationToken)
+    private async ValueTask<OperResult> UpdateVarModel(IEnumerable<VariableBasicData> item, CancellationToken cancellationToken)
    {
        var result = await InserableAsync(item.WhereIf(_driverPropertys.OnlineFilter, a => a.IsOnline == true).ToList(), cancellationToken).ConfigureAwait(false);
        if (success != result.IsSuccess)
@@ -101,7 +101,7 @@ public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableMode

    #region 方法

-    private async ValueTask<OperResult> InserableAsync(List<QuestDBHistoryValue> dbInserts, CancellationToken cancellationToken)
+    private async ValueTask<OperResult> InserableAsync(List<VariableBasicData> dbInserts, CancellationToken cancellationToken)
    {
        try
        {
@@ -118,8 +118,8 @@ public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableMode
            {
                Stopwatch stopwatch = new();
                stopwatch.Start();
-
-                var result = await _db.Insertable(dbInserts).AS(_driverPropertys.TableName).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);//不要加分表
+                var data = dbInserts.Adapt<List<QuestDBHistoryValue>>();
+                var result = await _db.Insertable(data).AS(_driverPropertys.TableName).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);//不要加分表
                stopwatch.Stop();

                //var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
--- a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDBProducer.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDBProducer.cs
@@ -25,7 +25,7 @@ namespace ThingsGateway.Plugin.SqlDB;
 /// <summary>
 /// SqlDBProducer
 /// </summary>
-public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<SQLHistoryValue>, IDBHistoryValueService
+public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<VariableBasicData>, IDBHistoryValueService
 {
    internal readonly SqlDBProducerProperty _driverPropertys = new();
    private readonly SqlDBProducerVariableProperty _variablePropertys = new();
@@ -236,7 +236,7 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
                var varList = RealTimeVariables.ToListWithDequeue();
                if (varList.Count > 0)
                {
-                    var result = await UpdateAsync(varList.Adapt<List<SQLRealValue>>(), cancellationToken).ConfigureAwait(false);
+                    var result = await UpdateAsync(varList, cancellationToken).ConfigureAwait(false);
                    if (success != result.IsSuccess)
                    {
                        if (!result.IsSuccess)
--- a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDbProducer.other.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDbProducer.other.cs
@@ -24,13 +24,13 @@ namespace ThingsGateway.Plugin.SqlDB;
 /// <summary>
 /// SqlDBProducer
 /// </summary>
-public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<SQLHistoryValue>
+public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<VariableBasicData>
 {
    private TypeAdapterConfig _config;
    private volatile bool _initRealData;
    private ConcurrentDictionary<long, VariableBasicData> RealTimeVariables { get; } = new ConcurrentDictionary<long, VariableBasicData>();

-    protected override ValueTask<OperResult> UpdateVarModel(IEnumerable<CacheDBItem<SQLHistoryValue>> item, CancellationToken cancellationToken)
+    protected override ValueTask<OperResult> UpdateVarModel(IEnumerable<CacheDBItem<VariableBasicData>> item, CancellationToken cancellationToken)
    {
        return UpdateVarModel(item.Select(a => a.Value).OrderBy(a => a.Id), cancellationToken);
    }
@@ -48,7 +48,7 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
        UpdateVariable(variableRuntime, variable);
        base.VariableChange(variableRuntime, variable);
    }
-    protected override ValueTask<OperResult> UpdateVarModels(IEnumerable<SQLHistoryValue> item, CancellationToken cancellationToken)
+    protected override ValueTask<OperResult> UpdateVarModels(IEnumerable<VariableBasicData> item, CancellationToken cancellationToken)
    {
        return UpdateVarModel(item, cancellationToken);
    }
@@ -62,18 +62,18 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<

            foreach (var group in varGroup)
            {
-                AddQueueVarModel(new CacheDBItem<List<SQLHistoryValue>>(group.Adapt<List<SQLHistoryValue>>(_config)));
+                AddQueueVarModel(new CacheDBItem<List<VariableBasicData>>(group.ToList()));
            }
            foreach (var variable in varList)
            {
-                AddQueueVarModel(new CacheDBItem<SQLHistoryValue>(variable.Adapt<SQLHistoryValue>(_config)));
+                AddQueueVarModel(new CacheDBItem<VariableBasicData>(variable));
            }
        }
        else
        {
            foreach (var variable in variables)
            {
-                AddQueueVarModel(new CacheDBItem<SQLHistoryValue>(variable.Adapt<SQLHistoryValue>(_config)));
+                AddQueueVarModel(new CacheDBItem<VariableBasicData>(variable));
            }
        }
    }
@@ -85,12 +85,12 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
            if (_driverPropertys.GroupUpdate && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
            {

-                AddQueueVarModel(new CacheDBItem<List<SQLHistoryValue>>(variableRuntimeGroup.Adapt<List<SQLHistoryValue>>(_config)));
+                AddQueueVarModel(new CacheDBItem<List<VariableBasicData>>(variableRuntimeGroup.Adapt<List<VariableBasicData>>(_config)));

            }
            else
            {
-                AddQueueVarModel(new CacheDBItem<SQLHistoryValue>(variableRuntime.Adapt<SQLHistoryValue>(_config)));
+                AddQueueVarModel(new CacheDBItem<VariableBasicData>(variable));
            }
        }

@@ -101,7 +101,7 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
    }


-    private async ValueTask<OperResult> UpdateVarModel(IEnumerable<SQLHistoryValue> item, CancellationToken cancellationToken)
+    private async ValueTask<OperResult> UpdateVarModel(IEnumerable<VariableBasicData> item, CancellationToken cancellationToken)
    {
        var result = await InserableAsync(item.WhereIf(_driverPropertys.OnlineFilter, a => a.IsOnline == true).ToList(), cancellationToken).ConfigureAwait(false);
        if (success != result.IsSuccess)
@@ -116,7 +116,7 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<

    #region 方法

-    private async ValueTask<OperResult> InserableAsync(List<SQLHistoryValue> dbInserts, CancellationToken cancellationToken)
+    private async ValueTask<OperResult> InserableAsync(List<VariableBasicData> dbInserts, CancellationToken cancellationToken)
    {
        try
        {
@@ -134,8 +134,8 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
            {
                Stopwatch stopwatch = new();
                stopwatch.Start();
-                var result = await _db.Fastest<SQLHistoryValue>().PageSize(50000).SplitTable().BulkCopyAsync(dbInserts).ConfigureAwait(false);
-                //var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
+                var data = dbInserts.Adapt<List<SQLHistoryValue>>(_config);
+                var result = await _db.Fastest<SQLHistoryValue>().PageSize(50000).SplitTable().BulkCopyAsync(data).ConfigureAwait(false);
                stopwatch.Stop();
                if (result > 0)
                {
@@ -152,7 +152,7 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
        }
    }

-    private async ValueTask<OperResult> UpdateAsync(List<SQLRealValue> datas, CancellationToken cancellationToken)
+    private async ValueTask<OperResult> UpdateAsync(List<VariableBasicData> datas, CancellationToken cancellationToken)
    {
        try
        {
@@ -190,7 +190,8 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
                        Stopwatch stopwatch = new();
                        stopwatch.Start();

-                        var result = await _db.Fastest<SQLRealValue>().AS(_driverPropertys.ReadDBTableName).PageSize(100000).BulkUpdateAsync(datas).ConfigureAwait(false);
+                        var data = datas.Adapt<List<SQLRealValue>>(_config);
+                        var result = await _db.Fastest<SQLRealValue>().AS(_driverPropertys.ReadDBTableName).PageSize(100000).BulkUpdateAsync(data).ConfigureAwait(false);

                        stopwatch.Stop();
                        if (result > 0)
--- a/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.cs
@@ -43,7 +43,7 @@ public partial class SqlHistoryAlarm : BusinessBaseWithCacheVariableModel<Histor

    protected override async Task InitChannelAsync(IChannel? channel, CancellationToken cancellationToken)
    {
-        _db = BusinessDatabaseUtil.GetDb(_driverPropertys.DbType, _driverPropertys.BigTextConnectStr);
+        _db = BusinessDatabaseUtil.GetDb((DbType)_driverPropertys.DbType, _driverPropertys.BigTextConnectStr);

        _config.ForType<AlarmVariable, HistoryAlarm>().Map(dest => dest.Id, (src) => CommonUtils.GetSingleId());
        GlobalData.AlarmChangedEvent -= AlarmWorker_OnAlarmChanged;
@@ -112,7 +112,7 @@ public partial class SqlHistoryAlarm : BusinessBaseWithCacheVariableModel<Histor

    internal ISugarQueryable<HistoryAlarm> Query(DBHistoryAlarmPageInput input)
    {
-        using var db = BusinessDatabaseUtil.GetDb(_driverPropertys.DbType, _driverPropertys.BigTextConnectStr);
+        using var db = BusinessDatabaseUtil.GetDb((DbType)_driverPropertys.DbType, _driverPropertys.BigTextConnectStr);
        var query = db.Queryable<HistoryAlarm>().AS(_driverPropertys.TableName)
                             .WhereIF(input.StartTime != null, a => a.EventTime >= input.StartTime)
                           .WhereIF(input.EndTime != null, a => a.EventTime <= input.EndTime)
@@ -132,7 +132,7 @@ public partial class SqlHistoryAlarm : BusinessBaseWithCacheVariableModel<Histor

    internal async Task<QueryData<HistoryAlarm>> QueryData(QueryPageOptions option)
    {
-        using var db = BusinessDatabaseUtil.GetDb(_driverPropertys.DbType, _driverPropertys.BigTextConnectStr);
+        using var db = BusinessDatabaseUtil.GetDb((DbType)_driverPropertys.DbType, _driverPropertys.BigTextConnectStr);
        var ret = new QueryData<HistoryAlarm>()
        {
            IsSorted = option.SortOrder != SortOrder.Unset,
--- a/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.other.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.other.cs
@@ -13,7 +13,7 @@ using Mapster;
 using System.Diagnostics;

 using ThingsGateway.Foundation;
-using ThingsGateway.NewLife.Threading;
+using ThingsGateway.Plugin.DB;

 using TouchSocket.Core;

@@ -56,36 +56,6 @@ public partial class SqlHistoryAlarm : BusinessBaseWithCacheVariableModel<Histor
        }
    }

-    private async ValueTask<OperResult> InserableAsync(List<HistoryAlarm> dbInserts, CancellationToken cancellationToken)
-    {
-        try
-        {
-
-            int result = 0;
-            //.SplitTable()
-            Stopwatch stopwatch = new();
-            stopwatch.Start();
-
-            if (_db.CurrentConnectionConfig.DbType == SqlSugar.DbType.QuestDB)
-                result = await _db.Insertable(dbInserts).AS(_driverPropertys.TableName).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);//不要加分表
-            else
-                result = await _db.Fastest<HistoryAlarm>().AS(_driverPropertys.TableName).PageSize(50000).BulkCopyAsync(dbInserts).ConfigureAwait(false);
-
-
-            stopwatch.Stop();
-            //var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
-            if (result > 0)
-            {
-                LogMessage?.Trace($"Count：{dbInserts.Count}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
-            }
-            return OperResult.Success;
-        }
-        catch (Exception ex)
-        {
-            return new OperResult(ex);
-        }
-    }
-
    private async ValueTask<OperResult> UpdateT(IEnumerable<HistoryAlarm> item, CancellationToken cancellationToken)
    {
        var result = await InserableAsync(item.ToList(), cancellationToken).ConfigureAwait(false);
@@ -98,4 +68,51 @@ public partial class SqlHistoryAlarm : BusinessBaseWithCacheVariableModel<Histor

        return result;
    }
+
+    private async ValueTask<OperResult> InserableAsync(List<HistoryAlarm> dbInserts, CancellationToken cancellationToken)
+    {
+        try
+        {
+            _db.Ado.CancellationToken = cancellationToken;
+            if (!_driverPropertys.BigTextScriptHistoryTable.IsNullOrEmpty())
+            {
+                var getDeviceModel = CSharpScriptEngineExtension.Do<DynamicSQLBase>(_driverPropertys.BigTextScriptHistoryTable);
+
+                getDeviceModel.Logger = LogMessage;
+
+                await getDeviceModel.DBInsertable(_db, dbInserts, cancellationToken).ConfigureAwait(false);
+
+            }
+            else
+            {
+                int result = 0;
+                //.SplitTable()
+                Stopwatch stopwatch = new();
+                stopwatch.Start();
+
+                if (_db.CurrentConnectionConfig.DbType == SqlSugar.DbType.QuestDB)
+                    result = await _db.Insertable(dbInserts).AS(_driverPropertys.TableName).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);
+                else
+                    result = await _db.Fastest<HistoryAlarm>().AS(_driverPropertys.TableName).PageSize(50000).BulkCopyAsync(dbInserts).ConfigureAwait(false);
+
+                stopwatch.Stop();
+                //var result = await db.Insertable(dbInserts).SplitTable().ExecuteCommandAsync().ConfigureAwait(false);
+                if (result > 0)
+                {
+                    LogMessage?.Trace($"Count：{dbInserts.Count}，watchTime:  {stopwatch.ElapsedMilliseconds} ms");
+                }
+                return OperResult.Success;
+            }
+
+
+            return OperResult.Success;
+        }
+        catch (Exception ex)
+        {
+            return new OperResult(ex);
+        }
+
+    }
+
+
 }
--- a/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarmProperty.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarmProperty.cs
@@ -12,7 +12,8 @@ using BootstrapBlazor.Components;

 using System.ComponentModel.DataAnnotations;

-using ThingsGateway.SqlSugar;
+using ThingsGateway.Plugin.SqlDB;
+

 namespace ThingsGateway.Plugin.SqlHistoryAlarm;

@@ -23,15 +24,21 @@ public class SqlHistoryAlarmProperty : BusinessPropertyWithCache
 {
    [DynamicProperty]
    public DbType DbType { get; set; } = DbType.SqlServer;
-
+    [DynamicProperty]
+    [Required]
+    public string TableName { get; set; } = "historyAlarm";
    [DynamicProperty]
    [Required]
    [AutoGenerateColumn(ComponentType = typeof(Textarea), Rows = 1)]
    public string BigTextConnectStr { get; set; } = "server=.;uid=sa;pwd=111111;database=test;";

+    /// <summary>
+    /// 历史表脚本
+    /// </summary>
    [DynamicProperty]
-    [Required]
-    public string TableName { get; set; } = "historyAlarm";
+    [AutoGenerateColumn(Visible = true, IsVisibleWhenEdit = false, IsVisibleWhenAdd = false)]
+    public string? BigTextScriptHistoryTable { get; set; }
+

    public override bool OnlineFilter { get; set; } = false;
 }
--- a/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBProducer.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBProducer.cs
@@ -29,7 +29,7 @@ namespace ThingsGateway.Plugin.TDengineDB;
 /// <summary>
 /// TDengineDBProducer
 /// </summary>
-public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableModel<TDengineDBHistoryValue>, IDBHistoryValueService
+public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableModel<VariableBasicData>, IDBHistoryValueService
 {
    internal readonly RealDBProducerProperty _driverPropertys = new()
    {
--- a/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBProducer.other.cs
+++ b/src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBProducer.other.cs
@@ -26,11 +26,11 @@ namespace ThingsGateway.Plugin.TDengineDB;
 /// <summary>
 /// RabbitMQProducer
 /// </summary>
-public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableModel<TDengineDBHistoryValue>
+public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableModel<VariableBasicData>
 {
    private TypeAdapterConfig _config;

-    protected override ValueTask<OperResult> UpdateVarModel(IEnumerable<CacheDBItem<TDengineDBHistoryValue>> item, CancellationToken cancellationToken)
+    protected override ValueTask<OperResult> UpdateVarModel(IEnumerable<CacheDBItem<VariableBasicData>> item, CancellationToken cancellationToken)
    {
        return UpdateVarModel(item.Select(a => a.Value).OrderBy(a => a.Id), cancellationToken);
    }
@@ -46,7 +46,7 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
        UpdateVariable(variableRuntime, variable);
        base.VariableChange(variableRuntime, variable);
    }
-    protected override ValueTask<OperResult> UpdateVarModels(IEnumerable<TDengineDBHistoryValue> item, CancellationToken cancellationToken)
+    protected override ValueTask<OperResult> UpdateVarModels(IEnumerable<VariableBasicData> item, CancellationToken cancellationToken)
    {
        return UpdateVarModel(item, cancellationToken);
    }
@@ -59,18 +59,18 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM

            foreach (var group in varGroup)
            {
-                AddQueueVarModel(new CacheDBItem<List<TDengineDBHistoryValue>>(group.Adapt<List<TDengineDBHistoryValue>>(_config)));
+                AddQueueVarModel(new CacheDBItem<List<VariableBasicData>>(group.ToList()));
            }
            foreach (var variable in varList)
            {
-                AddQueueVarModel(new CacheDBItem<TDengineDBHistoryValue>(variable.Adapt<TDengineDBHistoryValue>(_config)));
+                AddQueueVarModel(new CacheDBItem<VariableBasicData>(variable));
            }
        }
        else
        {
            foreach (var variable in variables)
            {
-                AddQueueVarModel(new CacheDBItem<TDengineDBHistoryValue>(variable.Adapt<TDengineDBHistoryValue>(_config)));
+                AddQueueVarModel(new CacheDBItem<VariableBasicData>(variable));
            }
        }
    }
@@ -80,15 +80,15 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
        if (_driverPropertys.GroupUpdate && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
        {

-            AddQueueVarModel(new CacheDBItem<List<TDengineDBHistoryValue>>(variableRuntimeGroup.Adapt<List<TDengineDBHistoryValue>>(_config)));
+            AddQueueVarModel(new CacheDBItem<List<VariableBasicData>>(variableRuntimeGroup.Adapt<List<VariableBasicData>>(_config)));

        }
        else
        {
-            AddQueueVarModel(new CacheDBItem<TDengineDBHistoryValue>(variableRuntime.Adapt<TDengineDBHistoryValue>(_config)));
+            AddQueueVarModel(new CacheDBItem<VariableBasicData>(variable));
        }
    }
-    private async ValueTask<OperResult> UpdateVarModel(IEnumerable<TDengineDBHistoryValue> item, CancellationToken cancellationToken)
+    private async ValueTask<OperResult> UpdateVarModel(IEnumerable<VariableBasicData> item, CancellationToken cancellationToken)
    {
        var result = await InserableAsync(item.WhereIf(_driverPropertys.OnlineFilter, a => a.IsOnline == true).ToList(), cancellationToken).ConfigureAwait(false);
        if (success != result.IsSuccess)
@@ -103,7 +103,7 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM

    #region 方法

-    private async ValueTask<OperResult> InserableAsync(List<TDengineDBHistoryValue> dbInserts, CancellationToken cancellationToken)
+    private async ValueTask<OperResult> InserableAsync(List<VariableBasicData> dbInserts, CancellationToken cancellationToken)
    {
        try
        {
--- a/src/Plugin/ThingsGateway.Plugin.DB/ThingsGateway.Plugin.DB.csproj
+++ b/src/Plugin/ThingsGateway.Plugin.DB/ThingsGateway.Plugin.DB.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 	</PropertyGroup>
--- a/src/Plugin/ThingsGateway.Plugin.Dlt645/ThingsGateway.Plugin.Dlt645.csproj
+++ b/src/Plugin/ThingsGateway.Plugin.Dlt645/ThingsGateway.Plugin.Dlt645.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 	</PropertyGroup>
--- a/src/Plugin/ThingsGateway.Plugin.Http/ThingsGateway.Plugin.Http.csproj
+++ b/src/Plugin/ThingsGateway.Plugin.Http/ThingsGateway.Plugin.Http.csproj
@@ -1,13 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+<Project Sdk="Microsoft.NET.Sdk">
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj">
-		</ProjectReference>
-		<ProjectReference Include="..\..\Gateway\ThingsGateway.Gateway.Razor\ThingsGateway.Gateway.Razor.csproj">
+		<ProjectReference Include="..\..\Gateway\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj">
 		</ProjectReference>

 		
--- a/src/Plugin/ThingsGateway.Plugin.Kafka/ThingsGateway.Plugin.Kafka.csproj
+++ b/src/Plugin/ThingsGateway.Plugin.Kafka/ThingsGateway.Plugin.Kafka.csproj
@@ -1,13 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj">
-		</ProjectReference>
-		<ProjectReference Include="..\..\Gateway\ThingsGateway.Gateway.Razor\ThingsGateway.Gateway.Razor.csproj">
+		<ProjectReference Include="..\..\Gateway\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj">
 		</ProjectReference>
 		<PackageReference Include="Confluent.Kafka" Version="2.10.1" GeneratePathProperty="true">
 			<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
--- a/src/Plugin/ThingsGateway.Plugin.Modbus/ModbusSlave/ModbusSlave.cs
+++ b/src/Plugin/ThingsGateway.Plugin.Modbus/ModbusSlave/ModbusSlave.cs
@@ -19,7 +19,6 @@ using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife;
 using ThingsGateway.NewLife.Extension;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.NewLife.Threading;
 using ThingsGateway.SqlSugar;

 using TouchSocket.Core;
--- a/src/Plugin/ThingsGateway.Plugin.Modbus/ThingsGateway.Plugin.Modbus.csproj
+++ b/src/Plugin/ThingsGateway.Plugin.Modbus/ThingsGateway.Plugin.Modbus.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 	</PropertyGroup>
--- a/src/Plugin/ThingsGateway.Plugin.Mqtt/MqttCollect/MqttCollect.cs
+++ b/src/Plugin/ThingsGateway.Plugin.Mqtt/MqttCollect/MqttCollect.cs
@@ -16,7 +16,6 @@ using MQTTnet.Client;
 #endif

 using ThingsGateway.Foundation;
-using ThingsGateway.NewLife.Threading;

 using TouchSocket.Core;

--- a/src/Plugin/ThingsGateway.Plugin.Mqtt/ThingsGateway.Plugin.Mqtt.csproj
+++ b/src/Plugin/ThingsGateway.Plugin.Mqtt/ThingsGateway.Plugin.Mqtt.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 	</PropertyGroup>
--- a/src/Plugin/ThingsGateway.Plugin.OpcDa/OpcDaMaster/OpcDaMaster.cs
+++ b/src/Plugin/ThingsGateway.Plugin.OpcDa/OpcDaMaster/OpcDaMaster.cs
@@ -14,7 +14,6 @@ using ThingsGateway.Foundation.OpcDa;
 using ThingsGateway.Foundation.OpcDa.Da;
 using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife.Json.Extension;
-using ThingsGateway.NewLife.Threading;

 using TouchSocket.Core;

--- a/src/Plugin/ThingsGateway.Plugin.OpcDa/ThingsGateway.Plugin.OpcDa.csproj
+++ b/src/Plugin/ThingsGateway.Plugin.OpcDa/ThingsGateway.Plugin.OpcDa.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 	</PropertyGroup>
--- a/src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/OpcUaServer.cs
+++ b/src/Plugin/ThingsGateway.Plugin.OpcUa/OpcUaServer/OpcUaServer.cs
@@ -22,7 +22,6 @@ using ThingsGateway.Extension;
 using ThingsGateway.Extension.Generic;
 using ThingsGateway.Gateway.Application;
 using ThingsGateway.NewLife.Extension;
-using ThingsGateway.NewLife.Threading;

 using TouchSocket.Core;

--- a/src/Plugin/ThingsGateway.Plugin.OpcUa/ThingsGateway.Plugin.OpcUa.csproj
+++ b/src/Plugin/ThingsGateway.Plugin.OpcUa/ThingsGateway.Plugin.OpcUa.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 	</PropertyGroup>
--- a/src/Plugin/ThingsGateway.Plugin.RabbitMQ/ThingsGateway.Plugin.RabbitMQ.csproj
+++ b/src/Plugin/ThingsGateway.Plugin.RabbitMQ/ThingsGateway.Plugin.RabbitMQ.csproj
@@ -1,13 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+<Project Sdk="Microsoft.NET.Sdk">
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj">
-		</ProjectReference>
-		<ProjectReference Include="..\..\Gateway\ThingsGateway.Gateway.Razor\ThingsGateway.Gateway.Razor.csproj">
+		<ProjectReference Include="..\..\Gateway\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj">
 		</ProjectReference>

 	</ItemGroup>
--- a/src/Plugin/ThingsGateway.Plugin.SiemensS7/ThingsGateway.Plugin.SiemensS7.csproj
+++ b/src/Plugin/ThingsGateway.Plugin.SiemensS7/ThingsGateway.Plugin.SiemensS7.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 	</PropertyGroup>
--- a/src/Plugin/ThingsGateway.Plugin.Synchronization/ThingsGateway.Plugin.Synchronization.csproj
+++ b/src/Plugin/ThingsGateway.Plugin.Synchronization/ThingsGateway.Plugin.Synchronization.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;</TargetFrameworks>
 	</PropertyGroup>
--- a/src/ThingsGateway.OnlyApi/Program.cs
+++ b/src/ThingsGateway.OnlyApi/Program.cs
@@ -92,7 +92,7 @@ public class Program


        })
-        .Configure(app=>
+        .Configure(app =>
        {
            ReflectionInoHelper.RemoveAllCache();
            InstanceFactory.RemoveCache();
--- a/src/ThingsGateway.OnlyApi/Properties/launchSettings.json
+++ b/src/ThingsGateway.OnlyApi/Properties/launchSettings.json
@@ -4,7 +4,7 @@
      "commandName": "Project",
      "launchBrowser": true,
      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Production"
+        "ASPNETCORE_ENVIRONMENT": "Development"
      },
      "dotnetRunMessages": true,
      "applicationUrl": "http://*:5000"
--- a/src/ThingsGateway.OnlyApi/Startup.cs
+++ b/src/ThingsGateway.OnlyApi/Startup.cs
@@ -15,7 +15,6 @@ using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.StaticFiles;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;

 using Newtonsoft.Json;
--- a/src/ThingsGateway.OnlyApi/ThingsGateway.OnlyApi.csproj
+++ b/src/ThingsGateway.OnlyApi/ThingsGateway.OnlyApi.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

-	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="..\Version.props" />


 	<ItemGroup Condition=" '$(SolutionName)' != 'ThingsGatewayRelease' ">
@@ -55,6 +55,7 @@
 		<!--动态适用GC-->
 		<GarbageCollectionAdaptationMode>1</GarbageCollectionAdaptationMode>

+		<CETCompat>false</CETCompat>
 		<!--<TieredCompilation>false</TieredCompilation>-->

 		<!--使用自托管线程池-->
--- a/src/ThingsGateway.Photino/ThingsGateway.Photino.csproj
+++ b/src/ThingsGateway.Photino/ThingsGateway.Photino.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">

-	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="..\Version.props" />


 	<ItemGroup Condition=" '$(SolutionName)' != 'ThingsGatewayRelease' ">
--- a/src/ThingsGateway.Server/ThingsGateway.Server.csproj
+++ b/src/ThingsGateway.Server/ThingsGateway.Server.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

-	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="..\Version.props" />


 	<ItemGroup Condition=" '$(SolutionName)' != 'ThingsGatewayRelease'">
--- a/src/Upgrade/ThingsGateway.Upgrade/ThingsGateway.Upgrade.csproj
+++ b/src/Upgrade/ThingsGateway.Upgrade/ThingsGateway.Upgrade.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-	<Import Project="$(SolutionDir)Version.props" />
-	<Import Project="$(SolutionDir)PackNuget.props" />
+	<Import Project="..\..\Version.props" />
+	<Import Project="..\..\PackNuget.props" />

 	<PropertyGroup>
 		<TargetFrameworks>net8.0</TargetFrameworks>
--- a/src/Upgrade/ThingsGateway.UpgradeServer/ThingsGateway.UpgradeServer.csproj
+++ b/src/Upgrade/ThingsGateway.UpgradeServer/ThingsGateway.UpgradeServer.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

-	<Import Project="$(SolutionDir)Version.props" />
+	<Import Project="..\..\Version.props" />

 	<PropertyGroup>
 		<TargetFrameworks>net9.0;</TargetFrameworks>
--- a/src/Version.props
+++ b/src/Version.props
@@ -1,9 +1,9 @@
 <Project>
  <PropertyGroup>
-    <Version>10.8.10</Version>
+    <Version>10.8.17</Version>
  </PropertyGroup>

  <ItemGroup>
-    <None Include="$(SolutionDir)Version.props" Pack="true" PackagePath="\" />
+    <None Include="$(MSBuildThisFileDirectory)Version.props" Pack="true" PackagePath="\" />
  </ItemGroup>
 </Project>
Author	SHA1	Message	Date
2248356998 qq.com	df9e7d6ff1	10.8.17	2025-06-22 21:11:37 +08:00
Diego	b40ca920d3	fix: 变量自动刷新运行态	2025-06-20 16:58:45 +08:00
Diego	5a4b0a0e93	修改插件过期提示	2025-06-20 14:43:13 +08:00
Diego	a879edd68b	10.8.12	2025-06-20 13:52:42 +08:00