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 306a7a9..a754bbc 100644 Binary files a/wol.db and b/wol.db differ