From a7244c4eb2de336993932b1435679a6dec690201 Mon Sep 17 00:00:00 2001 From: Zyy Date: Fri, 26 Jun 2026 18:40:20 +0800 Subject: [PATCH] feat: refine account management UI Co-authored-by: Codex --- src/admin/accounts/routes.rs | 97 +-- src/admin/accounts/service/lifecycle.rs | 49 ++ src/admin/accounts/service/mod.rs | 4 +- src/admin/accounts/service/types.rs | 23 + src/upstream/accounts/store.rs | 68 ++ tests/admin/accounts/lifecycle.rs | 33 + web/src/api/modules/accounts.ts | 49 +- web/src/components/base/BaseCard.vue | 30 +- web/src/components/base/BasePopover.vue | 175 +++++ web/src/components/base/BaseScrollbar.vue | 14 + web/src/layout/components/AppSidebar.vue | 4 +- web/src/layout/index.vue | 16 +- web/src/views/accounts/AccountsView.vue | 728 +++++++++++++++--- web/src/views/dashboard/DashboardView.vue | 18 +- .../dashboard/components/EventLogCard.vue | 3 +- .../components/RequestHealthTimelineCard.vue | 8 +- .../dashboard/components/RequestTrendCard.vue | 5 +- .../dashboard/composables/useDashboard.ts | 17 +- 18 files changed, 1146 insertions(+), 195 deletions(-) create mode 100644 web/src/components/base/BasePopover.vue diff --git a/src/admin/accounts/routes.rs b/src/admin/accounts/routes.rs index 9fdfe6db3..787fafd17 100644 --- a/src/admin/accounts/routes.rs +++ b/src/admin/accounts/routes.rs @@ -18,7 +18,7 @@ use crate::{ admin::auth::session::require_admin_session, admin::response::{AdminEnvelope, AdminError, AdminPageEnvelope, AdminResponse}, admin::{ - accounts::service::{AdminAccountError, AdminAccountMetadata}, + accounts::service::{AdminAccountError, AdminAccountMetadata, AdminAccountMetadataUpdate}, monitoring::{ billing, event_store::AdminLogFilter, @@ -806,28 +806,13 @@ pub(crate) async fn update_account( require_admin_session(&state, &headers, &request_id).await?; match parse_account_update(payload, &request_id)? { - ParsedAccountUpdate::Single { id, label, status } => { - if let Some(label) = label { - match state.services.admin_accounts.update_label(&id, label).await { - Ok(true) => {} - Ok(false) => return Err(account_not_found(request_id)), - Err(error) => return Err(account_error(error, request_id)), - } - } - if let Some(status) = status { - match state - .services - .admin_accounts - .update_status(&id, &status) - .await - { - Ok(Some(_)) => {} - Ok(None) => return Err(account_not_found(request_id)), - Err(error) => return Err(account_error(error, request_id)), - } - } - - match state.services.admin_accounts.get(&id).await { + ParsedAccountUpdate::Single { id, update } => { + match state + .services + .admin_accounts + .update_metadata(&id, update) + .await + { Ok(Some(account)) => Ok(AdminResponse::new( StatusCode::OK, AdminEnvelope::ok( @@ -1395,8 +1380,7 @@ fn format_cost(value: f64) -> String { enum ParsedAccountUpdate { Single { id: String, - label: Option>, - status: Option, + update: AdminAccountMetadataUpdate, }, BatchStatus { ids: Vec, @@ -1425,7 +1409,10 @@ fn parse_account_update( request_id, )); } - if object.contains_key("label") { + if ["label", "email", "accountId", "userId", "planType"] + .iter() + .any(|field| object.contains_key(*field)) + { return Err(AdminError::new( StatusCode::BAD_REQUEST, 40001, @@ -1438,23 +1425,32 @@ fn parse_account_update( return Ok(ParsedAccountUpdate::BatchStatus { ids, status }); } let id = required_string_field(object, "id", request_id)?; - let label = object - .get("label") - .map(|value| optional_string_field(value, "label", request_id)) - .transpose()?; + let label = optional_string_update_field(object, "label", request_id)?; + let email = optional_string_update_field(object, "email", request_id)?; + let account_id = optional_string_update_field(object, "accountId", request_id)?; + let user_id = optional_string_update_field(object, "userId", request_id)?; + let plan_type = optional_string_update_field(object, "planType", request_id)?; let status = object .get("status") .map(|value| required_string_value(value, "status", request_id)) .transpose()?; - if label.is_none() && status.is_none() { + let update = AdminAccountMetadataUpdate { + email, + account_id, + user_id, + label, + plan_type, + status, + }; + if !update.any() { return Err(AdminError::new( StatusCode::BAD_REQUEST, 40001, - "Account update request must include label or status", + "Account update request must include editable fields", request_id, )); } - Ok(ParsedAccountUpdate::Single { id, label, status }) + Ok(ParsedAccountUpdate::Single { id, update }) } fn required_string_field( @@ -1536,18 +1532,29 @@ fn optional_string_field( if value.is_null() { return Ok(None); } - value - .as_str() - .map(ToString::to_string) - .map(Some) - .ok_or_else(|| { - AdminError::new( - StatusCode::BAD_REQUEST, - 40001, - format!("{field} must be a string or null"), - request_id, - ) - }) + match value.as_str() { + Some(value) => { + let value = value.trim(); + Ok((!value.is_empty()).then(|| value.to_string())) + } + None => Err(AdminError::new( + StatusCode::BAD_REQUEST, + 40001, + format!("{field} must be a string or null"), + request_id, + )), + } +} + +fn optional_string_update_field( + object: &serde_json::Map, + field: &'static str, + request_id: &str, +) -> Result>, AdminError> { + object + .get(field) + .map(|value| optional_string_field(value, field, request_id)) + .transpose() } fn account_error(error: AdminAccountError, request_id: String) -> AdminError { diff --git a/src/admin/accounts/service/lifecycle.rs b/src/admin/accounts/service/lifecycle.rs index 777a5dbea..d978d6dbd 100644 --- a/src/admin/accounts/service/lifecycle.rs +++ b/src/admin/accounts/service/lifecycle.rs @@ -211,6 +211,55 @@ impl AdminAccountService { Err(_) => Err(AdminAccountError::UpdateStatus), } } + pub async fn update_metadata( + &self, + account_id: &str, + update: AdminAccountMetadataUpdate, + ) -> Result, AdminAccountError> { + if !update.any() { + return self.get(account_id).await; + } + if update + .label + .as_ref() + .and_then(|label| label.as_ref()) + .is_some_and(|label| label.chars().count() > 64) + { + return Err(AdminAccountError::LabelTooLong); + } + + let status = update + .status + .as_deref() + .map(parse_account_status) + .transpose()?; + let should_evict = status.is_some(); + let updated = self + .store + .update_metadata( + account_id, + crate::upstream::accounts::store::AccountMetadataUpdate { + email: update.email, + account_id: update.account_id, + user_id: update.user_id, + label: update.label, + plan_type: update.plan_type, + status, + }, + ) + .await + .map_err(|_| AdminAccountError::UpdateMetadata)?; + if !updated { + return Ok(None); + } + + self.sync_account_pool_best_effort(account_id, "account metadata update") + .await; + if should_evict { + self.evict_account_websocket_pool(account_id).await; + } + self.get(account_id).await + } pub async fn batch_delete( &self, ids: Vec, diff --git a/src/admin/accounts/service/mod.rs b/src/admin/accounts/service/mod.rs index eeb2c094f..170e994ed 100644 --- a/src/admin/accounts/service/mod.rs +++ b/src/admin/accounts/service/mod.rs @@ -20,8 +20,8 @@ use crate::{ }; pub use types::{ - AdminAccountError, AdminAccountMetadata, BatchDeleteAccounts, BatchUpdateAccountStatus, - ImportedAccounts, UpdatedAccountStatus, + AdminAccountError, AdminAccountMetadata, AdminAccountMetadataUpdate, BatchDeleteAccounts, + BatchUpdateAccountStatus, ImportedAccounts, UpdatedAccountStatus, }; #[derive(Clone)] diff --git a/src/admin/accounts/service/types.rs b/src/admin/accounts/service/types.rs index ab981ef93..7a1fb2a54 100644 --- a/src/admin/accounts/service/types.rs +++ b/src/admin/accounts/service/types.rs @@ -64,6 +64,8 @@ pub enum AdminAccountError { NotFound, #[error("failed to update label")] UpdateLabel, + #[error("failed to update account metadata")] + UpdateMetadata, #[error("failed to update status")] UpdateStatus, #[error("failed to delete account")] @@ -116,6 +118,27 @@ pub struct UpdatedAccountStatus { pub status: AcctStatus, } +#[derive(Debug, Clone, Default)] +pub struct AdminAccountMetadataUpdate { + pub email: Option>, + pub account_id: Option>, + pub user_id: Option>, + pub label: Option>, + pub plan_type: Option>, + pub status: Option, +} + +impl AdminAccountMetadataUpdate { + pub fn any(&self) -> bool { + self.email.is_some() + || self.account_id.is_some() + || self.user_id.is_some() + || self.label.is_some() + || self.plan_type.is_some() + || self.status.is_some() + } +} + #[derive(Debug, Clone)] pub struct BatchDeleteAccounts { pub deleted: u32, diff --git a/src/upstream/accounts/store.rs b/src/upstream/accounts/store.rs index cfb6945fe..042eaf96a 100644 --- a/src/upstream/accounts/store.rs +++ b/src/upstream/accounts/store.rs @@ -165,6 +165,18 @@ select from accounts where id = ?"; +const UPDATE_ACCOUNT_METADATA_SQL: &str = r" +update accounts +set + email = case when ? then ? else email end, + chatgpt_account_id = case when ? then ? else chatgpt_account_id end, + chatgpt_user_id = case when ? then ? else chatgpt_user_id end, + label = case when ? then ? else label end, + plan_type = case when ? then ? else plan_type end, + status = case when ? then ? else status end, + updated_at = ? +where id = ?"; + const LIST_STORED_ACCOUNTS_AFTER_CURSOR_SQL: &str = r" select id, @@ -694,6 +706,27 @@ pub struct StoredAccountMetadata { pub updated_at: String, } +#[derive(Debug, Clone, Default)] +pub struct AccountMetadataUpdate { + pub email: Option>, + pub account_id: Option>, + pub user_id: Option>, + pub label: Option>, + pub plan_type: Option>, + pub status: Option, +} + +impl AccountMetadataUpdate { + pub fn any(&self) -> bool { + self.email.is_some() + || self.account_id.is_some() + || self.user_id.is_some() + || self.label.is_some() + || self.plan_type.is_some() + || self.status.is_some() + } +} + /// 账号用量记录。 #[derive(Debug, Clone)] pub struct AccountUsageRecord { @@ -1066,6 +1099,37 @@ impl SqliteAccountStore { row.as_ref().map(metadata_from_row).transpose() } + /// 更新单账号元数据(不含 token)。 + pub async fn update_metadata( + &self, + account_id: &str, + update: AccountMetadataUpdate, + ) -> SqliteAccountStoreResult { + if !update.any() { + return Ok(false); + } + let now = Utc::now().to_rfc3339(); + let status = update.status.map(status_to_db); + let result = sqlx::query(UPDATE_ACCOUNT_METADATA_SQL) + .bind(update.email.is_some()) + .bind(optional_update_value(&update.email)) + .bind(update.account_id.is_some()) + .bind(optional_update_value(&update.account_id)) + .bind(update.user_id.is_some()) + .bind(optional_update_value(&update.user_id)) + .bind(update.label.is_some()) + .bind(optional_update_value(&update.label)) + .bind(update.plan_type.is_some()) + .bind(optional_update_value(&update.plan_type)) + .bind(update.status.is_some()) + .bind(status) + .bind(&now) + .bind(account_id) + .execute(&self.pool) + .await?; + Ok(result.rows_affected() > 0) + } + /// 更新账号 claims(含 refresh token)。 pub async fn update_from_claims( &self, @@ -1873,6 +1937,10 @@ fn status_to_db(status: AccountStatus) -> &'static str { } } +fn optional_update_value(value: &Option>) -> Option<&str> { + value.as_ref().and_then(|value| value.as_deref()) +} + fn status_from_db(value: &str) -> SqliteAccountStoreResult { match value { "active" => Ok(AccountStatus::Active), diff --git a/tests/admin/accounts/lifecycle.rs b/tests/admin/accounts/lifecycle.rs index fa307946d..74993f1fc 100644 --- a/tests/admin/accounts/lifecycle.rs +++ b/tests/admin/accounts/lifecycle.rs @@ -67,6 +67,39 @@ async fn admin_accounts_lifecycle_should_update_and_delete_accounts() { assert_eq!(status.status(), StatusCode::OK); assert_eq!(response_json(status).await["data"]["status"], "disabled"); + let metadata = app + .clone() + .oneshot( + Request::builder() + .method("POST") + .uri("/api/admin/accounts/update") + .header("content-type", "application/json") + .header("cookie", "cpr_admin_session=session_1") + .body(Body::from( + json!({ + "id": "acct_lifecycle", + "label": null, + "email": "updated-life@example.com", + "accountId": "chatgpt-updated-life", + "userId": "user-updated-life", + "planType": "team", + "status": "active" + }) + .to_string(), + )) + .unwrap(), + ) + .await + .unwrap(); + assert_eq!(metadata.status(), StatusCode::OK); + let metadata_body = response_json(metadata).await; + assert_eq!(metadata_body["data"]["label"], Value::Null); + assert_eq!(metadata_body["data"]["email"], "updated-life@example.com"); + assert_eq!(metadata_body["data"]["accountId"], "chatgpt-updated-life"); + assert_eq!(metadata_body["data"]["userId"], "user-updated-life"); + assert_eq!(metadata_body["data"]["planType"], "team"); + assert_eq!(metadata_body["data"]["status"], "active"); + let deleted = app .oneshot( Request::builder() diff --git a/web/src/api/modules/accounts.ts b/web/src/api/modules/accounts.ts index 2bd3abbb7..164b8b05a 100644 --- a/web/src/api/modules/accounts.ts +++ b/web/src/api/modules/accounts.ts @@ -136,18 +136,28 @@ export function refreshAccount(accountId: string) { }) } -export function updateAccountLabel(accountId: string, label: string | null) { +export interface UpdateAccountPayload { + label?: string | null + email?: string | null + accountId?: string | null + userId?: string | null + planType?: string | null + status?: Account['status'] +} + +export function updateAccount(accountId: string, payload: UpdateAccountPayload) { return requestJson('/api/admin/accounts/update', { method: 'POST', - data: { id: accountId, label }, + data: { id: accountId, ...payload }, }) } +export function updateAccountLabel(accountId: string, label: string | null) { + return updateAccount(accountId, { label }) +} + export function updateAccountStatus(accountId: string, status: Account['status']) { - return requestJson('/api/admin/accounts/update', { - method: 'POST', - data: { id: accountId, status }, - }) + return updateAccount(accountId, { status }) } export function batchDeleteAccounts(accountIds: string[]) { @@ -167,3 +177,30 @@ export function getAccountQuota(accountId: string) { const params = new URLSearchParams({ id: accountId }) return requestJson(`/api/admin/accounts/quota?${params}`) } + +export interface AccountHealthCheckSummary { + total: number + alive: number + dead: number + skipped: number +} + +export interface AccountHealthCheckResult { + id: string + email?: string | null + result: 'alive' | 'dead' | string + error?: string + durationMs?: number +} + +export interface AccountHealthCheckData { + summary: AccountHealthCheckSummary + results: AccountHealthCheckResult[] +} + +export function testAccountConnection(accountId: string) { + return requestJson('/api/admin/accounts/health-check', { + method: 'POST', + data: { ids: [accountId] }, + }) +} diff --git a/web/src/components/base/BaseCard.vue b/web/src/components/base/BaseCard.vue index 5053595ec..ebfbc5a06 100644 --- a/web/src/components/base/BaseCard.vue +++ b/web/src/components/base/BaseCard.vue @@ -5,12 +5,16 @@ const props = withDefaults( padded?: boolean radiusClass?: string shadowClass?: string + headerClass?: string + bodyClass?: string }>(), { as: 'section', padded: true, radiusClass: 'rounded-(--cp-card-radius)', shadowClass: 'shadow-(--cp-shadow-card)', + headerClass: 'px-6 pt-6 pb-3 md:px-7', + bodyClass: '', }, ) @@ -19,8 +23,30 @@ const props = withDefaults( - + + + diff --git a/web/src/components/base/BasePopover.vue b/web/src/components/base/BasePopover.vue new file mode 100644 index 000000000..c62738695 --- /dev/null +++ b/web/src/components/base/BasePopover.vue @@ -0,0 +1,175 @@ + + + diff --git a/web/src/components/base/BaseScrollbar.vue b/web/src/components/base/BaseScrollbar.vue index 47268b167..6e06d7b43 100644 --- a/web/src/components/base/BaseScrollbar.vue +++ b/web/src/components/base/BaseScrollbar.vue @@ -73,6 +73,7 @@ function update() { if (scrollRange <= 0 || availableTrackHeight <= 0) { thumbHeight.value = 0 thumbTop.value = 0 + visible.value = false return } @@ -81,6 +82,18 @@ function update() { thumbTop.value = (wrap.scrollTop / scrollRange) * maxThumbTop(wrap) } +async function scrollToTop() { + const wrap = wrapRef.value + if (wrap) { + wrap.scrollTop = 0 + wrap.scrollLeft = 0 + } + dragging.value = false + visible.value = false + await nextTick() + update() +} + function handleScroll() { const wrap = wrapRef.value if (!wrap) { @@ -170,6 +183,7 @@ onBeforeUnmount(() => { defineExpose({ update, + scrollToTop, wrapRef, }) diff --git a/web/src/layout/components/AppSidebar.vue b/web/src/layout/components/AppSidebar.vue index 5e9f9f46b..beac64b8c 100644 --- a/web/src/layout/components/AppSidebar.vue +++ b/web/src/layout/components/AppSidebar.vue @@ -206,12 +206,12 @@ watch( >
- + import { storeToRefs } from 'pinia' -import { RouterView } from 'vue-router' +import { nextTick, ref, watch } from 'vue' +import { RouterView, useRoute } from 'vue-router' import BaseScrollbar from '@/components/base/BaseScrollbar.vue' import { useUiStore } from '@/stores/modules/ui' @@ -10,13 +11,24 @@ import AppSidebar from './components/AppSidebar.vue' const uiStore = useUiStore() const { sidebarCollapsed } = storeToRefs(uiStore) const { toggleSidebar } = uiStore +const route = useRoute() +const pageScrollbarRef = ref | null>(null) + +watch( + () => route.fullPath, + async () => { + await nextTick() + await pageScrollbarRef.value?.scrollToTop() + }, + { flush: 'post' }, +)