Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/dao.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,21 +74,24 @@ pub fn create_api_key(conn: &Connection, user_id: i64, name: &str) -> Result<Str
}

/// 列出用户的 API Key(key 值脱敏;P2-B 起只列 active,revoked 不再显示)
/// rant 2026-08-24T12:41:25:返回 last_used(网关 Bearer 鉴权时 touch_api_key 维护,NULL=从未使用)
pub fn list_api_keys(conn: &Connection, user_id: i64) -> Result<Vec<serde_json::Value>> {
let mut stmt = conn.prepare(
"SELECT id, key_value, name, status, created_at FROM api_keys \
"SELECT id, key_value, name, status, created_at, last_used FROM api_keys \
WHERE user_id = ?1 AND status = 'active' ORDER BY id DESC",
)?;
let rows = stmt.query_map([user_id], |r| {
let raw: String = r.get(1)?;
let created_at: String = r.get(4)?;
let last_used: Option<String> = r.get(5)?;
Ok(serde_json::json!({
"id": r.get::<_, i64>(0)?,
"key": auth::mask_api_key(&raw),
"full_key": raw, // 属主可见完整值(前端展示仍用脱敏 key,复制时用 full_key)
"name": r.get::<_, String>(2)?,
"status": r.get::<_, String>(3)?,
"created_at": utc_iso(&created_at),
"last_used": last_used.as_deref().map(utc_iso),
}))
})?;
let mut out = Vec::new();
Expand Down
14 changes: 14 additions & 0 deletions src/routes/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -749,6 +749,20 @@ mod tests {
arr.iter().any(|k| k["full_key"] == new_key),
"列表含新生成 key 的完整值 full_key"
);
// rant 2026-08-24T12:41:25:列表返回 last_used(新 key 未使用 → null;用过 → 时间串)
assert!(
arr.iter().all(|k| k["last_used"].is_null()
|| k["last_used"]
.as_str()
.map(|s| !s.is_empty())
.unwrap_or(false)),
"last_used 字段存在且为 null(未用)或时间串(已用)"
);
assert!(
arr.iter()
.any(|k| k["full_key"] == new_key && k["last_used"].is_null()),
"新生成且未调用的 key last_used 应为 null"
);
assert!(
arr.iter().all(|k| {
k["full_key"]
Expand Down
10 changes: 5 additions & 5 deletions ui/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>AITokenPool</title>
<link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'%3E%3Cdefs%3E%3ClinearGradient id='g' x1='0' y1='0' x2='1' y2='1'%3E%3Cstop offset='0' stop-color='%234ecdc4'/%3E%3Cstop offset='1' stop-color='%232a9d8f'/%3E%3C/linearGradient%3E%3C/defs%3E%3Crect width='64' height='64' rx='14' fill='url(%23g)'/%3E%3Ctext x='32' y='43' font-family='-apple-system,Segoe UI,Arial,sans-serif' font-size='30' font-weight='800' text-anchor='middle' fill='%23062021'%3EAT%3C/text%3E%3C/svg%3E">
<link rel="stylesheet" href="css/style.css?v=20260824-7">
<link rel="stylesheet" href="css/style.css?v=20260824-8">
</head>
<body>

Expand DownExpand Up@@ -683,9 +683,9 @@ <h3 id="chat-title">使用模型</h3>
</div>
</div>

<script src="js/api.js?v=20260824-7"></script>
<script src="js/data.js?v=20260824-7"></script>
<script src="js/i18n.js?v=20260824-7"></script>
<script src="js/app.js?v=20260824-7"></script>
<script src="js/api.js?v=20260824-8"></script>
<script src="js/data.js?v=20260824-8"></script>
<script src="js/i18n.js?v=20260824-8"></script>
<script src="js/app.js?v=20260824-8"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions ui/js/app.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@
name: k.name || T("common.unnamed"),
key: k.key,
created: String(k.created_at || "").slice(0, 10),
last: T("settings.ak.last.never"),
last: k.last_used || null, // rant 2026-08-24T12:41:25:真实最近使用时间(NULL=从未使用)
status: k.status || "active",
}));
} else {
Expand All@@ -1734,7 +1734,7 @@
"<tr><td data-label='名字'><strong>" + hl(k.name, rawQ) + "</strong></td>" +
"<td data-label='Key'><code>" + esc(Live.apiKeys ? k.key : "") + "</code></td>" +
"<td data-label='创建时间'>" + esc(k.created) + "</td>" +
"<td data-label='最近使用'>" + timeCell(k.last) + "</td>" +
"<td data-label='最近使用'>" + (k.last ? timeCell(k.last) : esc(T("settings.ak.last.never"))) + "</td>" +
"<td data-label='状态'>" + (k.status === "active" ? '<span class="badge ok">' + T("settings.ak.status.active") + "</span>" : '<span class="badge dim">' + esc(k.status || "—") + "</span>") + "</td>" +
"<td data-label='操作'><button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-copy='" + i + "'>" + T("settings.ak.copy") + "</button> " +
"<button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-rename='" + i + "'>" + T("settings.ak.rename") + "</button> " +
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat(api-keys): return real last_used in list + render in settings (rant 2026-08-24T12:41:25) by argszero · Pull Request #140 · argszero/aitokenpool · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/dao.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,21 +74,24 @@ pub fn create_api_key(conn: &Connection, user_id: i64, name: &str) -> Result<Str
}

