From 74261f404549b3f61400563bb67770155257f269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Tue, 4 Feb 2025 20:28:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8E=8B=E7=BC=A9=E5=A4=87=E4=BB=BD?= =?UTF-8?q?pattern=20contains=20path=20separator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/data/backup.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/data/backup.go b/internal/data/backup.go index 127344b5..30959cac 100644 --- a/internal/data/backup.go +++ b/internal/data/backup.go @@ -423,6 +423,7 @@ func (r *backupRepo) restoreMySQL(backup, target string) error { if err != nil { return err } + defer io.Remove(filepath.Dir(backup)) // 删除解压目录 } if _, err = shell.Execf(`mysql -u root '%s' < '%s'`, target, backup); err != nil { @@ -432,7 +433,6 @@ func (r *backupRepo) restoreMySQL(backup, target string) error { return err } - _ = io.Remove(filepath.Dir(backup)) return nil } @@ -456,13 +456,13 @@ func (r *backupRepo) restorePostgres(backup, target string) error { if err != nil { return err } + defer io.Remove(filepath.Dir(backup)) // 删除解压目录 } if _, err = shell.Execf(`su - postgres -c "psql '%s'" < '%s'`, target, backup); err != nil { return err } - _ = io.Remove(filepath.Dir(backup)) return nil } @@ -525,7 +525,7 @@ func (r *backupRepo) preCheckDB(to string, size int64) error { // autoUnCompressSQL 自动处理压缩文件 func (r *backupRepo) autoUnCompressSQL(backup string) (string, error) { - temp, err := io.TempDir(backup) + temp, err := io.TempDir("sql-uncompress") if err != nil { return "", err } @@ -535,7 +535,7 @@ func (r *backupRepo) autoUnCompressSQL(backup string) (string, error) { } backup = "" // 置空，防止干扰后续判断 - if files, err := os.ReadDir(temp); err == nil { + if files, err := io.ReadDir(temp); err == nil { if len(files) != 1 { return "", fmt.Errorf("压缩文件中包含的文件数量不为1，实际为%d", len(files)) }