diff --git a/src/web/routes/accounts.py b/src/web/routes/accounts.py index f0f2256..d6de722 100644 --- a/src/web/routes/accounts.py +++ b/src/web/routes/accounts.py @@ -479,7 +479,7 @@ async def export_accounts_cpa(request: BatchExportRequest): """导出账号为 CPA Token JSON 格式(每个账号单独一个 JSON 文件,打包为 ZIP)""" import io import zipfile - from ...core.cpa_upload import generate_token_json + from ...core.upload.cpa_upload import generate_token_json with get_db() as db: ids = resolve_account_ids( @@ -582,7 +582,7 @@ class BatchValidateRequest(BaseModel): @router.post("/{account_id}/refresh") async def refresh_account_token(account_id: int, request: TokenRefreshRequest = None): """刷新单个账号的 Token""" - from ...core.token_refresh import refresh_account_token as do_refresh + from ...core.openai.token_refresh import refresh_account_token as do_refresh # 使用传入的代理或全局代理配置 proxy = request.proxy if request and request.proxy else get_settings().proxy_url @@ -604,7 +604,7 @@ async def refresh_account_token(account_id: int, request: TokenRefreshRequest = @router.post("/batch-refresh") async def batch_refresh_tokens(request: BatchRefreshRequest, background_tasks: BackgroundTasks): """批量刷新账号 Token""" - from ...core.token_refresh import refresh_account_token as do_refresh + from ...core.openai.token_refresh import refresh_account_token as do_refresh # 使用传入的代理或全局代理配置 proxy = request.proxy if request.proxy else get_settings().proxy_url @@ -639,7 +639,7 @@ async def batch_refresh_tokens(request: BatchRefreshRequest, background_tasks: B @router.post("/{account_id}/validate") async def validate_account_token(account_id: int, request: TokenValidateRequest = None): """验证单个账号的 Token 有效性""" - from ...core.token_refresh import validate_account_token as do_validate + from ...core.openai.token_refresh import validate_account_token as do_validate # 使用传入的代理或全局代理配置 proxy = request.proxy if request and request.proxy else get_settings().proxy_url @@ -655,7 +655,7 @@ async def validate_account_token(account_id: int, request: TokenValidateRequest @router.post("/batch-validate") async def batch_validate_tokens(request: BatchValidateRequest): """批量验证账号 Token 有效性""" - from ...core.token_refresh import validate_account_token as do_validate + from ...core.openai.token_refresh import validate_account_token as do_validate # 使用传入的代理或全局代理配置 proxy = request.proxy if request.proxy else get_settings().proxy_url @@ -717,7 +717,7 @@ class BatchCPAUploadRequest(BaseModel): @router.post("/{account_id}/upload-cpa") async def upload_account_to_cpa(account_id: int, request: CPAUploadRequest = None): """上传单个账号到 CPA""" - from ...core.cpa_upload import upload_to_cpa, generate_token_json + from ...core.upload.cpa_upload import upload_to_cpa, generate_token_json proxy = request.proxy if request and request.proxy else get_settings().proxy_url cpa_service_id = request.cpa_service_id if request else None @@ -762,7 +762,7 @@ async def upload_account_to_cpa(account_id: int, request: CPAUploadRequest = Non @router.post("/batch-upload-cpa") async def batch_upload_accounts_to_cpa(request: BatchCPAUploadRequest): """批量上传账号到 CPA""" - from ...core.cpa_upload import batch_upload_to_cpa + from ...core.upload.cpa_upload import batch_upload_to_cpa proxy = request.proxy if request.proxy else get_settings().proxy_url @@ -797,7 +797,7 @@ class Sub2ApiUploadRequest(BaseModel): @router.post("/{account_id}/upload-sub2api") async def upload_account_to_sub2api(account_id: int, request: Sub2ApiUploadRequest = None): """上传单个账号到 Sub2API""" - from ...core.sub2api_upload import upload_to_sub2api + from ...core.upload.sub2api_upload import upload_to_sub2api service_id = request.service_id if request else None concurrency = request.concurrency if request else 3 @@ -854,7 +854,7 @@ class BatchSub2ApiUploadRequest(BaseModel): @router.post("/batch-upload-sub2api") async def batch_upload_accounts_to_sub2api(request: BatchSub2ApiUploadRequest): """批量上传账号到 Sub2API""" - from ...core.sub2api_upload import batch_upload_to_sub2api + from ...core.upload.sub2api_upload import batch_upload_to_sub2api # 解析指定的 Sub2API 服务 api_url = None diff --git a/src/web/routes/registration.py b/src/web/routes/registration.py index 5ac1323..2bff131 100644 --- a/src/web/routes/registration.py +++ b/src/web/routes/registration.py @@ -369,7 +369,7 @@ def _run_sync_registration_task(task_uuid: str, email_service_type: str, proxy: # 自动上传到 CPA(可多服务) if auto_upload_cpa: try: - from ...core.cpa_upload import upload_to_cpa, generate_token_json + from ...core.upload.cpa_upload import upload_to_cpa, generate_token_json from ...database.models import Account as AccountModel saved_account = db.query(AccountModel).filter_by(email=result.email).first() if saved_account and saved_account.access_token: @@ -402,7 +402,7 @@ def _run_sync_registration_task(task_uuid: str, email_service_type: str, proxy: # 自动上传到 Sub2API(可多服务) if auto_upload_sub2api: try: - from ...core.sub2api_upload import upload_to_sub2api + from ...core.upload.sub2api_upload import upload_to_sub2api from ...database.models import Account as AccountModel saved_account = db.query(AccountModel).filter_by(email=result.email).first() if saved_account and saved_account.access_token: @@ -427,7 +427,7 @@ def _run_sync_registration_task(task_uuid: str, email_service_type: str, proxy: # 自动上传到 Team Manager(可多服务) if auto_upload_tm: try: - from ...core.team_manager import upload_account_to_tm + from ...core.upload.team_manager_upload import upload_account_to_tm from ...database.models import Account as AccountModel saved_account = db.query(AccountModel).filter_by(email=result.email).first() if saved_account and saved_account.access_token: diff --git a/src/web/routes/settings.py b/src/web/routes/settings.py index 9b7f47b..cca7c50 100644 --- a/src/web/routes/settings.py +++ b/src/web/routes/settings.py @@ -767,7 +767,7 @@ async def update_team_manager_settings(request: TeamManagerSettings): @router.post("/team-manager/test") async def test_team_manager_connection(request: TeamManagerTestRequest): """测试 Team Manager 连接""" - from ...core.team_manager import test_team_manager_connection as do_test + from ...core.upload.team_manager_upload import test_team_manager_connection as do_test settings = get_settings() api_key = request.api_key