Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	PLCLinker/centralController/obj/Release/centralController.csproj.FileListAbsolute.txt

PLCLinker/PLCLinker/obj/Debug/PLCLinker.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-bc88ed63d13083557ce9673451090a0e191a41b4
+87502a68a27e1cc27d81bb55af49bc180f1b8b08

PLCLinker/PLCLinker/obj/Release/PLCLinker.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-8b0c29bd7e29dd6f716140370526519f352b45b8
+87502a68a27e1cc27d81bb55af49bc180f1b8b08

PLCLinker/PLCS7/obj/Release/PLCS7.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-3ac464feb92987cc1fe90ecd0628cc0cc20e45e6
+92785b46f6769f30b6d6f9b39f495b02f6cffe6a

PLCLinker/centralController/Monitor/SystemInitializer.cs

@@ -1,4 +1,5 @@
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Linq;
@@ -79,8 +80,8 @@ namespace Monitor
             Monitor.SetNotification("初始化数据库...", parkMonitor.model.TextColor.Log);
             Monitor.remoteDBOper = new DBOperation(remoteDBConnStr, DBtimeout);
             Monitor.localDBOper = new DBOperation(localDBConnStr, DBtimeout);
-            initStatus = initStatus && Monitor.remoteDBOper.InitConnPooling(10);
-            initStatus = initStatus && Monitor.localDBOper.InitConnPooling(10);
+            initStatus = initStatus && Monitor.remoteDBOper.InitConnPooling(5);
+            initStatus = initStatus && Monitor.localDBOper.InitConnPooling(5);
             //数据库初始化结束，进入状态3
             if (!initStatus) { return; }
             else { Monitor.initializeState = 3; }

PLCLinker/centralController/WebServer/WebServer.cs

@@ -258,6 +258,7 @@ namespace centralController.WebServer
                                 returnMsg.cmd = "FAILED";
                                 returnMsg.garageID = Monitor.Monitor.garageID;
                                 returnMsg.context = msg.context;
+                                returnMsg.sender = IPaddressTools.GetLocalIP();
                                 comm.SendMessage(returnMsg);
                                 Monitor.Monitor.SetNotification("车辆" + msg.context + "预约停车,已无可预约车位", parkMonitor.model.TextColor.Warning);
                             }
@@ -277,6 +278,7 @@ namespace centralController.WebServer
                                 returnMsg.cmd = "OK";
                                 returnMsg.garageID = Monitor.Monitor.garageID;
                                 returnMsg.context = msg.context;
+                                returnMsg.sender = IPaddressTools.GetLocalIP();
                                 comm.SendMessage(returnMsg);
                                 Monitor.Monitor.SetNotification("车辆" + msg.context + "预约停车,操作成功", parkMonitor.model.TextColor.Log);
                             }
@@ -511,8 +513,8 @@ namespace centralController.WebServer
                     {
                         if (connected && comm != null)
                         {
-                            byte[] bytes = new byte[256];
-                            MessageUTF8 msg = ((MessageUTF8)comm.ReceiveMessage(out bytes));
+                            //byte[] bytes = new byte[256];
+                            MessageUTF8 msg = ((MessageUTF8)comm.ReceiveMessage());
                             //string str = "";
                             //str = Encoding.Default.GetString(bytes);
                             //Console.WriteLine(str);

PLCLinker/centralController/obj/Release/centralController.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-06a8c02145b158084c7aeb48ba8e70c35f6aaaff
+87053e9854ba639958c40694ac0e08932cbc872e

PLCLinker/centralController/obj/Release/centralController.csproj.FileListAbsolute.txt

@@ -175,3 +175,90 @@ C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centra
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csproj.CoreCompileInputs.cache
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csproj.CopyComplete
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csprojAssemblyReference.cache
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\sdk\VZ_Sdk\VzDrawsLib.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\sdk\VZ_Sdk\VzLPRSDK.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\sdk\VZ_Sdk\VZ_Sdk.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\serversettings.json
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\centralController.exe.config
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\centralController.exe
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\centralController.pdb
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\broadcastDLL.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\db.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar.Schedule.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar.SuperGrid.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar2.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.Instrumentation.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Buffers.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Codecs.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Common.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Handlers.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Transport.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\HslCommunication.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\log4net.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.Abstractions.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.FileExtensions.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.Json.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.FileProviders.Abstractions.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.FileProviders.Physical.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Logging.Abstractions.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Logging.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Primitives.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\MySql.Data.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\netstandard.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\nettyCommunication.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Newtonsoft.Json.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\PLCS7.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\snap7Enc.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Collections.Immutable.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Runtime.CompilerServices.Unsafe.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Runtime.InteropServices.RuntimeInformation.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Threading.Tasks.Extensions.dll
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar.Schedule.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar.SuperGrid.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar2.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.Instrumentation.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Buffers.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Codecs.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Common.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Handlers.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DotNetty.Transport.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\log4net.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.Abstractions.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.FileExtensions.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Configuration.Json.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.DependencyInjection.Abstractions.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.FileProviders.Abstractions.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.FileProviders.Physical.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Logging.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Logging.Abstractions.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Microsoft.Extensions.Primitives.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\Newtonsoft.Json.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\PLCS7.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Collections.Immutable.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Runtime.CompilerServices.Unsafe.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\System.Threading.Tasks.Extensions.xml
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.exe.config
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.g.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\VzClientSDKDemo.BaseConfig_From.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\PLC_Communication.FormModbus.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\VzClientSDKDemo.NetCfg_Form.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\VzClientSDKDemo.RuleCfg_Form.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\VzClientSDKDemo.RVideoCfg_Form.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\VzClientSDKDemo.VideoCfg_Form.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.FormNumberMachinePreview.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.FormRecordsManager.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.FormSysConfig.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.FormSysInfo.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.FormPaymentScheme.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.centralController.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\PLCConnector.FormPLCConf.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.Properties.Resources.resources
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csproj.GenerateResource.cache
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csproj.CoreCompileInputs.cache
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csproj.CopyComplete
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.exe
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.pdb
+E:\superScene\智能停车项目\智能停车项目\智能泊车系统\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csprojResolveAssemblyReference.cache

PLCLinker/socketTest/obj/Release/socketTest.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-ea1aee1977a5c9e18ef88790a1d00e0db45b7496
+d5d4b03806e074c0896636ac8fa7e6ce7f59ca64