从v0.9.2开始默认移除了OPCUAServer，你可以手动开启；设备编辑不允许修改驱动

iioter · Aug 11, 2022 · a445daf · a445daf
1 parent 42f19b0
commit a445daf
Show file tree

Hide file tree

Showing 29 changed files with 15 additions and 15 deletions.
diff --git a/IoTGateway/Areas/BasicData/Views/Device/Edit.cshtml b/IoTGateway/Areas/BasicData/Views/Device/Edit.cshtml
@@ -11,7 +11,7 @@
             if (Model.Entity.DeviceTypeEnum == IoTGateway.Model.DeviceTypeEnum.Device)
             {
                 <wt:combobox field="Entity.ParentId" items="AllParents" />
-                <wt:combobox field="Entity.DriverId" items="AllDrivers" />
+                //<wt:combobox field="Entity.DriverId" items="AllDrivers" />
                 <wt:switch field="Entity.AutoStart" />
                 <wt:switch field="Entity.CgUpload" />
                 <wt:textbox field="Entity.EnforcePeriod" />

diff --git a/Plugins/Plugin/MyMqttClient.cs b/Plugins/Plugin/MyMqttClient.cs
@@ -22,7 +22,7 @@ namespace Plugin
     public class MyMqttClient
     {
         private readonly ILogger<MyMqttClient> _logger;
-        private readonly ReferenceNodeManager? _uaNodeManager;
+        //private readonly ReferenceNodeManager? _uaNodeManager;
 
         private SystemConfig? _systemConfig;
         private IMqttClientOptions _clientOptions;
@@ -34,7 +34,7 @@ public class MyMqttClient
         public MyMqttClient(UAService uaService, ILogger<MyMqttClient> logger)
         {
             _logger = logger;
-            _uaNodeManager = uaService.server.m_server.nodeManagers[0] as ReferenceNodeManager;
+            //_uaNodeManager = uaService.server.m_server.nodeManagers[0] as ReferenceNodeManager;
             ConnectAsync();
         }
 
@@ -586,16 +586,16 @@ await Client.PublishAsync("v1/gateway/telemetry",
                         }
                 }
 
-                foreach (var payload in sendModel[device.DeviceName])
-                {
-                    if (payload.Values != null)
-                        foreach (var kv in payload.Values)
-                        {
-                            //更新到UAService
-                            _uaNodeManager?.UpdateNode($"{device.Parent.DeviceName}.{device.DeviceName}.{kv.Key}",
-                                kv.Value);
-                        }
-                }
+                //foreach (var payload in sendModel[device.DeviceName])
+                //{
+                //    if (payload.Values != null)
+                //        foreach (var kv in payload.Values)
+                //        {
+                //            //更新到UAService
+                //            _uaNodeManager?.UpdateNode($"{device.Parent.DeviceName}.{device.DeviceName}.{kv.Key}",
+                //                kv.Value);
+                //        }
+                //}
             }
             catch (Exception ex)
             {

diff --git a/auto-build-arm.sh b/auto-build-arm.sh
@@ -1,5 +1,5 @@
 echo start
-tag="0.8.1"
+tag="0.9.2"
 echo $tag
 docker build -t iotgateway .
 

diff --git a/auto-build.sh b/auto-build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 echo start
-tag="0.8.1"
+tag="0.9.2"
 echo $tag
 docker build -t iotgateway .
 

diff --git a/drivers/net6.0/DriverAllenBradley.dll b/drivers/net6.0/DriverAllenBradley.dll
diff --git a/drivers/net6.0/DriverAllenBradley.pdb b/drivers/net6.0/DriverAllenBradley.pdb
diff --git a/drivers/net6.0/DriverFanuc.dll b/drivers/net6.0/DriverFanuc.dll
diff --git a/drivers/net6.0/DriverFanuc.pdb b/drivers/net6.0/DriverFanuc.pdb
diff --git a/drivers/net6.0/DriverFanucHsl.dll b/drivers/net6.0/DriverFanucHsl.dll
diff --git a/drivers/net6.0/DriverFanucHsl.pdb b/drivers/net6.0/DriverFanucHsl.pdb
diff --git a/drivers/net6.0/DriverMTConnect.dll b/drivers/net6.0/DriverMTConnect.dll
diff --git a/drivers/net6.0/DriverMTConnect.pdb b/drivers/net6.0/DriverMTConnect.pdb
diff --git a/drivers/net6.0/DriverMitsubishi.dll b/drivers/net6.0/DriverMitsubishi.dll
diff --git a/drivers/net6.0/DriverMitsubishi.pdb b/drivers/net6.0/DriverMitsubishi.pdb
diff --git a/drivers/net6.0/DriverModbusMaster.dll b/drivers/net6.0/DriverModbusMaster.dll
diff --git a/drivers/net6.0/DriverModbusMaster.pdb b/drivers/net6.0/DriverModbusMaster.pdb
diff --git a/drivers/net6.0/DriverOPCDaClient.dll b/drivers/net6.0/DriverOPCDaClient.dll
diff --git a/drivers/net6.0/DriverOPCDaClient.pdb b/drivers/net6.0/DriverOPCDaClient.pdb
diff --git a/drivers/net6.0/DriverOPCUaClient.dll b/drivers/net6.0/DriverOPCUaClient.dll
diff --git a/drivers/net6.0/DriverOPCUaClient.pdb b/drivers/net6.0/DriverOPCUaClient.pdb
diff --git a/drivers/net6.0/DriverOmronFins.dll b/drivers/net6.0/DriverOmronFins.dll
diff --git a/drivers/net6.0/DriverOmronFins.pdb b/drivers/net6.0/DriverOmronFins.pdb
diff --git a/drivers/net6.0/DriverSiemensS7.dll b/drivers/net6.0/DriverSiemensS7.dll
diff --git a/drivers/net6.0/DriverSiemensS7.pdb b/drivers/net6.0/DriverSiemensS7.pdb
diff --git a/drivers/net6.0/DriverSimTcpClient.dll b/drivers/net6.0/DriverSimTcpClient.dll
diff --git a/drivers/net6.0/DriverSimTcpClient.pdb b/drivers/net6.0/DriverSimTcpClient.pdb
diff --git a/drivers/net6.0/Microsoft.Extensions.Logging.Abstractions.dll b/drivers/net6.0/Microsoft.Extensions.Logging.Abstractions.dll
diff --git a/drivers/net6.0/PluginInterface.dll b/drivers/net6.0/PluginInterface.dll
diff --git a/drivers/net6.0/PluginInterface.pdb b/drivers/net6.0/PluginInterface.pdb