fix: 上次更新导致大小端配置映射错误

src/Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
 
 	<PropertyGroup>
-		<PluginVersion>10.9.11</PluginVersion>
+		<PluginVersion>10.9.14</PluginVersion>
-		<ProPluginVersion>10.9.11</ProPluginVersion>
+		<ProPluginVersion>10.9.14</ProPluginVersion>
 		<AuthenticationVersion>2.9.5</AuthenticationVersion>
 		<SourceGeneratorVersion>10.9.5</SourceGeneratorVersion>
 		<NET8Version>8.0.17</NET8Version>

src/Foundation/ThingsGateway.Foundation/Trans/IThingsGatewayBitConverter.cs

@@ -27,7 +27,7 @@ public interface IThingsGatewayBitConverter
     /// <summary>
     /// 指定大小端。
     /// </summary>
-    EndianType EndianType { get; }
+    EndianType EndianType { get; set; }
 
     /// <summary>
     /// 当前的字符串编码类型

src/Foundation/ThingsGateway.Foundation/Trans/ThingsGatewayBitConverter.cs

@@ -62,7 +62,14 @@ public partial class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     }
 
     /// <inheritdoc/>
-    public virtual EndianType EndianType { get; }
+    public virtual EndianType EndianType
+    {
+        get => endianType; set
+        {
+            endianType = value;
+            TouchSocketBitConverter = new TouchSocketBitConverter(endianType);
+        }
+    }
 
     /// <inheritdoc/>
     public virtual bool IsStringReverseByteWord { get; set; }
@@ -70,7 +77,7 @@ public partial class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     /// <inheritdoc/>
     public virtual bool IsVariableStringLength { get; set; }
 
