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({