From 94443c588da83d40988b4077a9804b9af971ca83 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 2 Jul 2024 18:38:25 +0800 Subject: [PATCH] perf: display api error msg --- pkg/tunnel/server.go | 6 ++++-- ui/src/components/GuacamoleConnect.vue | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/tunnel/server.go b/pkg/tunnel/server.go index 5b94f85..c72b62b 100644 --- a/pkg/tunnel/server.go +++ b/pkg/tunnel/server.go @@ -94,7 +94,8 @@ func (g *GuacamoleTunnelServer) Connect(ctx *gin.Context) { tunnelSession, err := g.SessionService.CreatByToken(ctx, tokenId) if err != nil { logger.Errorf("Create token session err: %+v", err) - _ = ws.WriteMessage(websocket.TextMessage, []byte(ErrAPIFailed.String())) + errIns := NewJMSGuacamoleError(1006, err.Error()) + _ = ws.WriteMessage(websocket.TextMessage, []byte(errIns.String())) return } userItem, ok := ctx.Get(config.GinCtxUserKey) @@ -120,7 +121,8 @@ func (g *GuacamoleTunnelServer) Connect(ctx *gin.Context) { logger.Infof("User %s start to connect session %s", user, sessionId) if err = tunnelSession.ConnectedCallback(); err != nil { logger.Errorf("Session connect callback err %v", err) - _ = ws.WriteMessage(websocket.TextMessage, []byte(ErrAPIFailed.String())) + errIns := NewJMSGuacamoleError(1006, err.Error()) + _ = ws.WriteMessage(websocket.TextMessage, []byte(errIns.String())) return } p, _ := json.Marshal(tunnelSession) diff --git a/ui/src/components/GuacamoleConnect.vue b/ui/src/components/GuacamoleConnect.vue index c372da4..542f785 100644 --- a/ui/src/components/GuacamoleConnect.vue +++ b/ui/src/components/GuacamoleConnect.vue @@ -736,6 +736,9 @@ export default { case 1010: msg = msg.replace('{PLACEHOLDER}', status.message) break + case 1006: + msg = msg + ': ' + status.message + break } this.$alert(msg, this.$t('ErrTitle'), { confirmButtonText: this.$t('OK'),