/// 列出用户的 API Key(key 值脱敏;P2-B 起只列 active,revoked 不再显示)
/// rant 2026-08-24T12:41:25:返回 last_used(网关 Bearer 鉴权时 touch_api_key 维护,NULL=从未使用)
pub fn list_api_keys(conn: &Connection, user_id: i64) -> Result<Vec<serde_json::Value>> {
let mut stmt = conn.prepare(
"SELECT id, key_value, name, status, created_at FROM api_keys \
"SELECT id, key_value, name, status, created_at, last_used FROM api_keys \
WHERE user_id = ?1 AND status = 'active' ORDER BY id DESC",
)?;
let rows = stmt.query_map([user_id], |r| {
let raw: String = r.get(1)?;
let created_at: String = r.get(4)?;
let last_used: Option<String> = r.get(5)?;
Ok(serde_json::json!({
"id": r.get::<_, i64>(0)?,
"key": auth::mask_api_key(&raw),
"full_key": raw, // 属主可见完整值(前端展示仍用脱敏 key,复制时用 full_key)
"name": r.get::<_, String>(2)?,
"status": r.get::<_, String>(3)?,
"created_at": utc_iso(&created_at),
"last_used": last_used.as_deref().map(utc_iso),
}))
})?;
let mut out = Vec::new();
Expand Down
14 changes: 14 additions & 0 deletions src/routes/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -749,6 +749,20 @@ mod tests {
arr.iter().any(|k| k["full_key"] == new_key),
"列表含新生成 key 的完整值 full_key"
);
// rant 2026-08-24T12:41:25:列表返回 last_used(新 key 未使用 → null;用过 → 时间串)
assert!(
arr.iter().all(|k| k["last_used"].is_null()
|| k["last_used"]
.as_str()
.map(|s| !s.is_empty())
.unwrap_or(false)),
"last_used 字段存在且为 null(未用)或时间串(已用)"
);
assert!(
arr.iter()
.any(|k| k["full_key"] == new_key && k["last_used"].is_null()),
"新生成且未调用的 key last_used 应为 null"
);
assert!(
arr.iter().all(|k| {
k["full_key"]
Expand Down
10 changes: 5 additions & 5 deletions ui/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>AITokenPool</title>
<link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'%3E%3Cdefs%3E%3ClinearGradient id='g' x1='0' y1='0' x2='1' y2='1'%3E%3Cstop offset='0' stop-color='%234ecdc4'/%3E%3Cstop offset='1' stop-color='%232a9d8f'/%3E%3C/linearGradient%3E%3C/defs%3E%3Crect width='64' height='64' rx='14' fill='url(%23g)'/%3E%3Ctext x='32' y='43' font-family='-apple-system,Segoe UI,Arial,sans-serif' font-size='30' font-weight='800' text-anchor='middle' fill='%23062021'%3EAT%3C/text%3E%3C/svg%3E">
<link rel="stylesheet" href="css/style.css?v=20260824-7">
<link rel="stylesheet" href="css/style.css?v=20260824-8">
</head>
<body>

Expand DownExpand Up@@ -683,9 +683,9 @@ <h3 id="chat-title">使用模型</h3>
</div>
</div>

<script src="js/api.js?v=20260824-7"></script>
<script src="js/data.js?v=20260824-7"></script>
<script src="js/i18n.js?v=20260824-7"></script>
<script src="js/app.js?v=20260824-7"></script>
<script src="js/api.js?v=20260824-8"></script>
<script src="js/data.js?v=20260824-8"></script>
<script src="js/i18n.js?v=20260824-8"></script>
<script src="js/app.js?v=20260824-8"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions ui/js/app.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@
name: k.name || T("common.unnamed"),
key: k.key,
created: String(k.created_at || "").slice(0, 10),
last: T("settings.ak.last.never"),
last: k.last_used || null, // rant 2026-08-24T12:41:25:真实最近使用时间(NULL=从未使用)
status: k.status || "active",
}));
} else {
Expand All@@ -1734,7 +1734,7 @@
"<tr><td data-label='名字'><strong>" + hl(k.name, rawQ) + "</strong></td>" +
"<td data-label='Key'><code>" + esc(Live.apiKeys ? k.key : "") + "</code></td>" +
"<td data-label='创建时间'>" + esc(k.created) + "</td>" +
"<td data-label='最近使用'>" + timeCell(k.last) + "</td>" +
"<td data-label='最近使用'>" + (k.last ? timeCell(k.last) : esc(T("settings.ak.last.never"))) + "</td>" +
"<td data-label='状态'>" + (k.status === "active" ? '<span class="badge ok">' + T("settings.ak.status.active") + "</span>" : '<span class="badge dim">' + esc(k.status || "—") + "</span>") + "</td>" +
"<td data-label='操作'><button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-copy='" + i + "'>" + T("settings.ak.copy") + "</button> " +
"<button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-rename='" + i + "'>" + T("settings.ak.rename") + "</button> " +
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(api-keys): return real last_used in list + render in settings (rant 2026-08-24T12:41:25) by argszero · Pull Request #140 · argszero/aitokenpool · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/dao.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,21 +74,24 @@ pub fn create_api_key(conn: &Connection, user_id: i64, name: &str) -> Result<Str
}

