Merge main into pr27-cfworker-domain-pools

Resolve PR #27 conflicts by keeping the configurable CFWorker domain pool
changes alongside existing MaliAPI, CodexProxy, and chatgpt settings.
This commit is contained in:
zhangchen
2026-03-30 23:49:59 +08:00
8 changed files with 474 additions and 17 deletions

View File

@@ -12,6 +12,7 @@ CONFIG_KEYS = [
"freemail_api_url", "freemail_admin_token", "freemail_username", "freemail_password",
"moemail_api_url",
"mail_provider",
"maliapi_base_url", "maliapi_api_key", "maliapi_domain", "maliapi_auto_domain_strategy",
"cfworker_api_url", "cfworker_admin_token", "cfworker_custom_auth", "cfworker_domain",
"cfworker_domains", "cfworker_enabled_domains", "cfworker_fingerprint",
"smstome_cookie", "smstome_country_slugs", "smstome_phone_attempts", "smstome_otp_timeout_seconds",
@@ -19,6 +20,7 @@ CONFIG_KEYS = [
"luckmail_base_url", "luckmail_api_key", "luckmail_email_type", "luckmail_domain",
"cpa_api_url", "cpa_api_key",
"team_manager_url", "team_manager_key",
"codex_proxy_url", "codex_proxy_key", "codex_proxy_upload_type",
"cliproxyapi_management_key",
"grok2api_url", "grok2api_app_key", "grok2api_pool", "grok2api_quota",
"kiro_manager_path", "kiro_manager_exe",