fix: Update compression backup exclusion rules (#9323)

ssongliu · web-flow · commit be6d3ea337e9 · 2025-06-27T09:25:23.000Z
diff --git a/agent/app/dto/setting.go b/agent/app/dto/setting.go
@@ -23,8 +23,6 @@ type SettingInfo struct {
 	AppStoreSyncStatus   string `json:"appStoreSyncStatus"`
 
 	FileRecycleBin string `json:"fileRecycleBin"`
-
-	SnapshotIgnore string `json:"snapshotIgnore"`
 }
 
 type SettingUpdate struct {
diff --git a/agent/app/dto/snapshot.go b/agent/app/dto/snapshot.go
@@ -28,18 +28,21 @@ type SnapshotCreate struct {
 	WithOperationLog bool `json:"withOperationLog"`
 	WithSystemLog    bool `json:"withSystemLog"`
 	WithTaskLog      bool `json:"withTaskLog"`
+
+	IgnoreFiles []string `json:"ignoreFiles"`
 }
 
 type SnapshotData struct {
 	AppData    []DataTree `json:"appData"`
 	BackupData []DataTree `json:"backupData"`
 	PanelData  []DataTree `json:"panelData"`
 
-	WithMonitorData  bool `json:"withMonitorData"`
-	WithLoginLog     bool `json:"withLoginLog"`
-	WithOperationLog bool `json:"withOperationLog"`
-	WithSystemLog    bool `json:"withSystemLog"`
-	WithTaskLog      bool `json:"withTaskLog"`
+	WithMonitorData  bool     `json:"withMonitorData"`
+	WithLoginLog     bool     `json:"withLoginLog"`
+	WithOperationLog bool     `json:"withOperationLog"`
+	WithSystemLog    bool     `json:"withSystemLog"`
+	WithTaskLog      bool     `json:"withTaskLog"`
+	IgnoreFiles      []string `json:"ignoreFiles"`
 }
 type DataTree struct {
 	ID        string `json:"id"`
diff --git a/agent/app/model/snapshot.go b/agent/app/model/snapshot.go
@@ -23,6 +23,7 @@ type Snapshot struct {
 	WithOperationLog bool   `json:"withOperationLog"`
 	WithSystemLog    bool   `json:"withSystemLog"`
 	WithTaskLog      bool   `json:"withTaskLog"`
+	IgnoreFiles      string `json:"ignoreFiles"`
 
 	InterruptStep   string `json:"interruptStep"`
 	RecoverStatus   string `json:"recoverStatus"`
diff --git a/agent/app/service/cronjob_backup.go b/agent/app/service/cronjob_backup.go
@@ -285,6 +285,7 @@ func (u *CronjobService) handleSnapshot(cronjob model.Cronjob, jobRecord model.J
 		WithOperationLog:  true,
 		WithSystemLog:     true,
 		WithTaskLog:       true,
+		IgnoreFiles:       strings.Split(cronjob.ExclusionRules, ","),
 	}
 
 	if err := NewISnapshotService().SnapshotCreate(taskItem, req, jobRecord.ID, cronjob.RetryTimes, cronjob.Timeout); err != nil {
diff --git a/agent/app/service/snapshot_create.go b/agent/app/service/snapshot_create.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"path"
+	"path/filepath"
 	"strings"
 	"sync"
 	"time"
@@ -55,6 +56,7 @@ func (u *SnapshotService) SnapshotCreate(parentTask *task.Task, req dto.Snapshot
 		WithOperationLog: req.WithOperationLog,
 		WithTaskLog:      req.WithTaskLog,
 		WithSystemLog:    req.WithSystemLog,
+		IgnoreFiles:      strings.Join(req.IgnoreFiles, ","),
 
 		Version: versionItem.Value,
 		Status:  constant.StatusWaiting,
@@ -398,6 +400,7 @@ func snapBackupData(snap snapHelper, req dto.SnapshotCreate, targetDir string) e
 	snap.Task.LogStart(i18n.GetMsgByKey("SnapLocalBackup"))
 
 	excludes := loadBackupExcludes(snap, req.BackupData)
+	excludes = append(excludes, req.IgnoreFiles...)
 	excludes = append(excludes, "./system_snapshot")
 	for _, item := range req.AppData {
 		for _, itemApp := range item.Children {
@@ -421,7 +424,8 @@ func loadBackupExcludes(snap snapHelper, req []dto.DataTree) []string {
 			if err := snap.snapAgentDB.Where("file_dir = ? AND file_name = ?", strings.TrimPrefix(path.Dir(item.Path), global.Dir.LocalBackupDir+"/"), path.Base(item.Path)).Delete(&model.BackupRecord{}).Error; err != nil {
 				snap.Task.LogWithStatus("delete backup file from database", err)
 			}
-			excludes = append(excludes, "."+strings.TrimPrefix(item.Path, global.Dir.LocalBackupDir))
+			itemDir, _ := filepath.Rel(item.Path, global.Dir.LocalBackupDir)
+			excludes = append(excludes, itemDir)
 		} else {
 			excludes = append(excludes, loadBackupExcludes(snap, item.Children)...)
 		}
@@ -433,7 +437,8 @@ func loadAppBackupExcludes(req []dto.DataTree) []string {
 	for _, item := range req {
 		if len(item.Children) == 0 {
 			if !item.IsCheck {
-				excludes = append(excludes, "."+strings.TrimPrefix(item.Path, path.Join(global.Dir.LocalBackupDir)))
+				itemDir, _ := filepath.Rel(item.Path, global.Dir.LocalBackupDir)
+				excludes = append(excludes, itemDir)
 			}
 		} else {
 			excludes = append(excludes, loadAppBackupExcludes(item.Children)...)
@@ -466,26 +471,21 @@ func snapPanelData(snap snapHelper, req dto.SnapshotCreate, targetDir string) er
 
 	rootDir := global.Dir.DataDir
 	if strings.Contains(global.Dir.LocalBackupDir, rootDir) {
-		excludes = append(excludes, "."+strings.ReplaceAll(global.Dir.LocalBackupDir, rootDir, ""))
+		itemDir, _ := filepath.Rel(rootDir, global.Dir.LocalBackupDir)
+		excludes = append(excludes, itemDir)
 	}
 	if len(snap.OpenrestyDir) != 0 && strings.Contains(snap.OpenrestyDir, rootDir) {
-		excludes = append(excludes, "."+strings.ReplaceAll(snap.OpenrestyDir, rootDir, ""))
-	}
-	ignoreVal, _ := settingRepo.Get(settingRepo.WithByKey("SnapshotIgnore"))
-	rules := strings.Split(ignoreVal.Value, ",")
-	for _, ignore := range rules {
-		if len(ignore) == 0 || cmd.CheckIllegal(ignore) {
-			continue
-		}
-		excludes = append(excludes, "."+strings.ReplaceAll(ignore, rootDir, ""))
+		itemDir, _ := filepath.Rel(rootDir, snap.OpenrestyDir)
+		excludes = append(excludes, itemDir)
 	}
+	excludes = append(excludes, req.IgnoreFiles...)
 	err := snap.FileOp.TarGzCompressPro(false, rootDir, path.Join(targetDir, "1panel_data.tar.gz"), "", strings.Join(excludes, ","))
 	snap.Task.LogWithStatus(i18n.GetMsgByKey("SnapCompressPanel"), err)
 	if err != nil {
 		return err
 	}
 	if len(snap.OpenrestyDir) != 0 {
-		err := snap.FileOp.TarGzCompressPro(false, snap.OpenrestyDir, path.Join(targetDir, "website.tar.gz"), "", "")
+		err := snap.FileOp.TarGzCompressPro(false, snap.OpenrestyDir, path.Join(targetDir, "website.tar.gz"), "", strings.Join(req.IgnoreFiles, ","))
 		snap.Task.LogWithStatus(i18n.GetMsgByKey("SnapWebsite"), err)
 		if err != nil {
 			return err
@@ -499,7 +499,8 @@ func loadPanelExcludes(req []dto.DataTree) []string {
 	for _, item := range req {
 		if len(item.Children) == 0 {
 			if !item.IsCheck {
-				excludes = append(excludes, "."+strings.TrimPrefix(item.Path, path.Join(global.Dir.BaseDir, "1panel")))
+				itemDir, _ := filepath.Rel(item.Path, path.Join(global.Dir.BaseDir, "1panel"))
+				excludes = append(excludes, itemDir)
 			}
 		} else {
 			excludes = append(excludes, loadPanelExcludes(item.Children)...)
diff --git a/agent/init/migration/migrate.go b/agent/init/migration/migrate.go
@@ -27,6 +27,7 @@ func InitAgentDB() {
 		migrations.UpdateRuntime,
 		migrations.AddSnapshotRule,
 		migrations.UpdatePHPRuntime,
+		migrations.AddSnapshotIgnore,
 	})
 	if err := m.Migrate(); err != nil {
 		global.LOG.Error(err)
diff --git a/agent/init/migration/migrations/init.go b/agent/init/migration/migrations/init.go
@@ -185,9 +185,6 @@ var InitSetting = &gormigrate.Migration{
 		if err := tx.Create(&model.Setting{Key: "FileRecycleBin", Value: constant.StatusEnable}).Error; err != nil {
 			return err
 		}
-		if err := tx.Create(&model.Setting{Key: "SnapshotIgnore", Value: "*.sock"}).Error; err != nil {
-			return err
-		}
 
 		if err := tx.Create(&model.Setting{Key: "LocalSSHConn", Value: ""}).Error; err != nil {
 			return err
@@ -332,11 +329,18 @@ var AddSnapshotRule = &gormigrate.Migration{
 		)
 	},
 }
-
 var UpdatePHPRuntime = &gormigrate.Migration{
 	ID: "20250624-update-php-runtime",
 	Migrate: func(tx *gorm.DB) error {
 		service.HandleOldPHPRuntime()
 		return nil
 	},
 }
+var AddSnapshotIgnore = &gormigrate.Migration{
+	ID: "20250627-add-snapshot-ignore",
+	Migrate: func(tx *gorm.DB) error {
+		return tx.AutoMigrate(
+			&model.Snapshot{},
+		)
+	},
+}
diff --git a/agent/utils/files/file_op.go b/agent/utils/files/file_op.go
@@ -815,17 +815,16 @@ func (f FileOp) TarGzCompressPro(withDir bool, src, dst, secret, exclusionRules
 		if len(exclude) == 0 {
 			continue
 		}
+		if strings.HasPrefix(exclude, "/") {
+			exclude, _ = filepath.Rel(src, exclude)
+		}
 		if _, ok := exMap[exclude]; ok {
 			continue
 		}
 		exStr += fmt.Sprintf(" --exclude '%s'", exclude)
 		exMap[exclude] = struct{}{}
 	}
 
-	itemPrefix := filepath.Base(src)
-	if itemPrefix == "/" {
-		itemPrefix = ""
-	}
 	if len(secret) != 0 {
 		commands = fmt.Sprintf("tar %s -zcf - %s | openssl enc -aes-256-cbc -salt -k '%s' -out %s", exStr, srcItem, secret, dst)
 		global.LOG.Debug(strings.ReplaceAll(commands, fmt.Sprintf(" %s ", secret), "******"))
diff --git a/frontend/src/api/interface/cronjob.ts b/frontend/src/api/interface/cronjob.ts
@@ -23,6 +23,7 @@ export namespace Cronjob {
         appID: string;
         website: string;
         exclusionRules: string;
+        ignoreFiles: Array<string>;
         dbType: string;
         dbName: string;
         url: string;
diff --git a/frontend/src/components/file-batch/index.vue b/frontend/src/components/file-batch/index.vue
@@ -1,6 +1,5 @@
 <template>
-    <DrawerPro v-model="drawerVisible" :header="$t('setting.ignoreRule')" @close="handleClose" size="small">
-        <el-alert :closable="false" type="warning">{{ $t('setting.ignoreHelper') }}</el-alert>
+    <div>
         <el-form ref="formRef" :model="form" :rules="rules" v-loading="loading" class="mt-2">
             <el-form-item prop="tmpRule">
                 <div class="w-full">
@@ -13,6 +12,7 @@
                     />
                     <FileList @choose="loadDir" :path="baseDir" :isAll="true"></FileList>
                 </div>
+                <span class="input-help">{{ $t('cronjob.exclusionRulesHelper') }}</span>
             </el-form-item>
         </el-form>
 
@@ -30,26 +30,26 @@
                 </template>
             </el-table-column>
         </el-table>
-        <template #footer>
-            <el-button @click="drawerVisible = false">{{ $t('commons.button.cancel') }}</el-button>
-            <el-button :disabled="loading" type="primary" @click="onSave()">
-                {{ $t('commons.button.save') }}
-            </el-button>
-        </template>
-    </DrawerPro>
+    </div>
 </template>
 <script lang="ts" setup>
 import { reactive, ref } from 'vue';
 import i18n from '@/lang';
-import { MsgSuccess } from '@/utils/message';
 import FileList from '@/components/file-list/index.vue';
 import { FormInstance } from 'element-plus';
-import { getAgentSettingInfo, loadBaseDir, updateAgentSetting } from '@/api/modules/setting';
+import { loadBaseDir } from '@/api/modules/setting';
 
 const loading = ref();
 const baseDir = ref();
-const drawerVisible = ref(false);
 const tableList = ref();
+const em = defineEmits(['update:files']);
+
+const props = defineProps({
+    files: {
+        type: Array<String>,
+        default: [],
+    },
+});
 
 const form = reactive({
     tmpRule: '',
@@ -76,17 +76,6 @@ function checkData(rule: any, value: any, callback: any) {
     callback();
 }
 
-const acceptParams = async (): Promise<void> => {
-    loadPath();
-    const res = await getAgentSettingInfo();
-    tableList.value = [];
-    let items = res.data.snapshotIgnore.split(',');
-    for (const item of items) {
-        tableList.value.push({ value: item });
-    }
-    drawerVisible.value = true;
-};
-
 const loadPath = async () => {
     const pathRes = await loadBaseDir();
     baseDir.value = pathRes.data;
@@ -106,35 +95,25 @@ const handleAdd = (formEl: FormInstance | undefined) => {
                 tableList.value.push({ value: item });
             }
         }
+        em(
+            'update:files',
+            tableList.value.map((item) => item.value),
+        );
         form.tmpRule = '';
     });
 };
 const handleDelete = (index: number) => {
     tableList.value.splice(index, 1);
+    em(
+        'update:files',
+        tableList.value.map((item) => item.value),
+    );
 };
 
-const onSave = async () => {
-    let list = [];
-    for (const item of tableList.value) {
-        list.push(item.value);
-    }
-    await updateAgentSetting({ key: 'SnapshotIgnore', value: list.join(',') })
-        .then(async () => {
-            MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
-            loading.value = false;
-            drawerVisible.value = false;
-            return;
-        })
-        .catch(() => {
-            loading.value = false;
-        });
-};
-
-const handleClose = () => {
-    drawerVisible.value = false;
-};
-
-defineExpose({
-    acceptParams,
+onMounted(() => {
+    loadPath();
+    tableList.value = props.files.map((item) => {
+        return { value: item };
+    });
 });
 </script>
diff --git a/frontend/src/views/cronjob/cronjob/operate/index.vue b/frontend/src/views/cronjob/cronjob/operate/index.vue
@@ -601,11 +601,7 @@
                             <el-row :gutter="20">
                                 <LayoutCol :span="20" v-if="hasExclusionRules()">
                                     <el-form-item :label="$t('cronjob.exclusionRules')" prop="exclusionRules">
-                                        <el-input
-                                            :placeholder="$t('cronjob.rulesHelper')"
-                                            clearable
-                                            v-model="form.exclusionRules"
-                                        />
+                                        <IgnoreFile class="w-full" v-model:files="form.ignoreFiles"></IgnoreFile>
                                         <span class="input-help">{{ $t('cronjob.exclusionRulesHelper') }}</span>
                                     </el-form-item>
                                 </LayoutCol>
@@ -703,6 +699,7 @@ import { ElForm } from 'element-plus';
 import { Cronjob } from '@/api/interface/cronjob';
 import { addCronjob, editCronjob, loadCronjobInfo, loadNextHandle, loadScriptOptions } from '@/api/modules/cronjob';
 import CodemirrorPro from '@/components/codemirror-pro/index.vue';
+import IgnoreFile from '@/components/file-batch/index.vue';
 import LayoutCol from '@/components/layout-col/form.vue';
 import { listDbItems } from '@/api/modules/database';
 import { getWebsiteOptions } from '@/api/modules/website';
@@ -756,6 +753,7 @@ const form = reactive<Cronjob.CronjobInfo>({
     scriptID: null,
     appID: '',
     website: '',
+    ignoreFiles: [],
     exclusionRules: '',
     dbType: 'mysql',
     dbName: '',
@@ -835,6 +833,7 @@ const search = async () => {
                 form.website = res.data.website;
                 form.websiteList = res.data.website.split(',') || [];
                 form.exclusionRules = res.data.exclusionRules;
+                form.ignoreFiles = res.data.exclusionRules.split(',');
                 form.dbType = res.data.dbType;
                 form.dbName = res.data.dbName;
                 form.dbNameList = res.data.dbName.split(',') || [];
@@ -1280,7 +1279,12 @@ function isBackup() {
 }
 
 function hasExclusionRules() {
-    return form.type === 'app' || form.type === 'website' || (form.type === 'directory' && form.isDir);
+    return (
+        form.type === 'app' ||
+        form.type === 'website' ||
+        form.type === 'snapshot' ||
+        (form.type === 'directory' && form.isDir)
+    );
 }
 
 function hasScript() {
@@ -1327,6 +1331,7 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
             form.dbName = form.dbNameList.join(',');
         }
 
+        form.exclusionRules = form.ignoreFiles.join(',');
         form.snapshotRule = { withImage: form.withImage, ignoreAppIDs: form.ignoreAppIDs };
         form.alertCount = form.hasAlert && isProductPro.value ? form.alertCount : 0;
         form.alertTitle =
diff --git a/frontend/src/views/setting/snapshot/create/index.vue b/frontend/src/views/setting/snapshot/create/index.vue
diff --git a/frontend/src/views/setting/snapshot/index.vue b/frontend/src/views/setting/snapshot/index.vue
diff --git a/frontend/src/views/setting/snapshot/status/index.vue b/frontend/src/views/setting/snapshot/status/index.vue

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@ type SettingInfo struct {`
`23`	`23`	AppStoreSyncStatus string `json:"appStoreSyncStatus"`
`24`	`24`
`25`	`25`	FileRecycleBin string `json:"fileRecycleBin"`
`26`		`-`
`27`		- SnapshotIgnore string `json:"snapshotIgnore"`
`28`	`26`	`}`
`29`	`27`
`30`	`28`	`type SettingUpdate struct {`
Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,7 @@ func (u *CronjobService) handleSnapshot(cronjob model.Cronjob, jobRecord model.J`
`285`	`285`	`WithOperationLog: true,`
`286`	`286`	`WithSystemLog: true,`
`287`	`287`	`WithTaskLog: true,`
	`288`	`+ IgnoreFiles: strings.Split(cronjob.ExclusionRules, ","),`
`288`	`289`	`}`
`289`	`290`
`290`	`291`	`if err := NewISnapshotService().SnapshotCreate(taskItem, req, jobRecord.ID, cronjob.RetryTimes, cronjob.Timeout); err != nil {`