2.0.5

.gitignore

@@ -360,4 +360,7 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+
+
+/framework/*Pro*

README.md

@@ -5,12 +5,11 @@
 
  **NetCore** 跨平台边缘采集网关(工业设备采集)
 
- **ThingsGateway** 存储库同时提供 [**设备采集驱动**](https://www.nuget.org/profiles/KimDiego)
+ **ThingsGateway** 存储库同时提供 [**设备采集驱动**](https://www.nuget.org/packages?q=Tags%3A%22ThingsGateway%22)
 
  **ThingsGateway** 存储库同时提供 **基于Blazor的权限框架** 查看 [**ThingsGateway.Admin**](https://gitee.com/dotnetchina/ThingsGateway/blob/master/framework/ThingsGateway.Admin.sln)
 
 
-
 ## 文档
 
 [ThingsGateway](https://diego2098.gitee.io/thingsgateway-docs/) 文档。

framework/.editorconfig

@@ -81,6 +81,15 @@ dotnet_diagnostic.CA2208.severity = none
 # IDE0057: 使用范围运算符
 dotnet_diagnostic.IDE0057.severity = none
 
+# IDE0056: 使用索引运算符
+dotnet_diagnostic.IDE0056.severity = none
+
+# CA1830: 最好使用 StringBuilder 的强类型 Append 和 Insert 方法重载
+dotnet_diagnostic.CA1830.severity = none
+
+# CA1847: 将字符型文本用于单个字符查找
+dotnet_diagnostic.CA1847.severity = none
+
 [*.vb]
 #### 命名样式 ####
 

framework/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<Version>2.0.0.0</Version>
+		<Version>2.0.5.0</Version>
 		<Authors>Diego</Authors>
 		<Product>ThingsGateway</Product>
 		<Copyright>© 2023-present Diego</Copyright>

framework/ThingsGateway.Admin.ApiController/Controllers/FileController.cs

@@ -19,7 +19,7 @@ using ThingsGateway.Admin.Core;
 namespace ThingsGateway.Admin.Application;
 
 /// <summary>
-/// 后台登录控制器
+/// 文件下载
 /// </summary>
 [ApiDescriptionSettings(CateGoryConst.ThingsGatewayAdmin, Order = 200)]
 [Route("file")]

framework/ThingsGateway.Admin.ApiController/Controllers/SwaggerController.cs

@@ -46,7 +46,7 @@ namespace ThingsGateway.Admin.Application
         [AllowAnonymous, NonUnify]
         public async Task<int> SwaggerCheckUrlAsync()
         {
-            var enable = (await _configService.GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_SWAGGERLOGIN_OPEN)).ConfigValue.ToBool();
+            var enable = (await _configService.GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_SWAGGERLOGIN_OPEN)).ConfigValue.ToBoolean();
             return enable ? 401 : 200;
         }
 

framework/ThingsGateway.Admin.ApiController/ThingsGateway.Admin.ApiController.xml

@@ -30,7 +30,7 @@
         </member>
         <member name="T:ThingsGateway.Admin.Application.FileController">
             <summary>
-            后台登录控制器
+            文件下载
             </summary>
         </member>
         <member name="M:ThingsGateway.Admin.Application.FileController.#ctor(ThingsGateway.Admin.Application.IFileService,ThingsGateway.Admin.Application.IOperateLogService,ThingsGateway.Admin.Application.IVisitLogService)">

framework/ThingsGateway.Admin.Application/OpenApi/Services/OpenApiAuth/OpenApiAuthService.cs

@@ -149,7 +149,7 @@ public class OpenApiAuthService : IOpenApiAuthService, ITransient
         {
             bool isSingle = false;//默认不开启单用户登录
             var singleConfig = await _configService.GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_SINGLE_OPEN);//获取系统单用户登录选项
-            if (singleConfig != null) isSingle = singleConfig.ConfigValue.ToBool();//如果配置不为空则设置单用户登录选项为系统配置的值
+            if (singleConfig != null) isSingle = singleConfig.ConfigValue.ToBoolean();//如果配置不为空则设置单用户登录选项为系统配置的值
 
             //判断是否单用户登录
             if (isSingle)

framework/ThingsGateway.Admin.Application/System/Services/Auth/AuthService.cs

@@ -79,7 +79,7 @@ public class AuthService : IAuthService
 
         if (sysBase != null)//如果有这个配置项
         {
-            if (sysBase.ConfigValue.ToBool())//如果需要验证码
+            if (sysBase.ConfigValue.ToBoolean())//如果需要验证码
             {
                 //如果没填验证码，提示验证码不能为空
                 if (input.ValidCode.IsNullOrEmpty() || input.ValidCodeReqNo == 0) throw Oops.Bah("验证码不能为空").StatusCode(410);
@@ -217,7 +217,7 @@ public class AuthService : IAuthService
             bool isSingle = false;//默认不开启单用户登录
 
             var singleConfig = await _configService.GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_SINGLE_OPEN);//获取系统单用户登录选项
-            if (singleConfig != null) isSingle = singleConfig.ConfigValue.ToBool();//如果配置不为空则设置单用户登录选项为系统配置的值
+            if (singleConfig != null) isSingle = singleConfig.ConfigValue.ToBoolean();//如果配置不为空则设置单用户登录选项为系统配置的值
             if (isSingle)//判断是否单用户登录
             {
                 await _noticeService.LogoutAsync(loginEvent.SysUser.Id, verificatInfos.Where(it => it.Device == loginEvent.Device.ToString()).ToList(), "该账号已在别处登录!");//通知其他用户下线

framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor

@@ -189,7 +189,7 @@
                 }
                 else
                 {
-                    if (ItemColWithDTTemplate!=null)
+                    if (ItemColWithDTTemplate != null)
                     {
                         @ItemColWithDTTemplate(context)
                     }
@@ -220,7 +220,7 @@
 
                         }
                     }
-                    
+
 
                 }
             </ItemColContent>
@@ -310,16 +310,24 @@
                         {
                             string value = DetailModelPairs[item.Value];
                             {
-                                <tr @key="item.Text">
+                                @if (Detailemplate != null)
-                                    <td class="text-start table-minwidth">
+                                {
-                                        @item.Text
+                                    @Detailemplate((item,value))
-                                    </td>
+                                }
-                                    <td class="text-start ">
+                                else
-                                        <div style="word-break:break-all; white-space:pre-wrap;">
+                                {
-                                            @value
+                                    <tr @key="item.Text">
-                                        </div>
+                                        <td class="text-start table-minwidth">
-                                    </td>
+                                            @item.Text
-                                </tr>
+                                        </td>
+                                        <td class="text-start ">
+                                            <div style="word-break:break-all; white-space:pre-wrap;">
+                                                @value
+                                            </div>
+                                        </td>
+                                    </tr>
+                                }
+                                
                             }
                         }
                     }

framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor.cs

@@ -72,12 +72,6 @@ public partial class AppDataTable<TItem, SearchItem, AddItem, EditItem> : IAppDa
     [Parameter]
     public bool Dense { get; set; }
 
-    /// <summary>
-    /// 获得/设置 明细行模板
-    /// </summary>
-    [Parameter]
-    public RenderFragment<TItem> DetailRowTemplate { get; set; }
-
     /// <summary>
     /// 编辑项委托
     /// </summary>
@@ -89,6 +83,11 @@ public partial class AppDataTable<TItem, SearchItem, AddItem, EditItem> : IAppDa
     /// </summary>
     [Parameter]
     public RenderFragment<EditItem> EditTemplate { get; set; }
+    /// <summary>
+    /// 获得/设置 详情模板
+    /// </summary>
+    [Parameter]
+    public RenderFragment<(DataTableHeader<TItem>, string)> Detailemplate { get; set; }
 
     /// <summary>
     /// 表头过滤，返回DataTableHeader列表，传输参数已包含全部初始表头与表头标题

framework/ThingsGateway.Admin.Blazor/Shared/Login.razor.cs

@@ -133,7 +133,7 @@ public partial class Login
         GetCaptchaInfo();
         CONFIG_TITLE = (await App.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_TITLE))?.ConfigValue;
         CONFIG_REMARK = (await App.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_REMARK))?.ConfigValue;
-        _showCaptcha = (await App.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_CAPTCHA_OPEN))?.ConfigValue?.ToBool() == true;
+        _showCaptcha = (await App.GetService<IConfigService>().GetByConfigKeyAsync(ConfigConst.SYS_CONFIGBASEDEFAULT, ConfigConst.CONFIG_CAPTCHA_OPEN))?.ConfigValue?.ToBoolean() == true;
         Welcome = "欢迎使用" + CONFIG_TITLE + "!";
         await base.OnParametersSetAsync();
     }

framework/ThingsGateway.Admin.Blazor/ThingsGateway.Admin.Blazor.xml

@@ -43,11 +43,6 @@
             表格紧凑
             </summary>
         </member>
-        <member name="P:ThingsGateway.Admin.Blazor.Core.AppDataTable`4.DetailRowTemplate">
-            <summary>
-            获得/设置 明细行模板
-            </summary>
-        </member>
         <member name="P:ThingsGateway.Admin.Blazor.Core.AppDataTable`4.EditCallAsync">
             <summary>
             编辑项委托
@@ -58,6 +53,11 @@
             获得/设置 编辑模板
             </summary>
         </member>
+        <member name="P:ThingsGateway.Admin.Blazor.Core.AppDataTable`4.Detailemplate">
+            <summary>
+            获得/设置 详情模板
+            </summary>
+        </member>
         <member name="P:ThingsGateway.Admin.Blazor.Core.AppDataTable`4.FilterHeaders">
             <summary>
             表头过滤，返回DataTableHeader列表，传输参数已包含全部初始表头与表头标题

framework/ThingsGateway.Admin.Core/Const/UserManager.cs

@@ -22,7 +22,7 @@ public class UserManager
     /// <summary>
     /// 是否超级管理员
     /// </summary>
-    public static bool IsSuperAdmin => (App.User?.FindFirst(ClaimConst.IsSuperAdmin)?.Value).ToBool();
+    public static bool IsSuperAdmin => (App.User?.FindFirst(ClaimConst.IsSuperAdmin)?.Value).ToBoolean();
 
     /// <summary>
     /// 当前用户账号

framework/ThingsGateway.Admin.Core/Extension/ObjectExtensions.cs

@@ -330,7 +330,7 @@ public static class ObjectExtensions
     /// 转换布尔值
     /// </summary>
     /// <returns></returns>
-    public static bool ToBool(this object value, bool defaultValue = false) => value?.ToString().ToUpper() switch
+    public static bool ToBoolean(this object value, bool defaultValue = false) => value?.ToString().ToUpper() switch
     {
         "1" or "TRUE" => true,
         _ => defaultValue,
@@ -356,10 +356,22 @@ public static class ObjectExtensions
         {
             return Double.IsNaN(d) ? defaultValue : (Decimal)d;
         }
-        var str = value.ToString();
+        var str = value?.ToString();
         return str.IsNullOrEmpty() ? defaultValue : Decimal.TryParse(str, out var n) ? n : defaultValue;
     }
-
+    /// <summary>
+    /// ToDecimal
+    /// </summary>
+    /// <returns></returns>
+    public static double ToDouble(this object value, double defaultValue = 0)
+    {
+        if (value is Double d)
+        {
+            return Double.IsNaN(d) ? defaultValue : (Double)d;
+        }
+        var str = value?.ToString();
+        return str.IsNullOrEmpty() ? defaultValue : double.TryParse(str, out var n) ? n : defaultValue;
+    }
 
     /// <summary>
     /// JsonElement 转 Object

framework/ThingsGateway.Admin.Core/Extension/StringExtensions.cs

@@ -97,7 +97,7 @@ public static class StringExtensions
     /// 转换布尔值
     /// </summary>
     /// <returns></returns>
-    public static bool ToBool(this string value, bool defaultValue = false) => value?.ToUpper() switch
+    public static bool ToBoolean(this string value, bool defaultValue = false) => value?.ToUpper() switch
     {
         "1" or "TRUE" => true,
         _ => defaultValue,

framework/ThingsGateway.Admin.Core/ThingsGateway.Admin.Core.xml

@@ -1026,7 +1026,7 @@
             <param name="str"></param>
             <returns></returns>
         </member>
-        <member name="M:ThingsGateway.Admin.Core.ObjectExtensions.ToBool(System.Object,System.Boolean)">
+        <member name="M:ThingsGateway.Admin.Core.ObjectExtensions.ToBoolean(System.Object,System.Boolean)">
             <summary>
             转换布尔值
             </summary>
@@ -1050,6 +1050,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:ThingsGateway.Admin.Core.ObjectExtensions.ToDouble(System.Object,System.Double)">
+            <summary>
+            ToDecimal
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:ThingsGateway.Admin.Core.ObjectExtensions.ToObject(System.Text.Json.JsonElement)">
             <summary>
             JsonElement 转 Object
@@ -1142,7 +1148,7 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:ThingsGateway.Admin.Core.StringExtensions.ToBool(System.String,System.Boolean)">
+        <member name="M:ThingsGateway.Admin.Core.StringExtensions.ToBoolean(System.String,System.Boolean)">
             <summary>
             转换布尔值
             </summary>

framework/ThingsGateway.ApiController/Controllers/FileController.cs

@@ -21,7 +21,7 @@ using ThingsGateway.Application;
 namespace ThingsGateway.ApiController;
 
 /// <summary>
-/// 后台登录控制器
+/// 文件下载
 /// </summary>
 [ApiDescriptionSettings(CateGoryConst.ThingsGatewayAdmin, Order = 200)]
 [Route("gatewayFile")]

framework/ThingsGateway.ApiController/ThingsGateway.ApiController.xml

@@ -26,7 +26,7 @@
         </member>
         <member name="T:ThingsGateway.ApiController.FileController">
             <summary>
-            后台登录控制器
+            文件下载
             </summary>
         </member>
         <member name="M:ThingsGateway.ApiController.FileController.#ctor(ThingsGateway.Application.IRpcLogService,ThingsGateway.Application.IBackendLogService,ThingsGateway.Application.ICollectDeviceService,ThingsGateway.Application.IUploadDeviceService,ThingsGateway.Application.IVariableService)">

framework/ThingsGateway.Application/Entity/DeviceVariable.cs

@@ -31,7 +31,7 @@ public class DeviceVariable : MemoryVariable
     public virtual long DeviceId { get; set; }
 
     /// <summary>
-    /// 写入表达式
+    /// 单位
     /// </summary>
     [SugarColumn(ColumnName = "Unit", ColumnDescription = "单位", Length = 200, IsNullable = true)]
     [DataTable(Order = 3, IsShow = true, Sortable = true)]
@@ -59,12 +59,7 @@ public class DeviceVariable : MemoryVariable
     [DataTable(Order = 3, IsShow = true, Sortable = true)]
     public string VariableAddress { get; set; }
 
-    /// <summary>
+
-    /// 写入表达式
-    /// </summary>
-    [SugarColumn(ColumnName = "WriteExpressions", ColumnDescription = "写入表达式", Length = 200, IsNullable = true)]
-    [DataTable(Order = 7, IsShow = true, Sortable = true)]
-    public string WriteExpressions { get; set; }
 
     /// <summary>
     /// 是否中间变量

framework/ThingsGateway.Application/Entity/MemoryVariable.cs

@@ -51,7 +51,12 @@ public class MemoryVariable : BaseEntity
     [SugarColumn(ColumnName = "ReadExpressions", ColumnDescription = "读取表达式", Length = 200, IsNullable = true)]
     [DataTable(Order = 7, IsShow = true, Sortable = true, CellClass = " table-text-truncate ")]
     public string ReadExpressions { get; set; }
-
+    /// <summary>
+    /// 写入表达式
+    /// </summary>
+    [SugarColumn(ColumnName = "WriteExpressions", ColumnDescription = "写入表达式", Length = 200, IsNullable = true)]
+    [DataTable(Order = 7, IsShow = true, Sortable = true)]
+    public string WriteExpressions { get; set; }
     /// <summary>
     /// 是否中间变量
     /// </summary>

framework/ThingsGateway.Application/Model/VariableData.cs

@@ -20,6 +20,8 @@ public class VariableData
     public long Id { get; set; }
     /// <inheritdoc cref="MemoryVariable.Name"/>
     public string Name { get; set; }
+    /// <inheritdoc cref="DeviceVariable.Unit"/>
+    public string Unit { get; set; }
     /// <inheritdoc cref="MemoryVariable.Description"/>
     public string Description { get; set; }
     /// <inheritdoc cref="DeviceVariableRunTime.DeviceName"/>
@@ -36,7 +38,7 @@ public class VariableData
     public bool IsOnline { get; set; }
     /// <inheritdoc cref="MemoryVariable.ReadExpressions"/>
     public string ReadExpressions { get; set; }
-    /// <inheritdoc cref="DeviceVariable.WriteExpressions"/>
+    /// <inheritdoc cref="MemoryVariable.WriteExpressions"/>
     public string WriteExpressions { get; set; }
     /// <inheritdoc cref="DeviceVariable.IntervalTime"/>
     public int IntervalTime { get; set; }

framework/ThingsGateway.Application/Plugin/CollectBase.cs

@@ -17,8 +17,6 @@ using Newtonsoft.Json.Linq;
 using ThingsGateway.Foundation;
 using ThingsGateway.Foundation.Serial;
 
-using TouchSocket.Core;
-
 namespace ThingsGateway.Application;
 /// <summary>
 /// <para></para>

framework/ThingsGateway.Application/ThingsGateway.Application.xml

@@ -360,7 +360,7 @@
         </member>
         <member name="P:ThingsGateway.Application.DeviceVariable.Unit">
             <summary>
-            写入表达式
+            单位
             </summary>
         </member>
         <member name="P:ThingsGateway.Application.DeviceVariable.IntervalTime">
@@ -378,11 +378,6 @@
             变量地址，可能带有额外的信息，比如<see cref="T:ThingsGateway.Foundation.DataFormat"/> ，以;分割
             </summary>
         </member>
-        <member name="P:ThingsGateway.Application.DeviceVariable.WriteExpressions">
-            <summary>
-            写入表达式
-            </summary>
-        </member>
         <member name="P:ThingsGateway.Application.DeviceVariable.IsMemoryVariable">
             <summary>
             是否中间变量
@@ -524,6 +519,11 @@
             读取表达式
             </summary>
         </member>
+        <member name="P:ThingsGateway.Application.MemoryVariable.WriteExpressions">
+            <summary>
+            写入表达式
+            </summary>
+        </member>
         <member name="P:ThingsGateway.Application.MemoryVariable.IsMemoryVariable">
             <summary>
             是否中间变量
@@ -1791,6 +1791,9 @@
         <member name="P:ThingsGateway.Application.VariableData.Name">
             <inheritdoc cref="P:ThingsGateway.Application.MemoryVariable.Name"/>
         </member>
+        <member name="P:ThingsGateway.Application.VariableData.Unit">
+            <inheritdoc cref="P:ThingsGateway.Application.DeviceVariable.Unit"/>
+        </member>
         <member name="P:ThingsGateway.Application.VariableData.Description">
             <inheritdoc cref="P:ThingsGateway.Application.MemoryVariable.Description"/>
         </member>
@@ -1816,7 +1819,7 @@
             <inheritdoc cref="P:ThingsGateway.Application.MemoryVariable.ReadExpressions"/>
         </member>
         <member name="P:ThingsGateway.Application.VariableData.WriteExpressions">
-            <inheritdoc cref="P:ThingsGateway.Application.DeviceVariable.WriteExpressions"/>
+            <inheritdoc cref="P:ThingsGateway.Application.MemoryVariable.WriteExpressions"/>
         </member>
         <member name="P:ThingsGateway.Application.VariableData.IntervalTime">
             <inheritdoc cref="P:ThingsGateway.Application.DeviceVariable.IntervalTime"/>
@@ -3561,6 +3564,11 @@
             开始采集
             </summary>
         </member>
+        <member name="M:ThingsGateway.Application.CollectDeviceThread.BeforeStopThreadAsync">
+            <summary>
+            停止采集前，提前取消Token
+            </summary>
+        </member>
         <member name="M:ThingsGateway.Application.CollectDeviceThread.StopThreadAsync">
             <summary>
             停止采集
@@ -3934,6 +3942,11 @@
             开始上传
             </summary>
         </member>
+        <member name="M:ThingsGateway.Application.UploadDeviceThread.BeforeStopThreadAsync">
+            <summary>
+            停止采集前，提前取消Token
+            </summary>
+        </member>
         <member name="M:ThingsGateway.Application.UploadDeviceThread.StopThreadAsync">
             <summary>
             停止上传

framework/ThingsGateway.Application/Workers/Alarm/AlarmWorker.cs

@@ -74,7 +74,7 @@ public class AlarmWorker : BackgroundService
     public async Task<OperResult<SqlSugarClient>> GetAlarmDbAsync()
     {
         var ConfigService = ServiceHelper.Services.GetService<IConfigService>();
-        var alarmEnable = (await ConfigService.GetByConfigKeyAsync(ThingsGatewayConfigConst.ThingGateway_AlarmConfig_Base, ThingsGatewayConfigConst.Config_Alarm_Enable))?.ConfigValue?.ToBool();
+        var alarmEnable = (await ConfigService.GetByConfigKeyAsync(ThingsGatewayConfigConst.ThingGateway_AlarmConfig_Base, ThingsGatewayConfigConst.Config_Alarm_Enable))?.ConfigValue?.ToBoolean();
         var alarmDbType = (await ConfigService.GetByConfigKeyAsync(ThingsGatewayConfigConst.ThingGateway_AlarmConfig_Base, ThingsGatewayConfigConst.Config_Alarm_DbType))?.ConfigValue;
         var alarmConnstr = (await ConfigService.GetByConfigKeyAsync(ThingsGatewayConfigConst.ThingGateway_AlarmConfig_Base, ThingsGatewayConfigConst.Config_Alarm_ConnStr))?.ConfigValue;
 
@@ -132,14 +132,14 @@ public class AlarmWorker : BackgroundService
         limit = string.Empty;
         expressions = string.Empty;
         text = string.Empty;
-        if (tag.BoolCloseAlarmEnable && tag.Value.ToBool() == false)
+        if (tag.BoolCloseAlarmEnable && tag.Value.ToBoolean() == false)
         {
             limit = false.ToString();
             expressions = tag.BoolCloseRestrainExpressions;
             text = tag.BoolCloseAlarmText;
             return AlarmEnum.Close;
         }
-        if (tag.BoolOpenAlarmEnable && tag.Value.ToBool() == true)
+        if (tag.BoolOpenAlarmEnable && tag.Value.ToBoolean() == true)
         {
             limit = true.ToString();
             expressions = tag.BoolOpenRestrainExpressions;

framework/ThingsGateway.Application/Workers/Collect/CollectDeviceThread.cs

@@ -85,6 +85,29 @@ public class CollectDeviceThread : IAsyncDisposable
             easyLock.Release();
         }
     }
+    /// <summary>
+    /// 停止采集前，提前取消Token
+    /// </summary>
+    public virtual async Task BeforeStopThreadAsync()
+    {
+        try
+        {
+            await easyLock.WaitAsync();
+
+            if (DeviceTask == null)
+            {
+                return;
+            }
+            foreach (var token in StoppingTokens)
+            {
+                token.Cancel();
+            }
+        }
+        finally
+        {
+            easyLock.Release();
+        }
+    }
 
     /// <summary>
     /// 停止采集
@@ -173,7 +196,10 @@ public class CollectDeviceThread : IAsyncDisposable
                 foreach (var device in CollectDeviceCores)
                 {
                     try
-                    {//初始化成功才能执行
+                    {
+                        if (stoppingToken.IsCancellationRequested)
+                            break;
+                        //初始化成功才能执行
                         if (device.IsInitSuccess)
                         {
                             //如果是共享通道类型，需要每次转换时切换适配器

framework/ThingsGateway.Application/Workers/Collect/CollectDeviceWorker.cs

@@ -328,6 +328,18 @@ public class CollectDeviceWorker : BackgroundService
     /// </summary>
     private async Task RemoveAllDeviceThreadAsync()
     {
+        await CollectDeviceThreads.ParallelForEachAsync(async (deviceThread, token) =>
+        {
+            try
+            {
+                await deviceThread.BeforeStopThreadAsync();
+            }
+            catch (Exception ex)
+            {
+                _logger?.LogError(ex, deviceThread.ToString());
+            }
+        }, 10);
+
         await CollectDeviceThreads.ParallelForEachAsync(async (deviceThread, token) =>
          {
              try

framework/ThingsGateway.Application/Workers/HistoryValue/HistoryValueWorker.cs

@@ -60,7 +60,7 @@ public class HistoryValueWorker : BackgroundService
     public async Task<OperResult<SqlSugarClient>> GetHisDbAsync()
     {
         var ConfigService = ServiceHelper.Services.GetService<IConfigService>();
-        var hisEnable = (await ConfigService.GetByConfigKeyAsync(ThingsGatewayConfigConst.ThingGateway_HisConfig_Base, ThingsGatewayConfigConst.Config_His_Enable))?.ConfigValue?.ToBool();
+        var hisEnable = (await ConfigService.GetByConfigKeyAsync(ThingsGatewayConfigConst.ThingGateway_HisConfig_Base, ThingsGatewayConfigConst.Config_His_Enable))?.ConfigValue?.ToBoolean();
         var hisDbType = (await ConfigService.GetByConfigKeyAsync(ThingsGatewayConfigConst.ThingGateway_HisConfig_Base, ThingsGatewayConfigConst.Config_His_DbType))?.ConfigValue;
         var hisConnstr = (await ConfigService.GetByConfigKeyAsync(ThingsGatewayConfigConst.ThingGateway_HisConfig_Base, ThingsGatewayConfigConst.Config_His_ConnStr))?.ConfigValue;
 
@@ -458,7 +458,7 @@ public class HistoryValueMapper : IRegister
     {
         if (src.Value?.ToString()?.IsBoolValue() == true)
         {
-            if (src.Value.ToBool())
+            if (src.Value.ToBoolean())
             {
                 return 1;
             }

framework/ThingsGateway.Application/Workers/Upload/UploadDeviceThread.cs

@@ -74,6 +74,29 @@ public class UploadDeviceThread : IAsyncDisposable
             easyLock.Release();
         }
     }
+    /// <summary>
+    /// 停止采集前，提前取消Token
+    /// </summary>
+    public virtual async Task BeforeStopThreadAsync()
+    {
+        try
+        {
+            await easyLock.WaitAsync();
+
+            if (DeviceTask == null)
+            {
+                return;
+            }
+            foreach (var token in StoppingTokens)
+            {
+                token.Cancel();
+            }
+        }
+        finally
+        {
+            easyLock.Release();
+        }
+    }
 
     /// <summary>
     /// 停止上传
@@ -152,7 +175,10 @@ public class UploadDeviceThread : IAsyncDisposable
                 foreach (var device in UploadDeviceCores)
                 {
                     try
-                    {//初始化成功才能执行
+                    {
+                        if (stoppingToken.IsCancellationRequested)
+                            break;
+                        //初始化成功才能执行
                         if (device.IsInitSuccess)
                         {
 

framework/ThingsGateway.Application/Workers/Upload/UploadDeviceWorker.cs

@@ -239,6 +239,17 @@ public class UploadDeviceWorker : BackgroundService
     /// </summary>
     private async Task RemoveAllDeviceThreadAsync()
     {
+        await UploadDeviceThreads.ParallelForEachAsync(async (deviceThread, token) =>
+        {
+            try
+            {
+                await deviceThread.BeforeStopThreadAsync();
+            }
+            catch (Exception ex)
+            {
+                _logger?.LogError(ex, deviceThread.ToString());
+            }
+        }, 10);
         await UploadDeviceThreads.ParallelForEachAsync(async (deviceThread, token) =>
         {
             try

framework/ThingsGateway.Blazor/Components/ImportExcel.razor

@@ -102,44 +102,6 @@
 
                             }
 
-                            @foreach (var item in ImportPreviews)
-                            {
-                                <MSubheader Class="mt-2 font-weight-black">
-                                    @(
-                                        $"{item.Key}，预计导入{item.Value.DataCount}条数据"
-                                        )
-                                </MSubheader>
-                                <MSubheader Class=@((item.Value.HasError?"mt-2 red--text":"mt-2 green--text"))>
-                                    @(
-                                        (item.Value.HasError ? "出现错误" : "验证成功")
-                                        )
-                                </MSubheader>
-
-                                <MVirtualScroll Context="item1" Height=300 OverscanCount=2 ItemSize="60" Items="item.Value.Results">
-                                    <ItemContent>
-                                        <MListItem>
-                                            <MListItemAction>
-                                                <MChip Class="ma-2">
-                                                    @(
-                                            $"第{item1.row}行"
-                                            )
-                                                </MChip>
-                                            </MListItemAction>
-
-                                            <MListItemContent>
-                                                <MListItemTitle Class=@((item1.isSuccess?"green--text":"red--text"))>
-                                                    <strong>@item1.resultString</strong>
-                                                </MListItemTitle>
-                                            </MListItemContent>
-
-                                        </MListItem>
-
-                                        <MDivider></MDivider>
-
-                                    </ItemContent>
-                                </MVirtualScroll>
-
-                            }
                         </div>
                         <div class="mt-6">
                             <MButton Color="primary" Disabled=@ImportPreviews.Any(it=>it.Value.HasError) OnClick="()=>Step=3">下一步</MButton>

framework/ThingsGateway.Blazor/DebugPage/SerialClientPage.razor.cs

@@ -78,8 +78,7 @@ public partial class SerialClientPage
     /// <inheritdoc/>
     protected override void OnInitialized()
     {
-        config?.Dispose();
+        config ??= new TouchSocketConfig();
-        config = new TouchSocketConfig();
         var LogMessage = new TouchSocket.Core.LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
         LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = TouchSocket.Core.LogLevel.Trace });
         config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));

framework/ThingsGateway.Blazor/DebugPage/TcpClientPage.razor.cs

@@ -78,8 +78,7 @@ public partial class TcpClientPage
     /// <returns></returns>
     public TcpClientEx GetTcpClient()
     {
-        config?.Dispose();
+        config ??= new TouchSocketConfig();
-        config = new TouchSocketConfig();
         var LogMessage = new TouchSocket.Core.LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
         LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = TouchSocket.Core.LogLevel.Trace });
         config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));

framework/ThingsGateway.Blazor/DebugPage/TcpServerPage.razor.cs

@@ -67,8 +67,7 @@ public partial class TcpServerPage
     /// <returns></returns>
     public TcpService GetTcpServer()
     {
-        config?.Dispose();
+        config ??= new TouchSocketConfig();
-        config = new TouchSocketConfig();
         var LogMessage = new TouchSocket.Core.LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
         LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = TouchSocket.Core.LogLevel.Trace });
         config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));

framework/ThingsGateway.Blazor/DebugPage/UdpSessionPage.razor.cs

@@ -67,8 +67,7 @@ public partial class UdpSessionPage : IDisposable
     /// <returns></returns>
     public UdpSession GetUdpSession()
     {
-        config?.Dispose();
+        config ??= new TouchSocketConfig();
-        config = new TouchSocketConfig();
         var LogMessage = new TouchSocket.Core.LoggerGroup() { LogLevel = TouchSocket.Core.LogLevel.Trace };
         LogMessage.AddLogger(new EasyLogger(LogOut) { LogLevel = TouchSocket.Core.LogLevel.Trace });
         config.ConfigureContainer(a => a.RegisterSingleton<ILog>(LogMessage));

framework/ThingsGateway.Blazor/Page/DeviceStatusPage.razor

@@ -62,6 +62,7 @@
                             <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_collectDeviceGroupSearchName"
                                             Outlined Label=@typeof(CollectDevice).GetDescription(nameof(CollectDevice.DeviceGroup)) />
                             </MCardTitle>
+
                             <MTreeview Style=@($"height: calc(100vh - {BlazorResourceConst.DefaultHeight + 240}px; overflow-y:auto)") Dense TItem="string" TKey="string" ActiveChanged=@(async a=>
                                    {
                                    if(_collectDeviceGroup!=a.FirstOrDefault())

framework/ThingsGateway.Blazor/Page/DeviceStatusPage.razor.cs

@@ -199,7 +199,6 @@ public partial class DeviceStatusPage : IDisposable
     //        await MainLayout.StateHasChangedAsync();
     //    }
     //}
-
     private async Task RunTimerAsync()
     {
         while (await _periodicTimer.WaitForNextTickAsync())

framework/ThingsGateway.Blazor/Page/DeviceVariablePage.razor

@@ -180,8 +180,41 @@ else
             }
 
         </ItemColTemplate>
+
+        <Detailemplate>
+            @{
+                switch (context.Item1.Value)
+                {
+                    case nameof(DeviceVariable.DeviceId):
+                        <tr @key="context.Item1.Text">
+                            <td class="text-start table-minwidth">
+                                @context.Item1.Text
+                            </td>
+                            <td class="text-start ">
+                                <div style="word-break:break-all; white-space:pre-wrap;">
+                                    @(App.GetService<ICollectDeviceService>().GetNameById(context.Item2.ToLong()))
+                                </div>
+                            </td>
+                        </tr>
+                        break;
+                    default:
+                        <tr @key="context.Item1.Text">
+                            <td class="text-start table-minwidth">
+                                @context.Item1.Text
+                            </td>
+                            <td class="text-start ">
+                                <div style="word-break:break-all; white-space:pre-wrap;">
+                                    @context.Item2
+                                </div>
+                            </td>
+                        </tr>
+                        break;
+                }
+
+            }
+        </Detailemplate>
     </AppDataTable>
-    ;
+        ;
         return renderFragment;
     }
 

framework/ThingsGateway.Blazor/Page/DeviceVariableRunTimePage.razor

@@ -61,6 +61,7 @@ else
                         </span>
                     </LabelContent>
                 </MTreeview>
+
             </MCard>
         </MCol>
         <MCol Md=10 Cols="12">
@@ -119,7 +120,38 @@ else
             }
 
         </ItemColTemplate>
+        <Detailemplate>
+            @{
+                switch (context.Item1.Value)
+                {
+                    case nameof(DeviceVariable.DeviceId):
+                        <tr @key="context.Item1.Text">
+                            <td class="text-start table-minwidth">
+                                @context.Item1.Text
+                            </td>
+                            <td class="text-start ">
+                                <div style="word-break:break-all; white-space:pre-wrap;">
+                                    @(App.GetService<ICollectDeviceService>().GetNameById(context.Item2.ToLong()))
+                                </div>
+                            </td>
+                        </tr>
+                        break;
+                    default:
+                        <tr @key="context.Item1.Text">
+                            <td class="text-start table-minwidth">
+                                @context.Item1.Text
+                            </td>
+                            <td class="text-start ">
+                                <div style="word-break:break-all; white-space:pre-wrap;">
+                                    @context.Item2
+                                </div>
+                            </td>
+                        </tr>
+                        break;
+                }
 
+            }
+        </Detailemplate>
     </AppDataTable>
 
     ;

framework/ThingsGateway.Blazor/Page/DriverDebugPage.razor

@@ -32,7 +32,7 @@
 @layout MainLayout
 
 <MRow NoGutters>
-    <MCol Md=@(IsShowTreeView?4:0)>
+    <MCol Md=@(IsShowTreeView?3:0)>
         <MCard Show=IsShowTreeView Style=@($"height: calc(100vh - {BlazorResourceConst.DefaultHeight}px);border-radius:0px;")>
             <MCardTitle>
                 <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="_searchName" Outlined Label=@typeof(CollectDevice).GetDescription(nameof(CollectDevice.PluginId)) />
@@ -62,7 +62,7 @@
             </MTreeview>
         </MCard>
     </MCol>
-    <MCol Md=@(IsShowTreeView?8:12)>
+    <MCol Md=@(IsShowTreeView?9:12)>
         <MCard Style=@($"height: calc(100vh - {BlazorResourceConst.DefaultHeight}px);border-radius:0px;")>
             <MCard Class="mb-3 pa-2  text-h6" Elevation="0" Flat Rounded="false">
                 <MRow Align="AlignTypes.Center" Class="mt-1">

framework/ThingsGateway.Blazor/Page/HardwareInfoPage.razor

@@ -130,7 +130,7 @@
         <MCard Elevation="1" Class="ma-2">
             <MCardSubtitle Class=@("text-h6")>
                 <div class="mt-1  d-flex align-center justify-space-between">
-                    <span>"当前内存/磁盘信息</span>
+                    <span>当前内存/磁盘信息</span>
                 </div>
             </MCardSubtitle>
             <MDivider></MDivider>

framework/ThingsGateway.Blazor/Page/MemoryVariablePage.razor

@@ -149,6 +149,7 @@
                                 <MTextField Dense Outlined HideDetails="@("auto")" @bind-Value=@context.ReadExpressions />
 
                                 </MCol>
+
                                 <MCol Md=6 Cols=12 class="px-1">
 
                                     <MSubheader Class="font-weight-black">    @(context.Description(x => x.WriteExpressions))  </MSubheader>

framework/ThingsGateway.Blazor/Page/MemoryVariablePage.razor.cs

@@ -96,7 +96,7 @@ public partial class MemoryVariablePage
 
     Task<Dictionary<string, ImportPreviewOutputBase>> DeviceImportAsync(IBrowserFile file)
     {
-        return VariableService.PreviewAsync(file);
+        return VariableService.MemoryVariablePreviewAsync(file);
     }
 
 

framework/ThingsGateway.Foundation/BaseReadWrite/ReadWriteDevicesSerialBase.cs

@@ -30,7 +30,7 @@ public abstract class ReadWriteDevicesSerialBase : ReadWriteDevicesClientBase
     public ReadWriteDevicesSerialBase(SerialClient serialClient)
     {
         SerialClient = serialClient;
-        WaitingClientEx = SerialClient.GetWaitingClientEx(new());
+        WaitingClientEx = SerialClient.GetWaitingClientEx(new() { BreakTrigger = true });
 
         SerialClient.Connecting -= Connecting;
         SerialClient.Connected -= Connected;

framework/ThingsGateway.Foundation/BaseReadWrite/ReadWriteDevicesTcpClientBase.cs

@@ -26,7 +26,7 @@ public abstract class ReadWriteDevicesTcpClientBase : ReadWriteDevicesClientBase
     public ReadWriteDevicesTcpClientBase(TcpClientEx tcpClient)
     {
         TcpClientEx = tcpClient;
-        WaitingClientEx = TcpClientEx.GetWaitingClientEx(new());
+        WaitingClientEx = TcpClientEx.GetWaitingClientEx(new() { BreakTrigger = true });
         TcpClientEx.Connecting -= Connecting;
         TcpClientEx.Connected -= Connected;
         TcpClientEx.Disconnecting -= Disconnecting;

framework/ThingsGateway.Foundation/BaseReadWrite/ReadWriteDevicesUdpBase.cs

@@ -24,10 +24,8 @@ public abstract class ReadWriteDevicesUdpBase : ReadWriteDevicesClientBase
     /// <inheritdoc cref="ReadWriteDevicesUdpBase"/>
     public ReadWriteDevicesUdpBase(UdpSession udpSession)
     {
-
         UdpSession = udpSession;
-        WaitingClientEx = UdpSession.GetWaitingClientEx(new());
+        WaitingClientEx = UdpSession.GetWaitingClientEx(new() { BreakTrigger = true });
-
         SetDataAdapter();
     }
     /// <summary>

framework/ThingsGateway.Foundation/Common/WaitingClientEx.cs

@@ -12,6 +12,8 @@
 
 
 
+using ThingsGateway.Foundation.Serial;
+
 namespace ThingsGateway.Foundation;
 
 internal class WaitingClientEx<TClient> : DisposableObject, IWaitingClient<TClient> where TClient : IClient, IDefaultSender, ISender
@@ -52,6 +54,7 @@ internal class WaitingClientEx<TClient> : DisposableObject, IWaitingClient<TClie
     {
         this.Client = default;
         this.m_waitData.SafeDispose();
+        this.m_waitDataAsync.SafeDispose();
         base.Dispose(disposing);
     }
 
@@ -66,7 +69,11 @@ internal class WaitingClientEx<TClient> : DisposableObject, IWaitingClient<TClie
         this.m_breaked = true;
         this.Cancel();
     }
-
+    private void OnSerialClientDisconnected(ISerialClientBase client, DisconnectEventArgs e)
+    {
+        this.m_breaked = true;
+        this.Cancel();
+    }
     private bool OnHandleRawBuffer(ByteBlock byteBlock)
     {
         var responsedData = new ResponsedData(byteBlock.ToArray(), null, true);
@@ -121,7 +128,10 @@ internal class WaitingClientEx<TClient> : DisposableObject, IWaitingClient<TClie
             {
                 tcpClient.Disconnected += this.OnDisconnected;
             }
-
+            if (this.WaitingOptions.BreakTrigger && this.Client is ISerialClientBase serialClient)
+            {
+                serialClient.Disconnected += this.OnSerialClientDisconnected;
+            }
             if (this.WaitingOptions.AdapterFilter == AdapterFilter.AllAdapter || this.WaitingOptions.AdapterFilter == AdapterFilter.WaitAdapter)
             {
                 this.Client.OnHandleReceivedData += this.OnHandleReceivedData;
@@ -179,7 +189,10 @@ internal class WaitingClientEx<TClient> : DisposableObject, IWaitingClient<TClie
             {
                 tcpClient.Disconnected -= this.OnDisconnected;
             }
-
+            if (this.WaitingOptions.BreakTrigger && this.Client is ISerialClientBase serialClient)
+            {
+                serialClient.Disconnected -= this.OnSerialClientDisconnected;
+            }
             if (this.WaitingOptions.AdapterFilter == AdapterFilter.AllAdapter || this.WaitingOptions.AdapterFilter == AdapterFilter.WaitAdapter)
             {
                 this.Client.OnHandleReceivedData -= this.OnHandleReceivedData;
@@ -191,6 +204,8 @@ internal class WaitingClientEx<TClient> : DisposableObject, IWaitingClient<TClie
         }
     }
 
+
+
     public ResponsedData SendThenResponse(byte[] buffer, int timeout = 1000 * 5, CancellationToken token = default)
     {
         return this.SendThenResponse(buffer, 0, buffer.Length, timeout, token);
@@ -216,7 +231,10 @@ internal class WaitingClientEx<TClient> : DisposableObject, IWaitingClient<TClie
             {
                 tcpClient.Disconnected += this.OnDisconnected;
             }
-
+            if (this.WaitingOptions.BreakTrigger && this.Client is ISerialClientBase serialClient)
+            {
+                serialClient.Disconnected += this.OnSerialClientDisconnected;
+            }
             if (this.WaitingOptions.AdapterFilter == AdapterFilter.AllAdapter || this.WaitingOptions.AdapterFilter == AdapterFilter.WaitAdapter)
             {
                 this.Client.OnHandleReceivedData += this.OnHandleReceivedData;
@@ -274,7 +292,10 @@ internal class WaitingClientEx<TClient> : DisposableObject, IWaitingClient<TClie
             {
                 tcpClient.Disconnected -= this.OnDisconnected;
             }
-
+            if (this.WaitingOptions.BreakTrigger && this.Client is ISerialClientBase serialClient)
+            {
+                serialClient.Disconnected -= this.OnSerialClientDisconnected;
+            }
             if (this.WaitingOptions.AdapterFilter == AdapterFilter.AllAdapter || this.WaitingOptions.AdapterFilter == AdapterFilter.WaitAdapter)
             {
                 this.Client.OnHandleReceivedData -= this.OnHandleReceivedData;

framework/ThingsGateway.Foundation/DataHandleAdapter/ReadWriteDevicesTcpDataHandleAdapter.cs

@@ -108,11 +108,8 @@ public abstract class ReadWriteDevicesTcpDataHandleAdapter<TRequest> : CustomDat
     protected virtual FilterResult GetResponse(ByteBlock byteBlock, TRequest request, byte[] body, byte[] bytes)
     {
         var unpackbytes = UnpackResponse(request, request.SendBytes, body, bytes);
-        request.Message = unpackbytes.Message;
-        request.Content = unpackbytes.Content1;
         request.ReceivedBytes = bytes;
-        request.ResultCode = unpackbytes.ResultCode;
+        switch (unpackbytes)
-        switch (unpackbytes.Content2)
         {
             case FilterResult.Cache:
                 return FilterResult.Cache;
@@ -121,15 +118,10 @@ public abstract class ReadWriteDevicesTcpDataHandleAdapter<TRequest> : CustomDat
             case FilterResult.GoOn:
                 byteBlock.Pos = byteBlock.Len;
                 return FilterResult.GoOn;
+            default:
+                byteBlock.Pos = byteBlock.Len;
+                return FilterResult.GoOn;
         }
-
-        //直接放弃
-        byteBlock.Pos = byteBlock.Len;
-        request.ReceivedBytes = bytes;
-        Logger?.Warning(unpackbytes.Message);
-        request.ResultCode = ResultCode.Error;
-        request.Message = unpackbytes.Message;
-        return FilterResult.GoOn;
     }
     /// <summary>
     /// 发送方法,会重新建立<see cref="Request"/>
@@ -156,5 +148,5 @@ public abstract class ReadWriteDevicesTcpDataHandleAdapter<TRequest> : CustomDat
     /// <summary>
     /// 报文拆包
     /// </summary>
-    protected abstract OperResult<byte[], FilterResult> UnpackResponse(TRequest request, byte[] send, byte[] body, byte[] response);
+    protected abstract FilterResult UnpackResponse(TRequest request, byte[] send, byte[] body, byte[] response);
 }

framework/ThingsGateway.Foundation/Extensions/LoggerExtensions.cs

@@ -38,6 +38,8 @@ public static class LoggerExtensions
     {
         logger.Log(TouchSocket.Core.LogLevel.Warning, null, msg, ex);
     }
+
+
     /// <summary>
     /// 输出警示日志
     /// </summary>

framework/ThingsGateway.Foundation/SerialPort/SerialPort/SerialProperty.cs

@@ -45,4 +45,9 @@ public class SerialProperty
     /// </summary>
     [Description("停止位")]
     public StopBits StopBits { get; set; } = StopBits.One;
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"{PortName}[{BaudRate},{DataBits},{StopBits},{Parity}]";
+    }
 }

framework/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj

@@ -3,6 +3,11 @@
 	<PropertyGroup>
 		<TargetFrameworks>net45;net6.0;net7.0</TargetFrameworks>
 		<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+		<PackageProjectUrl>https://diego2098.gitee.io/thingsgateway-docs/</PackageProjectUrl>
+		<PackageTags>ThingsGateway;Diego;dotNET China;Blazor;设备采集;边缘网关</PackageTags>
+		<PackageOutputPath>../nupkgs</PackageOutputPath>
 		<AssemblyOriginatorKeyFile>..\..\snks\ThingsGateway.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
 	

framework/ThingsGateway.Foundation/ThingsGateway.Foundation.xml

@@ -2288,6 +2288,9 @@
             停止位
             </summary>
         </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialProperty.ToString">
+            <inheritdoc/>
+        </member>
         <member name="T:ThingsGateway.Foundation.SerialPortExtensions">
             <summary>
             SocketExtension

framework/ThingsGateway.Plugin/Foundataion.Demo/OPCUAClientDemo/OPCUAClientDemo.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Foundataion\ThingsGateway.Foundation.Adapter.OPCUA\ThingsGateway.Foundation.Adapter.OPCUA.csproj" />
+  </ItemGroup>
+
+</Project>

framework/ThingsGateway.Plugin/Foundataion.Demo/OPCUAClientDemo/OPCUAClientDemo.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>OPCUAClientDemo</name>
+    </assembly>
+    <members>
+    </members>
+</doc>

framework/ThingsGateway.Plugin/Foundataion.Demo/OPCUAClientDemo/Program.cs

@@ -0,0 +1,26 @@
+using ThingsGateway.Foundation.Adapter.OPCUA;
+
+using TouchSocket.Core;
+
+namespace ModbusDemo
+{
+    internal class Program
+    {
+        static async Task Main(string[] args)
+        {
+            OPCUAClient oPCUAClient = new(new EasyLogger(a => Console.WriteLine(a)))
+            {
+                OPCNode = new()
+                {
+                    OPCUrl = "opc.tcp://desktop-p5gb4iq:50001/StandardServer",
+                    IsUseSecurity = true,
+                }
+            };
+            await oPCUAClient.ConnectAsync();
+
+            var testData1 = await oPCUAClient.ReadJTokenValueAsync(new[] { "ns=2;i=2897" });
+            await oPCUAClient.WriteNodeAsync("ns=2;i=2897", testData1.FirstOrDefault().Item3);
+
+        }
+    }
+}

framework/ThingsGateway.Plugin/Foundataion/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-		<Version>2.0.0.0</Version>
+		<Version>2.0.5.0</Version>
 		<Authors>Diego</Authors>
 		<Product>ThingsGateway</Product>
 		<Copyright>© 2023-present Diego</Copyright>

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusRtu/ModbusRtu.cs

@@ -82,12 +82,12 @@ public class ModbusRtu : ReadWriteDevicesSerialBase
     /// <inheritdoc/>
     public override void SetDataAdapter()
     {
-        ModbusRtuDataHandleAdapter DataHandleAdapter = new()
+        ModbusRtuDataHandleAdapter dataHandleAdapter = new()
         {
             Crc16CheckEnable = Crc16CheckEnable,
             CacheTimeout = TimeSpan.FromMilliseconds(CacheTimeout)
         };
-        SerialClient.SetDataHandlingAdapter(DataHandleAdapter);
+        SerialClient.SetDataHandlingAdapter(dataHandleAdapter);
     }
 
     /// <inheritdoc/>

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusRtu/ModbusRtuDataHandleAdapter.cs

@@ -10,7 +10,6 @@
 //------------------------------------------------------------------------------
 #endregion
 
-using ThingsGateway.Foundation.Extension;
 
 namespace ThingsGateway.Foundation.Adapter.Modbus;
 
@@ -41,43 +40,52 @@ public class ModbusRtuDataHandleAdapter : ReadWriteDevicesTcpDataHandleAdapter<M
 
 
     /// <inheritdoc/>
-    protected override OperResult<byte[], FilterResult> UnpackResponse(ModbusRtuMessage request, byte[] send, byte[] body, byte[] response)
+    protected override FilterResult UnpackResponse(ModbusRtuMessage request, byte[] send, byte[] body, byte[] response)
     {
         //理想状态检测
         var result = ModbusHelper.GetModbusRtuData(send, response, Crc16CheckEnable);
         if (result.IsSuccess)
         {
-            return OperResult.CreateSuccessResult(result.Content, FilterResult.Success);
+            request.ResultCode = result.ResultCode;
+            request.Message = result.Message;
+            request.Content = result.Content;
+            return FilterResult.Success;
         }
         else
         {
-            //如果返回错误，具体分析
-            var op = result.Copy<byte[], FilterResult>();
             if (response.Length <= 1)
             {
+                request.ResultCode = result.ResultCode;
+                request.Message = result.Message;
+                request.Content = result.Content;
                 //如果长度不足，返回缓存
-                op.Content2 = FilterResult.Cache;
+                return FilterResult.Cache;
-                return op;
             }
             if (!(response[1] <= 0x10))
             {
+                request.ResultCode = result.ResultCode;
+                request.Message = result.Message;
+                request.Content = result.Content;
                 //功能码不对，返回放弃
-                op.Content2 = FilterResult.Success;
+                return FilterResult.Success;
-                return op;
             }
             else
             {
                 if ((response.Length > response[2] + 4))
                 {
+                    request.ResultCode = result.ResultCode;
+                    request.Message = result.Message;
+                    request.Content = result.Content;
                     //如果长度已经超了，说明这段报文已经不能继续解析了，直接返回放弃
-                    op.Content2 = FilterResult.Success;
+                    return FilterResult.Success;
-                    return op;
                 }
                 else
                 {
+                    request.ResultCode = result.ResultCode;
+                    request.Message = result.Message;
+                    request.Content = result.Content;
                     //否则返回缓存
-                    op.Content2 = FilterResult.Cache;
+                    return FilterResult.Cache;
-                    return op;
                 }
             }
         }

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusRtuOverTcp/ModbusRtuOverTcp.cs

@@ -78,12 +78,12 @@ public class ModbusRtuOverTcp : ReadWriteDevicesTcpClientBase
     /// <inheritdoc/>
     public override void SetDataAdapter()
     {
-        ModbusRtuDataHandleAdapter DataHandleAdapter = new()
+        ModbusRtuDataHandleAdapter dataHandleAdapter = new()
         {
             Crc16CheckEnable = Crc16CheckEnable,
             CacheTimeout = TimeSpan.FromMilliseconds(CacheTimeout)
         };
-        TcpClientEx.SetDataHandlingAdapter(DataHandleAdapter);
+        TcpClientEx.SetDataHandlingAdapter(dataHandleAdapter);
     }
 
     /// <inheritdoc/>

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusRtuOverUdp/ModbusRtuOverUdp.cs

@@ -72,11 +72,14 @@ public class ModbusRtuOverUdp : ReadWriteDevicesUdpBase
     /// <inheritdoc/>
     public override void SetDataAdapter()
     {
-        ModbusRtuOverUdpDataHandleAdapter DataHandleAdapter = new()
+        ModbusRtuOverUdpDataHandleAdapter dataHandleAdapter = new()
         {
             Crc16CheckEnable = Crc16CheckEnable,
         };
-        UdpSession.SetDataHandlingAdapter(DataHandleAdapter);
+        UdpSession.Config.SetUdpDataHandlingAdapter(() =>
+        {
+            return dataHandleAdapter;
+        });
     }
 
     /// <inheritdoc/>

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusServer/ModbusServer.cs

@@ -78,8 +78,8 @@ public class ModbusServer : ReadWriteDevicesTcpServerBase
     /// <inheritdoc/>
     public override void SetDataAdapter(SocketClient client)
     {
-        ModbusServerDataHandleAdapter DataHandleAdapter = new();
+        ModbusServerDataHandleAdapter dataHandleAdapter = new();
-        client.SetDataHandlingAdapter(DataHandleAdapter);
+        client.SetDataHandlingAdapter(dataHandleAdapter);
     }
 
     /// <inheritdoc/>

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusServer/ModbusServerDataHandleAdapter.cs

@@ -10,7 +10,6 @@
 //------------------------------------------------------------------------------
 #endregion
 
-using ThingsGateway.Foundation.Extension;
 using ThingsGateway.Foundation.Extension.Generic;
 
 namespace ThingsGateway.Foundation.Adapter.Modbus;
@@ -69,7 +68,7 @@ public class ModbusServerDataHandleAdapter : ReadWriteDevicesTcpDataHandleAdapte
     }
 
     /// <inheritdoc/>
-    protected override OperResult<byte[], FilterResult> UnpackResponse(ModbusServerMessage request, byte[] send, byte[] body, byte[] response)
+    protected override FilterResult UnpackResponse(ModbusServerMessage request, byte[] send, byte[] body, byte[] response)
     {
         var result = GetModbusData(response.RemoveBegin(6));
         if (result.IsSuccess)
@@ -119,14 +118,15 @@ public class ModbusServerDataHandleAdapter : ReadWriteDevicesTcpDataHandleAdapte
                     Length = ThingsGatewayBitConverter.ToByte(response, 11),
                 };
             }
-
+            request.ResultCode = result.ResultCode;
-            return OperResult.CreateSuccessResult(request.Content, FilterResult.Success);
+            request.Message = result.Message;
+            return FilterResult.Success;
         }
         else
         {
-            var op = result.Copy<byte[], FilterResult>();
+            request.ResultCode = result.ResultCode;
-            op.Content2 = FilterResult.Cache;
+            request.Message = result.Message;
-            return op;
+            return FilterResult.Cache;
         }
     }
 }

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusTcp/ModbusTcp.cs

@@ -79,12 +79,12 @@ public class ModbusTcp : ReadWriteDevicesTcpClientBase
     /// <inheritdoc/>
     public override void SetDataAdapter()
     {
-        ModbusTcpDataHandleAdapter DataHandleAdapter = new()
+        ModbusTcpDataHandleAdapter dataHandleAdapter = new()
         {
             IsCheckMessageId = IsCheckMessageId,
             CacheTimeout = TimeSpan.FromMilliseconds(CacheTimeout)
         };
-        TcpClientEx.SetDataHandlingAdapter(DataHandleAdapter);
+        TcpClientEx.SetDataHandlingAdapter(dataHandleAdapter);
     }
 
     /// <inheritdoc/>

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusTcp/ModbusTcpDataHandleAdapter.cs

@@ -50,35 +50,54 @@ public class ModbusTcpDataHandleAdapter : ReadWriteDevicesTcpDataHandleAdapter<M
     }
 
     /// <inheritdoc/>
-    protected override OperResult<byte[], FilterResult> UnpackResponse(ModbusTcpMessage request, byte[] send, byte[] body, byte[] response)
+    protected override FilterResult UnpackResponse(ModbusTcpMessage request, byte[] send, byte[] body, byte[] response)
     {
         //理想状态检测
         var result = ModbusHelper.GetModbusData(send.RemoveBegin(6), response.RemoveBegin(6));
         if (result.IsSuccess)
         {
-            return OperResult.CreateSuccessResult(result.Content, FilterResult.Success);
+            request.ResultCode = result.ResultCode;
+            request.Message = result.Message;
+            request.Content = result.Content;
+            return FilterResult.Success;
         }
         else
         {
             //如果返回错误，具体分析
             var op = result.Copy<byte[], FilterResult>();
+            if (response.Length == 9)
+            {
+                if (response[7] >= 0x80)//错误码
+                {
+                    request.ResultCode = result.ResultCode;
+                    request.Message = result.Message;
+                    request.Content = result.Content;
+                    return FilterResult.Success;
+                }
+            }
             if (response.Length < 10)
             {
+                request.ResultCode = result.ResultCode;
+                request.Message = result.Message;
+                request.Content = result.Content;
+                return FilterResult.Cache;
                 //如果长度不足，返回缓存
-                op.Content2 = FilterResult.Cache;
-                return op;
             }
             if ((response.Length > response[8] + 9))
             {
+                request.ResultCode = result.ResultCode;
+                request.Message = result.Message;
+                request.Content = result.Content;
+                return FilterResult.Success;
                 //如果长度已经超了，说明这段报文已经不能继续解析了，直接返回放弃
-                op.Content2 = FilterResult.Success;
-                return op;
             }
             else
             {
+                request.ResultCode = result.ResultCode;
+                request.Message = result.Message;
+                request.Content = result.Content;
+                return FilterResult.Cache;
                 //否则返回缓存
-                op.Content2 = FilterResult.Cache;
-                return op;
             }
         }
 

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Modbus/Modbus/ModbusUdp/ModbusUdp.cs

@@ -75,11 +75,14 @@ public class ModbusUdp : ReadWriteDevicesUdpBase
     /// <inheritdoc/>
     public override void SetDataAdapter()
     {
-        ModbusUdpDataHandleAdapter DataHandleAdapter = new()
+        ModbusUdpDataHandleAdapter dataHandleAdapter = new()
         {
             IsCheckMessageId = IsCheckMessageId
         };
-        UdpSession.SetDataHandlingAdapter(DataHandleAdapter);
+        UdpSession.Config.SetUdpDataHandlingAdapter(() =>
+        {
+            return dataHandleAdapter;
+        });
     }
 
     /// <inheritdoc/>

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.OPCUA/OPCUAClient/JsonUtils.cs

@@ -31,11 +31,6 @@ public static class JsonUtils
     /// <summary>
     /// 解析获取DataValue
     /// </summary>
-    /// <param name="Context"></param>
-    /// <param name="dataTypeId"></param>
-    /// <param name="builtInType"></param>
-    /// <param name="valueRank"></param>
-    /// <param name="json"></param>
     /// <returns></returns>
     public static DataValue Decode(
         IServiceMessageContext Context,
@@ -45,6 +40,7 @@ public static class JsonUtils
         JToken json
     )
     {
+
         var data = DecoderObject(Context, dataTypeId, builtInType, valueRank, json);
         var dataValue = new DataValue(new Variant(data));
         return dataValue;
@@ -54,11 +50,6 @@ public static class JsonUtils
     /// <summary>
     /// 解析获取object
     /// </summary>
-    /// <param name="Context"></param>
-    /// <param name="dataTypeId"></param>
-    /// <param name="builtInType"></param>
-    /// <param name="valueRank"></param>
-    /// <param name="json"></param>
     /// <returns></returns>
     public static object DecoderObject(
         IServiceMessageContext Context,
@@ -76,10 +67,9 @@ public static class JsonUtils
                 {
                     Value = new
                     {
-                        TypeId = new { Id = dataTypeId.Identifier },
+                        TypeId = new { Id = dataTypeId.Identifier, Namespace = dataTypeId.NamespaceIndex },
                         Body = json
                     }
-
                 }.ToJson();
                 break;
             case BuiltInType.Variant:

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.OPCUA/OPCUAClient/OPCUAClient.cs

@@ -14,6 +14,7 @@ using Newtonsoft.Json.Linq;
 
 using Opc.Ua;
 using Opc.Ua.Client;
+using Opc.Ua.Client.ComplexTypes;
 using Opc.Ua.Configuration;
 
 using System.Collections.Generic;
@@ -454,13 +455,24 @@ public class OPCUAClient : DisposableObject
     /// </summary>
     public async Task ConnectAsync()
     {
-        m_session = await ConnectAsync(OPCNode.OPCUrl);
+        await ConnectAsync(OPCNode.OPCUrl);
     }
 
     /// <summary>
     /// 断开连接。
     /// </summary>
     public void Disconnect()
+    {
+        PrivateDisconnect();
+        // disconnect any existing session.
+        if (m_session != null)
+        {
+            Log.Debug("断开连接");
+            m_session = null;
+        }
+    }
+
+    private void PrivateDisconnect()
     {
         // stop any reconnect operation.
         if (m_reConnectHandler != null)
@@ -468,15 +480,7 @@ public class OPCUAClient : DisposableObject
             m_reConnectHandler.SafeDispose();
             m_reConnectHandler = null;
         }
-
+        m_session?.Close(10000);
-        // disconnect any existing session.
-        if (m_session != null)
-        {
-            Log.Debug("断开连接");
-            m_session.Close(10000);
-            m_session = null;
-        }
-
 
 
     }
@@ -508,6 +512,10 @@ public class OPCUAClient : DisposableObject
                 AttributeId = Attributes.Value,
             };
             var node = (VariableNode)ReadNode(tag.ToString(), false);
+            //var expandedNodeId = NodeId.ToExpandedNodeId(node.DataType, m_session.NamespaceUris);
+            //var type = m_session.Factory.GetSystemType(expandedNodeId);
+            //var data = value.ToObject(type);
+            //var dataValue = new DataValue(new Variant(data));
             var dataValue = JsonUtils.Decode(
                 m_session.MessageContext,
                 node.DataType,
@@ -859,7 +867,7 @@ public class OPCUAClient : DisposableObject
     /// <returns>The new session object.</returns>
     private async Task<ISession> ConnectAsync(string serverUrl)
     {
-        Disconnect();
+        PrivateDisconnect();
 
         if (m_configuration == null)
         {
@@ -889,7 +897,7 @@ public class OPCUAClient : DisposableObject
     60000,
     userIdentity,
     Array.Empty<string>());
-
+        await new ComplexTypeSystem(m_session).Load(false, true).ConfigureAwait(false);
         Log.Debug("连接成功");
 
         m_session.KeepAliveInterval = OPCNode.KeepAliveInterval == 0 ? 60000 : OPCNode.KeepAliveInterval;

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.OPCUA/ThingsGateway.Foundation.Adapter.OPCUA.csproj

@@ -8,6 +8,7 @@
 
 	<ItemGroup>
 	  <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.4.371.96" />
+	  <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.4.371.96" />
 	  <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.4.371.96" />
 	</ItemGroup>
 

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.OPCUA/ThingsGateway.Foundation.Adapter.OPCUA.xml

@@ -161,22 +161,12 @@
             <summary>
             解析获取DataValue
             </summary>
-            <param name="Context"></param>
-            <param name="dataTypeId"></param>
-            <param name="builtInType"></param>
-            <param name="valueRank"></param>
-            <param name="json"></param>
             <returns></returns>
         </member>
         <member name="M:ThingsGateway.Foundation.Adapter.OPCUA.JsonUtils.DecoderObject(Opc.Ua.IServiceMessageContext,Opc.Ua.NodeId,Opc.Ua.BuiltInType,System.Int32,Newtonsoft.Json.Linq.JToken)">
             <summary>
             解析获取object
             </summary>
-            <param name="Context"></param>
-            <param name="dataTypeId"></param>
-            <param name="builtInType"></param>
-            <param name="valueRank"></param>
-            <param name="json"></param>
             <returns></returns>
         </member>
         <member name="M:ThingsGateway.Foundation.Adapter.OPCUA.JsonUtils.DecodeRawData(Opc.Ua.JsonDecoder,Opc.Ua.BuiltInType,System.Int32,System.String)">

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Siemens/Siemens/SiemensS7PLC.cs

@@ -305,6 +305,8 @@ namespace ThingsGateway.Foundation.Adapter.Siemens
                     foreach (var item in commandResult.Content)
                     {
                         ResponsedData result = await WaitingClientEx.SendThenResponseAsync(item, TimeOut, token);
+                        if (!((MessageBase)result.RequestInfo).IsSuccess)
+                            return OperResult.CreateFailedResult<byte[]>(((MessageBase)result.RequestInfo));
                         bytes.Add(result);
                     }
                     return OperResult.CreateSuccessResult(bytes.ToArray());
@@ -338,7 +340,7 @@ namespace ThingsGateway.Foundation.Adapter.Siemens
                 if (commandResult.IsSuccess)
                 {
                     var result = await WaitingClientEx.SendThenResponseAsync(commandResult.Content, TimeOut, token);
-                    return OperResult.CreateSuccessResult(result);
+                    return (MessageBase)result.RequestInfo;
                 }
                 else
                 {

framework/ThingsGateway.Plugin/Foundataion/ThingsGateway.Foundation.Adapter.Siemens/Siemens/SiemensS7PLCDataHandleAdapter.cs

@@ -10,7 +10,6 @@
 //------------------------------------------------------------------------------
 #endregion
 
-using ThingsGateway.Foundation.Extension;
 
 namespace ThingsGateway.Foundation.Adapter.Siemens;
 
@@ -35,7 +34,7 @@ public class SiemensS7PLCDataHandleAdapter : ReadWriteDevicesTcpDataHandleAdapte
     }
 
     /// <inheritdoc/>
-    protected override OperResult<byte[], FilterResult> UnpackResponse(SiemensMessage request, byte[] send, byte[] body, byte[] response)
+    protected override FilterResult UnpackResponse(SiemensMessage request, byte[] send, byte[] body, byte[] response)
     {
         var result = new OperResult<byte[]>();
         if (response[2] * 256 + response[3] == 7)
@@ -57,23 +56,29 @@ public class SiemensS7PLCDataHandleAdapter : ReadWriteDevicesTcpDataHandleAdapte
         }
         if (result.IsSuccess)
         {
-            return OperResult.CreateSuccessResult(result.Content, FilterResult.Success);
+            request.ResultCode = result.ResultCode;
+            request.Message = result.Message;
+            request.Content = result.Content;
+            return FilterResult.Success;
         }
         else
         {
             //如果返回错误，具体分析
-            var op = result.Copy<byte[], FilterResult>();
             if (response.Length < 21)
             {
+                request.ResultCode = result.ResultCode;
+                request.Message = result.Message;
+                request.Content = result.Content;
                 //如果长度不足，返回缓存
-                op.Content2 = FilterResult.Cache;
+                return FilterResult.Cache;
-                return op;
             }
             else
             {
+                request.ResultCode = result.ResultCode;
+                request.Message = result.Message;
+                request.Content = result.Content;
                 //如果长度已经超了，说明这段报文已经不能继续解析了，直接返回放弃
-                op.Content2 = FilterResult.Success;
+                return FilterResult.Success;
-                return op;
             }
         }
     }

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ModbusRtu/ModbusRtuDebugDriverPage.razor

@@ -26,13 +26,13 @@
 <DefalutDebugDriverPage  Channel="ChannelEnum.SerialPort" @ref=defalutDebugDriverPage>
     <MCard Flat Elevation="0">
         <MRow Class="my-1" NoGutters Justify="JustifyTypes.SpaceBetween" Align="AlignTypes.Center">
-            <MCheckbox Class="mx-1" Label=@(_plc.Description(x => x.Crc16CheckEnable)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Crc16CheckEnable></MCheckbox>
+            <MCheckbox Class="ma-1" Label=@(_plc.Description(x => x.Crc16CheckEnable)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Crc16CheckEnable></MCheckbox>
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.FrameTime)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.FrameTime></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.FrameTime)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.FrameTime></MTextField>
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.CacheTimeout)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.CacheTimeout></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.CacheTimeout)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.CacheTimeout></MTextField>
 
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Station)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Station></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Station)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Station></MTextField>
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
-            <MSelect Class="mx-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
+            <MSelect Class="ma-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
                      Items=@(typeof(DataFormat).GetEnumList())
                      MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
                      ItemText=@((u) =>u.des)
@@ -54,6 +54,7 @@
         {
             //载入配置
             _plc = new ThingsGateway.Foundation.Adapter.Modbus.ModbusRtu((SerialClient)defalutDebugDriverPage.SerialClientPage.GetSerialClient());
+            defalutDebugDriverPage.Plc = _plc;
         }
         base.OnAfterRender(firstRender);
     }

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ModbusRtuOverTcp/ModbusRtuOverTcpDebugDriverPage.razor

@@ -25,13 +25,13 @@
 <DefalutDebugDriverPage Channel="ChannelEnum.TcpClientEx" @ref=defalutDebugDriverPage>
     <MCard Flat Elevation="0">
         <MRow Class="my-1" NoGutters Justify="JustifyTypes.SpaceBetween" Align="AlignTypes.Center">
-            <MCheckbox Class="mx-1" Label=@(_plc.Description(x => x.Crc16CheckEnable)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Crc16CheckEnable></MCheckbox>
+            <MCheckbox Class="ma-1" Label=@(_plc.Description(x => x.Crc16CheckEnable)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Crc16CheckEnable></MCheckbox>
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.FrameTime)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.FrameTime></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.FrameTime)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.FrameTime></MTextField>
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.CacheTimeout)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.CacheTimeout></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.CacheTimeout)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.CacheTimeout></MTextField>
 
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Station)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Station></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Station)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Station></MTextField>
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
-            <MSelect Class="mx-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
+            <MSelect Class="ma-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
                      Items=@(typeof(DataFormat).GetEnumList())
                      MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
                      ItemText=@((u) =>u.des)

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ModbusRtuOverUdp/ModbusRtuOverUdpDebugDriverPage.razor

@@ -25,12 +25,12 @@
 <DefalutDebugDriverPage   Channel="ChannelEnum.UdpSession" @ref=defalutDebugDriverPage>
     <MCard Flat Elevation="0">
         <MRow Class="my-1" NoGutters Justify="JustifyTypes.SpaceBetween" Align="AlignTypes.Center">
-            <MCheckbox Class="mx-1" Label=@(_plc.Description(x => x.Crc16CheckEnable)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Crc16CheckEnable></MCheckbox>
+            <MCheckbox Class="ma-1" Label=@(_plc.Description(x => x.Crc16CheckEnable)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Crc16CheckEnable></MCheckbox>
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.FrameTime)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.FrameTime></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.FrameTime)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.FrameTime></MTextField>
 
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Station)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Station></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Station)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Station></MTextField>
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
-            <MSelect Class="mx-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
+            <MSelect Class="ma-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
                      Items=@(typeof(DataFormat).GetEnumList())
                      MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
                      ItemText=@((u) =>u.des)

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ModbusServer/ModbusServer.cs

@@ -193,7 +193,7 @@ public class ModbusServer : UpLoadBase
 
             if (tag.Value == null) return OperResult.CreateSuccessResult();
             var enable =
-                GetPropertyValue(tag.Value, nameof(variablePropertys.VariableRpcEnable)).ToBool()
+                GetPropertyValue(tag.Value, nameof(variablePropertys.VariableRpcEnable)).ToBoolean()
                 && driverPropertys.DeviceRpcEnable;
             if (!enable) return new OperResult("不允许写入");
             var type = GetPropertyValue(tag.Value, nameof(ModbusServerVariableProperty.ModbusType));

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ModbusServer/ModbusServerDebugDriverPage.razor

@@ -25,11 +25,11 @@
 <DefalutDebugDriverPage Channel="ChannelEnum.TcpServer" @ref=defalutDebugDriverPage>
     <MCard Flat Elevation="0">
         <MRow Class="my-1" NoGutters Justify="JustifyTypes.SpaceBetween" Align="AlignTypes.Center">
-            <MCheckbox Class="mx-1" Label=@(_plc.Description(x => x.MulStation)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.MulStation></MCheckbox>
+            <MCheckbox Class="ma-1" Label=@(_plc.Description(x => x.MulStation)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.MulStation></MCheckbox>
 
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Station)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Station></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Station)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Station></MTextField>
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
-            <MSelect Class="mx-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
+            <MSelect Class="ma-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
                      Items=@(typeof(DataFormat).GetEnumList())
                      MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
                      ItemText=@((u) =>u.des)

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ModbusTcp/ModbusTcpDebugDriverPage.razor

@@ -25,13 +25,13 @@
 <DefalutDebugDriverPage  Channel="ChannelEnum.TcpClientEx" @ref=defalutDebugDriverPage>
     <MCard Flat Elevation="0">
         <MRow Class="my-1" NoGutters Justify="JustifyTypes.SpaceBetween" Align="AlignTypes.Center">
-            <MCheckbox Class="mx-1" Label=@(_plc.Description(x => x.IsCheckMessageId)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.IsCheckMessageId></MCheckbox>
+            <MCheckbox Class="ma-1" Label=@(_plc.Description(x => x.IsCheckMessageId)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.IsCheckMessageId></MCheckbox>
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.FrameTime)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.FrameTime></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.FrameTime)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.FrameTime></MTextField>
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.CacheTimeout)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.CacheTimeout></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.CacheTimeout)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.CacheTimeout></MTextField>
 
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Station)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Station></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Station)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Station></MTextField>
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
-            <MSelect Class="mx-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
+            <MSelect Class="ma-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
                      Items=@(typeof(DataFormat).GetEnumList())
                      MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
                      ItemText=@((u) =>u.des)

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ModbusUdp/ModbusUdpDebugDriverPage.razor

@@ -25,12 +25,12 @@
 <DefalutDebugDriverPage  Channel="ChannelEnum.UdpSession" @ref=defalutDebugDriverPage>
     <MCard Flat Elevation="0">
         <MRow Class="my-1" NoGutters Justify="JustifyTypes.SpaceBetween" Align="AlignTypes.Center">
-            <MCheckbox Class="mx-1" Label=@(_plc.Description(x => x.IsCheckMessageId)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.IsCheckMessageId></MCheckbox>
+            <MCheckbox Class="ma-1" Label=@(_plc.Description(x => x.IsCheckMessageId)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.IsCheckMessageId></MCheckbox>
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.FrameTime)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.FrameTime></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.FrameTime)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.FrameTime></MTextField>
 
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Station)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Station></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Station)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Station></MTextField>
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
-            <MSelect Class="mx-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
+            <MSelect Class="ma-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
                      Items=@(typeof(DataFormat).GetEnumList())
                      MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
                      ItemText=@((u) =>u.des)

framework/ThingsGateway.Plugin/ThingsGateway.Modbus/ThingsGateway.Modbus.csproj

@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
+		<EnableDynamicLoading>true</EnableDynamicLoading>
 	</PropertyGroup>
 
 
@@ -12,7 +13,9 @@
 	</Target>
 
 	<ItemGroup>
-		<ProjectReference Include="..\..\ThingsGateway.Blazor\ThingsGateway.Blazor.csproj" />
+		<ProjectReference Include="..\..\ThingsGateway.Blazor\ThingsGateway.Blazor.csproj" >
+			<IncludeAssets>Compile</IncludeAssets>
+		</ProjectReference>
 		<ProjectReference Include="..\Foundataion\ThingsGateway.Foundation.Adapter.Modbus\ThingsGateway.Foundation.Adapter.Modbus.csproj" />
 	</ItemGroup>
 

framework/ThingsGateway.Plugin/ThingsGateway.Mqtt/IotSharp/IotSharpClient.cs

@@ -335,7 +335,7 @@ public class IotSharpClient : UpLoadBase
                         if (tag != null)
                         {
                             var rpcEnable =
-GetPropertyValue(tag, nameof(variablePropertys.VariableRpcEnable)).ToBool()
+GetPropertyValue(tag, nameof(variablePropertys.VariableRpcEnable)).ToBoolean()
 && driverPropertys.DeviceRpcEnable;
                             if (rpcEnable == true)
                             {

framework/ThingsGateway.Plugin/ThingsGateway.Mqtt/MqttClient.cs

@@ -415,7 +415,7 @@ public class MqttClient : UpLoadBase
             var tag = _uploadVariables.FirstOrDefault(a => a.Name == nv.Key);
             if (tag != null)
             {
-                var rpcEnable = GetPropertyValue(tag, nameof(variablePropertys.VariableRpcEnable)).ToBool();
+                var rpcEnable = GetPropertyValue(tag, nameof(variablePropertys.VariableRpcEnable)).ToBoolean();
                 if (rpcEnable == true)
                 {
                     var result = await _rpcCore.InvokeDeviceMethodAsync(ToString() + "-" + arg.ClientId, nv);

framework/ThingsGateway.Plugin/ThingsGateway.Mqtt/MqttServer.cs

@@ -270,7 +270,7 @@ public class MqttServer : UpLoadBase
             var tag = _uploadVariables.FirstOrDefault(a => a.Name == nv.Key);
             if (tag != null)
             {
-                var rpcEnable = GetPropertyValue(tag, nameof(variablePropertys.VariableRpcEnable)).ToBool();
+                var rpcEnable = GetPropertyValue(tag, nameof(variablePropertys.VariableRpcEnable)).ToBoolean();
                 if (rpcEnable == true)
                 {
                     var result = await _rpcCore.InvokeDeviceMethodAsync(ToString() + "-" + IdWithName[arg.ClientId], nv);

framework/ThingsGateway.Plugin/ThingsGateway.OPCDA/ThingsGateway.OPCDA.csproj

@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
+		<EnableDynamicLoading>true</EnableDynamicLoading>
 	</PropertyGroup>
 
 	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
@@ -9,7 +10,9 @@
 	</Target>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\ThingsGateway.Blazor\ThingsGateway.Blazor.csproj" />
+		<ProjectReference Include="..\..\ThingsGateway.Blazor\ThingsGateway.Blazor.csproj" >
+			<IncludeAssets>Compile</IncludeAssets>
+		</ProjectReference>
 	  <ProjectReference Include="..\Foundataion\ThingsGateway.Foundation.Adapter.OPCDA\ThingsGateway.Foundation.Adapter.OPCDA.csproj" />
 	</ItemGroup>
 

framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/ImportVariable.razor.cs

@@ -89,7 +89,7 @@ public partial class ImportVariable
 
                     var dataTypeId = (Opc.Ua.NodeId)(await PLC.ReadNoteAttributeAsync(a.NodeId.ToString(), Attributes.DataType)).Content.FirstOrDefault().Value;
                     var dataType = Opc.Ua.TypeInfo.GetSystemType(dataTypeId, PLC.Session.Factory);
-                    var result = dataType != null ? Enum.TryParse<DataTypeEnum>(dataType.Name, out dataTypeEnum) : false;
+                    var result = dataType != null && Enum.TryParse<DataTypeEnum>(dataType.Name, out dataTypeEnum);
                     if (!result)
                     {
                         dataTypeEnum = DataTypeEnum.Object;

framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/OPCUAClient.cs

@@ -36,6 +36,34 @@ namespace ThingsGateway.OPCUA;
 /// </summary>
 public class OPCUAClient : CollectBase
 {
+    readonly PeriodicTimer _periodicTimer = new(TimeSpan.FromSeconds(60));
+    /// <summary>
+    /// OPCUA客户端
+    /// </summary>
+    public OPCUAClient()
+    {
+        _ = RunTimerAsync();
+    }
+
+    private async Task RunTimerAsync()
+    {
+        while (await _periodicTimer.WaitForNextTickAsync())
+        {
+            if (PLC != null && PLC.Session == null)
+            {
+                try
+                {
+                    await PLC.ConnectAsync();
+                }
+                catch (Exception ex)
+                {
+                    LogMessage.Exception(ex);
+                }
+            }
+        }
+
+    }
+
     internal CollectDeviceRunTime Device;
 
     internal Foundation.Adapter.OPCUA.OPCUAClient PLC = null;
@@ -73,7 +101,11 @@ public class OPCUAClient : CollectBase
     }
 
     /// <inheritdoc/>
-    public override bool IsConnected() => PLC.Connected;
+    public override bool IsConnected()
+    {
+
+        return PLC.Connected;
+    }
 
     /// <inheritdoc/>
     public override List<DeviceVariableSourceRead> LoadSourceRead(List<DeviceVariableRunTime> deviceVariables)
@@ -99,7 +131,6 @@ public class OPCUAClient : CollectBase
     /// <inheritdoc/>
     public override async Task<OperResult<byte[]>> ReadSourceAsync(DeviceVariableSourceRead deviceVariableSourceRead, CancellationToken token)
     {
-        await Task.CompletedTask;
         var result = await PLC.ReadJTokenValueAsync(deviceVariableSourceRead.DeviceVariables.Select(a => a.VariableAddress).ToArray(), token);
         foreach (var data in result)
         {
@@ -163,6 +194,7 @@ public class OPCUAClient : CollectBase
     /// <inheritdoc/>
     protected override void Dispose(bool disposing)
     {
+        _periodicTimer?.Dispose();
         if (PLC != null)
         {
             PLC.DataChangedHandler -= DataChangedHandler;

framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/OPCUAClient/OPCUAClientDebugDriverPage.razor.cs

@@ -115,7 +115,7 @@ public partial class OPCUAClientDebugDriverPage
             try
             {
                 var data = await _plc.ReadJTokenValueAsync(new string[] { defalutDebugDriverPage.Address });
-                defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Debug, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + data.ToJson()));
+                defalutDebugDriverPage.Messages.Add((Microsoft.Extensions.Logging.LogLevel.Debug, SysDateTimeExtensions.CurrentDateTime.ToDefaultDateTimeFormat(InitTimezone.TimezoneOffset) + " - " + (data[0].Item1 + ":" + data[0].Item3)));
             }
             catch (Exception ex)
             {

framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/ThingsGateway.OPCUA.csproj

@@ -14,7 +14,9 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\Foundataion\ThingsGateway.Foundation.Adapter.OPCUA\ThingsGateway.Foundation.Adapter.OPCUA.csproj" />
-		<ProjectReference Include="..\..\ThingsGateway.Blazor\ThingsGateway.Blazor.csproj" />
+		<ProjectReference Include="..\..\ThingsGateway.Blazor\ThingsGateway.Blazor.csproj" >
+			<IncludeAssets>Compile</IncludeAssets>
+		</ProjectReference>
 	</ItemGroup>
 
 

framework/ThingsGateway.Plugin/ThingsGateway.OPCUA/ThingsGateway.OPCUA.xml

@@ -33,6 +33,11 @@
             OPCUA客户端
             </summary>
         </member>
+        <member name="M:ThingsGateway.OPCUA.OPCUAClient.#ctor">
+            <summary>
+            OPCUA客户端
+            </summary>
+        </member>
         <member name="P:ThingsGateway.OPCUA.OPCUAClient.DriverDebugUIType">
             <inheritdoc/>
         </member>

framework/ThingsGateway.Plugin/ThingsGateway.Siemens/GlobalUsings.cs

@@ -12,7 +12,6 @@
 
 global using ThingsGateway.Foundation.Adapter.Siemens;
 
-global using TouchSocket.Core;
 global using TouchSocket.Sockets;
 
 

framework/ThingsGateway.Plugin/ThingsGateway.Siemens/S7_1200DebugDriverPage.razor

@@ -25,11 +25,11 @@
 <DefalutDebugDriverPage Channel="ChannelEnum.TcpClientEx" @ref=defalutDebugDriverPage>
     <MCard Flat Elevation="0">
         <MRow Class="my-1" NoGutters Justify="JustifyTypes.SpaceBetween" Align="AlignTypes.Center">
-                <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Slot)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Slot></MTextField>
+                <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Slot)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Slot></MTextField>
-                <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Rack)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Rack></MTextField>
+                <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Rack)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Rack></MTextField>
 
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
-            <MSelect Class="mx-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
+            <MSelect Class="ma-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
                      Items=@(typeof(DataFormat).GetEnumList())
                      MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
                      ItemText=@((u) =>u.des)

framework/ThingsGateway.Plugin/ThingsGateway.Siemens/S7_1500DebugDriverPage.razor

@@ -25,11 +25,11 @@
 <DefalutDebugDriverPage  Channel="ChannelEnum.TcpClientEx" @ref=defalutDebugDriverPage>
     <MCard Flat Elevation="0">
         <MRow Class="my-1" NoGutters Justify="JustifyTypes.SpaceBetween" Align="AlignTypes.Center">
-                <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Slot)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Slot></MTextField>
+                <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Slot)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Slot></MTextField>
-                <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Rack)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Rack></MTextField>
+                <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Rack)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Rack></MTextField>
 
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
-            <MSelect Class="mx-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
+            <MSelect Class="ma-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
                      Items=@(typeof(DataFormat).GetEnumList())
                      MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
                      ItemText=@((u) =>u.des)

framework/ThingsGateway.Plugin/ThingsGateway.Siemens/S7_200DebugDriverPage.razor

@@ -25,11 +25,11 @@
 <DefalutDebugDriverPage  Channel="ChannelEnum.TcpClientEx" @ref=defalutDebugDriverPage>
     <MCard Flat Elevation="0">
         <MRow Class="my-1" NoGutters Justify="JustifyTypes.SpaceBetween" Align="AlignTypes.Center">
-                <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Slot)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Slot></MTextField>
+                <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Slot)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Slot></MTextField>
-                <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Rack)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Rack></MTextField>
+                <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Rack)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Rack></MTextField>
 
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
-            <MSelect Class="mx-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
+            <MSelect Class="ma-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
                      Items=@(typeof(DataFormat).GetEnumList())
                      MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
                      ItemText=@((u) =>u.des)

framework/ThingsGateway.Plugin/ThingsGateway.Siemens/S7_200SMARTDebugDriverPage.razor

@@ -25,11 +25,11 @@
 <DefalutDebugDriverPage Channel="ChannelEnum.TcpClientEx" @ref=defalutDebugDriverPage>
     <MCard Flat Elevation="0">
         <MRow Class="my-1" NoGutters Justify="JustifyTypes.SpaceBetween" Align="AlignTypes.Center">
-                <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Slot)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Slot></MTextField>
+                <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Slot)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Slot></MTextField>
-                <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Rack)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Rack></MTextField>
+                <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Rack)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Rack></MTextField>
 
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
-            <MSelect Class="mx-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
+            <MSelect Class="ma-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
                      Items=@(typeof(DataFormat).GetEnumList())
                      MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
                      ItemText=@((u) =>u.des)

framework/ThingsGateway.Plugin/ThingsGateway.Siemens/S7_300DebugDriverPage.razor

@@ -25,11 +25,11 @@
 <DefalutDebugDriverPage Channel="ChannelEnum.TcpClientEx" @ref=defalutDebugDriverPage>
     <MCard Flat Elevation="0">
         <MRow Class="my-1" NoGutters Justify="JustifyTypes.SpaceBetween" Align="AlignTypes.Center">
-                <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Slot)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Slot></MTextField>
+                <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Slot)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Slot></MTextField>
-                <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Rack)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Rack></MTextField>
+                <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Rack)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Rack></MTextField>
 
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
-            <MSelect Class="mx-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
+            <MSelect Class="ma-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
                      Items=@(typeof(DataFormat).GetEnumList())
                      MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
                      ItemText=@((u) =>u.des)

framework/ThingsGateway.Plugin/ThingsGateway.Siemens/S7_400DebugDriverPage.razor

@@ -25,11 +25,11 @@
 <DefalutDebugDriverPage Channel="ChannelEnum.TcpClientEx" @ref=defalutDebugDriverPage>
     <MCard Flat Elevation="0">
         <MRow Class="my-1" NoGutters Justify="JustifyTypes.SpaceBetween" Align="AlignTypes.Center">
-                <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Slot)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Slot></MTextField>
+                <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Slot)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Slot></MTextField>
-                <MTextField Class="mx-1" Label=@(_plc.Description(x => x.Rack)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Rack></MTextField>
+                <MTextField Class="ma-1" Label=@(_plc.Description(x => x.Rack)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.Rack></MTextField>
 
-            <MTextField Class="mx-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
+            <MTextField Class="ma-1" Label=@(_plc.Description(x => x.TimeOut)) Dense Outlined HideDetails="@("auto")" @bind-Value=@_plc.TimeOut></MTextField>
-            <MSelect Class="mx-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
+            <MSelect Class="ma-1" Style="max-width:200px" @bind-Value="_plc.DataFormat" Outlined Label="@(_plc.Description(x => x.DataFormat))"
                      Items=@(typeof(DataFormat).GetEnumList())
                      MenuProps="@(props => { props.Auto = true; props.OffsetY = true; })"
                      ItemText=@((u) =>u.des)

framework/ThingsGateway.Plugin/ThingsGateway.Siemens/ThingsGateway.Siemens.csproj

@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<!--<GenerateDocumentationFile>True</GenerateDocumentationFile>-->
+		<EnableDynamicLoading>true</EnableDynamicLoading>
 	</PropertyGroup>
 
 
@@ -13,7 +14,9 @@
 
 
 	<ItemGroup>
-		<ProjectReference Include="..\..\ThingsGateway.Blazor\ThingsGateway.Blazor.csproj" />
+		<ProjectReference Include="..\..\ThingsGateway.Blazor\ThingsGateway.Blazor.csproj" >
+			<IncludeAssets>Compile</IncludeAssets>
+		</ProjectReference>
 		<ProjectReference Include="..\Foundataion\ThingsGateway.Foundation.Adapter.Siemens\ThingsGateway.Foundation.Adapter.Siemens.csproj" />
 	</ItemGroup>
 

framework/ThingsGateway.Web.Core/Handlers/BlazorAuthorizeHandler.cs

@@ -68,7 +68,7 @@ public class BlazorAuthorizeHandler : AppAuthorizeHandler
 
         //这里鉴别密码是否改变
         var userId = context.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.UserId).Value.ToLong();
-        var isOpenApi = context.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.IsOpenApi)?.Value?.ToBool() == true;
+        var isOpenApi = context.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.IsOpenApi)?.Value?.ToBoolean() == true;
         if (isOpenApi)
         {
             var _openApiUserService = App.GetService<OpenApiUserService>();
@@ -91,7 +91,7 @@ public class BlazorAuthorizeHandler : AppAuthorizeHandler
             if (user == null) { return false; }
 
             //超级管理员都能访问
-            if (context.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.IsSuperAdmin)?.Value.ToBool() == true) return true;
+            if (context.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.IsSuperAdmin)?.Value.ToBoolean() == true) return true;
             if (context.Resource is RouteData routeData)
             {
                 // 获取超级管理员特性
@@ -144,7 +144,7 @@ public class BlazorAuthorizeHandler : AppAuthorizeHandler
     {
         var userId = context.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.UserId).Value;
         var verificatId = context.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.VerificatId)?.Value;
-        var isOpenApi = context.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.IsOpenApi)?.Value?.ToBool(false) == true;
+        var isOpenApi = context.User.Claims.FirstOrDefault(it => it.Type == ClaimConst.IsOpenApi)?.Value?.ToBoolean(false) == true;
         var _verificatService = App.GetService<VerificatService>();
         if (isOpenApi)
         {

framework/ThingsGateway.Web.Entry/.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "7.0.10",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}

framework/ThingsGateway.Web.Entry/SingleFilePublish.cs

@@ -0,0 +1,45 @@
+#region copyright
+//------------------------------------------------------------------------------
+//  此代码版权声明为全文件覆盖，如有原作者特别声明，会在下方手动补充
+//  此代码版权（除特别声明外的代码）归作者本人Diego所有
+//  源代码使用协议遵循本仓库的开源协议及附加协议
+//  Gitee源代码仓库：https://gitee.com/diego2098/ThingsGateway
+//  Github源代码仓库：https://github.com/kimdiego2098/ThingsGateway
+//  使用文档：https://diego2098.gitee.io/thingsgateway-docs/
+//  QQ群：605534569
+//------------------------------------------------------------------------------
+#endregion
+
+using Furion;
+
+using System.Reflection;
+
+namespace ThingsGateway.Web.Entry;
+
+/// <inheritdoc cref="ISingleFilePublish"/>
+public class SingleFilePublish : ISingleFilePublish
+{
+    /// <inheritdoc/>
+    public Assembly[] IncludeAssemblies()
+    {
+        return Array.Empty<Assembly>();
+    }
+
+    /// <inheritdoc/>
+    public string[] IncludeAssemblyNames()
+    {
+        return new[]
+        {
+        "ThingsGateway.Web.Core",
+        "ThingsGateway.Admin.ApiController",
+        "ThingsGateway.Admin.Application",
+        "ThingsGateway.Admin.Blazor",
+        "ThingsGateway.Admin.Blazor.Core",
+        "ThingsGateway.Admin.Core",
+        "ThingsGateway.ApiController",
+        "ThingsGateway.Application",
+        "ThingsGateway.Blazor",
+        "ThingsGateway.Foundation",
+    };
+    }
+}

framework/ThingsGateway.sln

@@ -88,6 +88,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Foundataion.Demo", "Foundat
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModbusDemo", "ThingsGateway.Plugin\Foundataion.Demo\ModbusDemo\ModbusDemo.csproj", "{48D2CA26-E535-413D-8CA9-A4A2AAC6582D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OPCUAClientDemo", "ThingsGateway.Plugin\Foundataion.Demo\OPCUAClientDemo\OPCUAClientDemo.csproj", "{3F83EF0F-002D-4D06-87A8-739399074DBA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -186,6 +188,10 @@ Global
 		{48D2CA26-E535-413D-8CA9-A4A2AAC6582D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{48D2CA26-E535-413D-8CA9-A4A2AAC6582D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{48D2CA26-E535-413D-8CA9-A4A2AAC6582D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F83EF0F-002D-4D06-87A8-739399074DBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F83EF0F-002D-4D06-87A8-739399074DBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F83EF0F-002D-4D06-87A8-739399074DBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F83EF0F-002D-4D06-87A8-739399074DBA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -220,6 +226,7 @@ Global
 		{E1C327FA-C442-45DD-9265-9EA26573B61E} = {F2DF3BE7-D497-44B3-9CD6-CDDBC4FBD09C}
 		{E733E483-4823-4BD6-BC29-669426386A96} = {86119A5F-5717-42FF-8888-F034B4136A1B}
 		{48D2CA26-E535-413D-8CA9-A4A2AAC6582D} = {E733E483-4823-4BD6-BC29-669426386A96}
+		{3F83EF0F-002D-4D06-87A8-739399074DBA} = {E733E483-4823-4BD6-BC29-669426386A96}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {38B292E0-B3E7-4608-9912-1B057C2A508F}