diff --git a/frontend/src/api/system/index.ts b/frontend/src/api/system/index.ts index d8a3f00d..0bde5740 100644 --- a/frontend/src/api/system/index.ts +++ b/frontend/src/api/system/index.ts @@ -227,6 +227,7 @@ export interface StorageCheckRequest { export interface StorageCheckResponse { ok: boolean message: string + bucket_created?: boolean } export function checkStorageEngine(req: StorageCheckRequest): Promise<{ data: StorageCheckResponse }> { diff --git a/frontend/src/views/settings/StorageEngineSettings.vue b/frontend/src/views/settings/StorageEngineSettings.vue index 96909f86..9f7bfa78 100644 --- a/frontend/src/views/settings/StorageEngineSettings.vue +++ b/frontend/src/views/settings/StorageEngineSettings.vue @@ -134,7 +134,7 @@
测试连接 - + {{ minioCheckResult.message }}
@@ -192,7 +192,7 @@
测试连接 - + {{ minioCheckResult.message }}
@@ -408,7 +408,7 @@ const saveMessage = ref('') const saveSuccess = ref(false) const checkingMinio = ref(false) -const minioCheckResult = ref<{ ok: boolean; message: string } | null>(null) +const minioCheckResult = ref<{ ok: boolean; message: string; bucket_created?: boolean } | null>(null) const checkingCos = ref(false) const cosCheckResult = ref<{ ok: boolean; message: string } | null>(null) const checkingTos = ref(false) @@ -569,6 +569,10 @@ async function onCheckMinio() { const payload = buildPayload() const res = await checkStorageEngine({ provider: 'minio', minio: payload.minio }) minioCheckResult.value = res?.data ?? { ok: false, message: '未知错误' } + // Refresh bucket list if a new bucket was auto-created + if (res?.data?.bucket_created) { + loadMinioBuckets() + } } catch (e: unknown) { minioCheckResult.value = { ok: false, message: e instanceof Error ? e.message : '请求失败' } } finally { @@ -834,6 +838,10 @@ onMounted(loadAll) color: #52c41a; } + &.created { + color: #fa8c16; + } + &.error { color: #ff4d4f; } diff --git a/internal/handler/system.go b/internal/handler/system.go index 4a52c9e8..fc0cd5f6 100644 --- a/internal/handler/system.go +++ b/internal/handler/system.go @@ -694,8 +694,9 @@ type StorageCheckRequest struct { // StorageCheckResponse is the response for a single-engine connectivity check. type StorageCheckResponse struct { - OK bool `json:"ok"` - Message string `json:"message"` + OK bool `json:"ok"` + Message string `json:"message"` + BucketCreated bool `json:"bucket_created,omitempty"` } // CheckStorageEngine tests connectivity for a single storage engine using the provided config. @@ -755,12 +756,51 @@ func (h *SystemHandler) checkMinio(c *gin.Context, ctx context.Context, cfg *typ err := file.CheckMinioConnectivity(ctx, endpoint, accessKeyID, secretAccessKey, cfg.BucketName, cfg.UseSSL) if err != nil { - logger.Error(ctx, "Storage check: MinIO connectivity failed", "error", err) errMsg := err.Error() - if strings.Contains(errMsg, "does not exist") { - c.JSON(200, gin.H{"code": 0, "data": StorageCheckResponse{OK: false, Message: fmt.Sprintf("Bucket「%s」不存在", cfg.BucketName)}}) + // If bucket does not exist, auto-create it with public-read policy + if strings.Contains(errMsg, "does not exist") && cfg.BucketName != "" { + logger.Info(ctx, "Storage check: bucket does not exist, attempting auto-creation", "bucket", cfg.BucketName) + minioClient, clientErr := minio.New(endpoint, &minio.Options{ + Creds: credentials.NewStaticV4(accessKeyID, secretAccessKey, ""), + Secure: cfg.UseSSL, + }) + if clientErr != nil { + c.JSON(200, gin.H{"code": 0, "data": StorageCheckResponse{OK: false, Message: fmt.Sprintf("创建 MinIO 客户端失败: %s", sanitizeStorageCheckError(clientErr))}}) + return + } + if mkErr := minioClient.MakeBucket(ctx, cfg.BucketName, minio.MakeBucketOptions{}); mkErr != nil { + logger.Error(ctx, "Storage check: failed to create bucket", "bucket", cfg.BucketName, "error", mkErr) + c.JSON(200, gin.H{"code": 0, "data": StorageCheckResponse{OK: false, Message: fmt.Sprintf("自动创建 Bucket「%s」失败: %s", cfg.BucketName, sanitizeStorageCheckError(mkErr))}}) + return + } + // Set public-read policy + publicReadPolicy := fmt.Sprintf(`{ + "Version": "2012-10-17", + "Statement": [ + { + "Effect": "Allow", + "Principal": {"AWS": ["*"]}, + "Action": ["s3:GetBucketLocation", "s3:ListBucket"], + "Resource": ["arn:aws:s3:::%s"] + }, + { + "Effect": "Allow", + "Principal": {"AWS": ["*"]}, + "Action": ["s3:GetObject"], + "Resource": ["arn:aws:s3:::%s/*"] + } + ] + }`, cfg.BucketName, cfg.BucketName) + if policyErr := minioClient.SetBucketPolicy(ctx, cfg.BucketName, publicReadPolicy); policyErr != nil { + logger.Error(ctx, "Storage check: bucket created but failed to set public-read policy", "bucket", cfg.BucketName, "error", policyErr) + c.JSON(200, gin.H{"code": 0, "data": StorageCheckResponse{OK: true, BucketCreated: true, Message: fmt.Sprintf("Bucket「%s」已自动创建,但设置公有读策略失败,请手动配置权限", cfg.BucketName)}}) + return + } + logger.Info(ctx, "Storage check: bucket created with public-read policy", "bucket", cfg.BucketName) + c.JSON(200, gin.H{"code": 0, "data": StorageCheckResponse{OK: true, BucketCreated: true, Message: fmt.Sprintf("Bucket「%s」不存在,已自动创建并设置公有读权限", cfg.BucketName)}}) return } + logger.Error(ctx, "Storage check: MinIO connectivity failed", "error", err) c.JSON(200, gin.H{"code": 0, "data": StorageCheckResponse{OK: false, Message: sanitizeStorageCheckError(err)}}) return }