/// 列出用户的 API Key(key 值脱敏;P2-B 起只列 active,revoked 不再显示)
/// rant 2026-08-24T12:41:25:返回 last_used(网关 Bearer 鉴权时 touch_api_key 维护,NULL=从未使用)
pub fn list_api_keys(conn: &Connection, user_id: i64) -> Result<Vec<serde_json::Value>> {
let mut stmt = conn.prepare(
"SELECT id, key_value, name, status, created_at FROM api_keys \
"SELECT id, key_value, name, status, created_at, last_used FROM api_keys \
WHERE user_id = ?1 AND status = 'active' ORDER BY id DESC",
)?;
let rows = stmt.query_map([user_id], |r| {
let raw: String = r.get(1)?;
let created_at: String = r.get(4)?;
let last_used: Option<String> = r.get(5)?;
Ok(serde_json::json!({
"id": r.get::<_, i64>(0)?,
"key": auth::mask_api_key(&raw),
"full_key": raw, // 属主可见完整值(前端展示仍用脱敏 key,复制时用 full_key)
"name": r.get::<_, String>(2)?,
"status": r.get::<_, String>(3)?,
"created_at": utc_iso(&created_at),
"last_used": last_used.as_deref().map(utc_iso),
}))
})?;
let mut out = Vec::new();
Expand Down
14 changes: 14 additions & 0 deletions src/routes/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -749,6 +749,20 @@ mod tests {
arr.iter().any(|k| k["full_key"] == new_key),
"列表含新生成 key 的完整值 full_key"
);
// rant 2026-08-24T12:41:25:列表返回 last_used(新 key 未使用 → null;用过 → 时间串)
assert!(
arr.iter().all(|k| k["last_used"].is_null()
|| k["last_used"]
.as_str()
.map(|s| !s.is_empty())
.unwrap_or(false)),
"last_used 字段存在且为 null(未用)或时间串(已用)"
);
assert!(
arr.iter()
.any(|k| k["full_key"] == new_key && k["last_used"].is_null()),
"新生成且未调用的 key last_used 应为 null"
);
assert!(
arr.iter().all(|k| {
k["full_key"]
Expand Down
10 changes: 5 additions & 5 deletions ui/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>AITokenPool</title>
<link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'%3E%3Cdefs%3E%3ClinearGradient id='g' x1='0' y1='0' x2='1' y2='1'%3E%3Cstop offset='0' stop-color='%234ecdc4'/%3E%3Cstop offset='1' stop-color='%232a9d8f'/%3E%3C/linearGradient%3E%3C/defs%3E%3Crect width='64' height='64' rx='14' fill='url(%23g)'/%3E%3Ctext x='32' y='43' font-family='-apple-system,Segoe UI,Arial,sans-serif' font-size='30' font-weight='800' text-anchor='middle' fill='%23062021'%3EAT%3C/text%3E%3C/svg%3E">
<link rel="stylesheet" href="css/style.css?v=20260824-7">
<link rel="stylesheet" href="css/style.css?v=20260824-8">
</head>
<body>

Expand DownExpand Up@@ -683,9 +683,9 @@ <h3 id="chat-title">使用模型</h3>
</div>
</div>

<script src="js/api.js?v=20260824-7"></script>
<script src="js/data.js?v=20260824-7"></script>
<script src="js/i18n.js?v=20260824-7"></script>
<script src="js/app.js?v=20260824-7"></script>
<script src="js/api.js?v=20260824-8"></script>
<script src="js/data.js?v=20260824-8"></script>
<script src="js/i18n.js?v=20260824-8"></script>
<script src="js/app.js?v=20260824-8"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions ui/js/app.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@
name: k.name || T("common.unnamed"),
key: k.key,
created: String(k.created_at || "").slice(0, 10),
last: T("settings.ak.last.never"),
last: k.last_used || null, // rant 2026-08-24T12:41:25:真实最近使用时间(NULL=从未使用)
status: k.status || "active",
}));
} else {
Expand All@@ -1734,7 +1734,7 @@
"<tr><td data-label='名字'><strong>" + hl(k.name, rawQ) + "</strong></td>" +
"<td data-label='Key'><code>" + esc(Live.apiKeys ? k.key : "") + "</code></td>" +
"<td data-label='创建时间'>" + esc(k.created) + "</td>" +
"<td data-label='最近使用'>" + timeCell(k.last) + "</td>" +
"<td data-label='最近使用'>" + (k.last ? timeCell(k.last) : esc(T("settings.ak.last.never"))) + "</td>" +
"<td data-label='状态'>" + (k.status === "active" ? '<span class="badge ok">' + T("settings.ak.status.active") + "</span>" : '<span class="badge dim">' + esc(k.status || "—") + "</span>") + "</td>" +
"<td data-label='操作'><button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-copy='" + i + "'>" + T("settings.ak.copy") + "</button> " +
"<button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-rename='" + i + "'>" + T("settings.ak.rename") + "</button> " +
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(api-keys): return real last_used in list + render in settings (rant 2026-08-24T12:41:25) by argszero · Pull Request #140 · argszero/aitokenpool · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/dao.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,21 +74,24 @@ pub fn create_api_key(conn: &Connection, user_id: i64, name: &str) -> Result<Str
}

