Merge branch 'master' of https://gitee.com/ericxinstar/jywcs

src/Khd.Core.Wcs/MainCentralControl.cs

@@ -50,7 +50,7 @@ namespace Khd.Core.Wcs
                         plc = new Plc.S7.Plc(plcConfig.CpuType, plcConfig.IP, plcConfig.Port, plcConfig.Rack, plcConfig.Slot);
                         try
                         {
-                            //plc.Open();
+                            plc.Open();
                             Console.WriteLine(DateTime.Now + ":连接PLC：" + plcConfig.IP);
                         }
                         catch

src/Khd.Core.Wcs/appsettings.json

@@ -1,9 +1,9 @@
 {
   "ConnectionStrings": {
     //"DefaultConnection": "server=106.12.13.113;port=3336;database=khd_jyhb;uid=khd;pwd=khd@123;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True",
-    //"DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
+    "DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
     //"DefaultConnection": "server=localhost;port=3306;database=jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
-    "DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
+   // "DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
   },
   "DeleteLogDays": 10,//删除日志的时间间隔，单位：天
   "PlcConfigs": [