-    internal protected TouchSocketBitConverter TouchSocketBitConverter => TouchSocketBitConverter.GetBitConverter(EndianType);
+    internal protected TouchSocketBitConverter TouchSocketBitConverter { get; set; }
 
     static ThingsGatewayBitConverter()
     {
@@ -87,7 +94,7 @@ public partial class ThingsGatewayBitConverter : IThingsGatewayBitConverter
     /// 以小端
     /// </summary>
     public static readonly ThingsGatewayBitConverter LittleEndian;
-
+    private EndianType endianType;
 
     public virtual void OtherPropertySet(IThingsGatewayBitConverter thingsGatewayBitConverter, string registerAddress)
     {

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

@@ -16,7 +16,7 @@ public class ScheduledAsyncTask : DisposeBase, IScheduledTask, IScheduledIntInte
     private ILog LogMessage;
     private volatile int _isRunning = 0;
     private volatile int _pendingTriggers = 0;
-    public Int32 Period => _timer?.Period??0;
+    public Int32 Period => _timer?.Period ?? 0;
 
     public ScheduledAsyncTask(int interval, Func<object?, CancellationToken, Task> taskFunc, object? state, ILog log, CancellationToken token)
     {

src/Gateway/ThingsGateway.Gateway.Application/Driver/Collect/CollectBase.cs

@@ -150,23 +150,26 @@ public abstract class CollectBase : DriverBase, IRpcDriver
             return variablesMethodResult;
         }
     }
-
+    private volatile bool _addVariableTasks;
     protected void RefreshVariableTasks(CancellationToken cancellationToken)
     {
-        if (VariableTasks.Count > 0)
+        if (_addVariableTasks)
         {
-            foreach (var item in VariableTasks)
+            if (VariableTasks != null)
             {
-                item.Stop();
+                foreach (var item in VariableTasks)
-                TaskSchedulerLoop.Remove(item);
+                {
-            }
+                    item.Stop();
+                    TaskSchedulerLoop?.Remove(item);
+                }
 
-            VariableTasks = AddVariableTask(cancellationToken);
+                VariableTasks = AddVariableTask(cancellationToken);
 
-            foreach (var item in VariableTasks)
+                foreach (var item in VariableTasks)
-            {
+                {
-                TaskSchedulerLoop.Add(item);
+                    TaskSchedulerLoop?.Add(item);
-                item.Start();
+                    item.Start();
+                }
             }
         }
     }
@@ -198,7 +201,7 @@ public abstract class CollectBase : DriverBase, IRpcDriver
         tasks.Add(testOnline);
 
         VariableTasks = AddVariableTask(cancellationToken);
-
+        _addVariableTasks = true;
         tasks.AddRange(VariableTasks);
         return tasks;
 
@@ -242,6 +245,7 @@ public abstract class CollectBase : DriverBase, IRpcDriver
 
     protected virtual void SetDeviceStatus(object? state, CancellationToken cancellationToken)
     {
+        CurrentDevice.SetDeviceStatus(TimerX.Now);
         if (IsConnected())
         {
             if (CurrentDevice.DeviceStatus == DeviceStatusEnum.OffLine)

src/Gateway/ThingsGateway.Gateway.Application/Services/GatewayMonitor/AlarmManage/AlarmHostedService.cs

@@ -11,9 +11,6 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-using System;
-using System.Threading;
-
 using ThingsGateway.Gateway.Application.Extensions;
 using ThingsGateway.NewLife.Extension;
 

src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableRuntimeService.cs

@@ -107,13 +107,13 @@ public class VariableRuntimeService : IVariableRuntimeService
             var result = await GlobalData.VariableService.DeleteVariableAsync(variableIds).ConfigureAwait(false);
 
 
+            ConcurrentHashSet<IDriver> changedDriver = new();
+
+            RuntimeServiceHelper.AddBusinessChangedDriver(variableIds, changedDriver);
+            RuntimeServiceHelper.VariableRuntimesDispose(variableIds);
+
             if (restart)
             {
-
-                ConcurrentHashSet<IDriver> changedDriver = new();
-
-                RuntimeServiceHelper.AddBusinessChangedDriver(variableIds, changedDriver);
-                RuntimeServiceHelper.VariableRuntimesDispose(variableIds);
                 await RuntimeServiceHelper.ChangedDriverAsync(changedDriver, _logger, cancellationToken).ConfigureAwait(false);
             }
 
@@ -136,14 +136,14 @@ public class VariableRuntimeService : IVariableRuntimeService
 
             var result = await GlobalData.VariableService.DeleteVariableAsync(null).ConfigureAwait(false);
 
-
+            ConcurrentHashSet<IDriver> changedDriver = new();
+            var variableIds = GlobalData.IdVariables.Select(a => a.Key).ToHashSet();
+            RuntimeServiceHelper.AddBusinessChangedDriver(variableIds, changedDriver);
+            RuntimeServiceHelper.VariableRuntimesDispose(variableIds);
 
             if (restart)
             {
-                ConcurrentHashSet<IDriver> changedDriver = new();
+
-                var variableIds = GlobalData.IdVariables.Select(a => a.Key).ToHashSet();
-                RuntimeServiceHelper.AddBusinessChangedDriver(variableIds, changedDriver);
-                RuntimeServiceHelper.VariableRuntimesDispose(variableIds);
                 await RuntimeServiceHelper.ChangedDriverAsync(changedDriver, _logger, cancellationToken).ConfigureAwait(false);
             }
 

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

@@ -1099,7 +1099,7 @@ public class OpcUaMaster : IDisposable
     }
 
 
-    private static List<VariableNode> GetVariableNodes(ReadValueIdCollection itemsToRead, DataValueCollection values, DiagnosticInfoCollection diagnosticInfos, ResponseHeader responseHeader, int count = 1)
+    private List<VariableNode> GetVariableNodes(ReadValueIdCollection itemsToRead, DataValueCollection values, DiagnosticInfoCollection diagnosticInfos, ResponseHeader responseHeader, int count = 1)
     {
         ClientBase.ValidateResponse(values, itemsToRead);
         ClientBase.ValidateDiagnosticInfos(diagnosticInfos, itemsToRead);
@@ -1130,11 +1130,11 @@ public class OpcUaMaster : IDisposable
             // NodeId Attribute
             if (!DataValue.IsGood(value))
             {
-                throw ServiceResultException.Create(value.StatusCode, 0 + 2 * i, diagnosticInfos, responseHeader.StringTable);
+                Log(3, ServiceResultException.Create(value.StatusCode, 0 + 2 * i, diagnosticInfos, responseHeader.StringTable), $"Get nodeid {itemsToRead[0 + 2 * i].NodeId} fail");
             }
             if (value == null)
             {
-                throw ServiceResultException.Create(StatusCodes.BadUnexpectedError, "Node does not support the NodeId attribute.");
+                Log(3, ServiceResultException.Create(StatusCodes.BadUnexpectedError, "Node does not support the NodeId attribute."), $"Get nodeid {itemsToRead[0 + 2 * i].NodeId} fail");
             }
 
             variableNode.NodeId = (NodeId)value.GetValue(typeof(NodeId));
@@ -1376,7 +1376,7 @@ public class OpcUaMaster : IDisposable
             {
                 if (m_reConnectHandler == null)
                 {
-                    Log(3, null, "Reconnecting in {0}s", 1);
+                    Log(3, null, "Reconnecting : {0}", e.Status.ToString());
                     m_ReconnectStarting?.Invoke(this, e);
 
                     m_reConnectHandler = new SessionReconnectHandler(true, 10000);

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

@@ -165,10 +165,11 @@ public class OpcUaMaster : CollectBase
                         //如果是订阅模式，连接时添加订阅组
                         if (_plc.OpcUaProperty?.ActiveSubscribe == true && CurrentDevice.VariableSourceReads.Count > 0 && _plc.Session.SubscriptionCount < CurrentDevice.VariableSourceReads.Count)
                         {
-                            try
-                            {
 
-                                foreach (var variableSourceRead in CurrentDevice.VariableSourceReads)
+
+                            foreach (var variableSourceRead in CurrentDevice.VariableSourceReads)
+                            {
+                                try
                                 {
                                     if (_plc.Session.Subscriptions.FirstOrDefault(a => a.DisplayName == variableSourceRead.RegisterAddress) == null)
                                     {
@@ -180,19 +181,22 @@ public class OpcUaMaster : CollectBase
 
                                     await Task.Delay(100, cancellationToken).ConfigureAwait(false); // allow for subscription to be finished on server?
 
+                                    checkLog = true;
                                 }
+                                catch (Exception ex)
+                                {
+                                    if (!checkLog)
+                                        LogMessage?.LogWarning(ex, "AddSubscriptions error");
+                                    checkLog = false;
+                                }
+                                finally
+                                {
+                                }
+
                                 LogMessage?.LogInformation("AddSubscriptions done");
-                                checkLog = true;
+
-                            }
-                            catch (Exception ex)
-                            {
-                                if (!checkLog)
-                                    LogMessage?.LogWarning(ex, "AddSubscriptions error");
-                                checkLog = false;
-                            }
-                            finally
-                            {
                             }
+
                         }
                     }
                 }

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

@@ -70,6 +70,8 @@ public class ThingsGatewayNodeManager : CustomNodeManager2
         {
             if (rootFolder == null) return;
 
+            NodeIdTags?.Clear();
+            RemoveRootNotifier(rootFolder);
             rootFolder?.SafeDispose();
             rootFolder = null;
             rootFolder = CreateFolder(null, "ThingsGateway", "ThingsGateway");
@@ -100,7 +102,6 @@ public class ThingsGatewayNodeManager : CustomNodeManager2
                 }
             }
             AddPredefinedNode(SystemContext, rootFolder);
-
             rootFolder.ClearChangeMasks(SystemContext, true);
 
         }
@@ -526,7 +527,7 @@ public class ThingsGatewayNodeManager : CustomNodeManager2
                 a.ToDictionary(a => a.Item1.Name, a => a.Item2)
             );
             var result = GlobalData.RpcService.InvokeDeviceMethodAsync("OpcUaServer - " + context?.Session?.Identity?.DisplayName, writeDatas
-            ).GetAwaiter().GetResult(); ;
+            ).GetAwaiter().GetResult();
 
             for (int ii = 0; ii < nodesToWrite.Count; ii++)
             {

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

@@ -44,19 +44,6 @@ public partial class ThingsGatewayServer : StandardServer
     }
 
 
-    //public void AfterVariablesChanged()
-    //{
-    //    if(masterNodeManager!=null)
-    //    {
-    //        masterNodeManager?.Dispose();
-    //        masterNodeManager = CreateMasterNodeManager((ServerInternalData)NodeManager.Server, _opcUaServer.m_configuration);
-    //        ((ServerInternalData)NodeManager.Server).SetNodeManager(masterNodeManager);
-    //        // put the node manager into a state that allows it to be used by other objects.
-    //        masterNodeManager.Startup();
-    //    }
-
-    //}
-
     /// <inheritdoc/>
     protected override MasterNodeManager CreateMasterNodeManager(IServerInternal server, ApplicationConfiguration configuration)
     {

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

@@ -78,14 +78,14 @@ public partial class OpcUaServer : BusinessBase
 
         CollectVariableRuntimes.Clear();
 
-        IdVariableRuntimes.ForEach(a =>
+        //IdVariableRuntimes.ForEach(a =>
-        {
+        //{
-            VariableValueChange(a.Value, a.Value.AdaptVariableBasicData());
+        //    VariableValueChange(a.Value, a.Value.AdaptVariableBasicData());
-        });
+        //});
-
-
-        m_server?.NodeManager?.RefreshVariable();
 
+        //动态更新UA库节点暂时取消
+        //m_server?.NodeManager?.RefreshVariable();
+        m_server?.Stop();
     }
 
 
@@ -112,6 +112,7 @@ public partial class OpcUaServer : BusinessBase
         GlobalData.VariableValueChangeEvent += VariableValueChange;
 
         Localizer = App.CreateLocalizerByType(typeof(OpcUaServer))!;
+
         await base.InitChannelAsync(channel, cancellationToken).ConfigureAwait(false);
 
 

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

@@ -100,7 +100,7 @@ public partial class OpcUaMaster : IDisposable
         LogMessage?.AddLogger(logger);
 
         _plc.LogEvent = (a, b, c, d) => LogMessage?.Log((LogLevel)a, b, c, d);
-        _plc.DataChangedHandler += (a) => LogMessage?.Trace(a.ToSystemTextJsonString());
+        _plc.DataChangedHandler += (a) => LogMessage?.Trace($"id:{a.monitoredItem?.StartNodeId};stateCode:{a.dataValue?.StatusCode};value:{a.jToken?.ToString()}");
         base.OnInitialized();
     }
 