/// 列出用户的 API Key(key 值脱敏;P2-B 起只列 active,revoked 不再显示)
/// rant 2026-08-24T12:41:25:返回 last_used(网关 Bearer 鉴权时 touch_api_key 维护,NULL=从未使用)
pub fn list_api_keys(conn: &Connection, user_id: i64) -> Result<Vec<serde_json::Value>> {
let mut stmt = conn.prepare(
"SELECT id, key_value, name, status, created_at FROM api_keys \
"SELECT id, key_value, name, status, created_at, last_used FROM api_keys \
WHERE user_id = ?1 AND status = 'active' ORDER BY id DESC",
)?;
let rows = stmt.query_map([user_id], |r| {
let raw: String = r.get(1)?;
let created_at: String = r.get(4)?;
let last_used: Option<String> = r.get(5)?;
Ok(serde_json::json!({
"id": r.get::<_, i64>(0)?,
"key": auth::mask_api_key(&raw),
"full_key": raw, // 属主可见完整值(前端展示仍用脱敏 key,复制时用 full_key)
"name": r.get::<_, String>(2)?,
"status": r.get::<_, String>(3)?,
"created_at": utc_iso(&created_at),
"last_used": last_used.as_deref().map(utc_iso),
}))
})?;
let mut out = Vec::new();
Expand Down
14 changes: 14 additions & 0 deletions src/routes/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -749,6 +749,20 @@ mod tests {
arr.iter().any(|k| k["full_key"] == new_key),
"列表含新生成 key 的完整值 full_key"
);
// rant 2026-08-24T12:41:25:列表返回 last_used(新 key 未使用 → null;用过 → 时间串)
assert!(
arr.iter().all(|k| k["last_used"].is_null()
|| k["last_used"]
.as_str()
.map(|s| !s.is_empty())
.unwrap_or(false)),
"last_used 字段存在且为 null(未用)或时间串(已用)"
);
assert!(
arr.iter()
.any(|k| k["full_key"] == new_key && k["last_used"].is_null()),
"新生成且未调用的 key last_used 应为 null"
);
assert!(
arr.iter().all(|k| {
k["full_key"]
Expand Down
10 changes: 5 additions & 5 deletions ui/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>AITokenPool</title>
<link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'%3E%3Cdefs%3E%3ClinearGradient id='g' x1='0' y1='0' x2='1' y2='1'%3E%3Cstop offset='0' stop-color='%234ecdc4'/%3E%3Cstop offset='1' stop-color='%232a9d8f'/%3E%3C/linearGradient%3E%3C/defs%3E%3Crect width='64' height='64' rx='14' fill='url(%23g)'/%3E%3Ctext x='32' y='43' font-family='-apple-system,Segoe UI,Arial,sans-serif' font-size='30' font-weight='800' text-anchor='middle' fill='%23062021'%3EAT%3C/text%3E%3C/svg%3E">
<link rel="stylesheet" href="css/style.css?v=20260824-7">
<link rel="stylesheet" href="css/style.css?v=20260824-8">
</head>
<body>

Expand DownExpand Up@@ -683,9 +683,9 @@ <h3 id="chat-title">使用模型</h3>
</div>
</div>

<script src="js/api.js?v=20260824-7"></script>
<script src="js/data.js?v=20260824-7"></script>
<script src="js/i18n.js?v=20260824-7"></script>
<script src="js/app.js?v=20260824-7"></script>
<script src="js/api.js?v=20260824-8"></script>
<script src="js/data.js?v=20260824-8"></script>
<script src="js/i18n.js?v=20260824-8"></script>
<script src="js/app.js?v=20260824-8"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions ui/js/app.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@
name: k.name || T("common.unnamed"),
key: k.key,
created: String(k.created_at || "").slice(0, 10),
last: T("settings.ak.last.never"),
last: k.last_used || null, // rant 2026-08-24T12:41:25:真实最近使用时间(NULL=从未使用)
status: k.status || "active",
}));
} else {
Expand All@@ -1734,7 +1734,7 @@
"<tr><td data-label='名字'><strong>" + hl(k.name, rawQ) + "</strong></td>" +
"<td data-label='Key'><code>" + esc(Live.apiKeys ? k.key : "") + "</code></td>" +
"<td data-label='创建时间'>" + esc(k.created) + "</td>" +
"<td data-label='最近使用'>" + timeCell(k.last) + "</td>" +
"<td data-label='最近使用'>" + (k.last ? timeCell(k.last) : esc(T("settings.ak.last.never"))) + "</td>" +
"<td data-label='状态'>" + (k.status === "active" ? '<span class="badge ok">' + T("settings.ak.status.active") + "</span>" : '<span class="badge dim">' + esc(k.status || "—") + "</span>") + "</td>" +
"<td data-label='操作'><button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-copy='" + i + "'>" + T("settings.ak.copy") + "</button> " +
"<button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-rename='" + i + "'>" + T("settings.ak.rename") + "</button> " +
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat(api-keys): return real last_used in list + render in settings (rant 2026-08-24T12:41:25) by argszero · Pull Request #140 · argszero/aitokenpool · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/dao.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,21 +74,24 @@ pub fn create_api_key(conn: &Connection, user_id: i64, name: &str) -> Result<Str
}

