From b3852db39e38887e7f61ab731c0b2f796678333a Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Thu, 1 Feb 2024 23:54:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=BD=91=E7=AB=99?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=87=E5=89=B2=E5=A4=87=E4=BB=BD=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=20(#3785?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/api/v1/terminal.go | 4 ++-- backend/app/service/backup.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/app/api/v1/terminal.go b/backend/app/api/v1/terminal.go index da62dc2ed..568c4871f 100644 --- a/backend/app/api/v1/terminal.go +++ b/backend/app/api/v1/terminal.go @@ -105,7 +105,7 @@ func (b *BaseApi) RedisWsSsh(c *gin.Context) { defer killBash(redisConf.ContainerName, commands, pidMap) defer slave.Close() - tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, true) + tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, false) if wshandleError(wsConn, err) { return } @@ -173,7 +173,7 @@ func (b *BaseApi) ContainerWsSsh(c *gin.Context) { defer killBash(containerID, command, pidMap) defer slave.Close() - tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, false) + tty, err := terminal.NewLocalWsSession(cols, rows, wsConn, slave, true) if wshandleError(wsConn, err) { return } diff --git a/backend/app/service/backup.go b/backend/app/service/backup.go index d13569e72..d8554c80f 100644 --- a/backend/app/service/backup.go +++ b/backend/app/service/backup.go @@ -341,6 +341,7 @@ func (u *BackupService) Update(req dto.BackupOperate) error { _ = backupRepo.Update(req.ID, (map[string]interface{}{"vars": oldVars})) return err } + global.CONF.System.Backup = dirStr } } }