diff --git a/internal/data/backup.go b/internal/data/backup.go index ec5c0b06..699f7aa3 100644 --- a/internal/data/backup.go +++ b/internal/data/backup.go @@ -400,7 +400,6 @@ func (r *backupRepo) getStorage(backupStorage biz.BackupStorage) (storage.Storag return storage.NewLocal(backupStorage.Info.Path) case biz.BackupStorageTypeS3: return storage.NewS3(storage.S3Config{ - Region: backupStorage.Info.Region, Bucket: backupStorage.Info.Bucket, AccessKeyID: backupStorage.Info.AccessKey, SecretAccessKey: backupStorage.Info.SecretKey, diff --git a/internal/service/backup_storage.go b/internal/service/backup_storage.go index 80756fad..c5269e89 100644 --- a/internal/service/backup_storage.go +++ b/internal/service/backup_storage.go @@ -124,7 +124,6 @@ func (s *BackupStorageService) validateStorage(accountType string, info types.Ba switch biz.BackupStorageType(accountType) { case biz.BackupStorageTypeS3: client, err = storage.NewS3(storage.S3Config{ - Region: info.Region, Bucket: info.Bucket, AccessKeyID: info.AccessKey, SecretAccessKey: info.SecretKey, diff --git a/pkg/types/backup.go b/pkg/types/backup.go index 5b3be49e..1505b12f 100644 --- a/pkg/types/backup.go +++ b/pkg/types/backup.go @@ -4,13 +4,12 @@ import "time" type BackupStorageInfo struct { // S3 - AccessKey string `json:"access_key"` // 访问密钥 - SecretKey string `json:"secret_key"` // 私钥 - Style string `json:"style"` // virtual-hosted, path - Region string `json:"region"` // 地区 - Endpoint string `json:"endpoint"` // 端点 - Scheme string `json:"scheme"` // http, https - Bucket string `json:"bucket"` // 存储桶 + AccessKey string `json:"access_key"` // 访问密钥 + SecretKey string `json:"secret_key"` // 私钥 + Style string `json:"style" validate:"required|in:path,virtual-hosted"` // virtual-hosted, path + Endpoint string `json:"endpoint" validate:"required"` // 端点 + Scheme string `json:"scheme" validate:"required|in:http,https"` // http, https + Bucket string `json:"bucket" validate:"required"` // 存储桶 // SFTP / WebDAV URL string `json:"url"` // 网址 diff --git a/web/src/views/backup/StorageView.vue b/web/src/views/backup/StorageView.vue index 6cb98c6a..15307e11 100644 --- a/web/src/views/backup/StorageView.vue +++ b/web/src/views/backup/StorageView.vue @@ -38,7 +38,6 @@ const defaultModel = { access_key: '', secret_key: '', style: 'virtual_hosted', - region: '', endpoint: '', scheme: 'https', bucket: '', @@ -247,12 +246,6 @@ onMounted(() => { - - - { - - -