2020/05/08 Jessica

Actions
1.  Packet.dll 更換 版本號 c4a64e3
2.  更換 WSS SSLProtocol tls1.2
3.  加入顯示電樁連線模式(ws/wss)

EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

@@ -170,8 +170,9 @@ namespace EVCB_OCPP.WSServer.Message
                                 db.Configuration.ValidateOnSaveEnabled = false;
                                 db.Machine.Attach(machine);
                                 machine.HeartbeatUpdatedOn = DateTime.Now;
-
+                                machine.ConnectionType = session.UriScheme.Equals("wss") ? 2 : 1;
                                 db.Entry(machine).Property(x => x.HeartbeatUpdatedOn).IsModified = true;
+                                db.Entry(machine).Property(x => x.ConnectionType).IsModified = true;
                                 db.SaveChanges();
                             }
                             var confirm = new HeartbeatConfirmation() { currentTime = DateTime.Now };

EVCB_OCPP.WSServer/ProtalServer.cs

@@ -32,6 +32,7 @@ using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 using EVCB_OCPP.WSServer.Service;
 using EVCB_OCPP.Packet.Messages.SmartCharging;
+using System.Security.Authentication;
 
 namespace EVCB_OCPP.WSServer
 {
@@ -298,7 +299,8 @@ namespace EVCB_OCPP.WSServer
             //System.Net.IPAddress.Any.ToString()
             // llistener.Add(new ListenerConfig { Ip = "", Port = Convert.ToInt32(wssserverPort), Backlog = 100, Security = serverSecurity });
             llistener.Add(new ListenerConfig { Ip = System.Net.IPAddress.Any.ToString(), Port = Convert.ToInt32(GlobalConfig.GetWS_Port()), Backlog = 100, Security = "None" });
-            llistener.Add(new ListenerConfig { Ip = System.Net.IPAddress.Any.ToString(), Port = Convert.ToInt32(GlobalConfig.GetWSS_Port()), Backlog = 100, Security = "tls" });
+            llistener.Add(new ListenerConfig { Ip = System.Net.IPAddress.Any.ToString(), Port = Convert.ToInt32(GlobalConfig.GetWSS_Port()), Backlog = 100, Security = SslProtocols.Tls12.ToString() });
+           // llistener.Add(new ListenerConfig { Ip = System.Net.IPAddress.Any.ToString(), Port = Convert.ToInt32(GlobalConfig.GetWSS_Port()), Backlog = 100, Security = SslProtocols.Tls11.ToString() });
             var config = ConfigurationManager.GetSection("superSocket") as IConfigurationSource;
             ICertificateConfig Certificate = config.Servers.ElementAt(0).Certificate;
             IEnumerable<IListenerConfig> listeners = llistener;

EVCB_OCPP.WSServer/SuperSocket.Protocol/OCPPWSServer.cs

@@ -61,6 +61,8 @@ namespace OCPPServer.Protocol
 
         protected override bool ValidateHandshake(ClientData session, string origin)
         {
+
+       
             string[] words = session.Path.Split('/');
             session.ChargeBoxId = words.Last();
           //  Console.WriteLine(string.Format("{0} :ValidateHandshake: {1}", DateTime.Now.ToString("yy/MM/dd HH:mm:ss.fff"), session.Path));