diff --git a/agent/app/repo/backup.go b/agent/app/repo/backup.go index 37cd8d18de73..cd8538ea3925 100644 --- a/agent/app/repo/backup.go +++ b/agent/app/repo/backup.go @@ -166,13 +166,29 @@ func (u *BackupRepo) GetRecord(opts ...DBOption) (*model.BackupRecord, error) { func (u *BackupRepo) SyncAll(data []model.BackupAccount) error { tx := global.DB.Begin() - if err := tx.Where("is_public = ?", 1).Delete(&model.BackupAccount{}).Error; err != nil { - tx.Rollback() - return err + var oldAccounts []model.BackupAccount + _ = tx.Where("is_public = ?", 1).Find(&oldAccounts).Error + oldAccountMap := make(map[string]uint) + for _, item := range oldAccounts { + oldAccountMap[item.Name] = item.ID } - if err := tx.Model(model.BackupAccount{}).Save(&data).Error; err != nil { - tx.Rollback() - return err + for _, item := range data { + if val, ok := oldAccountMap[item.Name]; ok { + item.ID = val + delete(oldAccountMap, item.Name) + } else { + item.ID = 0 + } + if err := tx.Model(model.BackupAccount{}).Where("id = ?", item.ID).Save(&item).Error; err != nil { + tx.Rollback() + return err + } + } + for _, val := range oldAccountMap { + if err := tx.Where("id = ?", val).Delete(&model.BackupAccount{}).Error; err != nil { + tx.Rollback() + return err + } } tx.Commit() return nil diff --git a/agent/app/service/backup_record.go b/agent/app/service/backup_record.go index f40c167089b2..47169af05aac 100644 --- a/agent/app/service/backup_record.go +++ b/agent/app/service/backup_record.go @@ -43,12 +43,21 @@ func (u *BackupRecordService) SearchRecordsWithPage(search dto.RecordSearch) (in if err != nil { return 0, nil, err } + accounts, _ := backupRepo.List() var data []dto.BackupRecords - for _, account := range records { + for _, record := range records { var item dto.BackupRecords - if err := copier.Copy(&item, &account); err != nil { + if err := copier.Copy(&item, &record); err != nil { global.LOG.Errorf("copy backup account to dto backup info failed, err: %v", err) } + for _, account := range accounts { + if account.ID == record.DownloadAccountID { + item.DownloadAccountID = account.ID + item.AccountName = account.Name + item.AccountType = account.Type + break + } + } data = append(data, item) } return total, data, err @@ -63,12 +72,21 @@ func (u *BackupRecordService) SearchRecordsByCronjobWithPage(search dto.RecordSe if err != nil { return 0, nil, err } + accounts, _ := backupRepo.List() var data []dto.BackupRecords - for _, account := range records { + for _, record := range records { var item dto.BackupRecords - if err := copier.Copy(&item, &account); err != nil { + if err := copier.Copy(&item, &record); err != nil { global.LOG.Errorf("copy backup account to dto backup info failed, err: %v", err) } + for _, account := range accounts { + if account.ID == record.DownloadAccountID { + item.DownloadAccountID = account.ID + item.AccountName = account.Name + item.AccountType = account.Type + break + } + } data = append(data, item) } return total, data, err diff --git a/agent/app/service/snapshot_create.go b/agent/app/service/snapshot_create.go index 06952a90575f..7881736eef93 100644 --- a/agent/app/service/snapshot_create.go +++ b/agent/app/service/snapshot_create.go @@ -492,7 +492,7 @@ func snapUpload(snap snapHelper, accounts string, file string) error { targetAccounts := strings.Split(accounts, ",") for _, item := range targetAccounts { snap.Task.LogStart(i18n.GetWithName("SnapUploadTo", fmt.Sprintf("[%s] %s", accountMap[item].name, path.Join("system_snapshot", path.Base(file))))) - _, err := accountMap[item].client.Upload(source, path.Join("system_snapshot", path.Base(file))) + _, err := accountMap[item].client.Upload(source, path.Join(accountMap[item].backupPath, "system_snapshot", path.Base(file))) snap.Task.LogWithStatus(i18n.GetWithName("SnapUploadRes", accountMap[item].name), err) if err != nil { return err diff --git a/agent/init/migration/migrations/init.go b/agent/init/migration/migrations/init.go index 1f7f0cf43af3..8ca7c17cd505 100644 --- a/agent/init/migration/migrations/init.go +++ b/agent/init/migration/migrations/init.go @@ -101,7 +101,7 @@ var InitSetting = &gormigrate.Migration{ return err } - if err := tx.Create(&model.Setting{Key: "EncryptKey", Value: common.RandStr(16)}).Error; err != nil { + if err := tx.Create(&model.Setting{Key: "EncryptKey", Value: global.CONF.Base.EncryptKey}).Error; err != nil { return err } if err := tx.Create(&model.Setting{Key: "SystemIP", Value: ""}).Error; err != nil { diff --git a/core/utils/cloud_storage/client/local.go b/core/utils/cloud_storage/client/local.go deleted file mode 100644 index 8df304a6ae12..000000000000 --- a/core/utils/cloud_storage/client/local.go +++ /dev/null @@ -1,47 +0,0 @@ -package client - -import ( - "fmt" - "os" - "path" - - "github.com/1Panel-dev/1Panel/core/utils/files" -) - -type localClient struct { - dir string -} - -func NewLocalClient(vars map[string]interface{}) (*localClient, error) { - dir := loadParamFromVars("dir", vars) - return &localClient{dir: dir}, nil -} - -func (c localClient) ListBuckets() ([]interface{}, error) { - return nil, nil -} - -func (c localClient) Upload(src, target string) (bool, error) { - targetFilePath := path.Join(c.dir, target) - if _, err := os.Stat(path.Dir(targetFilePath)); err != nil { - if os.IsNotExist(err) { - if err = os.MkdirAll(path.Dir(targetFilePath), os.ModePerm); err != nil { - return false, err - } - } else { - return false, err - } - } - - if err := files.CopyFile(src, targetFilePath, false); err != nil { - return false, fmt.Errorf("cp file failed, err: %v", err) - } - return true, nil -} - -func (c localClient) Delete(file string) (bool, error) { - if err := os.RemoveAll(file); err != nil { - return false, err - } - return true, nil -} diff --git a/core/utils/cloud_storage/cloud_storage_client.go b/core/utils/cloud_storage/cloud_storage_client.go index 0292d87d2982..6f693c406814 100644 --- a/core/utils/cloud_storage/cloud_storage_client.go +++ b/core/utils/cloud_storage/cloud_storage_client.go @@ -14,8 +14,6 @@ type CloudStorageClient interface { func NewCloudStorageClient(backupType string, vars map[string]interface{}) (CloudStorageClient, error) { switch backupType { - case constant.Local: - return client.NewLocalClient(vars) case constant.S3: return client.NewS3Client(vars) case constant.OSS: diff --git a/frontend/src/views/cronjob/operate/index.vue b/frontend/src/views/cronjob/operate/index.vue index b6593dd70ee9..a81bcced97f5 100644 --- a/frontend/src/views/cronjob/operate/index.vue +++ b/frontend/src/views/cronjob/operate/index.vue @@ -371,7 +371,7 @@ {{ $t('file.dir') }} - {{ $t('menu.file') }} + {{ $t('menu.files') }} diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue index 40d5b7054fe3..2f8a5128ad96 100644 --- a/frontend/src/views/host/file-management/index.vue +++ b/frontend/src/views/host/file-management/index.vue @@ -49,7 +49,7 @@ " /> - +