diff --git a/backend/app/service/cronjob_helper.go b/backend/app/service/cronjob_helper.go index 65a60578a..f2cc61945 100644 --- a/backend/app/service/cronjob_helper.go +++ b/backend/app/service/cronjob_helper.go @@ -2,7 +2,6 @@ package service import ( "context" - "encoding/json" "fmt" "os" "path" @@ -276,21 +275,6 @@ func loadClientMap(backupAccounts string) (map[string]cronjobUploadHelper, error if account.BackupPath != "/" { pathItem = strings.TrimPrefix(account.BackupPath, "/") } - if target == constant.Local { - varMap := make(map[string]interface{}) - if err := json.Unmarshal([]byte(account.Vars), &varMap); err != nil { - return nil, err - } - if _, ok := varMap["dir"]; !ok { - return nil, errors.New("load local backup dir failed") - } - baseDir, ok := varMap["dir"].(string) - if ok { - pathItem = baseDir - } else { - return nil, fmt.Errorf("error type dir: %T", varMap["dir"]) - } - } clients[target] = cronjobUploadHelper{ client: client, backupPath: pathItem, diff --git a/backend/utils/cloud_storage/client/local.go b/backend/utils/cloud_storage/client/local.go index ec6eac004..80f3e51e2 100644 --- a/backend/utils/cloud_storage/client/local.go +++ b/backend/utils/cloud_storage/client/local.go @@ -54,7 +54,7 @@ func (c localClient) Upload(src, target string) (bool, error) { } } - if err := common.CopyFile(src, target); err != nil { + if err := common.CopyFile(src, targetFilePath); err != nil { return false, fmt.Errorf("cp file failed, err: %v", err) } return true, nil