From 0433a26a07df9bc844e708aeba75abae0663a648 Mon Sep 17 00:00:00 2001 From: CityFun <31820853+zhengkunwang223@users.noreply.github.com> Date: Wed, 24 Sep 2025 17:40:20 +0800 Subject: [PATCH] feat: Optimize App Update Log Display (#10469) --- agent/app/service/app_utils.go | 36 +++++++++---------- agent/app/service/backup_app.go | 2 +- .../src/views/app-store/installed/index.vue | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/agent/app/service/app_utils.go b/agent/app/service/app_utils.go index ac6c9be23..d100b3e7b 100644 --- a/agent/app/service/app_utils.go +++ b/agent/app/service/app_utils.go @@ -677,29 +677,29 @@ func upgradeInstall(req request.AppInstallUpgrade) error { backupFile string ) backUpApp := func(t *task.Task) error { - if req.Backup { - backupService := NewIBackupService() - backupRecordService := NewIBackupRecordService() - fileName := fmt.Sprintf("upgrade_backup_%s_%s.tar.gz", install.Name, time.Now().Format(constant.DateTimeSlimLayout)+common.RandStrAndNum(5)) - backupRecord, err := backupService.AppBackup(dto.CommonBackup{Name: install.App.Key, DetailName: install.Name, FileName: fileName}) - if err == nil { - backups, _ := backupRecordService.ListAppRecords(install.App.Key, install.Name, "upgrade_backup") - if len(backups) > 3 { - backupsToDelete := backups[:len(backups)-3] - var deleteIDs []uint - for _, backup := range backupsToDelete { - deleteIDs = append(deleteIDs, backup.ID) - } - _ = backupRecordService.BatchDeleteRecord(deleteIDs) + backupService := NewIBackupService() + backupRecordService := NewIBackupRecordService() + fileName := fmt.Sprintf("upgrade_backup_%s_%s.tar.gz", install.Name, time.Now().Format(constant.DateTimeSlimLayout)+common.RandStrAndNum(5)) + backupRecord, err := backupService.AppBackup(dto.CommonBackup{Name: install.App.Key, DetailName: install.Name, FileName: fileName}) + if err == nil { + backups, _ := backupRecordService.ListAppRecords(install.App.Key, install.Name, "upgrade_backup") + if len(backups) > 3 { + backupsToDelete := backups[:len(backups)-3] + var deleteIDs []uint + for _, backup := range backupsToDelete { + deleteIDs = append(deleteIDs, backup.ID) } - backupFile = path.Join(global.Dir.LocalBackupDir, backupRecord.FileDir, backupRecord.FileName) - } else { - return buserr.WithNameAndErr("ErrAppBackup", install.Name, err) + _ = backupRecordService.BatchDeleteRecord(deleteIDs) } + backupFile = path.Join(global.Dir.LocalBackupDir, backupRecord.FileDir, backupRecord.FileName) + } else { + return buserr.WithNameAndErr("ErrAppBackup", install.Name, err) } return nil } - upgradeTask.AddSubTask(task.GetTaskName(install.Name, task.TaskBackup, task.TaskScopeApp), backUpApp, nil) + if req.Backup { + upgradeTask.AddSubTask(task.GetTaskName(install.Name, task.TaskBackup, task.TaskScopeApp), backUpApp, nil) + } upgradeApp := func(t *task.Task) error { fileOp := files.NewFileOp() diff --git a/agent/app/service/backup_app.go b/agent/app/service/backup_app.go index e38d368e5..c67836d22 100644 --- a/agent/app/service/backup_app.go +++ b/agent/app/service/backup_app.go @@ -67,7 +67,7 @@ func (u *BackupService) AppBackup(req dto.CommonBackup) (*model.BackupRecord, er return nil, err } - return nil, nil + return record, nil } func (u *BackupService) AppRecover(req dto.CommonRecover) error { diff --git a/frontend/src/views/app-store/installed/index.vue b/frontend/src/views/app-store/installed/index.vue index b42f8b7ff..5599c4415 100644 --- a/frontend/src/views/app-store/installed/index.vue +++ b/frontend/src/views/app-store/installed/index.vue @@ -5,7 +5,7 @@