From 300ac7867248e53ec39f9de73e3d6bc8beb71070 Mon Sep 17 00:00:00 2001
From: giaogiao <giaogiao>
Date: Thu, 14 Sep 2023 10:09:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=88=E5=AF=B9=E5=89=8D=E7=AB=AF=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E6=97=B6=E5=80=99=E5=88=87=E6=8D=A2=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E5=92=8C=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E7=9A=84ws=20url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml           |   2 +-
 controller/wsmain.go |  10 +++++-----
 wol.db               | Bin 16384 -> 12288 bytes
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 349fef8..f5f31fd 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -28,7 +28,7 @@ steps:
   - npm install yarn
   - yarn config set registry https://registry.npm.taobao.org --global
   - yarn
-  - yarn run eject
+  - sed -i 's?(dev_ws_url)?(dev_ws_url)?g' ./src/api/websocket.js
   - yarn build
 
 - name: build
diff --git a/controller/wsmain.go b/controller/wsmain.go
index 5e89767..05f3cec 100644
--- a/controller/wsmain.go
+++ b/controller/wsmain.go
@@ -35,7 +35,7 @@ func Hello(c echo.Context) error {
 			msg := ""
 			err := websocket.Message.Receive(ws, &msg)
 			if err != nil {
-				c.Logger().Error(err)
+				c.Logger().Error(err.Error())
 				break
 			}
 			//暂时不解析的json
@@ -45,13 +45,13 @@ func Hello(c echo.Context) error {
 			}
 			json.Unmarshal([]byte(msg), &wsValue)
 			if err := json.Unmarshal([]byte(msg), &wsValue); err != nil {
-				fmt.Println(err)
+				fmt.Println(err.Error())
 			}
 			switch wsValue.Method {
 			case "start":
 				var startdata MacData
 				if err := json.Unmarshal(json_data, &startdata); err != nil {
-					c.Logger().Error(err)
+					c.Logger().Error(err.Error())
 					return
 				}
 				Send_start(startdata.Mac, &ws, wsValue.Uuid)
@@ -61,14 +61,14 @@ func Hello(c echo.Context) error {
 			case "del":
 				var DelData DelData
 				if err := json.Unmarshal(json_data, &DelData); err != nil {
-					c.Logger().Error(err)
+					c.Logger().Error(err.Error())
 					return
 				}
 				Del(&ws, wsValue.Uuid, DelData.ID)
 			case "add":
 				var AddData AddData
 				if err := json.Unmarshal(json_data, &AddData); err != nil {
-					c.Logger().Error(err)
+					c.Logger().Error(err.Error())
 					return
 				}
 				Add(&ws, wsValue.Uuid, AddData.Nmae, AddData.Mac)
diff --git a/wol.db b/wol.db
index 306a7a9d552dd76024a6166fad2b84cf3fd406da..a754bbc6cf1a55f64ef5aa4889cfa40922947811 100644
GIT binary patch
delta 141
zcmZo@U~EX3AT7wjz`(!^#4x}(QO6i4sF!tt7bwKUZ^*#k%x}0^P~afnWG?<7(P~C^
zabaP`#@Ld?q@2|9{2U-+nmmI)gA1gdk^dP3|1+TK+x*g!5-cnX!urp)c3Zev8JSs`
eT39(7T3MJ{Sr~6p_{z`Cz`)MPEX)Yh&jJ9r{2p`w

delta 207
zcmZojXlP)ZAT21zz`(!)#7scU2*g|yb&Q4O81%9(@bbqnF!6IS@N@Au^Yv~ll;&dr
ziquXltekAf9|Y2)KCw_)w3?Y+Tv(W~F}5TzDJQi&KL?0dCePr{-~p<D0hY~z3eWf_
z2JmfC_{uNN$H30WEX)X0$i&P4l!1}|6a)V${!^O;1@`fqNiwl8i0YT5R+Lz{Ss9sG
VnOaym8(LYIT3HwaO_RnU1pqUpEY<)3