Merge branch 'master' into master

This commit is contained in:
演变
2026-03-17 17:59:47 +08:00
committed by GitHub
30 changed files with 2345 additions and 310 deletions

View File

@@ -34,6 +34,7 @@ class EmailServiceType(str, Enum):
TEMPMAIL = "tempmail"
OUTLOOK = "outlook"
CUSTOM_DOMAIN = "custom_domain"
TEMP_MAIL = "temp_mail"
# ============================================================================

View File

@@ -301,6 +301,27 @@ SETTING_DEFINITIONS: Dict[str, SettingDefinition] = {
is_secret=True
),
# Team Manager 配置
"tm_enabled": SettingDefinition(
db_key="tm.enabled",
default_value=False,
category=SettingCategory.GENERAL,
description="是否启用 Team Manager 上传"
),
"tm_api_url": SettingDefinition(
db_key="tm.api_url",
default_value="",
category=SettingCategory.GENERAL,
description="Team Manager API 地址"
),
"tm_api_key": SettingDefinition(
db_key="tm.api_key",
default_value="",
category=SettingCategory.GENERAL,
description="Team Manager API Key",
is_secret=True
),
# CPA 上传配置
"cpa_enabled": SettingDefinition(
db_key="cpa.enabled",
@@ -382,6 +403,7 @@ SETTING_TYPES: Dict[str, Type] = {
"email_service_priority": dict,
"tempmail_timeout": int,
"tempmail_max_retries": int,
"tm_enabled": bool,
"cpa_enabled": bool,
"email_code_timeout": int,
"email_code_poll_interval": int,
@@ -642,6 +664,11 @@ class Settings(BaseModel):
# 安全配置
encryption_key: SecretStr = SecretStr("your-encryption-key-change-in-production")
# Team Manager 配置
tm_enabled: bool = False
tm_api_url: str = ""
tm_api_key: Optional[SecretStr] = None
# CPA 上传配置
cpa_enabled: bool = False
cpa_api_url: str = ""