/// 列出用户的 API Key(key 值脱敏;P2-B 起只列 active,revoked 不再显示)
/// rant 2026-08-24T12:41:25:返回 last_used(网关 Bearer 鉴权时 touch_api_key 维护,NULL=从未使用)
pub fn list_api_keys(conn: &Connection, user_id: i64) -> Result<Vec<serde_json::Value>> {
let mut stmt = conn.prepare(
"SELECT id, key_value, name, status, created_at FROM api_keys \
"SELECT id, key_value, name, status, created_at, last_used FROM api_keys \
WHERE user_id = ?1 AND status = 'active' ORDER BY id DESC",
)?;
let rows = stmt.query_map([user_id], |r| {
let raw: String = r.get(1)?;
let created_at: String = r.get(4)?;
let last_used: Option<String> = r.get(5)?;
Ok(serde_json::json!({
"id": r.get::<_, i64>(0)?,
"key": auth::mask_api_key(&raw),
"full_key": raw, // 属主可见完整值(前端展示仍用脱敏 key,复制时用 full_key)
"name": r.get::<_, String>(2)?,
"status": r.get::<_, String>(3)?,
"created_at": utc_iso(&created_at),
"last_used": last_used.as_deref().map(utc_iso),
}))
})?;
let mut out = Vec::new();
Expand Down
14 changes: 14 additions & 0 deletions src/routes/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -749,6 +749,20 @@ mod tests {
arr.iter().any(|k| k["full_key"] == new_key),
"列表含新生成 key 的完整值 full_key"
);
// rant 2026-08-24T12:41:25:列表返回 last_used(新 key 未使用 → null;用过 → 时间串)
assert!(
arr.iter().all(|k| k["last_used"].is_null()
|| k["last_used"]
.as_str()
.map(|s| !s.is_empty())
.unwrap_or(false)),
"last_used 字段存在且为 null(未用)或时间串(已用)"
);
assert!(
arr.iter()
.any(|k| k["full_key"] == new_key && k["last_used"].is_null()),
"新生成且未调用的 key last_used 应为 null"
);
assert!(
arr.iter().all(|k| {
k["full_key"]
Expand Down
10 changes: 5 additions & 5 deletions ui/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>AITokenPool</title>
<link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'%3E%3Cdefs%3E%3ClinearGradient id='g' x1='0' y1='0' x2='1' y2='1'%3E%3Cstop offset='0' stop-color='%234ecdc4'/%3E%3Cstop offset='1' stop-color='%232a9d8f'/%3E%3C/linearGradient%3E%3C/defs%3E%3Crect width='64' height='64' rx='14' fill='url(%23g)'/%3E%3Ctext x='32' y='43' font-family='-apple-system,Segoe UI,Arial,sans-serif' font-size='30' font-weight='800' text-anchor='middle' fill='%23062021'%3EAT%3C/text%3E%3C/svg%3E">
<link rel="stylesheet" href="css/style.css?v=20260824-7">
<link rel="stylesheet" href="css/style.css?v=20260824-8">
</head>
<body>

Expand DownExpand Up@@ -683,9 +683,9 @@ <h3 id="chat-title">使用模型</h3>
</div>
</div>

<script src="js/api.js?v=20260824-7"></script>
<script src="js/data.js?v=20260824-7"></script>
<script src="js/i18n.js?v=20260824-7"></script>
<script src="js/app.js?v=20260824-7"></script>
<script src="js/api.js?v=20260824-8"></script>
<script src="js/data.js?v=20260824-8"></script>
<script src="js/i18n.js?v=20260824-8"></script>
<script src="js/app.js?v=20260824-8"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions ui/js/app.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@
name: k.name || T("common.unnamed"),
key: k.key,
created: String(k.created_at || "").slice(0, 10),
last: T("settings.ak.last.never"),
last: k.last_used || null, // rant 2026-08-24T12:41:25:真实最近使用时间(NULL=从未使用)
status: k.status || "active",
}));
} else {
Expand All@@ -1734,7 +1734,7 @@
"<tr><td data-label='名字'><strong>" + hl(k.name, rawQ) + "</strong></td>" +
"<td data-label='Key'><code>" + esc(Live.apiKeys ? k.key : "") + "</code></td>" +
"<td data-label='创建时间'>" + esc(k.created) + "</td>" +
"<td data-label='最近使用'>" + timeCell(k.last) + "</td>" +
"<td data-label='最近使用'>" + (k.last ? timeCell(k.last) : esc(T("settings.ak.last.never"))) + "</td>" +
"<td data-label='状态'>" + (k.status === "active" ? '<span class="badge ok">' + T("settings.ak.status.active") + "</span>" : '<span class="badge dim">' + esc(k.status || "—") + "</span>") + "</td>" +
"<td data-label='操作'><button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-copy='" + i + "'>" + T("settings.ak.copy") + "</button> " +
"<button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-rename='" + i + "'>" + T("settings.ak.rename") + "</button> " +
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(api-keys): return real last_used in list + render in settings (rant 2026-08-24T12:41:25) by argszero · Pull Request #140 · argszero/aitokenpool · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/dao.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,21 +74,24 @@ pub fn create_api_key(conn: &Connection, user_id: i64, name: &str) -> Result<Str
}

