feat(config): 合并上传配置并修复debug模式下数据库初始化提示错误

src/config/settings.py

@@ -514,7 +514,8 @@ def init_default_settings() -> None:
                     )
                     print(f"[Settings] 初始化默认设置: {defn.db_key} = {default_value if not defn.is_secret else '***'}")
     except Exception as e:
-        print(f"[Settings] 初始化默认设置失败: {e}")
+        if "未初始化" not in str(e):
+            print(f"[Settings] 初始化默认设置失败: {e}")
 
 
 def _load_settings_from_db() -> Dict[str, Any]:
@@ -549,7 +550,8 @@ def _load_settings_from_db() -> Dict[str, Any]:
                 settings_dict["webui_access_password"] = env_password
         return settings_dict
     except Exception as e:
-        print(f"[Settings] 从数据库加载设置失败: {e}，使用默认值")
+        if "未初始化" not in str(e):
+            print(f"[Settings] 从数据库加载设置失败: {e}，使用默认值")
         return {name: defn.default_value for name, defn in SETTING_DEFINITIONS.items()}
 
 
@@ -572,7 +574,8 @@ def _save_settings_to_db(**kwargs) -> None:
                         description=defn.description
                     )
     except Exception as e:
-        print(f"[Settings] 保存设置到数据库失败: {e}")
+        if "未初始化" not in str(e):
+            print(f"[Settings] 保存设置到数据库失败: {e}")
 
 
 class Settings(BaseModel):

src/database/crud.py

@@ -647,4 +647,68 @@ def delete_sub2api_service(db: Session, service_id: int) -> bool:
         return False
     db.delete(svc)
     db.commit()
+    return True
+
+
+# ============================================================================
+# Team Manager 服务 CRUD
+# ============================================================================
+
+def create_tm_service(
+    db: Session,
+    name: str,
+    api_url: str,
+    api_key: str,
+    enabled: bool = True,
+    priority: int = 0,
+):
+    """创建 Team Manager 服务配置"""
+    from .models import TeamManagerService
+    svc = TeamManagerService(
+        name=name,
+        api_url=api_url,
+        api_key=api_key,
+        enabled=enabled,
+        priority=priority,
+    )
+    db.add(svc)
+    db.commit()
+    db.refresh(svc)
+    return svc
+
+
+def get_tm_service_by_id(db: Session, service_id: int):
+    """按 ID 获取 Team Manager 服务"""
+    from .models import TeamManagerService
+    return db.query(TeamManagerService).filter(TeamManagerService.id == service_id).first()
+
+
+def get_tm_services(db: Session, enabled=None):
+    """获取 Team Manager 服务列表"""
+    from .models import TeamManagerService
+    q = db.query(TeamManagerService)
+    if enabled is not None:
+        q = q.filter(TeamManagerService.enabled == enabled)
+    return q.order_by(TeamManagerService.priority.asc(), TeamManagerService.id.asc()).all()
+
+
+def update_tm_service(db: Session, service_id: int, **kwargs):
+    """更新 Team Manager 服务配置"""
+    svc = get_tm_service_by_id(db, service_id)
+    if not svc:
+        return None
+    for k, v in kwargs.items():
+        setattr(svc, k, v)
+    db.commit()
+    db.refresh(svc)
+    return svc
+
+
+def delete_tm_service(db: Session, service_id: int) -> bool:
+    """删除 Team Manager 服务配置"""
+    svc = get_tm_service_by_id(db, service_id)
+    if not svc:
+        return False
+    db.delete(svc)
+    db.commit()
     return True

src/database/models.py

@@ -158,6 +158,20 @@ class Sub2ApiService(Base):
     updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
 
 
+class TeamManagerService(Base):
+    """Team Manager 服务配置表"""
+    __tablename__ = 'tm_services'
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    name = Column(String(100), nullable=False)  # 服务名称
+    api_url = Column(String(500), nullable=False)  # API URL
+    api_key = Column(Text, nullable=False)  # X-API-Key
+    enabled = Column(Boolean, default=True)
+    priority = Column(Integer, default=0)  # 优先级
+    created_at = Column(DateTime, default=datetime.utcnow)
+    updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
+
+
 class Proxy(Base):
     """代理列表表"""
     __tablename__ = 'proxies'

