From 87586da40a77f7c718da4168b43d646cfa192d96 Mon Sep 17 00:00:00 2001 From: dushixiang <798148596@qq.com> Date: Tue, 23 Feb 2021 19:33:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F=E7=BB=88?= =?UTF-8?q?=E6=AD=A2=E5=9C=A8=E7=BA=BF=E4=BC=9A=E8=AF=9D=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/global/store.go | 2 +- web/src/components/access/Access.js | 6 ++---- web/src/components/session/OnlineSession.js | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/global/store.go b/pkg/global/store.go index 28e6ab8..6e91a7b 100644 --- a/pkg/global/store.go +++ b/pkg/global/store.go @@ -27,7 +27,7 @@ func (r *Tun) Close(code int, reason string) { ws := r.WebSocket if ws != nil { if r.Mode == "guacd" { - err := guacd.NewInstruction("error", reason, strconv.Itoa(code)) + err := guacd.NewInstruction("error", "", strconv.Itoa(code)) _ = ws.WriteMessage(websocket.TextMessage, []byte(err.String())) disconnect := guacd.NewInstruction("disconnect") _ = ws.WriteMessage(websocket.TextMessage, []byte(disconnect.String())) diff --git a/web/src/components/access/Access.js b/web/src/components/access/Access.js index 4a40dc3..22815b0 100644 --- a/web/src/components/access/Access.js +++ b/web/src/components/access/Access.js @@ -158,12 +158,10 @@ class Access extends Component { }) break; case STATE_DISCONNECTING: - message.destroy(); - message.loading('正在关闭连接...', 0); + break; case STATE_DISCONNECTED: - message.destroy(); - message.error('连接关闭'); + break; default: break; diff --git a/web/src/components/session/OnlineSession.js b/web/src/components/session/OnlineSession.js index 93668d4..52ad7dd 100644 --- a/web/src/components/session/OnlineSession.js +++ b/web/src/components/session/OnlineSession.js @@ -192,7 +192,7 @@ class OnlineSession extends Component { delBtnLoading: true }) try { - let result = await request.post('/sessions/' + this.state.selectedRowKeys.join(',') + '/discontent'); + let result = await request.post('/sessions/' + this.state.selectedRowKeys.join(',') + '/disconnect'); if (result.code === 1) { message.success('操作成功', 3); this.setState({