src/ThingsGateway.Server/Dockerfile

@@ -19,3 +19,6 @@ ENV ASPNETCORE_FORWARDEDHEADERS_ENABLED=true
 RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone
 
 ENTRYPOINT ["dotnet", "ThingsGateway.Server.dll","--urls","http://*:5000"]
+
+
+ 

src/ThingsGateway.Server/docker-compose-demo.yml

@@ -1,9 +1,12 @@
+
+#docker run -d --name tg  --restart always -p 127.0.0.1:5000:5000 -e ASPNETCORE_ENVIRONMENT=Demo -v /thingsgateway/Keys:/app/Keys -v /thingsgateway/DB:/app/DB  --memory="512m" registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway:latest
+
 version: "latest"    # Docker Compose 配置版本
 
 services:         # 定义所有要跑的容器（服务）
   thingsgateway: #服务名称
     image: registry.cn-shenzhen.aliyuncs.com/thingsgateway/thingsgateway:latest  #镜像名:tag
-    container_name: thingsgateway  #容器名字
+    container_name: tg  #容器名字
     ports:
       - "127.0.0.1:5000:5000"    #"主机端口:容器端口"
     environment:
@@ -16,3 +19,4 @@ services:         # 定义所有要跑的容器（服务）
         limits:
           memory: 512M
     restart: always   # 容器异常退出自动重启
+

src/Version.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>10.9.11</Version>
+    <Version>10.9.14</Version>
   </PropertyGroup>
 
   <ItemGroup>