merge feature/follow_upstream

8519a8eb · 陈曦 · 994da655 · c61a9d4b · 8519a8eb · 8519a8eb
Commit 8519a8eb authored Apr 26, 2026 by 陈曦
--- a/backend/ent/paymentorder_create.go
+++ b/backend/ent/paymentorder_create.go
--- a/backend/ent/paymentorder_update.go
+++ b/backend/ent/paymentorder_update.go
--- a/backend/ent/pendingauthsession.go
+++ b/backend/ent/pendingauthsession.go
--- a/backend/ent/pendingauthsession/pendingauthsession.go
+++ b/backend/ent/pendingauthsession/pendingauthsession.go
--- a/backend/ent/pendingauthsession/where.go
+++ b/backend/ent/pendingauthsession/where.go
--- a/backend/ent/pendingauthsession_create.go
+++ b/backend/ent/pendingauthsession_create.go
--- a/backend/ent/pendingauthsession_delete.go
+++ b/backend/ent/pendingauthsession_delete.go
--- a/backend/ent/pendingauthsession_query.go
+++ b/backend/ent/pendingauthsession_query.go
--- a/backend/ent/pendingauthsession_update.go
+++ b/backend/ent/pendingauthsession_update.go
--- a/backend/ent/predicate/predicate.go
+++ b/backend/ent/predicate/predicate.go
--- a/backend/ent/runtime/runtime.go
+++ b/backend/ent/runtime/runtime.go
--- a/backend/ent/schema/auth_identity.go
+++ b/backend/ent/schema/auth_identity.go
--- a/backend/ent/schema/auth_identity_channel.go
+++ b/backend/ent/schema/auth_identity_channel.go
--- a/backend/ent/schema/auth_identity_schema_test.go
+++ b/backend/ent/schema/auth_identity_schema_test.go
--- a/backend/ent/schema/channel_monitor.go
+++ b/backend/ent/schema/channel_monitor.go
--- a/backend/ent/schema/channel_monitor_daily_rollup.go
+++ b/backend/ent/schema/channel_monitor_daily_rollup.go
--- a/backend/ent/schema/channel_monitor_history.go
+++ b/backend/ent/schema/channel_monitor_history.go
--- a/backend/ent/schema/channel_monitor_request_template.go
+++ b/backend/ent/schema/channel_monitor_request_template.go
--- a/backend/ent/schema/group.go
+++ b/backend/ent/schema/group.go
@@ -145,6 +145,11 @@ func (Group) Fields() []ent.Field {
 			Default(domain.OpenAIMessagesDispatchModelConfig{}).
 			SchemaType(map[string]string{dialect.Postgres: "jsonb"}).
 			Comment("OpenAI Messages 调度模型配置：按 Claude 系列/精确模型映射到目标 GPT 模型"),
+		// 分组级每分钟请求数上限（0 = 不限制）。设置后优先于用户级兜底生效。
+		field.Int("rpm_limit").
+			Default(0).
+			Comment("分组 RPM 上限，0 表示不限制；设置后接管该分组用户的限流"),
 	}
 }

--- a/backend/ent/schema/identity_adoption_decision.go
+++ b/backend/ent/schema/identity_adoption_decision.go