/// 列出用户的 API Key(key 值脱敏;P2-B 起只列 active,revoked 不再显示)
/// rant 2026-08-24T12:41:25:返回 last_used(网关 Bearer 鉴权时 touch_api_key 维护,NULL=从未使用)
pub fn list_api_keys(conn: &Connection, user_id: i64) -> Result<Vec<serde_json::Value>> {
let mut stmt = conn.prepare(
"SELECT id, key_value, name, status, created_at FROM api_keys \
"SELECT id, key_value, name, status, created_at, last_used FROM api_keys \
WHERE user_id = ?1 AND status = 'active' ORDER BY id DESC",
)?;
let rows = stmt.query_map([user_id], |r| {
let raw: String = r.get(1)?;
let created_at: String = r.get(4)?;
let last_used: Option<String> = r.get(5)?;
Ok(serde_json::json!({
"id": r.get::<_, i64>(0)?,
"key": auth::mask_api_key(&raw),
"full_key": raw, // 属主可见完整值(前端展示仍用脱敏 key,复制时用 full_key)
"name": r.get::<_, String>(2)?,
"status": r.get::<_, String>(3)?,
"created_at": utc_iso(&created_at),
"last_used": last_used.as_deref().map(utc_iso),
}))
})?;
let mut out = Vec::new();
Expand Down
14 changes: 14 additions & 0 deletions src/routes/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -749,6 +749,20 @@ mod tests {
arr.iter().any(|k| k["full_key"] == new_key),
"列表含新生成 key 的完整值 full_key"
);
// rant 2026-08-24T12:41:25:列表返回 last_used(新 key 未使用 → null;用过 → 时间串)
assert!(
arr.iter().all(|k| k["last_used"].is_null()
|| k["last_used"]
.as_str()
.map(|s| !s.is_empty())
.unwrap_or(false)),
"last_used 字段存在且为 null(未用)或时间串(已用)"
);
assert!(
arr.iter()
.any(|k| k["full_key"] == new_key && k["last_used"].is_null()),
"新生成且未调用的 key last_used 应为 null"
);
assert!(
arr.iter().all(|k| {
k["full_key"]
Expand Down
10 changes: 5 additions & 5 deletions ui/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>AITokenPool</title>
<link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'%3E%3Cdefs%3E%3ClinearGradient id='g' x1='0' y1='0' x2='1' y2='1'%3E%3Cstop offset='0' stop-color='%234ecdc4'/%3E%3Cstop offset='1' stop-color='%232a9d8f'/%3E%3C/linearGradient%3E%3C/defs%3E%3Crect width='64' height='64' rx='14' fill='url(%23g)'/%3E%3Ctext x='32' y='43' font-family='-apple-system,Segoe UI,Arial,sans-serif' font-size='30' font-weight='800' text-anchor='middle' fill='%23062021'%3EAT%3C/text%3E%3C/svg%3E">
<link rel="stylesheet" href="css/style.css?v=20260824-7">
<link rel="stylesheet" href="css/style.css?v=20260824-8">
</head>
<body>

Expand DownExpand Up@@ -683,9 +683,9 @@ <h3 id="chat-title">使用模型</h3>
</div>
</div>

<script src="js/api.js?v=20260824-7"></script>
<script src="js/data.js?v=20260824-7"></script>
<script src="js/i18n.js?v=20260824-7"></script>
<script src="js/app.js?v=20260824-7"></script>
<script src="js/api.js?v=20260824-8"></script>
<script src="js/data.js?v=20260824-8"></script>
<script src="js/i18n.js?v=20260824-8"></script>
<script src="js/app.js?v=20260824-8"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions ui/js/app.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@
name: k.name || T("common.unnamed"),
key: k.key,
created: String(k.created_at || "").slice(0, 10),
last: T("settings.ak.last.never"),
last: k.last_used || null, // rant 2026-08-24T12:41:25:真实最近使用时间(NULL=从未使用)
status: k.status || "active",
}));
} else {
Expand All@@ -1734,7 +1734,7 @@
"<tr><td data-label='名字'><strong>" + hl(k.name, rawQ) + "</strong></td>" +
"<td data-label='Key'><code>" + esc(Live.apiKeys ? k.key : "") + "</code></td>" +
"<td data-label='创建时间'>" + esc(k.created) + "</td>" +
"<td data-label='最近使用'>" + timeCell(k.last) + "</td>" +
"<td data-label='最近使用'>" + (k.last ? timeCell(k.last) : esc(T("settings.ak.last.never"))) + "</td>" +
"<td data-label='状态'>" + (k.status === "active" ? '<span class="badge ok">' + T("settings.ak.status.active") + "</span>" : '<span class="badge dim">' + esc(k.status || "—") + "</span>") + "</td>" +
"<td data-label='操作'><button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-copy='" + i + "'>" + T("settings.ak.copy") + "</button> " +
"<button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-rename='" + i + "'>" + T("settings.ak.rename") + "</button> " +
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(api-keys): return real last_used in list + render in settings (rant 2026-08-24T12:41:25) by argszero · Pull Request #140 · argszero/aitokenpool · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/dao.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,21 +74,24 @@ pub fn create_api_key(conn: &Connection, user_id: i64, name: &str) -> Result<Str
}

