1. 修改ws消息显示格式

Author: hoilung

PlcClient/Controls/WebClient.cs

@@ -47,7 +47,7 @@ private void webClient_ReceiveEvent(object sender, string e)
         {
             tbx_received.Invoke(() =>
             {
-                tbx_received.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff "));
+                tbx_received.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff")+Environment.NewLine);
                 tbx_received.AppendText(e);
                 //设置最新一行数据颜色为随机颜色
                 tbx_received.Select(tbx_received.TextLength - e.Length, e.Length);

PlcClient/Controls/WebSocketServer.cs

@@ -42,11 +42,11 @@ public WebSocketServer()
             nd_step.DataBindings.Add("Value", this, "SendInterval");
         }
 
-        private void OnReceive(string msg)
+        private void OnReceive(string remote, string msg)
         {
             tbx_received.Invoke(() =>
             {
-                tbx_received.AppendText(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff "));
+                tbx_received.AppendText(string.Format("{0} [{1}]{2}", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), remote, Environment.NewLine));
                 tbx_received.AppendText(msg);
                 tbx_received.Select(tbx_received.TextLength - msg.Length, msg.Length);
                 tbx_received.SelectionColor = Color.FromArgb(255, new Random().Next(0, 100), new Random().Next(100, 255), new Random().Next(1, 128));
@@ -78,9 +78,10 @@ private void btn_start_Click(object sender, EventArgs e)
                 else if (ServerMode == "HTTP")
                 {
                     Server.Map(ServerUrl, () => SendMessage);
-                }
+                    
+                }                
                 Server.Start();
-                cbx_mode.Enabled=cbx_ip.Enabled=tbx_port.Enabled=tbx_path.Enabled= btn_start.Enabled = false;
+                cbx_mode.Enabled = cbx_ip.Enabled = tbx_port.Enabled = tbx_path.Enabled = btn_start.Enabled = false;
                 btn_stop.Enabled = true;
             }
             catch (Exception ex)
@@ -95,33 +96,42 @@ public void WebSocketHandler(IHttpContext content)
         {
             var ws = content.WebSocket;
             ws.Handler = ProcessMessage;
-            OnReceive(string.Format("[{0}]->WebSocket连接建立", ws.Context.Connection.Remote));
+            OnReceive(ws.Context.Connection.Remote.ToString(), "WebSocket连接建立");
+            // 加入客户端列表
             _clients.Add(ws.Context.Connection.Remote.ToString(), ws);
+            if (cbx_reply.Checked)
+            {
+                Task.Run(async () =>
+                {
+                    await Task.Delay(500);
+                    ws.Send("Welcome to WebSocket Server");
+                });
+            }
         }
 
         public void ProcessMessage(WebSocket socket, WebSocketMessage message)
         {
-            var remote = socket.Context.Connection.Remote;
+            var remote = socket.Context.Connection.Remote.ToString();
             var msg = message.Payload.GetSpan().ToStr();
             switch (message.Type)
             {
                 case WebSocketMessageType.Text:
-                    OnReceive(string.Format("[{0}]->{1}", remote, msg));
+                    OnReceive(remote, msg);
                     // 群发所有客户端
                     //socket.SendAll($"[{remote}]说，{msg}");
                     if (cbx_reply.Checked)
                         socket.Send(msg);
                     //socket.SendAll(msg, (s) => s.Session.Remote == remote);
                     break;
                 case WebSocketMessageType.Close:
-                    OnReceive(string.Format("[{0}]->关闭连接 [{1}] {2}", remote, message.CloseStatus, message.StatusDescription));
+                    OnReceive(remote, string.Format("关闭连接 [{0}] {1}", message.CloseStatus, message.StatusDescription));
                     break;
                 case WebSocketMessageType.Ping:
                 case WebSocketMessageType.Pong:
-                    OnReceive(string.Format("[{0}]->{1}", remote, msg));
+                    OnMsg($"{remote} {message.Type}");
                     break;
                 default:
-                    OnReceive(string.Format("[{0}]->{1}", remote, msg));
+                    OnReceive(remote, msg);
                     break;
             }
         }