diff --git a/apps/server/src/routes/admin-usage.ts b/apps/server/src/routes/admin-usage.ts index 7c5738f..6ebb33d 100644 --- a/apps/server/src/routes/admin-usage.ts +++ b/apps/server/src/routes/admin-usage.ts @@ -240,6 +240,7 @@ export function adminUsageRoutes() { }; b.key_count += 1; if ( + v.status === "active" && v.log_synced_at && (b.cutoff === null || v.log_synced_at < b.cutoff) ) { diff --git a/packages/db/src/repos.ts b/packages/db/src/repos.ts index a7f1496..ec6743a 100644 --- a/packages/db/src/repos.ts +++ b/packages/db/src/repos.ts @@ -636,12 +636,17 @@ export function createRepos(db: Db) { }, keysExtra: { - /** 全池数据截止 = 最慢 log_synced_at */ + /** 全池数据截止 = 仍会同步的 key 中最慢 log_synced_at(停用 key 不计) */ async slowestLogSyncedAt(): Promise { const rows = await db .select({ t: sql`min(${apiKeys.log_synced_at})::text` }) .from(apiKeys) - .where(sql`${apiKeys.log_synced_at} is not null`); + .where( + and( + eq(apiKeys.status, "active"), + sql`${apiKeys.log_synced_at} is not null`, + ), + ); const raw = rows[0]?.t; if (!raw) return null; const d = new Date(raw);