diff --git a/IoTGateway/Areas/BasicData/Views/Device/Edit.cshtml b/IoTGateway/Areas/BasicData/Views/Device/Edit.cshtml index 915603c..ac29b64 100644 --- 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) { - + // diff --git a/Plugins/Plugin/MyMqttClient.cs b/Plugins/Plugin/MyMqttClient.cs index 117ccd3..bab323f 100644 --- a/Plugins/Plugin/MyMqttClient.cs +++ b/Plugins/Plugin/MyMqttClient.cs @@ -22,7 +22,7 @@ namespace Plugin public class MyMqttClient { private readonly ILogger _logger; - private readonly ReferenceNodeManager? _uaNodeManager; + //private readonly ReferenceNodeManager? _uaNodeManager; private SystemConfig? _systemConfig; private IMqttClientOptions _clientOptions; @@ -34,7 +34,7 @@ namespace Plugin public MyMqttClient(UAService uaService, ILogger 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 @@ namespace Plugin } } - 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 index 46e7e54..842f47c 100644 --- 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 index faaacac..1519249 100644 --- 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 index f9b5144..cc70668 100644 Binary files a/drivers/net6.0/DriverAllenBradley.dll and b/drivers/net6.0/DriverAllenBradley.dll differ diff --git a/drivers/net6.0/DriverAllenBradley.pdb b/drivers/net6.0/DriverAllenBradley.pdb index 1e0b8dd..c5e7733 100644 Binary files a/drivers/net6.0/DriverAllenBradley.pdb and b/drivers/net6.0/DriverAllenBradley.pdb differ diff --git a/drivers/net6.0/DriverFanuc.dll b/drivers/net6.0/DriverFanuc.dll index f96fad2..9fbd493 100644 Binary files a/drivers/net6.0/DriverFanuc.dll and b/drivers/net6.0/DriverFanuc.dll differ diff --git a/drivers/net6.0/DriverFanuc.pdb b/drivers/net6.0/DriverFanuc.pdb index 3b92f28..77db8df 100644 Binary files a/drivers/net6.0/DriverFanuc.pdb and b/drivers/net6.0/DriverFanuc.pdb differ diff --git a/drivers/net6.0/DriverFanucHsl.dll b/drivers/net6.0/DriverFanucHsl.dll index 4a5a645..57c8ca1 100644 Binary files a/drivers/net6.0/DriverFanucHsl.dll and b/drivers/net6.0/DriverFanucHsl.dll differ diff --git a/drivers/net6.0/DriverFanucHsl.pdb b/drivers/net6.0/DriverFanucHsl.pdb index ff955b3..602f870 100644 Binary files a/drivers/net6.0/DriverFanucHsl.pdb and b/drivers/net6.0/DriverFanucHsl.pdb differ diff --git a/drivers/net6.0/DriverMTConnect.dll b/drivers/net6.0/DriverMTConnect.dll index 08f50bc..9ba832e 100644 Binary files a/drivers/net6.0/DriverMTConnect.dll and b/drivers/net6.0/DriverMTConnect.dll differ diff --git a/drivers/net6.0/DriverMTConnect.pdb b/drivers/net6.0/DriverMTConnect.pdb index cfb1d93..d1c7491 100644 Binary files a/drivers/net6.0/DriverMTConnect.pdb and b/drivers/net6.0/DriverMTConnect.pdb differ diff --git a/drivers/net6.0/DriverMitsubishi.dll b/drivers/net6.0/DriverMitsubishi.dll index 021713d..8a21af4 100644 Binary files a/drivers/net6.0/DriverMitsubishi.dll and b/drivers/net6.0/DriverMitsubishi.dll differ diff --git a/drivers/net6.0/DriverMitsubishi.pdb b/drivers/net6.0/DriverMitsubishi.pdb index 63c3dcd..015ac21 100644 Binary files a/drivers/net6.0/DriverMitsubishi.pdb and b/drivers/net6.0/DriverMitsubishi.pdb differ diff --git a/drivers/net6.0/DriverModbusMaster.dll b/drivers/net6.0/DriverModbusMaster.dll index e1fb301..bbc84c4 100644 Binary files a/drivers/net6.0/DriverModbusMaster.dll and b/drivers/net6.0/DriverModbusMaster.dll differ diff --git a/drivers/net6.0/DriverModbusMaster.pdb b/drivers/net6.0/DriverModbusMaster.pdb index 879e28a..fbf2d7c 100644 Binary files a/drivers/net6.0/DriverModbusMaster.pdb and b/drivers/net6.0/DriverModbusMaster.pdb differ diff --git a/drivers/net6.0/DriverOPCDaClient.dll b/drivers/net6.0/DriverOPCDaClient.dll index 764149e..d1c6783 100644 Binary files a/drivers/net6.0/DriverOPCDaClient.dll and b/drivers/net6.0/DriverOPCDaClient.dll differ diff --git a/drivers/net6.0/DriverOPCDaClient.pdb b/drivers/net6.0/DriverOPCDaClient.pdb index 11f5ee8..0980fc9 100644 Binary files a/drivers/net6.0/DriverOPCDaClient.pdb and b/drivers/net6.0/DriverOPCDaClient.pdb differ diff --git a/drivers/net6.0/DriverOPCUaClient.dll b/drivers/net6.0/DriverOPCUaClient.dll index 8c18663..35e0b34 100644 Binary files a/drivers/net6.0/DriverOPCUaClient.dll and b/drivers/net6.0/DriverOPCUaClient.dll differ diff --git a/drivers/net6.0/DriverOPCUaClient.pdb b/drivers/net6.0/DriverOPCUaClient.pdb index b15ea2e..a1efb83 100644 Binary files a/drivers/net6.0/DriverOPCUaClient.pdb and b/drivers/net6.0/DriverOPCUaClient.pdb differ diff --git a/drivers/net6.0/DriverOmronFins.dll b/drivers/net6.0/DriverOmronFins.dll index 1bf9dfe..5836389 100644 Binary files a/drivers/net6.0/DriverOmronFins.dll and b/drivers/net6.0/DriverOmronFins.dll differ diff --git a/drivers/net6.0/DriverOmronFins.pdb b/drivers/net6.0/DriverOmronFins.pdb index d95b32a..d70be8e 100644 Binary files a/drivers/net6.0/DriverOmronFins.pdb and b/drivers/net6.0/DriverOmronFins.pdb differ diff --git a/drivers/net6.0/DriverSiemensS7.dll b/drivers/net6.0/DriverSiemensS7.dll index f05f40e..861d22c 100644 Binary files a/drivers/net6.0/DriverSiemensS7.dll and b/drivers/net6.0/DriverSiemensS7.dll differ diff --git a/drivers/net6.0/DriverSiemensS7.pdb b/drivers/net6.0/DriverSiemensS7.pdb index 7be0d30..4cd69ba 100644 Binary files a/drivers/net6.0/DriverSiemensS7.pdb and b/drivers/net6.0/DriverSiemensS7.pdb differ diff --git a/drivers/net6.0/DriverSimTcpClient.dll b/drivers/net6.0/DriverSimTcpClient.dll index 8f0a64b..b97d1ed 100644 Binary files a/drivers/net6.0/DriverSimTcpClient.dll and b/drivers/net6.0/DriverSimTcpClient.dll differ diff --git a/drivers/net6.0/DriverSimTcpClient.pdb b/drivers/net6.0/DriverSimTcpClient.pdb index 984c0ab..f0f0087 100644 Binary files a/drivers/net6.0/DriverSimTcpClient.pdb and b/drivers/net6.0/DriverSimTcpClient.pdb differ diff --git a/drivers/net6.0/Microsoft.Extensions.Logging.Abstractions.dll b/drivers/net6.0/Microsoft.Extensions.Logging.Abstractions.dll index a42ea83..bb27a2f 100644 Binary files a/drivers/net6.0/Microsoft.Extensions.Logging.Abstractions.dll and b/drivers/net6.0/Microsoft.Extensions.Logging.Abstractions.dll differ diff --git a/drivers/net6.0/PluginInterface.dll b/drivers/net6.0/PluginInterface.dll index 6de97dd..eea52e1 100644 Binary files a/drivers/net6.0/PluginInterface.dll and b/drivers/net6.0/PluginInterface.dll differ diff --git a/drivers/net6.0/PluginInterface.pdb b/drivers/net6.0/PluginInterface.pdb index 99c0a27..d6ad889 100644 Binary files a/drivers/net6.0/PluginInterface.pdb and b/drivers/net6.0/PluginInterface.pdb differ