evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复批量终止在线会话失败的bug

Browse Source
This commit is contained in:
dushixiang 2021-02-23 19:33:11 +08:00
parent 88b0e39f48
commit 87586da40a
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/global/store.go
View File

@ -27,7 +27,7 @@ func (r *Tun) Close(code int, reason string) {
ws := r.WebSocket ws := r.WebSocket
if ws != nil { if ws != nil {
if r.Mode == "guacd" { 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())) _ = ws.WriteMessage(websocket.TextMessage, []byte(err.String()))
disconnect := guacd.NewInstruction("disconnect") disconnect := guacd.NewInstruction("disconnect")
_ = ws.WriteMessage(websocket.TextMessage, []byte(disconnect.String())) _ = ws.WriteMessage(websocket.TextMessage, []byte(disconnect.String()))

6
web/src/components/access/Access.js
View File

@ -158,12 +158,10 @@ class Access extends Component {
}) })
break; break;
case STATE_DISCONNECTING: case STATE_DISCONNECTING:
message.destroy();
message.loading('正在关闭连接...', 0);
break; break;
case STATE_DISCONNECTED: case STATE_DISCONNECTED:
message.destroy();
message.error('连接关闭');
break; break;
default: default:
break; break;

2
web/src/components/session/OnlineSession.js
View File

@ -192,7 +192,7 @@ class OnlineSession extends Component {
delBtnLoading: true delBtnLoading: true
}) })
try { 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) { if (result.code === 1) {
message.success('操作成功', 3); message.success('操作成功', 3);
this.setState({ this.setState({