feat(assets): 素材回收站与画布历史 - 合并 PR #370 并修复删除一致性

backend/internal/service/runtime_policy.go

@@ -25,18 +25,19 @@ const (
 )
 
 type RuntimeResourcePolicy struct {
-	ResourceUploadMB int64 `json:"resourceUploadMB"`
-	SessionUploadMB  int64 `json:"sessionUploadMB"`
-	GeneratedFileMB  int64 `json:"generatedFileMB"`
-	DailyUploadMB    int64 `json:"dailyUploadMB"`
-	StoredFileGB     int64 `json:"storedFileGB"`
-	StructuredDataMB int64 `json:"structuredDataMB"`
-	TaskDataGB       int64 `json:"taskDataGB"`
-	AssetCount       int64 `json:"assetCount"`
-	CanvasCount      int64 `json:"canvasCount"`
-	SessionCount     int64 `json:"sessionCount"`
-	TaskCount        int64 `json:"taskCount"`
-	APICallLogCount  int64 `json:"apiCallLogCount"`
+	ResourceUploadMB        int64 `json:"resourceUploadMB"`
+	SessionUploadMB         int64 `json:"sessionUploadMB"`
+	GeneratedFileMB         int64 `json:"generatedFileMB"`
+	DailyUploadMB           int64 `json:"dailyUploadMB"`
+	StoredFileGB            int64 `json:"storedFileGB"`
+	StructuredDataMB        int64 `json:"structuredDataMB"`
+	TaskDataGB              int64 `json:"taskDataGB"`
+	AssetCount              int64 `json:"assetCount"`
+	CanvasCount             int64 `json:"canvasCount"`
+	SessionCount            int64 `json:"sessionCount"`
+	TaskCount               int64 `json:"taskCount"`
+	APICallLogCount         int64 `json:"apiCallLogCount"`
+	RecycleBinRetentionDays int   `json:"recycleBinRetentionDays"`
 }
 
 type RuntimeTaskPolicy struct {
@@ -90,26 +91,28 @@ type PublicRuntimePolicySetting struct {
 }
 
 type PublicRuntimeLimits struct {
-	ActiveTaskLimit  int   `json:"activeTaskLimit"`
-	ResourceUploadMB int64 `json:"resourceUploadMB"`
-	SessionUploadMB  int64 `json:"sessionUploadMB"`
+	ActiveTaskLimit         int   `json:"activeTaskLimit"`
+	ResourceUploadMB        int64 `json:"resourceUploadMB"`
+	SessionUploadMB         int64 `json:"sessionUploadMB"`
+	RecycleBinRetentionDays int   `json:"recycleBinRetentionDays"`
 }
 
 func defaultRuntimePolicy() RuntimePolicySetting {
 	return RuntimePolicySetting{
 		Resource: RuntimeResourcePolicy{
-			ResourceUploadMB: 50,
-			SessionUploadMB:  32,
-			GeneratedFileMB:  64,
-			DailyUploadMB:    200,
-			StoredFileGB:     2,
-			StructuredDataMB: 256,
-			TaskDataGB:       1,
-			AssetCount:       2_000,
-			CanvasCount:      1_000,
-			SessionCount:     1_000,
-			TaskCount:        20_000,
-			APICallLogCount:  100_000,
+			ResourceUploadMB:        50,
+			SessionUploadMB:         32,
+			GeneratedFileMB:         64,
+			DailyUploadMB:           200,
+			StoredFileGB:            2,
+			StructuredDataMB:        256,
+			TaskDataGB:              1,
+			AssetCount:              2_000,
+			CanvasCount:             1_000,
+			SessionCount:            1_000,
+			TaskCount:               20_000,
+			APICallLogCount:         100_000,
+			RecycleBinRetentionDays: 30,
 		},
 		Task: RuntimeTaskPolicy{
 			WorkerConcurrency:        effectiveChannelConcurrencyLimit(envInt("CANVAS_WORKER_CONCURRENCY", taskWorkerConcurrency)),
@@ -155,6 +158,7 @@ func selfUseRuntimePolicy() RuntimePolicySetting {
 		DailyUploadMB: maxRuntimeDataMB, StoredFileGB: maxRuntimeStorageGB, StructuredDataMB: maxRuntimeDataMB,
 		TaskDataGB: maxRuntimeStorageGB, AssetCount: maxRuntimeCount, CanvasCount: maxRuntimeCount,
 		SessionCount: maxRuntimeCount, TaskCount: maxRuntimeCount, APICallLogCount: maxRuntimeCount,
+		RecycleBinRetentionDays: 0,
 	}
 	value.Task = RuntimeTaskPolicy{
 		WorkerConcurrency: maxRuntimeConcurrency, ChannelConcurrency: maxRuntimeConcurrency, ActiveTaskLimit: maxRuntimeConcurrency,
@@ -194,7 +198,8 @@ func (s *Service) PublicRuntimeLimits() (*PublicRuntimeLimits, error) {
 	}
 	return &PublicRuntimeLimits{
 		ActiveTaskLimit: policy.Task.ActiveTaskLimit, ResourceUploadMB: policy.Resource.ResourceUploadMB,
-		SessionUploadMB: policy.Resource.SessionUploadMB,
+		SessionUploadMB:         policy.Resource.SessionUploadMB,
+		RecycleBinRetentionDays: policy.Resource.RecycleBinRetentionDays,
 	}, nil
 }
 
@@ -271,7 +276,7 @@ func (s *Service) readRuntimePolicy() (*model.SystemSetting, RuntimePolicySettin
 	if err != nil {
 		return nil, RuntimePolicySetting{}, err
 	}
-	value := RuntimePolicySetting{}
+	value := defaultRuntimePolicy()
 	if strings.TrimSpace(setting.ValueJSON) == "" || json.Unmarshal([]byte(setting.ValueJSON), &value) != nil {
 		return nil, RuntimePolicySetting{}, errors.New("资源与请求策略配置格式无效")
 	}
@@ -312,6 +317,9 @@ func validateRuntimePolicy(value RuntimePolicySetting) error {
 			return BadAuthRequest(fmt.Sprintf("%s必须是 1-%d 的整数", label, maxRuntimeCount))
 		}
 	}
+	if resource.RecycleBinRetentionDays < 0 || resource.RecycleBinRetentionDays > 365 {
+		return BadAuthRequest("回收站保留天数必须是 0-365 的整数 (0 表示不自动清理)")
+	}
 	task := value.Task
 	for label, item := range map[string]int{
 		"Worker 并发数": task.WorkerConcurrency, "全局渠道并发数": task.ChannelConcurrency, "活动任务上限": task.ActiveTaskLimit,