fix(main): 优化项目结构

This commit is contained in:
cnlimiter
2026-03-18 19:57:49 +08:00
parent baeb3061fe
commit fef0978a0e
23 changed files with 59 additions and 37 deletions

View File

@@ -2,7 +2,7 @@
核心功能模块
"""
from .oauth import OAuthManager, OAuthStart, generate_oauth_url, submit_callback_url
from .openai.oauth import OAuthManager, OAuthStart, generate_oauth_url, submit_callback_url
from .http_client import (
OpenAIHTTPClient,
HTTPClient,

View File

@@ -0,0 +1,3 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# @Time : 2026/3/18 19:55

View File

@@ -14,7 +14,7 @@ from typing import Any, Dict, Optional
from curl_cffi import requests as cffi_requests
from ..config.constants import (
from ...config.constants import (
OAUTH_CLIENT_ID,
OAUTH_AUTH_URL,
OAUTH_TOKEN_URL,

View File

@@ -9,7 +9,7 @@ from typing import Optional
from curl_cffi import requests as cffi_requests
from ..database.models import Account
from ...database.models import Account
logger = logging.getLogger(__name__)

View File

@@ -12,10 +12,10 @@ from datetime import datetime, timedelta
from curl_cffi import requests as cffi_requests
from ..config.settings import get_settings
from ..database.session import get_db
from ..database import crud
from ..database.models import Account
from ...config.settings import get_settings
from ...database.session import get_db
from ...database import crud
from ...database.models import Account
logger = logging.getLogger(__name__)

View File

@@ -15,7 +15,7 @@ from datetime import datetime
from curl_cffi import requests as cffi_requests
from .oauth import OAuthManager, OAuthStart
from .openai.oauth import OAuthManager, OAuthStart
from .http_client import OpenAIHTTPClient, HTTPClientError
from ..services import EmailServiceFactory, BaseEmailService, EmailServiceType
from ..database import crud

View File

@@ -0,0 +1,3 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# @Time : 2026/3/18 19:54

View File

@@ -10,9 +10,9 @@ from datetime import datetime
from curl_cffi import requests as cffi_requests
from curl_cffi import CurlMime
from ..database.session import get_db
from ..database.models import Account
from ..config.settings import get_settings
from ...database.session import get_db
from ...database.models import Account
from ...config.settings import get_settings
logger = logging.getLogger(__name__)

View File

@@ -10,8 +10,8 @@ from typing import List, Tuple, Optional
from curl_cffi import requests as cffi_requests
from ..database.session import get_db
from ..database.models import Account
from ...database.session import get_db
from ...database.models import Account
logger = logging.getLogger(__name__)

View File

@@ -9,9 +9,9 @@ from datetime import datetime
from curl_cffi import requests as cffi_requests
from ..database.session import get_db
from ..database.models import Account
from ..config.settings import get_settings
from ...database.session import get_db
from ...database.models import Account
from ...config.settings import get_settings
logger = logging.getLogger(__name__)

View File

@@ -12,13 +12,13 @@ from .base import (
)
from .tempmail import TempmailService
from .outlook import OutlookService
from .custom_domain import CustomDomainEmailService
from .moe_mail import MeoMailEmailService
from .temp_mail import TempMailService
# 注册服务
EmailServiceFactory.register(EmailServiceType.TEMPMAIL, TempmailService)
EmailServiceFactory.register(EmailServiceType.OUTLOOK, OutlookService)
EmailServiceFactory.register(EmailServiceType.CUSTOM_DOMAIN, CustomDomainEmailService)
EmailServiceFactory.register(EmailServiceType.CUSTOM_DOMAIN, MeoMailEmailService)
EmailServiceFactory.register(EmailServiceType.TEMP_MAIL, TempMailService)
# 导出 Outlook 模块的额外内容
@@ -48,7 +48,7 @@ __all__ = [
# 服务类
'TempmailService',
'OutlookService',
'CustomDomainEmailService',
'MeoMailEmailService',
'TempMailService',
# Outlook 模块
'ProviderType',

View File

@@ -18,7 +18,7 @@ from ..config.constants import OTP_CODE_PATTERN
logger = logging.getLogger(__name__)
class CustomDomainEmailService(BaseEmailService):
class MeoMailEmailService(BaseEmailService):
"""
自定义域名邮箱服务
基于 REST API 接口

View File

@@ -7,11 +7,11 @@ from fastapi import APIRouter
from .accounts import router as accounts_router
from .registration import router as registration_router
from .settings import router as settings_router
from .email_services import router as email_services_router
from .email import router as email_services_router
from .payment import router as payment_router
from .cpa_services import router as cpa_services_router
from .sub2api_services import router as sub2api_services_router
from .tm_services import router as tm_services_router
from .upload.cpa_services import router as cpa_services_router
from .upload.sub2api_services import router as sub2api_services_router
from .upload.tm_services import router as tm_services_router
api_router = APIRouter()

View File

@@ -14,13 +14,13 @@ from ...database.models import Account
from ...database import crud
from ...config.settings import get_settings
from .accounts import resolve_account_ids
from ...core.payment import (
from ...core.openai.payment import (
generate_plus_link,
generate_team_link,
open_url_incognito,
check_subscription_status,
)
from ...core.team_manager import (
from ...core.upload.team_manager_upload import (
upload_to_team_manager,
batch_upload_to_team_manager,
)

View File

@@ -3,14 +3,15 @@
"""
import logging
from typing import Optional, Dict, Any, List
import os
from typing import Optional
from fastapi import APIRouter, HTTPException
from pydantic import BaseModel
from ...config.settings import get_settings, update_settings
from ...database import crud
from ...database.session import get_db
from ...config.settings import get_settings, update_settings
logger = logging.getLogger(__name__)
router = APIRouter()
@@ -289,6 +290,7 @@ async def backup_database():
raise HTTPException(status_code=404, detail="数据库文件不存在")
# 创建备份目录
from fastapi import Path
backup_dir = Path(db_path).parent / "backups"
backup_dir.mkdir(exist_ok=True)

View File

@@ -0,0 +1,2 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-

View File

@@ -6,9 +6,9 @@ from typing import List, Optional
from fastapi import APIRouter, HTTPException
from pydantic import BaseModel
from ...database import crud
from ...database.session import get_db
from ...core.cpa_upload import test_cpa_connection
from ....database import crud
from ....database.session import get_db
from ....core.upload.cpa_upload import test_cpa_connection
router = APIRouter()

View File

@@ -6,9 +6,9 @@ from typing import List, Optional
from fastapi import APIRouter, HTTPException
from pydantic import BaseModel
from ...database import crud
from ...database.session import get_db
from ...core.sub2api_upload import test_sub2api_connection, batch_upload_to_sub2api
from ....database import crud
from ....database.session import get_db
from ....core.upload.sub2api_upload import test_sub2api_connection, batch_upload_to_sub2api
router = APIRouter()

View File

@@ -6,9 +6,9 @@ from typing import List, Optional
from fastapi import APIRouter, HTTPException
from pydantic import BaseModel
from ...database import crud
from ...database.session import get_db
from ...core.team_manager import test_team_manager_connection
from ....database import crud
from ....database.session import get_db
from ....core.upload.team_manager_upload import test_team_manager_connection
router = APIRouter()