Merge remote-tracking branch 'origin/main'

internal/data/backup.go

@@ -144,7 +144,12 @@ func (r *backupRepo) CutoffLog(path, target string) error {
 		return err
 	}
 
-	return io.Remove(target)
+	// 原文件不能直接删除，直接删的话仍会占用空间直到重启相关的应用
+	if _, err := shell.Execf("cat /dev/null > '%s'", target); err != nil {
+		return err
+	}
+
+	return nil
 }
 
 // ClearExpired 清理过期备份

internal/data/cert_account.go

@@ -183,8 +183,8 @@ func (r certAccountRepo) Delete(id uint) error {
 // getGoogleEAB 获取 Google EAB
 func (r certAccountRepo) getGoogleEAB() (*acme.EAB, error) {
 	type data struct {
-		Message string `json:"message"`
-		Data    struct {
+		Msg  string `json:"msg"`
+		Data struct {
 			KeyId  string `json:"key_id"`
 			MacKey string `json:"mac_key"`
 		} `json:"data"`
@@ -198,8 +198,8 @@ func (r certAccountRepo) getGoogleEAB() (*acme.EAB, error) {
 		return &acme.EAB{}, errors.New(r.t.Get("failed to get Google EAB: %v", err))
 	}
 	eab := resp.Result().(*data)
-	if eab.Message != "success" {
-		return &acme.EAB{}, errors.New(r.t.Get("failed to get Google EAB: %s", eab.Message))
+	if eab.Msg != "success" {
+		return &acme.EAB{}, errors.New(r.t.Get("failed to get Google EAB: %s", eab.Msg))
 	}
 
 	return &acme.EAB{KeyID: eab.Data.KeyId, MACKey: eab.Data.MacKey}, nil

pkg/embed/locales/backend.pot

@@ -185,15 +185,15 @@ msgstr ""
 msgid "Cleaning failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:628
+#: internal/data/backup.go:633
 msgid "Cleaning temporary directory failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:666
+#: internal/data/backup.go:671
 msgid "Cleaning temporary file failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:193
+#: internal/data/backup.go:198
 msgid "Cleanup failed: %v"
 msgstr ""
 
@@ -298,12 +298,12 @@ msgstr ""
 msgid "Download URL is empty"
 msgstr ""
 
-#: internal/data/backup.go:726
-#: internal/data/backup.go:729
+#: internal/data/backup.go:731
+#: internal/data/backup.go:734
 msgid "Download failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:732
+#: internal/data/backup.go:737
 msgid "Download file check failed"
 msgstr ""
 
@@ -448,7 +448,7 @@ msgstr ""
 msgid "Fileinfo is a library used to identify file types"
 msgstr ""
 
-#: internal/data/backup.go:588
+#: internal/data/backup.go:593
 msgid "Files are normal and do not need to be repaired, please run panel-cli update to update the panel"
 msgstr ""
 
@@ -575,8 +575,8 @@ msgstr ""
 msgid "Install application"
 msgstr ""
 
-#: internal/data/backup.go:510
-#: internal/data/backup.go:536
+#: internal/data/backup.go:515
+#: internal/data/backup.go:541
 msgid "Insufficient backup directory space"
 msgstr ""
 
@@ -660,15 +660,15 @@ msgstr ""
 msgid "Memory Fragmentation Ratio"
 msgstr ""
 
-#: internal/data/backup.go:648
+#: internal/data/backup.go:653
 msgid "Move panel config failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:643
+#: internal/data/backup.go:648
 msgid "Move panel file failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:653
+#: internal/data/backup.go:658
 msgid "Move panel-cli file failed: %v"
 msgstr ""
 
@@ -698,7 +698,7 @@ msgstr ""
 msgid "New username cannot be empty"
 msgstr ""
 
-#: internal/data/backup.go:616
+#: internal/data/backup.go:621
 msgid "No backup file found, unable to automatically repair"
 msgstr ""
 
@@ -895,7 +895,7 @@ msgstr ""
 msgid "Remove panel application mark (use only under guidance)"
 msgstr ""
 
-#: internal/data/backup.go:640
+#: internal/data/backup.go:645
 msgid "Remove panel file failed: %v"
 msgstr ""
 
@@ -1052,7 +1052,7 @@ msgstr ""
 msgid "Temporary Tables Created on Disk"
 msgstr ""
 
-#: internal/data/backup.go:746
+#: internal/data/backup.go:751
 msgid "Temporary file detected in /tmp, this may be caused by the last update failure, please run panel-cli fix to repair and try again"
 msgstr ""
 
@@ -1060,7 +1060,7 @@ msgstr ""
 msgid "Tencent Cloud"
 msgstr ""
 
-#: internal/data/backup.go:556
+#: internal/data/backup.go:561
 msgid "The number of files contained in the compressed file is not 1, actual %d"
 msgstr ""
 
@@ -1136,11 +1136,11 @@ msgstr ""
 msgid "Uninstall application"
 msgstr ""
 
-#: internal/data/backup.go:631
+#: internal/data/backup.go:636
 msgid "Unzip backup file failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:663
+#: internal/data/backup.go:668
 msgid "Unzip panel data failed: %v"
 msgstr ""
 
@@ -1194,7 +1194,7 @@ msgstr ""
 msgid "Vercel"
 msgstr ""
 
-#: internal/data/backup.go:739
+#: internal/data/backup.go:744
 msgid "Verify download file failed: %v"
 msgstr ""
 
@@ -1313,9 +1313,9 @@ msgstr ""
 msgid "background task is running, updating is prohibited, please try again later"
 msgstr ""
 
-#: internal/data/backup.go:378
-#: internal/data/backup.go:405
-#: internal/data/backup.go:451
+#: internal/data/backup.go:383
+#: internal/data/backup.go:410
+#: internal/data/backup.go:456
 msgid "backup file %s not exists"
 msgstr ""
 
@@ -1336,7 +1336,7 @@ msgstr ""
 msgid "client ip/ua changed, please login again"
 msgstr ""
 
-#: internal/data/backup.go:564
+#: internal/data/backup.go:569
 msgid "could not find .sql backup file"
 msgstr ""
 
@@ -1352,10 +1352,10 @@ msgstr ""
 msgid "cron log directory %s not exists"
 msgstr ""
 
-#: internal/data/backup.go:258
-#: internal/data/backup.go:304
-#: internal/data/backup.go:420
-#: internal/data/backup.go:462
+#: internal/data/backup.go:263
+#: internal/data/backup.go:309
+#: internal/data/backup.go:425
+#: internal/data/backup.go:467
 msgid "database does not exist: %s"
 msgstr ""
 
@@ -1403,7 +1403,7 @@ msgstr ""
 msgid "failed to check ssh connection: %v"
 msgstr ""
 
-#: internal/data/backup.go:598
+#: internal/data/backup.go:603
 msgid "failed to clean temporary files: %v"
 msgstr ""
 
@@ -1948,7 +1948,7 @@ msgid "unable to update in offline mode"
 msgstr ""
 
 #: internal/data/backup.go:131
-#: internal/data/backup.go:207
+#: internal/data/backup.go:212
 #: internal/data/backup.go:95
 msgid "unknown backup type"
 msgstr ""
@@ -2021,37 +2021,37 @@ msgstr ""
 msgid "zstd is a library for compressing and decompressing files"
 msgstr ""
 
-#: internal/data/backup.go:239
-#: internal/data/backup.go:289
-#: internal/data/backup.go:329
-#: internal/data/backup.go:369
+#: internal/data/backup.go:244
+#: internal/data/backup.go:294
+#: internal/data/backup.go:334
+#: internal/data/backup.go:374
 msgid "|-Backed up to file: %s"
 msgstr ""
 
-#: internal/data/backup.go:506
-#: internal/data/backup.go:532
+#: internal/data/backup.go:511
+#: internal/data/backup.go:537
 msgid "|-Backup directory available Inode: %d"
 msgstr ""
 
-#: internal/data/backup.go:505
-#: internal/data/backup.go:531
+#: internal/data/backup.go:510
+#: internal/data/backup.go:536
 msgid "|-Backup directory available space: %s"
 msgstr ""
 
-#: internal/data/backup.go:620
+#: internal/data/backup.go:625
 msgid "|-Backup file used: %s"
 msgstr ""
 
-#: internal/data/backup.go:760
+#: internal/data/backup.go:765
 msgid "|-Backup panel data failed, missing file"
 msgstr ""
 
-#: internal/data/backup.go:754
-#: internal/data/backup.go:757
+#: internal/data/backup.go:759
+#: internal/data/backup.go:762
 msgid "|-Backup panel data failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:750
+#: internal/data/backup.go:755
 msgid "|-Backup panel data..."
 msgstr ""
 
@@ -2060,10 +2060,10 @@ msgstr ""
 msgid "|-Backup target: %s"
 msgstr ""
 
-#: internal/data/backup.go:238
-#: internal/data/backup.go:288
-#: internal/data/backup.go:328
-#: internal/data/backup.go:368
+#: internal/data/backup.go:243
+#: internal/data/backup.go:293
+#: internal/data/backup.go:333
+#: internal/data/backup.go:373
 msgid "|-Backup time: %s"
 msgstr ""
 
@@ -2079,27 +2079,27 @@ msgstr ""
 msgid "|-Backup type: website"
 msgstr ""
 
-#: internal/data/backup.go:780
+#: internal/data/backup.go:785
 msgid "|-Clean up temporary file failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:742
+#: internal/data/backup.go:747
 msgid "|-Clean up verification file failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:601
+#: internal/data/backup.go:606
 msgid "|-Cleaned up temporary files, please run panel-cli update to update the panel"
 msgstr ""
 
-#: internal/data/backup.go:190
+#: internal/data/backup.go:195
 msgid "|-Cleaning expired file: %s"
 msgstr ""
 
-#: internal/data/backup.go:767
+#: internal/data/backup.go:772
 msgid "|-Cleaning old version failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:764
+#: internal/data/backup.go:769
 msgid "|-Cleaning old version..."
 msgstr ""
 
@@ -2117,23 +2117,23 @@ msgstr ""
 msgid "|-Database: %s"
 msgstr ""
 
-#: internal/data/backup.go:718
+#: internal/data/backup.go:723
 msgid "|-Download link: %s"
 msgstr ""
 
-#: internal/data/backup.go:800
+#: internal/data/backup.go:805
 msgid "|-Download panel service file failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:723
+#: internal/data/backup.go:728
 msgid "|-Downloading..."
 msgstr ""
 
-#: internal/data/backup.go:719
+#: internal/data/backup.go:724
 msgid "|-File name: %s"
 msgstr ""
 
-#: internal/data/backup.go:699
+#: internal/data/backup.go:704
 msgid "|-Fix completed"
 msgstr ""
 
@@ -2142,24 +2142,24 @@ msgstr ""
 msgid "|-Keep count: %d"
 msgstr ""
 
-#: internal/data/backup.go:636
+#: internal/data/backup.go:641
 msgid "|-Move backup file..."
 msgstr ""
 
-#: internal/data/backup.go:806
+#: internal/data/backup.go:811
 msgid "|-Move panel-cli tool failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:790
+#: internal/data/backup.go:795
 msgid "|-Restore panel data failed, missing file"
 msgstr ""
 
-#: internal/data/backup.go:787
+#: internal/data/backup.go:792
 msgid "|-Restore panel data failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:659
-#: internal/data/backup.go:784
+#: internal/data/backup.go:664
+#: internal/data/backup.go:789
 msgid "|-Restore panel data..."
 msgstr ""
 
@@ -2171,61 +2171,61 @@ msgstr ""
 msgid "|-Rotation type: website"
 msgstr ""
 
-#: internal/data/backup.go:797
+#: internal/data/backup.go:802
 msgid "|-Run post-update script failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:794
+#: internal/data/backup.go:799
 msgid "|-Run post-update script..."
 msgstr ""
 
-#: internal/data/backup.go:679
-#: internal/data/backup.go:810
+#: internal/data/backup.go:684
+#: internal/data/backup.go:815
 msgid "|-Set key file permissions..."
 msgstr ""
 
-#: internal/data/backup.go:572
+#: internal/data/backup.go:577
 msgid "|-Start fixing the panel..."
 msgstr ""
 
-#: internal/data/backup.go:504
+#: internal/data/backup.go:509
 msgid "|-Target file count: %d"
 msgstr ""
 
-#: internal/data/backup.go:503
-#: internal/data/backup.go:530
+#: internal/data/backup.go:508
+#: internal/data/backup.go:535
 msgid "|-Target size: %s"
 msgstr ""
 
-#: internal/data/backup.go:717
+#: internal/data/backup.go:722
 msgid "|-Target version: %s"
 msgstr ""
 
-#: internal/data/backup.go:625
+#: internal/data/backup.go:630
 msgid "|-Unzip backup file..."
 msgstr ""
 
-#: internal/data/backup.go:777
+#: internal/data/backup.go:782
 msgid "|-Unzip new version failed, missing file"
 msgstr ""
 
-#: internal/data/backup.go:774
+#: internal/data/backup.go:779
 msgid "|-Unzip new version failed: %v"
 msgstr ""
 
-#: internal/data/backup.go:771
+#: internal/data/backup.go:776
 msgid "|-Unzip new version..."
 msgstr ""
 
-#: internal/data/backup.go:817
+#: internal/data/backup.go:822
 msgid "|-Update completed"
 msgstr ""
 
-#: internal/data/backup.go:736
+#: internal/data/backup.go:741
 msgid "|-Verify download file..."
 msgstr ""
 
-#: internal/data/backup.go:803
+#: internal/data/backup.go:808
 msgid "|-Write new panel version failed: %v"
 msgstr ""