Add SmartUp account pool parameter configuration

backend/app/routers/websites.py

@@ -1151,7 +1151,7 @@ def set_website_accounts_concurrency(
     db: Session = Depends(get_db),
     _=Depends(get_current_user),
 ):
-    """批量设置当前网站已导入账号的并发数"""
+    """批量设置当前网站已导入账号参数。"""
     website = db.query(Website).filter(Website.id == wid).first()
     if not website:
         raise HTTPException(404, "website not found")
@@ -1204,6 +1204,16 @@ def set_website_accounts_concurrency(
 
         bulk_candidates = []
         skipped_items = []
+        retry_status_codes = sorted({
+            int(code)
+            for code in body.pool_mode_retry_status_codes
+            if isinstance(code, int) and 100 <= code <= 599
+        })
+        pool_credentials = {
+            "pool_mode": body.pool_mode,
+            "pool_mode_retry_count": body.pool_mode_retry_count,
+            "pool_mode_retry_status_codes": retry_status_codes if body.pool_mode else [],
+        }
 
         for aid, cand in candidates.items():
             remote_acc = remote_map.get(aid)
@@ -1220,13 +1230,19 @@ def set_website_accounts_concurrency(
 
             acc_name = remote_acc.get("name")
             old_con = remote_acc.get("concurrency")
+            remote_credentials = remote_acc.get("credentials")
+            if not isinstance(remote_credentials, dict):
+                remote_credentials = {}
+            old_pool_mode = remote_credentials.get("pool_mode")
 
             try:
                 int(aid)
                 bulk_candidates.append({
                     "account_id": aid,
                     "account_name": acc_name,
-                    "old_concurrency": old_con
+                    "old_concurrency": old_con,
+                    "old_pool_mode": old_pool_mode,
+                    "credentials": remote_credentials,
                 })
             except ValueError:
                 skipped_items.append(SetConcurrencyItem(
@@ -1234,6 +1250,8 @@ def set_website_accounts_concurrency(
                     account_name=acc_name,
                     old_concurrency=old_con,
                     target_concurrency=body.concurrency,
+                    old_pool_mode=old_pool_mode if isinstance(old_pool_mode, bool) else None,
+                    target_pool_mode=body.pool_mode if body.configure_pool_mode else None,
                     status="skipped",
                     message="账号 ID 无法转换为数字，跳过批量更新"
                 ))
@@ -1253,6 +1271,7 @@ def set_website_accounts_concurrency(
         bulk_success = False
         bulk_error_msg = ""
 
+        if not body.configure_pool_mode:
             try:
                 c.bulk_update_accounts(bulk_ids, {"concurrency": body.concurrency})
                 bulk_success = True
@@ -1274,14 +1293,22 @@ def set_website_accounts_concurrency(
             for item in bulk_candidates:
                 aid = item["account_id"]
                 try:
-                    c.update_account(aid, {"concurrency": body.concurrency})
+                    update_payload = {"concurrency": body.concurrency}
+                    if body.configure_pool_mode:
+                        update_payload["credentials"] = {
+                            **item["credentials"],
+                            **pool_credentials,
+                        }
+                    c.update_account(aid, update_payload)
                     items.append(SetConcurrencyItem(
                         account_id=aid,
                         account_name=item["account_name"],
                         old_concurrency=item["old_concurrency"],
                         target_concurrency=body.concurrency,
+                        old_pool_mode=item["old_pool_mode"] if isinstance(item["old_pool_mode"], bool) else None,
+                        target_pool_mode=body.pool_mode if body.configure_pool_mode else None,
                         status="success",
-                        message="成功 (逐个更新)"
+                        message="成功 (逐个更新)" if not body.configure_pool_mode else "成功"
                     ))
                 except Exception as e:
                     items.append(SetConcurrencyItem(
@@ -1289,6 +1316,8 @@ def set_website_accounts_concurrency(
                         account_name=item["account_name"],
                         old_concurrency=item["old_concurrency"],
                         target_concurrency=body.concurrency,
+                        old_pool_mode=item["old_pool_mode"] if isinstance(item["old_pool_mode"], bool) else None,
+                        target_pool_mode=body.pool_mode if body.configure_pool_mode else None,
                         status="failed",
                         message=f"更新失败: {e}"
                     ))
@@ -1306,7 +1335,8 @@ def set_website_accounts_concurrency(
         if skip_count:
             msg_parts.append(f"跳过 {skip_count} 个")
 
-        message = "设置账号并发执行完毕：" + "，".join(msg_parts)
+        action_name = "设置账号参数" if body.configure_pool_mode else "设置账号并发"
+        message = f"{action_name}执行完毕：" + "，".join(msg_parts)
 
         return SetConcurrencyResponse(
             success=success,

backend/app/schemas/website.py

@@ -272,6 +272,10 @@ class CleanupInvalidAccountsExecuteResponse(BaseModel):
 
 class SetConcurrencyRequest(BaseModel):
     concurrency: int = Field(default=100, ge=1, le=1000)
+    configure_pool_mode: bool = False
+    pool_mode: bool = True
+    pool_mode_retry_count: int = Field(default=1, ge=0, le=10)
+    pool_mode_retry_status_codes: list[int] = Field(default_factory=lambda: [429, 502, 503, 529])
 
 
 class SetConcurrencyItem(BaseModel):
@@ -279,6 +283,8 @@ class SetConcurrencyItem(BaseModel):
     account_name: Optional[str] = None
     old_concurrency: Optional[int] = None
     target_concurrency: int
+    old_pool_mode: Optional[bool] = None
+    target_pool_mode: Optional[bool] = None
     status: str  # "success" | "skipped" | "failed"
     message: str
 

backend/test_account_concurrency.py

@@ -233,6 +233,94 @@ def test_set_website_accounts_concurrency_fallback(db_session, monkeypatch):
     assert closed_count == 1
 
 
+def test_set_website_accounts_concurrency_pool_mode_merges_credentials(db_session, monkeypatch):
+    w = Website(
+        id=1,
+        name="Sub2Api site",
+        site_type="sub2api",
+        base_url="http://sub2api",
+        api_prefix="api/v1",
+        auth_type="bearer",
+        auth_config_json='{"token": "tok1"}'
+    )
+    db_session.add(w)
+
+    up = Upstream(id=10, name="Upstream A", base_url="http://upstream-a")
+    db_session.add(up)
+    db_session.commit()
+
+    k1 = UpstreamGeneratedKey(
+        id=101,
+        upstream_id=up.id,
+        group_id="g1",
+        key_name="key-101",
+        key_value="val-101",
+        status="active",
+        imported_website_id=w.id,
+        imported_account_id="1001",
+    )
+    db_session.add(k1)
+    db_session.commit()
+
+    bulk_calls = []
+    update_calls = []
+
+    class MockClient:
+        def __enter__(self):
+            return self
+
+        def __exit__(self, exc_type, exc, tb):
+            return False
+
+        def list_accounts(self):
+            return [{
+                "id": 1001,
+                "name": "acc-1001",
+                "concurrency": 10,
+                "credentials": {
+                    "base_url": "https://relay.example.com",
+                    "api_key": "sk-old",
+                    "pool_mode": False,
+                },
+            }]
+
+        def extract_id(self, val):
+            return str(val.get("id"))
+
+        def bulk_update_accounts(self, account_ids, body):
+            bulk_calls.append((account_ids, body))
+
+        def update_account(self, account_id, body):
+            update_calls.append((account_id, body))
+
+    monkeypatch.setattr("app.routers.websites._client", lambda row: MockClient())
+
+    req = SetConcurrencyRequest(
+        concurrency=80,
+        configure_pool_mode=True,
+        pool_mode=True,
+        pool_mode_retry_count=1,
+        pool_mode_retry_status_codes=[529, 429, 999, 502, 429],
+    )
+    res = set_website_accounts_concurrency(wid=w.id, body=req, db=db_session)
+
+    assert res.success is True
+    assert "设置账号参数执行完毕" in res.message
+    assert bulk_calls == []
+    assert update_calls == [("1001", {
+        "concurrency": 80,
+        "credentials": {
+            "base_url": "https://relay.example.com",
+            "api_key": "sk-old",
+            "pool_mode": True,
+            "pool_mode_retry_count": 1,
+            "pool_mode_retry_status_codes": [429, 502, 529],
+        },
+    })]
+    assert res.items[0].old_pool_mode is False
+    assert res.items[0].target_pool_mode is True
+
+
 def test_set_website_accounts_concurrency_list_accounts_none(db_session, monkeypatch):
     w = Website(
         id=1,

frontend/src/api/index.ts

@@ -370,6 +370,8 @@ export interface SetConcurrencyItem {
   account_name: string | null
   old_concurrency: number | null
   target_concurrency: number
+  old_pool_mode?: boolean | null
+  target_pool_mode?: boolean | null
   status: string
   message: string
 }
@@ -414,7 +416,13 @@ export const websitesApi = {
     api.post<{ success: boolean; message: string; items: CleanupInvalidAccountsItem[] }>(`/api/websites/${id}/accounts/cleanup-invalid/preview`),
   cleanupExecute: (id: number) =>
     api.post<{ success: boolean; message: string; items: CleanupInvalidAccountsItem[] }>(`/api/websites/${id}/accounts/cleanup-invalid/execute`),
-  setConcurrency: (id: number, data: { concurrency: number }) =>
+  setConcurrency: (id: number, data: {
+    concurrency: number
+    configure_pool_mode?: boolean
+    pool_mode?: boolean
+    pool_mode_retry_count?: number
+    pool_mode_retry_status_codes?: number[]
+  }) =>
     api.post<{ success: boolean; message: string; items: SetConcurrencyItem[] }>(`/api/websites/${id}/accounts/set-concurrency`, data),
   syncUpstreamModels: (id: number) =>
     api.post<{ success: boolean; message: string; items: SyncUpstreamModelsItem[] }>(`/api/websites/${id}/accounts/sync-upstream-models`),

frontend/src/views/Websites.vue

@@ -169,9 +169,9 @@
             text
             :disabled="!selectedWebsite"
             @click="openConcurrencyDialog"
-            title="一键设置当前网站已导入账号的并发数"
+            title="一键设置当前网站已导入账号的并发和上游池参数"
           >
-            设置账号并发
+            设置账号参数
           </el-button>
           <el-button
             size="small"
@@ -894,10 +894,10 @@
       </template>
     </el-dialog>
 
-    <!-- 设置账号并发数弹窗 -->
+    <!-- 设置账号参数弹窗 -->
     <el-dialog
       v-model="concurrencyDialog"
-      title="一键设置账号并发数"
+      title="一键设置账号参数"
       width="850px"
       destroy-on-close
     >
@@ -910,8 +910,8 @@
           style="margin-bottom: 15px;"
         >
           <div style="font-size: 13px; line-height: 1.5;">
-            该操作将<strong>仅修改由 SmartUp 导入并绑定到当前网站的账号并发数</strong>，不会影响任何由目标站手工创建的其他账号。<br />
+            该操作将<strong>仅修改由 SmartUp 导入并绑定到当前网站的账号</strong>，不会影响任何由目标站手工创建的其他账号。<br />
-            如果目标站接口支持批量更新（bulk-update），系统将一次性批量设置；否则将自动退回至逐个请求更新模式。
+            只设置并发时优先使用批量更新；启用上游池参数时会逐个合并账号凭据，避免覆盖已有 base_url / key 等字段。
           </div>
         </el-alert>
 
@@ -928,6 +928,42 @@
               请输入 1 到 1000 之间的并发值，推荐设置为 100。
             </div>
           </el-form-item>
+          <el-form-item label="上游池模式">
+            <div style="display:flex;align-items:center;gap:12px;flex-wrap:wrap">
+              <el-switch
+                v-model="configurePoolMode"
+                active-text="写入上游池参数"
+                inactive-text="不修改"
+              />
+              <el-button size="small" text :disabled="!configurePoolMode" @click="applyPoolModePreset">套用保守预设</el-button>
+            </div>
+            <div style="font-size: 12px; color: var(--el-text-color-secondary); margin-top: 5px;">
+              适用于账号背后是上游池/中转池的场景。保守预设：pool_mode=true，重试 1 次，状态码 429/502/503/529。
+            </div>
+          </el-form-item>
+          <template v-if="configurePoolMode">
+            <el-form-item label="启用 pool_mode">
+              <el-switch v-model="poolModeEnabled" />
+            </el-form-item>
+            <el-form-item label="重试次数">
+              <el-input-number
+                v-model="poolModeRetryCount"
+                :min="0"
+                :max="10"
+                style="width: 200px;"
+              />
+            </el-form-item>
+            <el-form-item label="重试状态码">
+              <el-input
+                v-model="poolModeRetryStatusCodes"
+                placeholder="429,502,503,529"
+                style="max-width: 360px;"
+              />
+              <div style="font-size: 12px; color: var(--el-text-color-secondary); margin-top: 5px;">
+                用逗号或空格分隔。关闭 pool_mode 时会清空同账号重试状态码。
+              </div>
+            </el-form-item>
+          </template>
         </el-form>
       </div>
 
@@ -946,6 +982,13 @@
             </template>
           </el-table-column>
           <el-table-column prop="target_concurrency" label="目标并发" width="110" align="center" />
+          <el-table-column label="Pool Mode" width="120" align="center">
+            <template #default="{ row }">
+              <span v-if="row.target_pool_mode === true">开启</span>
+              <span v-else-if="row.target_pool_mode === false">关闭</span>
+              <span v-else class="text-muted">未修改</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="status" label="状态" width="100" align="center">
             <template #default="{ row }">
               <el-tag v-if="row.status === 'success'" type="success" size="small">成功</el-tag>
@@ -1236,6 +1279,10 @@ const concurrencyDialog = ref(false)
 const concurrencyExecuting = ref(false)
 const concurrencyHasExecuted = ref(false)
 const targetConcurrency = ref(100)
+const configurePoolMode = ref(true)
+const poolModeEnabled = ref(true)
+const poolModeRetryCount = ref(1)
+const poolModeRetryStatusCodes = ref('429,502,503,529')
 const concurrencyMessage = ref('')
 const concurrencyResults = ref<SetConcurrencyItem[]>([])
 
@@ -1986,18 +2033,43 @@ async function executeCleanup() {
 function openConcurrencyDialog() {
   if (!selectedWebsite.value) return
   targetConcurrency.value = 100
+  applyPoolModePreset()
   concurrencyHasExecuted.value = false
   concurrencyResults.value = []
   concurrencyMessage.value = ''
   concurrencyDialog.value = true
 }
 
+function applyPoolModePreset() {
+  configurePoolMode.value = true
+  poolModeEnabled.value = true
+  poolModeRetryCount.value = 1
+  poolModeRetryStatusCodes.value = '429,502,503,529'
+}
+
+function parsePoolModeRetryStatusCodes() {
+  const seen = new Set<number>()
+  poolModeRetryStatusCodes.value
+    .split(/[,\s]+/)
+    .map(part => Number(part.trim()))
+    .forEach(code => {
+      if (Number.isInteger(code) && code >= 100 && code <= 599) {
+        seen.add(code)
+      }
+    })
+  return [...seen].sort((a, b) => a - b)
+}
+
 async function submitSetConcurrency() {
   if (!selectedWebsite.value) return
+  const retryStatusCodes = poolModeEnabled.value ? parsePoolModeRetryStatusCodes() : []
+  const confirmMessage = configurePoolMode.value
+    ? `确认将当前网站中由 SmartUp 导入账号的并发数设置为 ${targetConcurrency.value}，并写入上游池参数？`
+    : `确认将当前网站中由 SmartUp 导入账号的并发数一键设置为 ${targetConcurrency.value}？`
   try {
     await ElMessageBox.confirm(
-      `确认将当前网站中由 SmartUp 导入账号的并发数一键设置为 ${targetConcurrency.value}？`,
+      confirmMessage,
-      '确认修改并发数',
+      '确认修改账号参数',
       { type: 'warning' }
     )
   } catch {
@@ -2007,7 +2079,11 @@ async function submitSetConcurrency() {
   concurrencyExecuting.value = true
   try {
     const res = await websitesApi.setConcurrency(selectedWebsite.value.id, {
-      concurrency: targetConcurrency.value
+      concurrency: targetConcurrency.value,
+      configure_pool_mode: configurePoolMode.value,
+      pool_mode: poolModeEnabled.value,
+      pool_mode_retry_count: poolModeRetryCount.value,
+      pool_mode_retry_status_codes: retryStatusCodes,
     })
     concurrencyMessage.value = res.data.message
     concurrencyResults.value = res.data.items