src/web/routes/__init__.py

@@ -11,6 +11,7 @@ from .email_services 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
 
 api_router = APIRouter()
 
@@ -22,3 +23,4 @@ api_router.include_router(email_services_router, prefix="/email-services", tags=
 api_router.include_router(payment_router, prefix="/payment", tags=["payment"])
 api_router.include_router(cpa_services_router, prefix="/cpa-services", tags=["cpa-services"])
 api_router.include_router(sub2api_services_router, prefix="/sub2api-services", tags=["sub2api-services"])
+api_router.include_router(tm_services_router, prefix="/tm-services", tags=["tm-services"])

src/web/routes/payment.py

@@ -11,6 +11,7 @@ from pydantic import BaseModel
 
 from ...database.session import get_db
 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 (
@@ -61,12 +62,14 @@ class BatchCheckSubscriptionRequest(BaseModel):
 
 class UploadTMRequest(BaseModel):
     proxy: Optional[str] = None  # 保留，TM 上传不走代理
+    service_id: Optional[int] = None  # 指定 TM 服务 ID，不传则使用第一个启用的
 
 
 class BatchUploadTMRequest(BaseModel):
     ids: List[int] = []
     select_all: bool = False
     status_filter: Optional[str] = None
+    service_id: Optional[int] = None  # 指定 TM 服务 ID，不传则使用第一个启用的
     email_service_filter: Optional[str] = None
     search_filter: Optional[str] = None
 
@@ -200,14 +203,21 @@ def batch_check_subscription(request: BatchCheckSubscriptionRequest):
 @router.post("/accounts/{account_id}/upload-tm")
 def upload_account_tm(account_id: int, request: UploadTMRequest = None):
     """上传单账号到 Team Manager"""
-    settings = get_settings()
-    if not settings.tm_enabled:
-        raise HTTPException(status_code=400, detail="Team Manager 上传未启用")
-
-    api_url = settings.tm_api_url
-    api_key = settings.tm_api_key.get_secret_value() if settings.tm_api_key else ""
+    service_id = request.service_id if request and hasattr(request, 'service_id') else None
 
     with get_db() as db:
+        if service_id:
+            svc = crud.get_tm_service_by_id(db, service_id)
+        else:
+            svcs = crud.get_tm_services(db, enabled=True)
+            svc = svcs[0] if svcs else None
+
+        if not svc:
+            raise HTTPException(status_code=400, detail="未找到可用的 Team Manager 服务，请先在设置中配置")
+
+        api_url = svc.api_url
+        api_key = svc.api_key
+
         account = db.query(Account).filter(Account.id == account_id).first()
         if not account:
             raise HTTPException(status_code=404, detail="账号不存在")
@@ -219,14 +229,21 @@ def upload_account_tm(account_id: int, request: UploadTMRequest = None):
 @router.post("/accounts/batch-upload-tm")
 def batch_upload_tm(request: BatchUploadTMRequest):
     """批量上传账号到 Team Manager"""
-    settings = get_settings()
-    if not settings.tm_enabled:
-        raise HTTPException(status_code=400, detail="Team Manager 上传未启用")
-
-    api_url = settings.tm_api_url
-    api_key = settings.tm_api_key.get_secret_value() if settings.tm_api_key else ""
+    service_id = request.service_id if hasattr(request, 'service_id') else None
 
     with get_db() as db:
+        if service_id:
+            svc = crud.get_tm_service_by_id(db, service_id)
+        else:
+            svcs = crud.get_tm_services(db, enabled=True)
+            svc = svcs[0] if svcs else None
+
+        if not svc:
+            raise HTTPException(status_code=400, detail="未找到可用的 Team Manager 服务，请先在设置中配置")
+
+        api_url = svc.api_url
+        api_key = svc.api_key
+
         ids = resolve_account_ids(
             db, request.ids, request.select_all,
             request.status_filter, request.email_service_filter, request.search_filter

static/js/settings.js

@@ -57,9 +57,15 @@ const elements = {
     sub2ApiServiceForm: document.getElementById('sub2api-service-form'),
     sub2ApiServiceModalTitle: document.getElementById('sub2api-service-modal-title'),
     testSub2ApiServiceBtn: document.getElementById('test-sub2api-service-btn'),
-    // Team Manager 设置
-    tmForm: document.getElementById('tm-form'),
-    testTmBtn: document.getElementById('test-tm-btn'),
+    // Team Manager 服务管理
+    addTmServiceBtn: document.getElementById('add-tm-service-btn'),
+    tmServicesTable: document.getElementById('tm-services-table'),
+    tmServiceEditModal: document.getElementById('tm-service-edit-modal'),
+    closeTmServiceModal: document.getElementById('close-tm-service-modal'),
+    cancelTmServiceBtn: document.getElementById('cancel-tm-service-btn'),
+    tmServiceForm: document.getElementById('tm-service-form'),
+    tmServiceModalTitle: document.getElementById('tm-service-modal-title'),
+    testTmServiceBtn: document.getElementById('test-tm-service-btn'),
     // 验证码设置
     emailCodeForm: document.getElementById('email-code-form'),
     // Outlook 设置
@@ -80,6 +86,7 @@ document.addEventListener('DOMContentLoaded', () => {
     loadProxies();
     loadCpaServices();
     loadSub2ApiServices();
+    loadTmServices();
     initEventListeners();
 });
 
@@ -236,12 +243,26 @@ function initEventListeners() {
     if (elements.webuiSettingsForm) {
         elements.webuiSettingsForm.addEventListener('submit', handleSaveWebuiSettings);
     }
-    // Team Manager 设置
-    if (elements.tmForm) {
-        elements.tmForm.addEventListener('submit', handleSaveTm);
+    // Team Manager 服务管理
+    if (elements.addTmServiceBtn) {
+        elements.addTmServiceBtn.addEventListener('click', () => openTmServiceModal());
     }
-    if (elements.testTmBtn) {
-        elements.testTmBtn.addEventListener('click', handleTestTm);
+    if (elements.closeTmServiceModal) {
+        elements.closeTmServiceModal.addEventListener('click', closeTmServiceModal);
+    }
+    if (elements.cancelTmServiceBtn) {
+        elements.cancelTmServiceBtn.addEventListener('click', closeTmServiceModal);
+    }
+    if (elements.tmServiceEditModal) {
+        elements.tmServiceEditModal.addEventListener('click', (e) => {
+            if (e.target === elements.tmServiceEditModal) closeTmServiceModal();
+        });
+    }
+    if (elements.tmServiceForm) {
+        elements.tmServiceForm.addEventListener('submit', handleSaveTmService);
+    }
+    if (elements.testTmServiceBtn) {
+        elements.testTmServiceBtn.addEventListener('click', handleTestTmService);
     }
 
     // CPA 服务管理
@@ -315,8 +336,6 @@ async function loadSettings() {
 
         // 加载 Outlook 设置
         loadOutlookSettings();
-        // 加载 Team Manager 设置
-        loadTmSettings();
 
         // Web UI 访问密码提示
         if (data.webui?.has_access_password) {
@@ -1030,73 +1049,167 @@ async function handleTestDynamicProxy() {
     }
 }
 
-// ============== Team Manager 设置 ==============
+// ============== Team Manager 服务管理 ==============
 
-async function loadTmSettings() {
+async function loadTmServices() {
+    if (!elements.tmServicesTable) return;
     try {
-        const data = await api.get('/settings/team-manager');
-        document.getElementById('tm-enabled').checked = data.enabled || false;
-        document.getElementById('tm-api-url').value = data.api_url || '';
-        document.getElementById('tm-api-key').value = '';
-        document.getElementById('tm-api-key').placeholder = data.has_api_key ? '已配置，留空保持不变' : '请输入 API Key';
-    } catch (error) {
-        console.error('加载 Team Manager 设置失败:', error);
+        const services = await api.get('/tm-services');
+        renderTmServicesTable(services);
+    } catch (e) {
+        elements.tmServicesTable.innerHTML = `<tr><td colspan="5" style="text-align:center;color:var(--danger-color);">${e.message}</td></tr>`;
     }
 }
 
-async function handleSaveTm(e) {
+function renderTmServicesTable(services) {
+    if (!services || services.length === 0) {
+        elements.tmServicesTable.innerHTML = '<tr><td colspan="5" style="text-align:center;color:var(--text-muted);padding:20px;">暂无 Team Manager 服务，点击「添加服务」新增</td></tr>';
+        return;
+    }
+    elements.tmServicesTable.innerHTML = services.map(s => `
+        <tr>
+            <td>${escapeHtml(s.name)}</td>
+            <td style="font-size:0.85rem;color:var(--text-muted);">${escapeHtml(s.api_url)}</td>
+            <td>
+                <span class="badge" style="background:${s.enabled ? 'var(--success-color)' : 'var(--border)'};color:${s.enabled ? '#fff' : 'var(--text-muted)'};font-size:0.75rem;padding:2px 8px;border-radius:10px;">
+                    ${s.enabled ? '启用' : '禁用'}
+                </span>
+            </td>
+            <td style="text-align:center;">${s.priority}</td>
+            <td>
+                <button class="btn btn-secondary btn-sm" onclick="editTmService(${s.id})">编辑</button>
+                <button class="btn btn-secondary btn-sm" onclick="testTmServiceById(${s.id})">测试</button>
+                <button class="btn btn-danger btn-sm" onclick="deleteTmService(${s.id}, '${escapeHtml(s.name)}')">删除</button>
+            </td>
+        </tr>
+    `).join('');
+}
+
+function openTmServiceModal(service = null) {
+    document.getElementById('tm-service-id').value = service ? service.id : '';
+    document.getElementById('tm-service-name').value = service ? service.name : '';
+    document.getElementById('tm-service-url').value = service ? service.api_url : '';
+    document.getElementById('tm-service-key').value = '';
+    document.getElementById('tm-service-priority').value = service ? service.priority : 0;
+    document.getElementById('tm-service-enabled').checked = service ? service.enabled : true;
+    if (service) {
+        document.getElementById('tm-service-key').placeholder = service.has_key ? '已配置，留空保持不变' : '请输入 API Key';
+    } else {
+        document.getElementById('tm-service-key').placeholder = '请输入 API Key';
+    }
+    elements.tmServiceModalTitle.textContent = service ? '编辑 Team Manager 服务' : '添加 Team Manager 服务';
+    elements.tmServiceEditModal.classList.add('active');
+}
+
+function closeTmServiceModal() {
+    elements.tmServiceEditModal.classList.remove('active');
+}
+
+async function editTmService(id) {
+    try {
+        const service = await api.get(`/tm-services/${id}`);
+        openTmServiceModal(service);
+    } catch (e) {
+        toast.error('获取服务信息失败: ' + e.message);
+    }
+}
+
+async function handleSaveTmService(e) {
     e.preventDefault();
-    const data = {
-        enabled: document.getElementById('tm-enabled').checked,
-        api_url: document.getElementById('tm-api-url').value,
-        api_key: document.getElementById('tm-api-key').value || ''
-    };
-    try {
-        await api.post('/settings/team-manager', data);
-        toast.success('Team Manager 设置已保存');
-        loadTmSettings();
-    } catch (error) {
-        toast.error('保存失败: ' + error.message);
+    const id = document.getElementById('tm-service-id').value;
+    const name = document.getElementById('tm-service-name').value.trim();
+    const apiUrl = document.getElementById('tm-service-url').value.trim();
+    const apiKey = document.getElementById('tm-service-key').value.trim();
+    const priority = parseInt(document.getElementById('tm-service-priority').value) || 0;
+    const enabled = document.getElementById('tm-service-enabled').checked;
+
+    if (!name || !apiUrl) {
+        toast.error('名称和 API URL 不能为空');
+        return;
     }
-}
-
-async function handleTestTm() {
-    const apiUrl = document.getElementById('tm-api-url').value;
-    const apiKey = document.getElementById('tm-api-key').value;
-
-    if (!apiUrl) {
-        toast.error('请先填写 API URL');
+    if (!id && !apiKey) {
+        toast.error('新增服务时 API Key 不能为空');
         return;
     }
 
-    let keyToTest = apiKey;
-    if (!keyToTest) {
-        const saved = await api.get('/settings/team-manager');
-        if (!saved.has_api_key) {
-            toast.error('请先填写 API Key');
-            return;
-        }
-        keyToTest = 'use_saved_key';
-    }
-
-    elements.testTmBtn.disabled = true;
-    elements.testTmBtn.innerHTML = '<span class="loading-spinner"></span> 测试中...';
-
     try {
-        const result = await api.post('/settings/team-manager/test', {
-            api_url: apiUrl,
-            api_key: keyToTest
-        });
+        const payload = { name, api_url: apiUrl, priority, enabled };
+        if (apiKey) payload.api_key = apiKey;
+
+        if (id) {
+            await api.patch(`/tm-services/${id}`, payload);
+            toast.success('服务已更新');
+        } else {
+            payload.api_key = apiKey;
+            await api.post('/tm-services', payload);
+            toast.success('服务已添加');
+        }
+        closeTmServiceModal();
+        loadTmServices();
+    } catch (e) {
+        toast.error('保存失败: ' + e.message);
+    }
+}
+
+async function deleteTmService(id, name) {
+    const confirmed = await confirm(`确定要删除 Team Manager 服务「${name}」吗？`);
+    if (!confirmed) return;
+    try {
+        await api.delete(`/tm-services/${id}`);
+        toast.success('已删除');
+        loadTmServices();
+    } catch (e) {
+        toast.error('删除失败: ' + e.message);
+    }
+}
+
+async function testTmServiceById(id) {
+    try {
+        const result = await api.post(`/tm-services/${id}/test`);
         if (result.success) {
             toast.success(result.message);
         } else {
             toast.error(result.message);
         }
-    } catch (error) {
-        toast.error('测试失败: ' + error.message);
+    } catch (e) {
+        toast.error('测试失败: ' + e.message);
+    }
+}
+
+async function handleTestTmService() {
+    const apiUrl = document.getElementById('tm-service-url').value.trim();
+    const apiKey = document.getElementById('tm-service-key').value.trim();
+    const id = document.getElementById('tm-service-id').value;
+
+    if (!apiUrl) {
+        toast.error('请先填写 API URL');
+        return;
+    }
+    if (!id && !apiKey) {
+        toast.error('请先填写 API Key');
+        return;
+    }
+
+    elements.testTmServiceBtn.disabled = true;
+    elements.testTmServiceBtn.textContent = '测试中...';
+
+    try {
+        let result;
+        if (id && !apiKey) {
+            result = await api.post(`/tm-services/${id}/test`);
+        } else {
+            result = await api.post('/tm-services/test-connection', { api_url: apiUrl, api_key: apiKey });
+        }
+        if (result.success) {
+            toast.success(result.message);
+        } else {
+            toast.error(result.message);
+        }
+    } catch (e) {
+        toast.error('测试失败: ' + e.message);
     } finally {
-        elements.testTmBtn.disabled = false;
-        elements.testTmBtn.textContent = '🔌 测试连接';
+        elements.testTmServiceBtn.disabled = false;
+        elements.testTmServiceBtn.textContent = '🔌 测试连接';
     }
 }
 

templates/settings.html

@@ -255,34 +255,72 @@
                     </div>
                 </div>
 
-                <!-- Team Manager 配置 -->
+                <!-- Team Manager 服务管理 -->
                 <div class="card" style="margin-top: var(--spacing-lg);">
                     <div class="card-header">
-                        <h3>🚀 Team Manager</h3>
-                        <span class="hint">配置 Team Manager 账号导入功能</span>
+                        <h3>🚀 Team Manager 服务</h3>
+                        <button class="btn btn-primary btn-sm" id="add-tm-service-btn">+ 添加服务</button>
                     </div>
-                    <div class="card-body">
-                        <form id="tm-form">
+                    <div class="card-body" style="padding: 0;">
+                        <div class="table-container">
+                            <table class="data-table">
+                                <thead>
+                                    <tr>
+                                        <th>名称</th>
+                                        <th>API URL</th>
+                                        <th style="width:80px;">状态</th>
+                                        <th style="width:60px;">优先级</th>
+                                        <th style="width:160px;">操作</th>
+                                    </tr>
+                                </thead>
+                                <tbody id="tm-services-table">
+                                    <tr><td colspan="5" style="text-align:center;color:var(--text-muted);padding:20px;">加载中...</td></tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Team Manager 服务编辑模态框 -->
+            <div class="modal" id="tm-service-edit-modal">
+                <div class="modal-content" style="max-width: 500px;">
+                    <div class="modal-header">
+                        <h3 id="tm-service-modal-title">添加 Team Manager 服务</h3>
+                        <button class="modal-close" id="close-tm-service-modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <form id="tm-service-form">
+                            <input type="hidden" id="tm-service-id">
                             <div class="form-group">
-                                <label>
-                                    <input type="checkbox" id="tm-enabled" name="enabled">
-                                    启用 Team Manager 上传
-                                </label>
-                                <p class="hint">启用后可在账号管理页面将账号导入 Team Manager 平台</p>
+                                <label for="tm-service-name">名称 *</label>
+                                <input type="text" id="tm-service-name" placeholder="例如: 主服务" required>
                             </div>
                             <div class="form-group">
-                                <label for="tm-api-url">API URL</label>
-                                <input type="text" id="tm-api-url" name="api_url" placeholder="例如: https://tm.example.com">
-                                <p class="hint">Team Manager 平台的 API 地址</p>
+                                <label for="tm-service-url">API URL *</label>
+                                <input type="text" id="tm-service-url" placeholder="https://tm.example.com" required>
                             </div>
                             <div class="form-group">
-                                <label for="tm-api-key">API Key</label>
-                                <input type="password" id="tm-api-key" name="api_key" placeholder="留空则保持原值" autocomplete="new-password">
-                                <p class="hint">Team Manager 平台的认证 Key</p>
+                                <label for="tm-service-key">API Key</label>
+                                <input type="password" id="tm-service-key" placeholder="编辑时留空则保持原值" autocomplete="new-password">
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group">
+                                    <label for="tm-service-priority">优先级</label>
+                                    <input type="number" id="tm-service-priority" value="0" min="0">
+                                    <p class="hint">数字越小优先级越高</p>
+                                </div>
+                                <div class="form-group">
+                                    <label>&nbsp;</label>
+                                    <label style="margin-top:10px;display:flex;align-items:center;gap:8px;">
+                                        <input type="checkbox" id="tm-service-enabled" checked> 启用
+                                    </label>
+                                </div>
                             </div>
                             <div class="form-actions">
-                                <button type="submit" class="btn btn-primary">💾 保存设置</button>
-                                <button type="button" class="btn btn-secondary" id="test-tm-btn">🔌 测试连接</button>
+                                <button type="submit" class="btn btn-primary">💾 保存</button>
+                                <button type="button" class="btn btn-secondary" id="test-tm-service-btn">🔌 测试连接</button>
+                                <button type="button" class="btn btn-secondary" id="cancel-tm-service-btn">取消</button>
                             </div>
                         </form>
                     </div>