From e924fc8bf52aa6ddc1f74b1f865a819a95bf00ff Mon Sep 17 00:00:00 2001 From: iioter <535915157@qq.com> Date: Mon, 21 Nov 2022 09:45:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A9=B1=E5=8A=A8=E5=BD=92=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IoTGateway.Model/SystemConfig.cs | 2 - IoTGateway/IoTGateway.csproj | 2 +- IoTGateway/Views/Home/FrontPage.cshtml | 8 +- IoTGateway/Views/Login/Login.cshtml | 4 +- IoTGateway/wwwroot/images/wx.png | Bin 0 -> 5887 bytes Plugins/Plugin/DeviceThread.cs | 2 +- Plugins/Plugin/MyMqttClient.cs | 51 ----- drivers/net6.0/DriverAllenBradley.deps.json | 16 +- drivers/net6.0/DriverAllenBradley.dll | Bin 9728 -> 9728 bytes drivers/net6.0/DriverAllenBradley.pdb | Bin 11868 -> 11868 bytes drivers/net6.0/DriverFanucHsl.deps.json | 176 +++++++----------- drivers/net6.0/DriverFanucHsl.dll | Bin 16384 -> 16384 bytes drivers/net6.0/DriverFanucHsl.pdb | Bin 17056 -> 17056 bytes drivers/net6.0/DriverMitsubishi.deps.json | 16 +- drivers/net6.0/DriverMitsubishi.dll | Bin 10240 -> 10240 bytes drivers/net6.0/DriverMitsubishi.pdb | Bin 11940 -> 11940 bytes drivers/net6.0/DriverModbusMaster.dll | Bin 104960 -> 104960 bytes drivers/net6.0/DriverModbusMaster.pdb | Bin 52384 -> 52348 bytes drivers/net6.0/DriverOmronFins.deps.json | 16 +- drivers/net6.0/DriverOmronFins.dll | Bin 10240 -> 10240 bytes drivers/net6.0/DriverOmronFins.pdb | Bin 11824 -> 11824 bytes drivers/net6.0/DriverSiemensS7.dll | Bin 110592 -> 111104 bytes drivers/net6.0/DriverSiemensS7.pdb | Bin 49208 -> 49528 bytes drivers/net6.0/HslCommunication.dll | Bin 3830784 -> 3878912 bytes drivers/net6.0/IoTClient.dll | Bin 123392 -> 124416 bytes drivers/net6.0/PluginInterface.dll | Bin 21504 -> 21504 bytes drivers/net6.0/PluginInterface.pdb | Bin 16480 -> 16444 bytes .../native/libSystem.IO.Ports.Native.so | Bin 0 -> 14084 bytes .../native/libSystem.IO.Ports.Native.so | Bin 0 -> 198944 bytes .../native/libSystem.IO.Ports.Native.so | Bin 0 -> 18496 bytes .../native/libSystem.IO.Ports.Native.dylib | Bin 0 -> 70464 bytes .../native/libSystem.IO.Ports.Native.dylib | Bin 0 -> 53968 bytes .../unix/lib/net6.0/System.IO.Ports.dll | Bin 0 -> 70256 bytes .../win/lib/net6.0/System.IO.Ports.dll | Bin 0 -> 75368 bytes 34 files changed, 104 insertions(+), 189 deletions(-) create mode 100644 IoTGateway/wwwroot/images/wx.png create mode 100644 drivers/net6.0/runtimes/linux-arm/native/libSystem.IO.Ports.Native.so create mode 100644 drivers/net6.0/runtimes/linux-arm64/native/libSystem.IO.Ports.Native.so create mode 100644 drivers/net6.0/runtimes/linux-x64/native/libSystem.IO.Ports.Native.so create mode 100644 drivers/net6.0/runtimes/osx-arm64/native/libSystem.IO.Ports.Native.dylib create mode 100644 drivers/net6.0/runtimes/osx-x64/native/libSystem.IO.Ports.Native.dylib create mode 100644 drivers/net6.0/runtimes/unix/lib/net6.0/System.IO.Ports.dll create mode 100644 drivers/net6.0/runtimes/win/lib/net6.0/System.IO.Ports.dll diff --git a/IoTGateway.Model/SystemConfig.cs b/IoTGateway.Model/SystemConfig.cs index bc7b767..b3ee916 100644 --- a/IoTGateway.Model/SystemConfig.cs +++ b/IoTGateway.Model/SystemConfig.cs @@ -38,7 +38,5 @@ namespace IoTGateway.Model ThingsCloud = 6, [Display(Name = "华为云")] HuaWei = 7, - [Display(Name = "IotDB")] - IotDB = 99 } } \ No newline at end of file diff --git a/IoTGateway/IoTGateway.csproj b/IoTGateway/IoTGateway.csproj index e5538dc..08114db 100644 --- a/IoTGateway/IoTGateway.csproj +++ b/IoTGateway/IoTGateway.csproj @@ -7,7 +7,7 @@ zh-Hans,en true Linux - + x86 diff --git a/IoTGateway/Views/Home/FrontPage.cshtml b/IoTGateway/Views/Home/FrontPage.cshtml index 955cdde..3372db1 100644 --- a/IoTGateway/Views/Home/FrontPage.cshtml +++ b/IoTGateway/Views/Home/FrontPage.cshtml @@ -58,9 +58,9 @@
-
公众号
+
技术支持
- +
@@ -83,9 +83,9 @@
-
小程序
+
公众号
- +
diff --git a/IoTGateway/Views/Login/Login.cshtml b/IoTGateway/Views/Login/Login.cshtml index 9bf1d6b..b762734 100644 --- a/IoTGateway/Views/Login/Login.cshtml +++ b/IoTGateway/Views/Login/Login.cshtml @@ -37,8 +37,8 @@