tt-help-cli-ycl 1.3.72 → 1.3.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.3.72",
+  "version": "1.3.73",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {

package/src/cli/attach.js

@@ -289,12 +289,14 @@ export async function handleAttach(options) {
                 const task = successTasks.find(
                   (t) => t.uniqueId === r.uniqueId,
                 );
-                if (task && task.info && task.info.error) {
+                const info = task?.info;
+                const sellerTag = info?.ttSeller ? " [商家ttSeller=true]" : "";
+                if (info && info.error) {
                   attachLog(
-                    `  ⚠ @${r.uniqueId} 已记录 (statusCode=${task.info.statusCode})`,
+                    `  ⚠${sellerTag} @${r.uniqueId} 已记录 (statusCode=${info.statusCode})`,
                   );
                 } else {
-                  attachLog(`  ✓ @${r.uniqueId} 已提交更新`);
+                  attachLog(`  ✓${sellerTag} @${r.uniqueId} 已提交更新`);
                 }
               } else {
                 failCount++;

package/src/lib/parse-ssr.mjs

@@ -70,6 +70,7 @@ export function parseUserInfo(rawHtml) {
     privateAccount: u.privateAccount,
     language: u.language,
     bio: u.signature || "",
+    bioLink: u.bioLink?.link || u.bioLink?.url || u.bioLink || null,
     avatar: u.avatarLarger || u.avatarMedium || u.avatarThumb || "",
     followerCount: s.followerCount,
     followingCount: s.followingCount,

package/src/watch/data-store.js

@@ -140,6 +140,9 @@ function initUserDb(filePath) {
   if (!existingJobColumns.has("modified_at")) {
     db.exec(`ALTER TABLE jobs ADD COLUMN modified_at INTEGER`);
   }
+  if (!existingJobColumns.has("bio_link")) {
+    db.exec(`ALTER TABLE jobs ADD COLUMN bio_link TEXT`);
+  }
   db.exec(`
     CREATE TABLE IF NOT EXISTS raw_jobs (
       unique_id TEXT PRIMARY KEY,
@@ -196,6 +199,9 @@ function initUserDb(filePath) {
   if (!existingRawJobColumns.has("modified_at")) {
     db.exec(`ALTER TABLE raw_jobs ADD COLUMN modified_at INTEGER`);
   }
+  if (!existingRawJobColumns.has("bio_link")) {
+    db.exec(`ALTER TABLE raw_jobs ADD COLUMN bio_link TEXT`);
+  }
   db.exec(`
     CREATE TABLE IF NOT EXISTS videos (
       id TEXT PRIMARY KEY,
@@ -461,9 +467,10 @@ function addJobToDb(user) {
       updated_at,
       region,
       signature,
+      bio_link,
       sec_uid
     )
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `,
   ).run(
     user.uniqueId,
@@ -507,6 +514,7 @@ function addJobToDb(user) {
     user.updatedAt || now,
     user.region || null,
     user.signature || null,
+    user.bioLink?.link || user.bioLink?.url || user.bioLink || null,
     user.secUid || null,
   );
 }
@@ -550,44 +558,46 @@ function getRawJobsCount() {
 function getDashboardStatsFromDb(targetLocations = []) {
   if (!db) return null;
 
-  const total = getJobsCount();
-  const statusCounts = {
-    pending: 0,
-    processing: 0,
-    done: 0,
-    error: 0,
-    restricted: 0,
-  };
-  const rows = db
+  const targetPlaceholders = targetLocations.map(() => "?").join(", ");
+  const targetParams = targetLocations.length ? targetLocations : [];
+
+  // 合并所有 jobs 表的聚合统计为单次扫描
+  const aggregateRow = db
     .prepare(
       `
-      SELECT status, COUNT(*) as count
+      SELECT
+        COUNT(*) as total,
+        SUM(CASE WHEN status = 'pending' THEN 1 ELSE 0 END) as pending,
+        SUM(CASE WHEN status = 'processing' THEN 1 ELSE 0 END) as processing,
+        SUM(CASE WHEN status = 'done' THEN 1 ELSE 0 END) as done,
+        SUM(CASE WHEN status = 'error' THEN 1 ELSE 0 END) as error,
+        SUM(CASE WHEN status = 'restricted' THEN 1 ELSE 0 END) as restricted,
+        SUM(CASE WHEN tt_seller = 1 AND verified = 0 ${
+          targetLocations.length
+            ? `AND location_created IN (${targetPlaceholders})`
+            : "AND 1 = 0"
+        } THEN 1 ELSE 0 END) as targetUsers,
+        SUM(CASE WHEN no_video = 1 THEN 1 ELSE 0 END) as noVideo,
+        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"video"') > 0 THEN 1 ELSE 0 END) as video,
+        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"comment"') > 0 THEN 1 ELSE 0 END) as comment,
+        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"guess"') > 0 THEN 1 ELSE 0 END) as guess,
+        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"following"') > 0 THEN 1 ELSE 0 END) as following,
+        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"follower"') > 0 THEN 1 ELSE 0 END) as follower,
+        SUM(CASE
+          WHEN status != 'done'
+            AND instr(COALESCE(sources, ''), '"video"') = 0
+            AND instr(COALESCE(sources, ''), '"comment"') = 0
+            AND instr(COALESCE(sources, ''), '"guess"') = 0
+            AND instr(COALESCE(sources, ''), '"following"') = 0
+            AND instr(COALESCE(sources, ''), '"follower"') = 0
+          THEN 1 ELSE 0 END) as seed,
+        SUM(CASE WHEN COALESCE(tt_seller, '') = '' AND COALESCE(user_update_count, 0) <= 0 THEN 1 ELSE 0 END) as userUpdateTasks
       FROM jobs
-      GROUP BY status
     `,
     )
-    .all();
-  for (const row of rows) {
-    if (row.status && statusCounts[row.status] !== undefined) {
-      statusCounts[row.status] = row.count;
-    }
-  }
-
-  const targetPlaceholders = targetLocations.map(() => "?").join(", ");
-  const targetUsers = targetLocations.length
-    ? db
-        .prepare(
-          `
-          SELECT COUNT(*) as c
-          FROM jobs
-          WHERE tt_seller = 1
-            AND verified = 0
-            AND location_created IN (${targetPlaceholders})
-        `,
-        )
-        .get(...targetLocations).c
-    : 0;
+    .get(...targetParams);
 
+  // countryStats 和 targetCountryStats 需要 GROUP BY，保留为独立查询
   const countryStats = db
     .prepare(
       `
@@ -607,7 +617,7 @@ function getDashboardStatsFromDb(targetLocations = []) {
       ORDER BY count DESC
     `,
     )
-    .all(...targetLocations);
+    .all(...targetParams);
 
   const targetCountryStats = targetLocations.length
     ? db
@@ -625,58 +635,32 @@ function getDashboardStatsFromDb(targetLocations = []) {
         .all(...targetLocations)
     : [];
 
-  const sourceRow = db
-    .prepare(
-      `
-      SELECT
-        SUM(CASE WHEN status = 'done' THEN 1 ELSE 0 END) as processed,
-        SUM(CASE WHEN status = 'restricted' THEN 1 ELSE 0 END) as restricted,
-        SUM(CASE WHEN status = 'error' THEN 1 ELSE 0 END) as error,
-        SUM(CASE WHEN no_video = 1 THEN 1 ELSE 0 END) as noVideo,
-        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"video"') > 0 THEN 1 ELSE 0 END) as video,
-        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"comment"') > 0 THEN 1 ELSE 0 END) as comment,
-        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"guess"') > 0 THEN 1 ELSE 0 END) as guess,
-        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"following"') > 0 THEN 1 ELSE 0 END) as following,
-        SUM(CASE WHEN status != 'done' AND instr(COALESCE(sources, ''), '"follower"') > 0 THEN 1 ELSE 0 END) as follower,
-        SUM(CASE
-          WHEN status != 'done'
-            AND instr(COALESCE(sources, ''), '"video"') = 0
-            AND instr(COALESCE(sources, ''), '"comment"') = 0
-            AND instr(COALESCE(sources, ''), '"guess"') = 0
-            AND instr(COALESCE(sources, ''), '"following"') = 0
-            AND instr(COALESCE(sources, ''), '"follower"') = 0
-          THEN 1 ELSE 0 END) as seed
-      FROM jobs
-    `,
-    )
-    .get();
-
   return {
-    totalUsers: total,
+    totalUsers: aggregateRow.total,
     rawJobs: getRawJobsCount(),
     dbTotalUsers: getUserDbCount(),
-    jobsTotal: total,
-    jobsPending: getPendingJobsCount(),
-    processedUsers: statusCounts.done,
-    pendingUsers: statusCounts.pending,
-    processingUsers: statusCounts.processing,
-    restrictedUsers: statusCounts.restricted,
-    errorUsers: statusCounts.error,
-    targetUsers,
-    userUpdateTasks: getPendingJobsUserUpdateCount(),
+    jobsTotal: aggregateRow.total,
+    jobsPending: aggregateRow.pending,
+    processedUsers: aggregateRow.done,
+    pendingUsers: aggregateRow.pending,
+    processingUsers: aggregateRow.processing,
+    restrictedUsers: aggregateRow.restricted,
+    errorUsers: aggregateRow.error,
+    targetUsers: aggregateRow.targetUsers,
+    userUpdateTasks: aggregateRow.userUpdateTasks,
     targetCountryStats,
     countryStats,
     sourceStats: {
-      seed: sourceRow.seed || 0,
-      video: sourceRow.video || 0,
-      comment: sourceRow.comment || 0,
-      guess: sourceRow.guess || 0,
-      following: sourceRow.following || 0,
-      follower: sourceRow.follower || 0,
-      processed: sourceRow.processed || 0,
-      restricted: sourceRow.restricted || 0,
-      error: sourceRow.error || 0,
-      noVideo: sourceRow.noVideo || 0,
+      seed: aggregateRow.seed || 0,
+      video: aggregateRow.video || 0,
+      comment: aggregateRow.comment || 0,
+      guess: aggregateRow.guess || 0,
+      following: aggregateRow.following || 0,
+      follower: aggregateRow.follower || 0,
+      processed: aggregateRow.done,
+      restricted: aggregateRow.restricted,
+      error: aggregateRow.error,
+      noVideo: aggregateRow.noVideo || 0,
     },
   };
 }
@@ -873,7 +857,7 @@ function moveJobsToRawByCountry(scope, country) {
 
   let scopeWhere = "";
   if (normalizedScope === "pending") {
-    scopeWhere = `status = 'pending'`;
+    scopeWhere = `status = 'pending' AND COALESCE(user_update_count, 0) >= 2`;
   } else if (normalizedScope === "userUpdate") {
     scopeWhere = `COALESCE(tt_seller, '') = '' AND COALESCE(user_update_count, 0) <= 0`;
   } else {
@@ -1121,14 +1105,14 @@ function restoreRawJobById(uniqueId) {
         pinned, no_video, restricted, user_update_count, tt_seller, verified,
         video_count, comment_count, guessed_location, location_created,
         follower_count, following_count, heart_count, refresh_time,
-        processed, processed_at, created_at, updated_at, region, signature, sec_uid
+        processed, processed_at, created_at, updated_at, region, signature, bio_link, sec_uid
       )
       SELECT
         unique_id, nickname, status, sources, claimed_by, claimed_at, error,
         pinned, no_video, restricted, user_update_count, tt_seller, verified,
         video_count, comment_count, guessed_location, location_created,
         follower_count, following_count, heart_count, refresh_time,
-        processed, processed_at, created_at, updated_at, region, signature, sec_uid
+        processed, processed_at, created_at, updated_at, region, signature, bio_link, sec_uid
       FROM raw_jobs WHERE unique_id = ?
     `,
     ).run(safeId);
@@ -1192,14 +1176,14 @@ function restoreRawJobsByFilter({ search, location, hasVideo, hasFollower }) {
         pinned, no_video, restricted, user_update_count, tt_seller, verified,
         video_count, comment_count, guessed_location, location_created,
         follower_count, following_count, heart_count, refresh_time,
-        processed, processed_at, created_at, updated_at, region, signature, sec_uid
+        processed, processed_at, created_at, updated_at, region, signature, bio_link, sec_uid
       )
       SELECT
         unique_id, nickname, status, sources, claimed_by, claimed_at, error,
         pinned, no_video, restricted, user_update_count, tt_seller, verified,
         video_count, comment_count, guessed_location, location_created,
         follower_count, following_count, heart_count, refresh_time,
-        processed, processed_at, created_at, updated_at, region, signature, sec_uid
+        processed, processed_at, created_at, updated_at, region, signature, bio_link, sec_uid
       FROM raw_jobs WHERE ${whereSql}
     `,
     ).run(...args);
@@ -1329,46 +1313,59 @@ function getUsersPageFromDb({
   }
 
   const whereSql = where.length ? `WHERE ${where.join(" AND ")}` : "";
-  const total = db
-    .prepare(`SELECT COUNT(*) as c FROM jobs ${whereSql}`)
-    .get(...args).c;
 
+  // COUNT 缓存：134 万条数据全表扫描慢，5 秒内返回缓存值
+  const cacheKey = whereSql + "|" + args.join(",");
+  if (!getUsersPageFromDb._countCache)
+    getUsersPageFromDb._countCache = new Map();
+  const cachedCount = getUsersPageFromDb._countCache.get(cacheKey);
+  let total;
+  if (cachedCount && Date.now() - cachedCount.time < 5000) {
+    total = cachedCount.c;
+  } else {
+    total = db
+      .prepare(`SELECT COUNT(*) as c FROM jobs ${whereSql}`)
+      .get(...args).c;
+    getUsersPageFromDb._countCache.set(cacheKey, {
+      c: total,
+      time: Date.now(),
+    });
+  }
+
+  // 只查询前端需要的列，避免 SELECT * 带来的大字段传输和 mapJobRow 开销
   const rows = db
     .prepare(
       `
-      SELECT *
-      FROM jobs
-      ${whereSql}
-      ORDER BY
-        pinned DESC,
-        CASE status
-          WHEN 'processing' THEN 0
-          WHEN 'pending' THEN 1
-          WHEN 'done' THEN 2
-          WHEN 'error' THEN 3
-          WHEN 'restricted' THEN 4
-          ELSE 9
-        END ASC,
-        CASE
-          WHEN status = 'done' THEN -COALESCE(processed_at, 0)
-          ELSE 0
-        END ASC,
-        CASE
-          WHEN status = 'pending' AND tt_seller = 1 AND verified = 0 THEN 0
-          ELSE 1
-        END ASC,
-        CASE
-          WHEN status = 'pending' AND UPPER(COALESCE(guessed_location, '')) IN ('PL', 'NL', 'BE', 'AT') THEN 0
-          WHEN status = 'pending' AND UPPER(COALESCE(guessed_location, '')) IN ('DE', 'FR', 'IT', 'IE', 'ES') THEN 1
-          ELSE 2
-        END ASC,
-        COALESCE(follower_count, 0) DESC,
-        COALESCE(processed_at, 0) DESC,
-        unique_id ASC
-      LIMIT ? OFFSET ?
-    `,
+        SELECT
+          unique_id, nickname, sec_uid, status, sources,
+          tt_seller, verified, follower_count, following_count,
+          location_created, latest_video_time, refresh_time,
+          guessed_location, pinned, processed_at, video_count,
+          no_video, claimed_by, claimed_at, created_at, updated_at
+        FROM jobs
+        ${whereSql}
+        ORDER BY
+          pinned DESC,
+          CASE
+            WHEN ? = 'done' THEN COALESCE(processed_at, 0) * -1
+            WHEN ? = '1' THEN COALESCE(refresh_time, 0) * -1
+            ELSE 0
+          END ASC,
+          CASE status
+            WHEN 'processing' THEN 0
+            WHEN 'pending' THEN 1
+            WHEN 'done' THEN 2
+            WHEN 'error' THEN 3
+            WHEN 'restricted' THEN 4
+            ELSE 9
+          END ASC,
+          COALESCE(follower_count, 0) DESC,
+          COALESCE(processed_at, 0) DESC,
+            unique_id ASC
+          LIMIT ? OFFSET ?
+        `,
     )
-    .all(...args, safeLimit, safeOffset)
+    .all(...args, status || "", target, safeLimit, safeOffset)
     .map(mapJobRow);
 
   return {
@@ -1387,18 +1384,12 @@ function getTargetUsersFromDb(targetLocations = []) {
   const rows = db
     .prepare(
       `
-      SELECT
-        unique_id,
-        nickname,
-        follower_count,
-        tt_seller,
-        verified,
-        location_created,
-        latest_video_time,
-        status,
-        sources
-      FROM jobs
-      WHERE tt_seller = 1
+        SELECT
+          unique_id, nickname, sec_uid, status, sources,
+          tt_seller, verified, follower_count, following_count,
+          location_created, latest_video_time, refresh_time,
+          guessed_location, pinned, processed_at, video_count,
+          no_video, claimed_by, claimed_at, created_at, updated_at
         AND verified = 0
         AND location_created IN (${placeholders})
       ORDER BY COALESCE(follower_count, 0) DESC, unique_id ASC
@@ -1413,13 +1404,109 @@ function getTargetUsersFromDb(targetLocations = []) {
   };
 }
 
-function getTargetUsersByCountryFromDb(targetLocations = []) {
+function getTargetUsersByCountryFromDb(targetLocations = [], options = {}) {
   if (!db) return null;
   if (!targetLocations.length) {
     return { countries: [] };
   }
 
+  const {
+    summaryOnly = false,
+    country: filterCountry,
+    search,
+    limit,
+    offset,
+  } = options;
   const placeholders = targetLocations.map(() => "?").join(", ");
+  const baseParams = [...targetLocations];
+
+  // 摘要模式：只返回各国统计数，不返回用户数据
+  if (summaryOnly) {
+    const statsRows = db
+      .prepare(
+        `
+        SELECT location_created as country, COUNT(*) as count
+        FROM jobs
+        WHERE tt_seller = 1
+          AND verified = 0
+          AND location_created IN (${placeholders})
+        GROUP BY location_created
+        ORDER BY count DESC
+      `,
+      )
+      .all(...targetLocations);
+
+    const countries = statsRows.map((r) => ({
+      country: r.country,
+      count: r.count,
+      users: undefined,
+    }));
+    return {
+      total: statsRows.reduce((s, r) => s + r.count, 0),
+      countries,
+    };
+  }
+
+  // 分页模式：按国家或全局分页查询用户
+  if (limit !== undefined) {
+    let sql = `
+      SELECT
+        unique_id,
+        nickname,
+        follower_count,
+        video_count,
+        tt_seller,
+        verified,
+        location_created,
+        confirmed_location,
+        modified_at,
+        latest_video_time,
+        refresh_time,
+        status,
+        sources
+      FROM jobs
+      WHERE tt_seller = 1
+        AND verified = 0
+        AND location_created IN (${placeholders})
+    `;
+    const params = [...targetLocations];
+
+    if (filterCountry) {
+      sql += ` AND location_created = ?`;
+      params.push(filterCountry);
+    }
+
+    if (search) {
+      sql += ` AND (unique_id LIKE ? OR nickname LIKE ?)`;
+      const likeSearch = `%${search}%`;
+      params.push(likeSearch, likeSearch);
+    }
+
+    sql += ` ORDER BY location_created ASC, COALESCE(latest_video_time, 0) DESC`;
+
+    const countSql = sql.replace(
+      /SELECT[^FROM]*FROM/,
+      "SELECT COUNT(*) as cnt FROM",
+    );
+    const total = db.prepare(countSql).get(...params)?.cnt || 0;
+
+    sql += ` LIMIT ? OFFSET ?`;
+    const safeLimit = Math.min(Math.floor(limit), 10000);
+    const safeOffset = Math.max(Math.floor(offset), 0);
+
+    const rows = db
+      .prepare(sql)
+      .all(...params, safeLimit, safeOffset)
+      .map(mapJobRow);
+
+    return {
+      total,
+      limit: safeLimit,
+      offset: safeOffset,
+      users: rows,
+    };
+  }
+
   const rows = db
     .prepare(
       `
@@ -1519,6 +1606,7 @@ const writableJobColumns = new Set([
   "updated_at",
   "region",
   "signature",
+  "bio_link",
   "sec_uid",
   "status_code",
   "latest_video_time",
@@ -1607,7 +1695,9 @@ function updateJobInfo(uniqueId, info, incrementCount = true) {
   for (const [key, value] of Object.entries(info || {})) {
     if (key === "uniqueId" || key === "unique_id") continue;
     if (value === undefined || value === "") continue;
-    const column = camelToSnake(key);
+    let column = camelToSnake(key);
+    // 字段别名：bio → signature
+    if (column === "bio") column = "signature";
     if (!writableJobColumns.has(column)) continue;
     nextValues[column] = normalizeJobValue(column, value);
   }
@@ -2774,7 +2864,9 @@ export function createStore(filePath) {
       user.ttSeller = result.userInfo?.ttSeller ?? user.ttSeller;
       user.verified = result.userInfo?.verified ?? user.verified;
       user.region = result.userInfo?.region || user.region;
-      user.signature = result.userInfo?.signature ?? user.signature;
+      user.signature =
+        result.userInfo?.signature ?? result.userInfo?.bio ?? user.signature;
+      user.bioLink = result.userInfo?.bioLink ?? user.bioLink;
       user.followingCount =
         result.userInfo?.followingCount ?? user.followingCount;
       user.heartCount = result.userInfo?.heartCount ?? user.heartCount;
@@ -3244,39 +3336,138 @@ export function createStore(filePath) {
     return { ok: true, location, modifiedAt: user.modifiedAt };
   }
 
+  // 将单个 job 移动到 raw_jobs 表（完整字段复制 + 删除原记录）
+  function moveJobToRaw(uniqueId) {
+    if (!db) return false;
+    const safeId = String(uniqueId).trim();
+    if (!safeId) return false;
+
+    const moveSingleTxn = db.transaction(() => {
+      db.prepare(
+        `
+        INSERT OR REPLACE INTO raw_jobs (
+          unique_id, nickname, status, sources, claimed_by, claimed_at,
+          error, pinned, no_video, restricted, user_update_count,
+          tt_seller, verified, video_count, comment_count,
+          guessed_location, location_created, confirmed_location, modified_at,
+          follower_count, following_count, heart_count, refresh_time,
+          processed, processed_at, created_at, updated_at,
+          region, signature, bio_link, sec_uid, status_code, latest_video_time
+        )
+        SELECT
+          unique_id, nickname, status, sources, claimed_by, claimed_at,
+          error, pinned, no_video, restricted, user_update_count,
+          tt_seller, verified, video_count, comment_count,
+          guessed_location, location_created, confirmed_location, modified_at,
+          follower_count, following_count, heart_count, refresh_time,
+          processed, processed_at, created_at, updated_at,
+          region, signature, bio_link, sec_uid, status_code, latest_video_time
+        FROM jobs WHERE unique_id = ?
+      `,
+      ).run(safeId);
+
+      db.prepare("DELETE FROM jobs WHERE unique_id = ?").run(safeId);
+    });
+    moveSingleTxn();
+    return true;
+  }
+
   function batchUpdateUserInfo(updates) {
     if (db) {
-      const txn = db.transaction((items) =>
-        items.map((item) => {
+      const results = [];
+      const moveList = [];
+
+      const txn = db.transaction((items) => {
+        items.forEach((item) => {
+          const uniqueId = item.uniqueId;
           // 处理 { error: true, statusCode: xxx } 的情况
           const info = item.info;
+          let updateResult;
           if (info && info.error && info.statusCode !== undefined) {
             // 只更新 status_code，不更新其他字段
-            return updateJobInfo(
-              item.uniqueId,
+            updateResult = updateJobInfo(
+              uniqueId,
               { statusCode: info.statusCode },
               true,
             );
+          } else {
+            updateResult = updateJobInfo(uniqueId, info, true);
           }
-          return updateJobInfo(item.uniqueId, info, true);
-        }),
-      );
-      return txn(updates).map((result, index) =>
-        result.error
-          ? { uniqueId: updates[index].uniqueId, error: result.error }
-          : {
-              uniqueId: updates[index].uniqueId,
+
+          if (updateResult.error) {
+            results.push({ uniqueId, error: updateResult.error });
+            return;
+          }
+
+          // 检查 tt_seller：非商家则标记为需要移动到毛料表
+          const row = getJobRow(uniqueId);
+          const ttSeller = row ? row.tt_seller : null;
+          if (ttSeller) {
+            // 商家：保持当前逻辑
+            results.push({
+              uniqueId,
               ok: true,
-              userUpdateCount: result.userUpdateCount,
-            },
-      );
+              userUpdateCount: updateResult.userUpdateCount,
+            });
+          } else {
+            // 非商家：标记移动
+            results.push({
+              uniqueId,
+              ok: true,
+              userUpdateCount: updateResult.userUpdateCount,
+              _movedToRaw: true,
+            });
+            moveList.push(uniqueId);
+          }
+        });
+      });
+      txn(updates);
+
+      // 在事务外执行移动操作（避免嵌套 transaction 问题）
+      if (moveList.length > 0) {
+        const moveTxn = db.transaction((ids) => {
+          ids.forEach((uid) => {
+            db.prepare(
+              `
+              INSERT OR REPLACE INTO raw_jobs (
+                unique_id, nickname, status, sources, claimed_by, claimed_at,
+                error, pinned, no_video, restricted, user_update_count,
+                tt_seller, verified, video_count, comment_count,
+                guessed_location, location_created, confirmed_location, modified_at,
+                follower_count, following_count, heart_count, refresh_time,
+                processed, processed_at, created_at, updated_at,
+                region, signature, bio_link, sec_uid, status_code, latest_video_time
+              )
+              SELECT
+                unique_id, nickname, status, sources, claimed_by, claimed_at,
+                error, pinned, no_video, restricted, user_update_count,
+                tt_seller, verified, video_count, comment_count,
+                guessed_location, location_created, confirmed_location, modified_at,
+                follower_count, following_count, heart_count, refresh_time,
+                processed, processed_at, created_at, updated_at,
+                region, signature, bio_link, sec_uid, status_code, latest_video_time
+              FROM jobs WHERE unique_id = ?
+            `,
+            ).run(uid);
+
+            db.prepare("DELETE FROM jobs WHERE unique_id = ?").run(uid);
+          });
+        });
+        moveTxn(moveList);
+      }
+
+      // 清理内部标记
+      return results.map((r) => {
+        const { _movedToRaw, ...rest } = r;
+        return rest;
+      });
     }
 
-    const results = [];
+    const memResults = [];
     for (const item of updates) {
       const user = getUser(item.uniqueId);
       if (!user) {
-        results.push({ uniqueId: item.uniqueId, error: "user not found" });
+        memResults.push({ uniqueId: item.uniqueId, error: "user not found" });
         continue;
       }
       const info = item.info;
@@ -3298,14 +3489,14 @@ export function createStore(filePath) {
       }
       user.userUpdateCount = (user.userUpdateCount || 0) + 1;
       user.updatedAt = Date.now();
-      results.push({
+      memResults.push({
         uniqueId: item.uniqueId,
         ok: true,
         userUpdateCount: user.userUpdateCount,
       });
     }
     save();
-    return results;
+    return memResults;
   }
 
   // 视频登记
@@ -3393,7 +3584,7 @@ export function createStore(filePath) {
   }
 
   function getVideosPage(limit, offset) {
-    const safeLimit = Math.max(1, Math.min(200, parseInt(limit) || 50));
+    const safeLimit = Math.max(1, Math.min(100, parseInt(limit) || 50));
     const safeOffset = Math.max(0, parseInt(offset) || 0);
 
     if (db) {

package/src/watch/public/app.js

@@ -33,7 +33,7 @@ async function fetchStats() {
   }
 }
 
-async function fetchUsers() {
+async function fetchUsers(showLoad) {
   try {
     const params = new URLSearchParams();
     if (currentFilter === "target") {
@@ -46,11 +46,13 @@ async function fetchUsers() {
     const search = document.getElementById("searchInput").value.trim();
     if (search) params.set("search", search);
     if (currentLocation) params.set("location", currentLocation);
-    params.set("limit", "200");
+    params.set("limit", "100");
+    if (showLoad) showLoading("加载中...");
     const res = await fetch("/api/users?" + params.toString());
     const data = await res.json();
     currentUsers = data.users || [];
     renderTable(currentUsers);
+    if (showLoad) hideLoading();
   } catch (e) {}
 }
 
@@ -434,7 +436,7 @@ function setFilter(f) {
     targetLocSel.style.display = "none";
     currentTargetLocation = "";
   }
-  fetchUsers();
+  fetchUsers(true);
 }
 
 function renderLocationFilter() {
@@ -454,15 +456,20 @@ function renderLocationFilter() {
 }
 
 function onLocationChange() {
-  const sel = document.getElementById("locationFilter");
-  currentLocation = sel.value;
-  fetchUsers();
-}
-
-function onTargetLocationChange() {
-  const sel = document.getElementById("targetLocationFilter");
-  currentTargetLocation = sel.value;
-  fetchUsers();
+  const locationSel = document.getElementById("locationFilter");
+  currentLocation = locationSel.value;
+  fetchUsers(true);
+  const targetSel = document.getElementById("targetLocationFilter");
+  currentTargetLocation = targetSel.value;
+  // 判断当前在哪个页面
+  if (document.getElementById("targetPage").classList.contains("active")) {
+    if (currentTargetSummary) {
+      renderTargetCountryGrid(currentTargetSummary.countries || []);
+      loadTargetUsersPage();
+    }
+  } else {
+    fetchUsers();
+  }
 }
 
 let searchTimer = null;
@@ -591,40 +598,6 @@ async function selectLocation(uniqueId, location) {
     }
     showToast(`@${uniqueId} 国家已更新为 ${location}`);
 
-    // 同步更新内存数据：将用户从旧国家组移到新国家组
-    if (currentTargetData && currentTargetData.countries) {
-      let oldCountry = null;
-      let userObj = null;
-      for (const country of currentTargetData.countries) {
-        const idx = country.users.findIndex((u) => u.uniqueId === uniqueId);
-        if (idx !== -1) {
-          oldCountry = country;
-          userObj = country.users.splice(idx, 1)[0];
-          break;
-        }
-      }
-      if (userObj) {
-        userObj.locationCreated = location;
-        userObj.modifiedAt = Date.now();
-        // 找到或创建新国家组
-        let newCountry = currentTargetData.countries.find(
-          (c) => c.country === location,
-        );
-        if (!newCountry) {
-          newCountry = { country: location, count: 0, users: [] };
-          currentTargetData.countries.push(newCountry);
-        }
-        newCountry.users.push(userObj);
-        newCountry.count = newCountry.users.length;
-        // 更新旧国家组的 count
-        if (oldCountry) oldCountry.count = oldCountry.users.length;
-        // 重新渲染左侧国家列表和表格
-        renderTargetCountryGrid(currentTargetData.countries);
-        renderTargetLocationFilter(currentTargetData.countries);
-        renderTargetTable(currentTargetData.countries);
-      }
-    }
-
     // 只更新当前行 DOM
     const tr = document.querySelector(`tr[data-user="${uniqueId}"]`);
     if (tr) {
@@ -634,8 +607,16 @@ async function selectLocation(uniqueId, location) {
         locCell.className = "location-cell modified";
         locCell.innerHTML = `${location}${editIcon}`;
         locCell.title = `点击修改国家（已修改: ${formatTime(Date.now())})`;
+        locCell.onclick = () => openLocationModal(uniqueId, location);
       }
     }
+
+    // 在内存用户列表中也更新
+    const userInMem = currentTargetUsers.find((u) => u.uniqueId === uniqueId);
+    if (userInMem) {
+      userInMem.locationCreated = location;
+      userInMem.modifiedAt = Date.now();
+    }
   } catch (e) {
     showToast("更新失败: " + e.message, true);
   } finally {
@@ -960,6 +941,7 @@ function showTargetPage() {
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.remove("active");
   document.getElementById("targetPage").classList.add("active");
+  showLoading("正在加载目标商家数据...");
   fetchTargetByCountry();
   // 同步统计
   if (currentStats) {
@@ -970,16 +952,21 @@ function showTargetPage() {
   }
 }
 
-let currentTargetData = null;
+let currentTargetSummary = null;
+let currentTargetUsers = [];
+let currentTargetTotal = 0;
+let currentTargetLoading = false;
+let currentTargetAllLoaded = false;
+let currentTargetSeq = 0;
+const TARGET_PAGE_SIZE = 200;
 
 async function fetchTargetByCountry() {
   try {
-    const res = await fetch("/api/target-users-by-country");
+    const res = await fetch("/api/target-users-by-country?summary=1");
     const data = await res.json();
-    currentTargetData = data;
+    currentTargetSummary = data;
     renderTargetCountryGrid(data.countries || []);
-    renderTargetLocationFilter(data.countries || []);
-    renderTargetTable(data.countries || []);
+    renderTargetPageLocationFilter(data.countries || []);
     document.getElementById("targetPageStatTotal").textContent = formatStatNum(
       data.total || 0,
       { full: true },
@@ -987,8 +974,11 @@ async function fetchTargetByCountry() {
     document.getElementById("targetPageStatCountries").textContent = (
       data.countries || []
     ).length;
+    await loadTargetUsersPage(false, true);
   } catch (e) {
     console.error("获取目标商家数据失败:", e);
+  } finally {
+    hideLoading();
   }
 }
 
@@ -999,17 +989,18 @@ function renderTargetCountryGrid(countries) {
       '<span style="color:#666;font-size:12px">暂无目标商家</span>';
     return;
   }
-  const total = countries.reduce((sum, c) => sum + c.count, 0);
+  const total = countries.reduce((sum, c) => sum + (c.count || 0), 0);
   grid.innerHTML = countries
     .map((c) => {
-      const pct = ((c.count / total) * 100).toFixed(1);
+      const cnt = c.count || 0;
+      const pct = total > 0 ? ((cnt / total) * 100).toFixed(1) : "0.0";
       const safeCountry = escapeJsString(c.country);
       const sel = currentTargetLocation === c.country ? " selected" : "";
       return `
       <div class="pending-country-item has-target${sel}"
            onclick="filterTargetByCountry('${safeCountry}')">
         <div class="country-name">${c.country}</div>
-        <div class="country-count">${c.count}</div>
+        <div class="country-count">${cnt}</div>
         <div class="country-label">${pct}% 目标商家</div>
       </div>
     `;
@@ -1017,7 +1008,7 @@ function renderTargetCountryGrid(countries) {
     .join("");
 }
 
-function renderTargetLocationFilter(countries) {
+function renderTargetPageLocationFilter(countries) {
   const sel = document.getElementById("targetLocationFilter");
   if (!sel) return;
   const val = sel.value;
@@ -1026,46 +1017,90 @@ function renderTargetLocationFilter(countries) {
     countries
       .map(
         (c) =>
-          `<option value="${c.country}"${val === c.country ? " selected" : ""}>${c.country} (${c.count})</option>`,
+          `<option value="${c.country}"${val === c.country ? " selected" : ""}>${c.country} (${c.count || 0})</option>`,
       )
       .join("");
 }
 
-function renderTargetTable(countries) {
-  const el = document.getElementById("targetTable");
+async function loadTargetUsersPage(append = false, skipLoading = false) {
+  if (currentTargetLoading) return;
+  currentTargetLoading = true;
+
+  const seq = ++currentTargetSeq;
   const search = document.getElementById("targetSearchInput")
-    ? document.getElementById("targetSearchInput").value.trim().toLowerCase()
+    ? document.getElementById("targetSearchInput").value.trim()
     : "";
-  const location = currentTargetLocation;
+  const offset = append ? currentTargetUsers.length : 0;
 
-  let allUsers = [];
-  for (const c of countries) {
-    if (location && c.country !== location) continue;
-    allUsers = allUsers.concat(c.users);
+  // 非追加模式（重置加载）时显示 loading，除非外层已经显示了
+  if (!append && !skipLoading) {
+    showLoading("正在加载数据...");
   }
 
-  if (search) {
-    allUsers = allUsers.filter(
-      (u) =>
-        (u.uniqueId || "").toLowerCase().includes(search) ||
-        (u.nickname || "").toLowerCase().includes(search),
-    );
+  let data = null;
+  let error = null;
+  try {
+    let url = `/api/target-users-by-country?limit=${TARGET_PAGE_SIZE}&offset=${offset}`;
+    if (currentTargetLocation)
+      url += `&country=${encodeURIComponent(currentTargetLocation)}`;
+    if (search) url += `&search=${encodeURIComponent(search)}`;
+
+    const res = await fetch(url);
+    data = await res.json();
+  } catch (e) {
+    error = e;
+    console.error("加载目标用户失败:", e);
+  } finally {
+    // 非追加模式时隐藏 loading，除非外层负责隐藏
+    if (!append && !skipLoading) {
+      hideLoading();
+    }
+    currentTargetLoading = false;
+
+    if (error || !data) return;
+
+    // 防止旧请求覆盖新请求的结果
+    if (seq !== currentTargetSeq && !append) return;
+
+    if (!append) {
+      currentTargetUsers = data.users || [];
+      currentTargetTotal = data.total || 0;
+      currentTargetAllLoaded = currentTargetUsers.length >= currentTargetTotal;
+    } else {
+      currentTargetUsers = currentTargetUsers.concat(data.users || []);
+      currentTargetAllLoaded = currentTargetUsers.length >= currentTargetTotal;
+    }
+
+    // 所有状态更新完成后，再渲染
+    renderTargetTable();
   }
+}
 
-  if (!allUsers.length) {
+function updateLoadMoreButton() {
+  // 按钮已移除，保留函数名以兼容旧调用
+}
+
+function renderTargetTable() {
+  const el = document.getElementById("targetTable");
+  const moreHint = document.getElementById("targetMoreHint");
+
+  if (currentTargetUsers.length === 0) {
     el.innerHTML =
-      '<tr><td colspan="8" style="color:#666;text-align:center;padding:24px">暂无目标商家</td></tr>';
+      '<tr><td colspan="9" style="text-align:center;color:#888;padding:24px">暂无数据</td></tr>';
+    if (moreHint) {
+      moreHint.style.display = "none";
+    }
     return;
   }
 
-  el.innerHTML = allUsers
-    .map((u) => {
+  el.innerHTML = currentTargetUsers
+    .map((u, i) => {
       const nick = (u.nickname || "")
         .replace(/</g, "&lt;")
         .replace(/>/g, "&gt;");
       const fans = u.followerCount != null ? formatNum(u.followerCount) : "-";
       const videos = u.videoCount != null ? u.videoCount : "-";
-      const location = u.locationCreated || "-";
+      const userLocation = u.locationCreated || "-";
       const confirmedLocation = u.confirmedLocation
         ? u.confirmedLocation === u.locationCreated
           ? `<span style="color:#22c55e">${u.confirmedLocation} ✓</span>`
@@ -1075,13 +1110,11 @@ function renderTargetTable(countries) {
         ? formatTime(u.latestVideoTime * 1000)
         : "-";
       const refreshTime = u.refreshTime ? formatTime(u.refreshTime) : "-";
-      const sources = (u.sources || []).join(", ");
 
-      // 修改过的国家用特殊颜色，带编辑图标
       const editIcon = ' <span style="font-size:10px;opacity:0.5">✏️</span>';
       const locationCell = u.modifiedAt
-        ? `<td data-label="国家" class="location-cell modified" onclick="openLocationModal('${u.uniqueId}','${location}')" title="点击修改国家（已修改: ${formatTime(u.modifiedAt)}）">${location}${editIcon}</td>`
-        : `<td data-label="国家" class="location-cell" onclick="openLocationModal('${u.uniqueId}','${location}')" title="点击修改国家">${location}${editIcon}</td>`;
+        ? `<td data-label="国家" class="location-cell modified" onclick="openLocationModal('${u.uniqueId}','${userLocation}')" title="点击修改国家（已修改: ${formatTime(u.modifiedAt)}）">${userLocation}${editIcon}</td>`
+        : `<td data-label="国家" class="location-cell" onclick="openLocationModal('${u.uniqueId}','${userLocation}')" title="点击修改国家">${userLocation}${editIcon}</td>`;
 
       let statusTag = "";
       if (u.status === "done")
@@ -1097,6 +1130,7 @@ function renderTargetTable(countries) {
       else statusTag = u.status || "-";
 
       return `<tr data-user="${u.uniqueId}">
+      <td style="color:#9ca3af;font-size:12px;text-align:center" data-label="#">${i + 1}</td>
       <td class="user-id" data-label="用户名">@${u.uniqueId}</td>
       <td data-label="昵称">${nick}</td>
       <td data-label="粉丝">${fans}</td>
@@ -1108,6 +1142,24 @@ function renderTargetTable(countries) {
     </tr>`;
     })
     .join("");
+
+  if (moreHint) {
+    moreHint.style.display = "";
+    if (currentTargetAllLoaded) {
+      moreHint.innerHTML = `共 <b>${currentTargetTotal}</b> 条，已全部加载`;
+      moreHint.style.color = "#9ca3af";
+      moreHint.style.cursor = "default";
+    } else if (currentTargetLoading) {
+      moreHint.innerHTML = `已加载 <b>${currentTargetUsers.length}</b> / ${currentTargetTotal} 条，加载中...`;
+      moreHint.style.color = "#9ca3af";
+      moreHint.style.cursor = "wait";
+    } else {
+      moreHint.innerHTML = `已加载 <b>${currentTargetUsers.length}</b> / ${currentTargetTotal} 条，<u style="color:#3b82f6">点击此处加载更多</u> ↓`;
+      moreHint.style.color = "#6b7280";
+      moreHint.style.cursor = "pointer";
+    }
+  }
+  updateLoadMoreButton();
 }
 
 function filterTargetByCountry(country) {
@@ -1116,18 +1168,9 @@ function filterTargetByCountry(country) {
   if (sel) sel.value = country;
   const btn = document.getElementById("targetReprocessBtn");
   if (btn) btn.style.display = "";
-  if (currentTargetData) {
-    renderTargetCountryGrid(currentTargetData.countries || []);
-    renderTargetTable(currentTargetData.countries || []);
-  }
-}
-
-function onTargetLocationChange() {
-  const sel = document.getElementById("targetLocationFilter");
-  currentTargetLocation = sel.value;
-  if (currentTargetData) {
-    renderTargetCountryGrid(currentTargetData.countries || []);
-    renderTargetTable(currentTargetData.countries || []);
+  if (currentTargetSummary) {
+    renderTargetCountryGrid(currentTargetSummary.countries || []);
+    loadTargetUsersPage();
   }
 }
 
@@ -1139,53 +1182,54 @@ function clearTargetFilters() {
   if (locationFilter) locationFilter.value = "";
   const btn = document.getElementById("targetReprocessBtn");
   if (btn) btn.style.display = "none";
-  if (currentTargetData) {
-    renderTargetCountryGrid(currentTargetData.countries || []);
-    renderTargetTable(currentTargetData.countries || []);
+  if (currentTargetSummary) {
+    renderTargetCountryGrid(currentTargetSummary.countries || []);
+    loadTargetUsersPage();
   }
 }
 
 async function reprocessTargetUsers() {
-  if (!currentTargetLocation || !currentTargetData) return;
+  if (!currentTargetLocation) return;
   const country = currentTargetLocation;
-  const countryData = currentTargetData.countries.find((c) => c.country === country);
-  const users = countryData ? countryData.users : [];
   const search = document.getElementById("targetSearchInput")
-    ? document.getElementById("targetSearchInput").value.trim().toLowerCase()
+    ? document.getElementById("targetSearchInput").value.trim()
     : "";
-  const filtered = search
-    ? users.filter(
-        (u) =>
-          (u.uniqueId || "").toLowerCase().includes(search) ||
-          (u.nickname || "").toLowerCase().includes(search),
-      )
-    : users;
-  if (filtered.length === 0) {
-    showToast("当前筛选结果为空", true);
-    return;
-  }
-  if (
-    !confirm(
-      `确定要重新处理 ${country} 的 ${filtered.length} 个目标商家吗？\n这将重置它们的任务状态，使客户端重新采集。`,
-    )
-  ) {
-    return;
-  }
-  const userIds = filtered.map((u) => u.uniqueId);
-  showLoading("正在批量重置...");
+
+  // 加载该国家全量用户用于重置
+  showLoading("正在加载用户列表...");
   try {
-    const res = await fetch("/api/jobs/batch-reset", {
+    let url = `/api/target-users-by-country?limit=99999&offset=0&country=${encodeURIComponent(country)}`;
+    if (search) url += `&search=${encodeURIComponent(search)}`;
+    const res = await fetch(url);
+    const data = await res.json();
+    const users = data.users || [];
+
+    if (users.length === 0) {
+      showToast("当前筛选结果为空", true);
+      return;
+    }
+    if (
+      !confirm(
+        `确定要重新处理 ${country} 的 ${users.length} 个目标商家吗？\n这将重置它们的任务状态，使客户端重新采集。`,
+      )
+    ) {
+      hideLoading();
+      return;
+    }
+    showLoading("正在批量重置...");
+    const userIds = users.map((u) => u.uniqueId);
+    const resetRes = await fetch("/api/jobs/batch-reset", {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ userIds }),
     });
-    const data = await res.json();
-    if (data.error) {
-      showToast(data.error, true);
+    const resetData = await resetRes.json();
+    if (resetData.error) {
+      showToast(resetData.error, true);
       return;
     }
-    showToast(`已重置 ${data.reset} / ${data.total} 个用户`);
-    fetchTargetData();
+    showToast(`已重置 ${resetData.reset} / ${resetData.total} 个用户`);
+    fetchTargetByCountry();
   } catch (e) {
     showToast("批量重置失败: " + e.message, true);
   } finally {
@@ -1198,8 +1242,8 @@ let targetSearchTimer = null;
 document.getElementById("targetSearchInput").addEventListener("input", () => {
   if (targetSearchTimer) clearTimeout(targetSearchTimer);
   targetSearchTimer = setTimeout(() => {
-    if (currentTargetData) {
-      renderTargetTable(currentTargetData.countries || []);
+    if (currentTargetSummary) {
+      loadTargetUsersPage();
     }
   }, 300);
 });
@@ -1228,6 +1272,29 @@ document
     }
   });
 
+document
+  .getElementById("refreshTargetBtn")
+  .addEventListener("click", async () => {
+    showLoading("正在刷新...");
+    try {
+      currentTargetLocation = "";
+      const searchInput = document.getElementById("targetSearchInput");
+      const locationFilter = document.getElementById("targetLocationFilter");
+      if (searchInput) searchInput.value = "";
+      if (locationFilter) locationFilter.value = "";
+      const btn = document.getElementById("targetReprocessBtn");
+      if (btn) btn.style.display = "none";
+      await fetchTargetByCountry();
+      showToast("刷新完成");
+    } catch (e) {
+      showToast("刷新失败: " + e.message, true);
+    } finally {
+      hideLoading();
+    }
+  });
+
+// 加载更多按钮由 HTML 中 onclick="loadTargetUsersPage(true)" 直接触发
+
 async function fetchPendingByCountry() {
   try {
     const res = await fetch("/api/pending-by-country");
@@ -1771,6 +1838,7 @@ fetchStats();
 fetchUsers();
 fetchClientErrors();
 initTableSorting();
+
 setInterval(fetchStats, 10000);
 setInterval(fetchUsers, 10000);
 setInterval(fetchClientErrors, 10000);

package/src/watch/public/index.html

@@ -296,6 +296,9 @@
       <div class="stat-card clickable" id="exportTargetCsvBtn" style="background:rgba(34,197,94,0.12);cursor:pointer">
         <div class="label">导出 CSV</div>
       </div>
+      <div class="stat-card clickable" id="refreshTargetBtn" style="background:rgba(59,130,246,0.12);cursor:pointer">
+        <div class="label">🔄 刷新</div>
+      </div>
     </div>
     <div class="target-page-layout">
       <div class="target-side-card">
@@ -316,6 +319,7 @@
           <table>
             <thead>
               <tr>
+                <th style="width:48px">#</th>
                 <th>用户名</th>
                 <th>昵称</th>
                 <th>粉丝</th>
@@ -328,6 +332,9 @@
             </thead>
             <tbody id="targetTable"></tbody>
           </table>
+          <div id="targetMoreHint" onclick="loadTargetUsersPage(true)"
+            style="text-align:center;padding:10px 8px;font-size:13px;color:#6b7280;cursor:default;user-select:none;transition:color 0.2s">
+          </div>
         </div>
       </div>
     </div>

package/src/watch/server.js

@@ -24,8 +24,24 @@ function getLocalIP() {
 const __dirname = dirname(__filename);
 const publicDir = join(__dirname, "public");
 
+// Stats 缓存：避免每次请求都扫描 100 万+ 条 jobs 数据
+let statsCache = null;
+let statsCacheTime = 0;
+const STATS_CACHE_TTL = 10000; // 10 秒缓存
+
+function invalidateStatsCache() {
+  statsCache = null;
+  statsCacheTime = 0;
+}
+
 function computeStatsIncremental(st) {
-  return st.getDashboardStats(DEFAULT_TARGET_LOCATIONS);
+  const now = Date.now();
+  if (statsCache && now - statsCacheTime < STATS_CACHE_TTL) {
+    return statsCache;
+  }
+  statsCache = st.getDashboardStats(DEFAULT_TARGET_LOCATIONS);
+  statsCacheTime = now;
+  return statsCache;
 }
 
 function readBody(req) {
@@ -553,8 +569,21 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
         req.method === "GET" &&
         routePath === "/api/target-users-by-country"
       ) {
-        const result = store.getTargetUsersByCountry(DEFAULT_TARGET_LOCATIONS);
+        // 摘要模式：只返回各国统计数
+        if (params.summary === "1") {
+          const result = store.getTargetUsersByCountry(
+            DEFAULT_TARGET_LOCATIONS,
+            { summaryOnly: true },
+          );
+          sendJSON(res, 200, result);
+          return;
+        }
+
+        // CSV 导出：全量数据
         if (req.headers["accept"]?.includes("text/csv")) {
+          const result = store.getTargetUsersByCountry(
+            DEFAULT_TARGET_LOCATIONS,
+          );
           const columns = [
             "uniqueId",
             "nickname",
@@ -603,9 +632,27 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
             columns.map((c) => csvEscape(r[c])).join(","),
           );
           res.end(BOM + [header, ...lines].join("\r\n"));
-        } else {
+          return;
+        }
+
+        // 分页模式：按国家+搜索+分页查询用户
+        if (params.limit) {
+          const result = store.getTargetUsersByCountry(
+            DEFAULT_TARGET_LOCATIONS,
+            {
+              country: params.country || undefined,
+              search: params.search || undefined,
+              limit: parseInt(params.limit, 10),
+              offset: parseInt(params.offset || "0", 10),
+            },
+          );
           sendJSON(res, 200, result);
+          return;
         }
+
+        // 默认：全量（兼容旧调用）
+        const result = store.getTargetUsersByCountry(DEFAULT_TARGET_LOCATIONS);
+        sendJSON(res, 200, result);
         return;
       }