From 967b8772204f0ae4a0ae0fb50f4ff45cdd8a4cc2 Mon Sep 17 00:00:00 2001
From: Hinse <756681202@qq.com>
Date: Sat, 7 Aug 2021 18:33:27 +0800
Subject: [PATCH] 2

---
 Waste.Application/Test/TestAppService.cs    |  7 +++
 Waste.Web.Entry/Pages/Socket/Test.cshtml    | 59 ++++++++++++++-------
 Waste.Web.Entry/Pages/Socket/Test.cshtml.cs |  1 +
 3 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/Waste.Application/Test/TestAppService.cs b/Waste.Application/Test/TestAppService.cs
index db105b0..b77fb61 100644
--- a/Waste.Application/Test/TestAppService.cs
+++ b/Waste.Application/Test/TestAppService.cs
@@ -41,6 +41,13 @@ namespace Waste.Application
             _loggerService.AddLogger(msg, 1);
             return "success";
         }
+
+        [HttpGet]
+        public void ConnectServer()
+        {
+
+        }
+
         [HttpGet]
         public async Task TestSendAsync()
         {
diff --git a/Waste.Web.Entry/Pages/Socket/Test.cshtml b/Waste.Web.Entry/Pages/Socket/Test.cshtml
index 74f67f4..54db55b 100644
--- a/Waste.Web.Entry/Pages/Socket/Test.cshtml
+++ b/Waste.Web.Entry/Pages/Socket/Test.cshtml
@@ -25,6 +25,8 @@
                 </div>
                 <div class="layui-inline">
                     <button class="btn btn-primary btn-lg  js-send" type="button">发送</button>
+                    <button class="btn btn-primary btn-lg  js-connect" type="button">握手</button>
+                    <button class="btn btn-primary btn-lg  js-hello" type="button">sayHello</button>
                 </div>
             </div>
         </div>
@@ -35,6 +37,7 @@
 </div>
 @section Scripts{ 
 <script type="text/javascript">
+    //第一步调用 /
     $(".js-start").on("click", function () {
         initWebSocket();
     });
@@ -42,31 +45,47 @@
         var val = $("#Content").val();
         sendData("", val, "");
     });
+    $(".js-connect").on("click", function () {
+        var val = {
+            "protocol": "messagepack",
+            "version":1
+        };
+        var data = JSON.stringify(val);
+        sendData(data);
+    });
+    $(".js-hello").on("click", function () {
+        var val = {
+            "protocol": "messagepack",
+            "version": 1
+        };
+        var data = JSON.stringify(val);
+        sendData(data);
+    });
     var webSocket;
     //d:内容
     function sendData(d) {
         initWebSocket();
         if (webSocket.OPEN && webSocket.readyState == 1) {
-            let time = new Date().getTime(); //1603009495724,精确到毫秒
-            var s = {
-                "type": 1,
-                "headers": {
-                    "device": "08d92497-09cb-4d1d-8c47-44443caa6896",
-                    "secret": "oWxxKZwwHvVxQhdE",
-                    "time": time,
-                    "os": 12,
-                    "script": 2,
-                    "baseProgrameLang": 109,
-                    "dev": true
-                },
-                "invocationId": "Nil",
-                "target": "sayHello",
-                "arguments": [
-                    "Hello Test Message"
-                ]
-            };
-            var aa = JSON.stringify(s);
-            webSocket.send(aa);
+            //let time = new Date().getTime(); //1603009495724,精确到毫秒
+            //var s = {
+            //    "type": 1,
+            //    "headers": {
+            //        "device": "08d92497-09cb-4d1d-8c47-44443caa6896",
+            //        "secret": "oWxxKZwwHvVxQhdE",
+            //        "time": time,
+            //        "os": 12,
+            //        "script": 2,
+            //        "baseProgrameLang": 109,
+            //        "dev": true
+            //    },
+            //    "invocationId": "Nil",
+            //    "target": "sayHello",
+            //    "arguments": [
+            //        "Hello Test Message"
+            //    ]
+            //};
+            var s = "<";
+            webSocket.send(d+s);
         }
         if (webSocket.readyState == 2 || webSocket.readyState == 3) {
             $("#div_receive").append("WebSocket closed");
diff --git a/Waste.Web.Entry/Pages/Socket/Test.cshtml.cs b/Waste.Web.Entry/Pages/Socket/Test.cshtml.cs
index 392a162..b71c977 100644
--- a/Waste.Web.Entry/Pages/Socket/Test.cshtml.cs
+++ b/Waste.Web.Entry/Pages/Socket/Test.cshtml.cs
@@ -11,6 +11,7 @@ namespace Waste.Web.Entry.Pages.Socket
     {
         public void OnGet()
         {
+
         }
     }
 }