/// 列出用户的 API Key(key 值脱敏;P2-B 起只列 active,revoked 不再显示)
/// rant 2026-08-24T12:41:25:返回 last_used(网关 Bearer 鉴权时 touch_api_key 维护,NULL=从未使用)
pub fn list_api_keys(conn: &Connection, user_id: i64) -> Result<Vec<serde_json::Value>> {
let mut stmt = conn.prepare(
"SELECT id, key_value, name, status, created_at FROM api_keys \
"SELECT id, key_value, name, status, created_at, last_used FROM api_keys \
WHERE user_id = ?1 AND status = 'active' ORDER BY id DESC",
)?;
let rows = stmt.query_map([user_id], |r| {
let raw: String = r.get(1)?;
let created_at: String = r.get(4)?;
let last_used: Option<String> = r.get(5)?;
Ok(serde_json::json!({
"id": r.get::<_, i64>(0)?,
"key": auth::mask_api_key(&raw),
"full_key": raw, // 属主可见完整值(前端展示仍用脱敏 key,复制时用 full_key)
"name": r.get::<_, String>(2)?,
"status": r.get::<_, String>(3)?,
"created_at": utc_iso(&created_at),
"last_used": last_used.as_deref().map(utc_iso),
}))
})?;
let mut out = Vec::new();
Expand Down
14 changes: 14 additions & 0 deletions src/routes/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -749,6 +749,20 @@ mod tests {
arr.iter().any(|k| k["full_key"] == new_key),
"列表含新生成 key 的完整值 full_key"
);
// rant 2026-08-24T12:41:25:列表返回 last_used(新 key 未使用 → null;用过 → 时间串)
assert!(
arr.iter().all(|k| k["last_used"].is_null()
|| k["last_used"]
.as_str()
.map(|s| !s.is_empty())
.unwrap_or(false)),
"last_used 字段存在且为 null(未用)或时间串(已用)"
);
assert!(
arr.iter()
.any(|k| k["full_key"] == new_key && k["last_used"].is_null()),
"新生成且未调用的 key last_used 应为 null"
);
assert!(
arr.iter().all(|k| {
k["full_key"]
Expand Down
10 changes: 5 additions & 5 deletions ui/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>AITokenPool</title>
<link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'%3E%3Cdefs%3E%3ClinearGradient id='g' x1='0' y1='0' x2='1' y2='1'%3E%3Cstop offset='0' stop-color='%234ecdc4'/%3E%3Cstop offset='1' stop-color='%232a9d8f'/%3E%3C/linearGradient%3E%3C/defs%3E%3Crect width='64' height='64' rx='14' fill='url(%23g)'/%3E%3Ctext x='32' y='43' font-family='-apple-system,Segoe UI,Arial,sans-serif' font-size='30' font-weight='800' text-anchor='middle' fill='%23062021'%3EAT%3C/text%3E%3C/svg%3E">
<link rel="stylesheet" href="css/style.css?v=20260824-7">
<link rel="stylesheet" href="css/style.css?v=20260824-8">
</head>
<body>

Expand DownExpand Up@@ -683,9 +683,9 @@ <h3 id="chat-title">使用模型</h3>
</div>
</div>

<script src="js/api.js?v=20260824-7"></script>
<script src="js/data.js?v=20260824-7"></script>
<script src="js/i18n.js?v=20260824-7"></script>
<script src="js/app.js?v=20260824-7"></script>
<script src="js/api.js?v=20260824-8"></script>
<script src="js/data.js?v=20260824-8"></script>
<script src="js/i18n.js?v=20260824-8"></script>
<script src="js/app.js?v=20260824-8"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions ui/js/app.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@
name: k.name || T("common.unnamed"),
key: k.key,
created: String(k.created_at || "").slice(0, 10),
last: T("settings.ak.last.never"),
last: k.last_used || null, // rant 2026-08-24T12:41:25:真实最近使用时间(NULL=从未使用)
status: k.status || "active",
}));
} else {
Expand All@@ -1734,7 +1734,7 @@
"<tr><td data-label='名字'><strong>" + hl(k.name, rawQ) + "</strong></td>" +
"<td data-label='Key'><code>" + esc(Live.apiKeys ? k.key : "") + "</code></td>" +
"<td data-label='创建时间'>" + esc(k.created) + "</td>" +
"<td data-label='最近使用'>" + timeCell(k.last) + "</td>" +
"<td data-label='最近使用'>" + (k.last ? timeCell(k.last) : esc(T("settings.ak.last.never"))) + "</td>" +
"<td data-label='状态'>" + (k.status === "active" ? '<span class="badge ok">' + T("settings.ak.status.active") + "</span>" : '<span class="badge dim">' + esc(k.status || "—") + "</span>") + "</td>" +
"<td data-label='操作'><button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-copy='" + i + "'>" + T("settings.ak.copy") + "</button> " +
"<button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-rename='" + i + "'>" + T("settings.ak.rename") + "</button> " +
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); feat(api-keys): return real last_used in list + render in settings (rant 2026-08-24T12:41:25) by argszero · Pull Request #140 · argszero/aitokenpool · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/dao.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,21 +74,24 @@ pub fn create_api_key(conn: &Connection, user_id: i64, name: &str) -> Result<Str
}

