Merge remote-tracking branch 'upstream/main' into feat/channel-insights

# Conflicts: # backend/cmd/server/wire_gen.go
2026-04-23 22:30:45 +08:00
parent 6f04c25e3d 0a80ec80e3
commit 5e060b2222
106 changed files with 5109 additions and 1427 deletions
--- a/backend/internal/handler/dto/settings.go
+++ b/backend/internal/handler/dto/settings.go
@@ -108,6 +108,7 @@ type SystemSettings struct {

 	DefaultConcurrency   int                          `json:"default_concurrency"`
 	DefaultBalance       float64                      `json:"default_balance"`
+	DefaultUserRPMLimit  int                          `json:"default_user_rpm_limit"`
 	DefaultSubscriptions []DefaultSubscriptionSetting `json:"default_subscriptions"`

 	// Model fallback configuration