/// 列出用户的 API Key(key 值脱敏;P2-B 起只列 active,revoked 不再显示)
/// rant 2026-08-24T12:41:25:返回 last_used(网关 Bearer 鉴权时 touch_api_key 维护,NULL=从未使用)
pub fn list_api_keys(conn: &Connection, user_id: i64) -> Result<Vec<serde_json::Value>> {
let mut stmt = conn.prepare(
"SELECT id, key_value, name, status, created_at FROM api_keys \
"SELECT id, key_value, name, status, created_at, last_used FROM api_keys \
WHERE user_id = ?1 AND status = 'active' ORDER BY id DESC",
)?;
let rows = stmt.query_map([user_id], |r| {
let raw: String = r.get(1)?;
let created_at: String = r.get(4)?;
let last_used: Option<String> = r.get(5)?;
Ok(serde_json::json!({
"id": r.get::<_, i64>(0)?,
"key": auth::mask_api_key(&raw),
"full_key": raw, // 属主可见完整值(前端展示仍用脱敏 key,复制时用 full_key)
"name": r.get::<_, String>(2)?,
"status": r.get::<_, String>(3)?,
"created_at": utc_iso(&created_at),
"last_used": last_used.as_deref().map(utc_iso),
}))
})?;
let mut out = Vec::new();
Expand Down
14 changes: 14 additions & 0 deletions src/routes/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -749,6 +749,20 @@ mod tests {
arr.iter().any(|k| k["full_key"] == new_key),
"列表含新生成 key 的完整值 full_key"
);
// rant 2026-08-24T12:41:25:列表返回 last_used(新 key 未使用 → null;用过 → 时间串)
assert!(
arr.iter().all(|k| k["last_used"].is_null()
|| k["last_used"]
.as_str()
.map(|s| !s.is_empty())
.unwrap_or(false)),
"last_used 字段存在且为 null(未用)或时间串(已用)"
);
assert!(
arr.iter()
.any(|k| k["full_key"] == new_key && k["last_used"].is_null()),
"新生成且未调用的 key last_used 应为 null"
);
assert!(
arr.iter().all(|k| {
k["full_key"]
Expand Down
10 changes: 5 additions & 5 deletions ui/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>AITokenPool</title>
<link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'%3E%3Cdefs%3E%3ClinearGradient id='g' x1='0' y1='0' x2='1' y2='1'%3E%3Cstop offset='0' stop-color='%234ecdc4'/%3E%3Cstop offset='1' stop-color='%232a9d8f'/%3E%3C/linearGradient%3E%3C/defs%3E%3Crect width='64' height='64' rx='14' fill='url(%23g)'/%3E%3Ctext x='32' y='43' font-family='-apple-system,Segoe UI,Arial,sans-serif' font-size='30' font-weight='800' text-anchor='middle' fill='%23062021'%3EAT%3C/text%3E%3C/svg%3E">
<link rel="stylesheet" href="css/style.css?v=20260824-7">
<link rel="stylesheet" href="css/style.css?v=20260824-8">
</head>
<body>

Expand DownExpand Up@@ -683,9 +683,9 @@ <h3 id="chat-title">使用模型</h3>
</div>
</div>

<script src="js/api.js?v=20260824-7"></script>
<script src="js/data.js?v=20260824-7"></script>
<script src="js/i18n.js?v=20260824-7"></script>
<script src="js/app.js?v=20260824-7"></script>
<script src="js/api.js?v=20260824-8"></script>
<script src="js/data.js?v=20260824-8"></script>
<script src="js/i18n.js?v=20260824-8"></script>
<script src="js/app.js?v=20260824-8"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions ui/js/app.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,7 +1723,7 @@
name: k.name || T("common.unnamed"),
key: k.key,
created: String(k.created_at || "").slice(0, 10),
last: T("settings.ak.last.never"),
last: k.last_used || null, // rant 2026-08-24T12:41:25:真实最近使用时间(NULL=从未使用)
status: k.status || "active",
}));
} else {
Expand All@@ -1734,7 +1734,7 @@
"<tr><td data-label='名字'><strong>" + hl(k.name, rawQ) + "</strong></td>" +
"<td data-label='Key'><code>" + esc(Live.apiKeys ? k.key : "") + "</code></td>" +
"<td data-label='创建时间'>" + esc(k.created) + "</td>" +
"<td data-label='最近使用'>" + timeCell(k.last) + "</td>" +
"<td data-label='最近使用'>" + (k.last ? timeCell(k.last) : esc(T("settings.ak.last.never"))) + "</td>" +
"<td data-label='状态'>" + (k.status === "active" ? '<span class="badge ok">' + T("settings.ak.status.active") + "</span>" : '<span class="badge dim">' + esc(k.status || "—") + "</span>") + "</td>" +
"<td data-label='操作'><button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-copy='" + i + "'>" + T("settings.ak.copy") + "</button> " +
"<button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-rename='" + i + "'>" + T("settings.ak.rename") + "</button> " +
Expand Down
Loading