From 13f7fbbfcba8a6ee051f9d83d21c92e0e92305d3 Mon Sep 17 00:00:00 2001 From: WangLX <519407855@qq.com> Date: Tue, 8 Sep 2026 20:43:04 +0800 Subject: [PATCH] feat: add admin model usage audit --- .../controlplane/catalog/CatalogService.java | 1 + .../gateway/GatewayController.java | 23 +- .../controlplane/task/AsyncTaskService.java | 9 +- .../usage/UsageAuditController.java | 94 +++++++ .../controlplane/usage/UsageAuditService.java | 254 ++++++++++++++++++ .../db/migration/V8__usage_payload_audit.sql | 17 ++ docs/09-java-control-plane-node.md | 8 + prototype/src/data.ts | 2 + prototype/src/services/catalog.ts | 66 +++++ prototype/src/styles.css | 2 + prototype/src/views/AdminConsole.vue | 94 ++++++- 11 files changed, 566 insertions(+), 4 deletions(-) create mode 100644 control-plane-java/src/main/java/com/moyi/controlplane/usage/UsageAuditController.java create mode 100644 control-plane-java/src/main/java/com/moyi/controlplane/usage/UsageAuditService.java create mode 100644 control-plane-java/src/main/resources/db/migration/V8__usage_payload_audit.sql diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogService.java b/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogService.java index 6d02fb0..10f6346 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogService.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogService.java @@ -309,6 +309,7 @@ public class CatalogService { UUID id = resultSet.getObject("id", UUID.class); String projectId = resultSet.getString("project_id"); key.put("id", id); + key.put("userId", resultSet.getObject("user_id", UUID.class)); key.put("scopeType", projectId == null ? "personal" : "project"); putIfNotNull(key, "projectId", projectId); key.put("name", resultSet.getString("name")); diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/gateway/GatewayController.java b/control-plane-java/src/main/java/com/moyi/controlplane/gateway/GatewayController.java index 4fdcb43..1003d41 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/gateway/GatewayController.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/gateway/GatewayController.java @@ -3,6 +3,7 @@ package com.moyi.controlplane.gateway; import com.moyi.controlplane.catalog.CatalogService; import com.moyi.controlplane.common.ApiException; import com.moyi.controlplane.provider.OpenAiCompatibleProvider; +import com.moyi.controlplane.usage.UsageAuditService; import java.time.Instant; import java.util.LinkedHashMap; import java.util.List; @@ -23,11 +24,13 @@ public class GatewayController { private final CatalogService catalogService; private final OpenAiCompatibleProvider provider; private final GatewayGuard guard; + private final UsageAuditService usage; - public GatewayController(CatalogService catalogService, OpenAiCompatibleProvider provider, GatewayGuard guard) { + public GatewayController(CatalogService catalogService, OpenAiCompatibleProvider provider, GatewayGuard guard, UsageAuditService usage) { this.catalogService = catalogService; this.provider = provider; this.guard = guard; + this.usage = usage; } @GetMapping("/models") @@ -55,6 +58,7 @@ public class GatewayController { @RequestBody Map input ) { Map key = requireKey(authorization); + long startedAt = System.currentTimeMillis(); String modelId = String.valueOf(input.getOrDefault("model", "")); Map model = catalogService.activeModel(modelId); if (model == null) throw new ApiException("MODEL_NOT_FOUND", "模型不存在或已下线", 404); @@ -63,7 +67,13 @@ public class GatewayController { if (Boolean.TRUE.equals(input.get("stream"))) throw new ApiException("STREAM_NOT_IMPLEMENTED", "流式转发将在下一节点开放", 501); guard.checkRate(UUID.fromString(String.valueOf(key.get("id"))), false); try (GatewayGuard.Slot slot = guard.acquire(model)) { - return invoke(key, modelId, model, input); + ResponseEntity> result = invoke(key, modelId, model, input); + Map body = result.getBody(); + usage.recordCall(UUID.fromString(String.valueOf(key.get("userId"))), UUID.fromString(String.valueOf(key.get("id"))), modelId, String.valueOf(model.get("providerId")), "succeeded", (int) (System.currentTimeMillis() - startedAt), number(body, "usage.prompt_tokens"), number(body, "usage.completion_tokens"), input, body, null, null); + return result; + } catch (ApiException exception) { + usage.recordCall(UUID.fromString(String.valueOf(key.get("userId"))), UUID.fromString(String.valueOf(key.get("id"))), modelId, String.valueOf(model.get("providerId")), "failed", (int) (System.currentTimeMillis() - startedAt), 0, 0, input, null, exception.getCode(), exception.getMessage()); + throw exception; } } @@ -103,4 +113,13 @@ public class GatewayController { return content == null ? "" : String.valueOf(content); }).reduce((left, right) -> left + "\n" + right).orElse(""); } + + private long number(Map body, String path) { + if (body == null) return 0; + Object usageValue = body.get("usage"); + if (!(usageValue instanceof Map map)) return 0; + String key = path.substring(path.indexOf('.') + 1); + Object value = map.get(key); + return value instanceof Number number ? number.longValue() : 0; + } } diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java index 41bb601..24aee9f 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/task/AsyncTaskService.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.moyi.controlplane.catalog.CatalogService; import com.moyi.controlplane.common.ApiException; import com.moyi.controlplane.gateway.GatewayGuard; +import com.moyi.controlplane.usage.UsageAuditService; import java.sql.ResultSet; import java.sql.SQLException; import java.time.OffsetDateTime; @@ -27,13 +28,15 @@ public class AsyncTaskService { private final CatalogService catalogService; private final int maxQueuedPerModel; private final GatewayGuard gatewayGuard; + private final UsageAuditService usage; public AsyncTaskService( JdbcTemplate jdbc, ObjectMapper objectMapper, CatalogService catalogService, @Value("${moyi.tasks.max-queued-per-model:100}") int maxQueuedPerModel, - GatewayGuard gatewayGuard + GatewayGuard gatewayGuard, + UsageAuditService usage ) { if (maxQueuedPerModel < 1) throw new IllegalArgumentException("Task queue limit must be positive"); this.jdbc = jdbc; @@ -41,6 +44,7 @@ public class AsyncTaskService { this.catalogService = catalogService; this.maxQueuedPerModel = maxQueuedPerModel; this.gatewayGuard = gatewayGuard; + this.usage = usage; } @Transactional @@ -64,6 +68,7 @@ public class AsyncTaskService { "INSERT INTO model_tasks (id, user_id, api_key_id, model_id, task_type, provider_task_id, status, progress, prompt, created_at, updated_at) VALUES (?, ?, ?, ?, ?, 'mock', 'queued', 0, ?, ?, ?)", id, userId, apiKeyId, modelId, taskType, prompt, now, now ); + usage.recordTask(userId, apiKeyId, modelId, String.valueOf(model.get("providerId")), id, "queued", input, null, null, null); catalogService.touchKey(key); return taskView(id); } @@ -93,11 +98,13 @@ public class AsyncTaskService { @Scheduled(fixedDelayString = "${moyi.tasks.worker-interval-ms:1000}") public void completeMockTasks() { + List taskIds = jdbc.query("SELECT id FROM model_tasks WHERE status IN ('queued', 'running') AND provider_task_id = 'mock' AND created_at < now() - INTERVAL '500 milliseconds'", (rs, row) -> rs.getString("id")); jdbc.update( "UPDATE model_tasks SET status = 'succeeded', progress = 100, result = CAST(CASE WHEN task_type = '3d' THEN ? ELSE ? END AS jsonb), updated_at = ?, completed_at = ? WHERE status IN ('queued', 'running') AND provider_task_id = 'mock' AND created_at < now() - INTERVAL '500 milliseconds'", "{\"format\":\"glb\",\"url\":\"https://mock.moyi.ai/tasks/result.glb\"}", "{\"format\":\"mp4\",\"url\":\"https://mock.moyi.ai/tasks/result.mp4\"}", now(), now() ); + taskIds.forEach(taskId -> usage.updateTask(taskId, "succeeded", Map.of("format", "result", "url", "https://mock.moyi.ai/tasks/" + taskId + "/result"), null, null)); } private Map requireKey(String authorization) { diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/usage/UsageAuditController.java b/control-plane-java/src/main/java/com/moyi/controlplane/usage/UsageAuditController.java new file mode 100644 index 0000000..190ffb0 --- /dev/null +++ b/control-plane-java/src/main/java/com/moyi/controlplane/usage/UsageAuditController.java @@ -0,0 +1,94 @@ +package com.moyi.controlplane.usage; + +import com.moyi.controlplane.auth.AuthController; +import com.moyi.controlplane.auth.AuthService; +import java.time.OffsetDateTime; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/admin/usage") +public class UsageAuditController { + private final UsageAuditService usage; + private final AuthService auth; + + public UsageAuditController(UsageAuditService usage, AuthService auth) { + this.usage = usage; + this.auth = auth; + } + + @GetMapping + public Map list( + jakarta.servlet.http.HttpServletRequest request, + @RequestParam(required = false) String q, + @RequestParam(required = false) String keyId, + @RequestParam(required = false) String modelId, + @RequestParam(required = false) String status, + @RequestParam(required = false) String eventKind, + @RequestParam(required = false) OffsetDateTime from, + @RequestParam(required = false) OffsetDateTime to, + @RequestParam(defaultValue = "1") int page, + @RequestParam(defaultValue = "50") int size + ) { + return usage.listAdmin(AuthController.sessionToken(request), filters(q, keyId, modelId, status, eventKind, from, to, page, size), auth); + } + + @GetMapping("/{id}") + public Map detail(@PathVariable String id, jakarta.servlet.http.HttpServletRequest request) { + return Map.of("record", usage.detail(AuthController.sessionToken(request), id, auth)); + } + + @PatchMapping("/{id}") + public Map update( + @PathVariable String id, + @RequestBody Map input, + jakarta.servlet.http.HttpServletRequest request + ) { + usage.updateNote(AuthController.sessionToken(request), id, input.get("adminNote") == null ? null : String.valueOf(input.get("adminNote")), auth, AuthController.meta(request)); + return usage.detail(AuthController.sessionToken(request), id, auth); + } + + @DeleteMapping("/{id}") + public ResponseEntity delete(@PathVariable String id, jakarta.servlet.http.HttpServletRequest request) { + usage.delete(AuthController.sessionToken(request), id, auth, AuthController.meta(request)); + return ResponseEntity.noContent().build(); + } + + @DeleteMapping + public Map deleteMany(@RequestParam String ids, jakarta.servlet.http.HttpServletRequest request) { + int count = usage.deleteMany(AuthController.sessionToken(request), Arrays.asList(ids.split(",")), auth, AuthController.meta(request)); + return Map.of("deleted", count); + } + + @GetMapping(value = "/export", produces = "text/csv") + public ResponseEntity export( + jakarta.servlet.http.HttpServletRequest request, + @RequestParam(required = false) String q, + @RequestParam(required = false) String keyId, + @RequestParam(required = false) String modelId, + @RequestParam(required = false) String status, + @RequestParam(required = false) String eventKind, + @RequestParam(required = false) OffsetDateTime from, + @RequestParam(required = false) OffsetDateTime to + ) { + UsageAuditService.Filters filters = filters(q, keyId, modelId, status, eventKind, from, to, 1, 5000); + String csv = usage.exportCsv(AuthController.sessionToken(request), filters, auth); + return ResponseEntity.ok().header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"moyi-usage.csv\"").contentType(MediaType.parseMediaType("text/csv; charset=UTF-8")).body("\uFEFF" + csv); + } + + private UsageAuditService.Filters filters(String q, String keyId, String modelId, String status, String eventKind, OffsetDateTime from, OffsetDateTime to, int page, int size) { + return new UsageAuditService.Filters(q, keyId, modelId, status, eventKind, from, to, page, size); + } +} diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/usage/UsageAuditService.java b/control-plane-java/src/main/java/com/moyi/controlplane/usage/UsageAuditService.java new file mode 100644 index 0000000..24283eb --- /dev/null +++ b/control-plane-java/src/main/java/com/moyi/controlplane/usage/UsageAuditService.java @@ -0,0 +1,254 @@ +package com.moyi.controlplane.usage; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.moyi.controlplane.auth.AuthService; +import com.moyi.controlplane.common.ApiException; +import java.nio.charset.StandardCharsets; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.springframework.dao.EmptyResultDataAccessException; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +public class UsageAuditService { + private static final int MAX_PAYLOAD_CHARS = 32_000; + private final JdbcTemplate jdbc; + private final ObjectMapper objectMapper; + + public UsageAuditService(JdbcTemplate jdbc, ObjectMapper objectMapper) { + this.jdbc = jdbc; + this.objectMapper = objectMapper; + } + + public void recordCall( + UUID userId, UUID apiKeyId, String modelId, String providerId, String status, + int latencyMs, long inputUnits, long outputUnits, Object input, Object output, + String errorCode, String errorMessage + ) { + record(userId, apiKeyId, modelId, providerId, "call", status, latencyMs, inputUnits, outputUnits, + input, output, null, errorCode, errorMessage, null, null); + } + + public void recordTask( + UUID userId, UUID apiKeyId, String modelId, String providerId, String taskId, + String status, Object input, Object output, String errorCode, String errorMessage + ) { + record(userId, apiKeyId, modelId, providerId, "task", status, null, 0, 0, + input, output, taskId, errorCode, errorMessage, null, null); + } + + public void updateTask(String taskId, String status, Object output, String errorCode, String errorMessage) { + jdbc.update( + "UPDATE usage_events SET status = ?, output_payload = CAST(? AS jsonb), error_code = ?, error_message = ?, updated_at = ? WHERE provider_task_id = ? AND event_kind = 'task' AND deleted_at IS NULL", + status, json(output), errorCode, errorMessage, now(), taskId + ); + } + + @Transactional(readOnly = true) + public Map listAdmin(String token, Filters filters, AuthService auth) { + auth.requireAdmin(token); + Query query = buildQuery(filters, false); + List> records = jdbc.query(query.sql(), this::mapRecord, query.params().toArray()); + Query countQuery = buildQuery(filters, true); + Long total = jdbc.queryForObject(countQuery.sql(), Long.class, countQuery.params().toArray()); + int safeSize = filters.size(); + int safePage = filters.page(); + long totalValue = total == null ? 0 : total; + Map result = new LinkedHashMap<>(); + result.put("records", records); + result.put("page", safePage); + result.put("size", safeSize); + result.put("total", totalValue); + result.put("pages", Math.max(1, (int) Math.ceil((double) totalValue / safeSize))); + return result; + } + + @Transactional(readOnly = true) + public Map detail(String token, String id, AuthService auth) { + auth.requireAdmin(token); + try { + return jdbc.queryForObject(baseSelect() + " WHERE ue.deleted_at IS NULL AND ue.id = ?", this::mapRecord, parseUuid(id)); + } catch (EmptyResultDataAccessException exception) { + throw new ApiException("USAGE_NOT_FOUND", "调用记录不存在或已删除", 404); + } + } + + @Transactional + public void updateNote(String token, String id, String note, AuthService auth, AuthService.RequestMeta meta) { + UUID adminId = auth.requireAdmin(token).id(); + String value = note == null ? "" : note.trim(); + if (value.length() > 1000) throw new ApiException("NOTE_TOO_LONG", "管理员备注不能超过 1000 个字符"); + int changed = jdbc.update("UPDATE usage_events SET admin_note = ?, updated_at = ? WHERE id = ? AND deleted_at IS NULL", blankToNull(value), now(), parseUuid(id)); + if (changed == 0) throw new ApiException("USAGE_NOT_FOUND", "调用记录不存在或已删除", 404); + auth.audit("usage.note_updated", adminId, meta, Map.of("usageId", id)); + } + + @Transactional + public void delete(String token, String id, AuthService auth, AuthService.RequestMeta meta) { + UUID adminId = auth.requireAdmin(token).id(); + int changed = jdbc.update("UPDATE usage_events SET deleted_at = ?, deleted_by = ?, updated_at = ? WHERE id = ? AND deleted_at IS NULL", now(), adminId, now(), parseUuid(id)); + if (changed == 0) throw new ApiException("USAGE_NOT_FOUND", "调用记录不存在或已删除", 404); + auth.audit("usage.deleted", adminId, meta, Map.of("usageId", id)); + } + + @Transactional + public int deleteMany(String token, List ids, AuthService auth, AuthService.RequestMeta meta) { + UUID adminId = auth.requireAdmin(token).id(); + if (ids == null || ids.isEmpty()) return 0; + if (ids.size() > 100) throw new ApiException("TOO_MANY_RECORDS", "单次最多删除 100 条记录"); + List parsed = ids.stream().distinct().map(this::parseUuid).toList(); + int changed = 0; + for (UUID id : parsed) { + changed += jdbc.update("UPDATE usage_events SET deleted_at = ?, deleted_by = ?, updated_at = ? WHERE id = ? AND deleted_at IS NULL", now(), adminId, now(), id); + } + auth.audit("usage.bulk_deleted", adminId, meta, Map.of("count", changed)); + return changed; + } + + @Transactional(readOnly = true) + public String exportCsv(String token, Filters filters, AuthService auth) { + auth.requireAdmin(token); + Filters exportFilters = filters.withPage(1, Math.min(filters.size(), 5000)); + Query query = buildQuery(exportFilters, false); + List> records = jdbc.query(query.sql(), this::mapRecord, query.params().toArray()); + StringBuilder csv = new StringBuilder("记录 ID,时间,用户,分发 Key,模型,供应商,类型,状态,输入单位,输出单位,耗时(ms),错误,管理员备注,输入数据,输出数据\n"); + for (Map record : records) { + csv.append(row( + record.get("id"), record.get("createdAt"), record.get("userAccount"), record.get("keyName"), + record.get("modelName"), record.get("providerName"), record.get("eventKind"), record.get("status"), + record.get("inputUnits"), record.get("outputUnits"), record.get("latencyMs"), record.get("errorMessage"), + record.get("adminNote"), record.get("input"), record.get("output") + )).append('\n'); + } + return csv.toString(); + } + + public record Filters( + String query, String keyId, String modelId, String status, String eventKind, + OffsetDateTime from, OffsetDateTime to, int page, int size + ) { + public Filters { + page = Math.max(1, page); + size = Math.max(1, Math.min(size, 100)); + } + public Filters withPage(int newPage, int newSize) { return new Filters(query, keyId, modelId, status, eventKind, from, to, newPage, newSize); } + } + + private Query buildQuery(Filters filters, boolean count) { + StringBuilder sql = new StringBuilder(count ? "SELECT COUNT(*) FROM usage_events ue LEFT JOIN users u ON u.id = ue.user_id LEFT JOIN platform_api_keys k ON k.id = ue.api_key_id LEFT JOIN model_catalog m ON m.id = ue.model_id LEFT JOIN model_providers p ON p.id = ue.provider_id" : baseSelect()); + if (!count) sql.append(" "); + sql.append(" WHERE ue.deleted_at IS NULL"); + List params = new ArrayList<>(); + if (filters.query() != null && !filters.query().isBlank()) { + sql.append(" AND (ue.id::text ILIKE ? OR u.account ILIKE ? OR u.display_name ILIKE ? OR k.name ILIKE ? OR k.key_prefix ILIKE ? OR m.public_name ILIKE ? OR m.id ILIKE ?)"); + String query = "%" + filters.query().trim() + "%"; + params.addAll(List.of(query, query, query, query, query, query, query)); + } + if (filters.keyId() != null && !filters.keyId().isBlank()) { sql.append(" AND ue.api_key_id = ?"); params.add(parseUuid(filters.keyId())); } + if (filters.modelId() != null && !filters.modelId().isBlank()) { sql.append(" AND ue.model_id = ?"); params.add(filters.modelId().trim()); } + if (filters.status() != null && !filters.status().isBlank()) { sql.append(" AND ue.status = ?"); params.add(filters.status().trim()); } + if (filters.eventKind() != null && !filters.eventKind().isBlank()) { sql.append(" AND ue.event_kind = ?"); params.add(filters.eventKind().trim()); } + if (filters.from() != null) { sql.append(" AND ue.created_at >= ?"); params.add(filters.from()); } + if (filters.to() != null) { sql.append(" AND ue.created_at < ?"); params.add(filters.to()); } + if (!count) { sql.append(" ORDER BY ue.created_at DESC LIMIT ? OFFSET ?"); params.add(filters.size()); params.add((filters.page() - 1) * filters.size()); } + return new Query(sql.toString(), params); + } + + private String baseSelect() { + return "SELECT ue.*, u.account AS user_account, u.display_name AS user_name, k.name AS key_name, k.key_prefix, m.public_name AS model_name, p.name AS provider_name FROM usage_events ue LEFT JOIN users u ON u.id = ue.user_id LEFT JOIN platform_api_keys k ON k.id = ue.api_key_id LEFT JOIN model_catalog m ON m.id = ue.model_id LEFT JOIN model_providers p ON p.id = ue.provider_id"; + } + + private Map mapRecord(ResultSet rs, int row) throws SQLException { + Map value = new LinkedHashMap<>(); + value.put("id", rs.getObject("id", UUID.class)); + value.put("requestId", rs.getString("request_id")); + value.put("userId", rs.getObject("user_id", UUID.class)); + value.put("userAccount", rs.getString("user_account")); + value.put("userName", rs.getString("user_name")); + value.put("apiKeyId", rs.getObject("api_key_id", UUID.class)); + value.put("keyName", rs.getString("key_name")); + value.put("keyPrefix", rs.getString("key_prefix")); + value.put("modelId", rs.getString("model_id")); + value.put("modelName", rs.getString("model_name")); + value.put("providerId", rs.getString("provider_id")); + value.put("providerName", rs.getString("provider_name")); + value.put("eventKind", rs.getString("event_kind")); + value.put("status", rs.getString("status")); + value.put("latencyMs", rs.getObject("latency_ms")); + value.put("inputUnits", rs.getObject("input_units")); + value.put("outputUnits", rs.getObject("output_units")); + value.put("costAmount", rs.getBigDecimal("cost_amount")); + value.put("providerTaskId", rs.getString("provider_task_id")); + value.put("errorCode", rs.getString("error_code")); + value.put("errorMessage", rs.getString("error_message")); + value.put("adminNote", rs.getString("admin_note")); + value.put("sourceIp", rs.getString("source_ip")); + value.put("createdAt", rs.getObject("created_at", OffsetDateTime.class)); + value.put("updatedAt", rs.getObject("updated_at", OffsetDateTime.class)); + value.put("input", readPayload(rs.getString("input_payload"))); + value.put("output", readPayload(rs.getString("output_payload"))); + return value; + } + + private void record(UUID userId, UUID keyId, String modelId, String providerId, String kind, String status, Integer latency, long inputUnits, long outputUnits, Object input, Object output, String taskId, String errorCode, String errorMessage, String ip, String userAgent) { + jdbc.update( + "INSERT INTO usage_events (id, user_id, api_key_id, model_id, provider_id, event_kind, status, latency_ms, input_units, output_units, provider_task_id, input_payload, output_payload, error_code, error_message, source_ip, user_agent, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, CAST(? AS jsonb), CAST(? AS jsonb), ?, ?, CAST(? AS inet), ?, ?, ?)", + UUID.randomUUID(), userId, keyId, modelId, providerId, kind, status, latency, inputUnits, outputUnits, taskId, + json(input), json(output), errorCode, errorMessage, blankToNull(ip), blankToNull(userAgent), now(), now() + ); + } + + private String json(Object value) { + if (value == null) return null; + try { + JsonNode sanitized = sanitize(objectMapper.valueToTree(value)); + String text = objectMapper.writeValueAsString(sanitized); + return text.length() > MAX_PAYLOAD_CHARS ? text.substring(0, MAX_PAYLOAD_CHARS) + "…" : text; + } catch (JsonProcessingException exception) { return "{\"_unserializable\":true}"; } + } + + private JsonNode sanitize(JsonNode node) { + if (node == null || node.isNull()) return node; + if (node.isTextual()) return node.textValue().length() > 8000 ? objectMapper.getNodeFactory().textNode(node.textValue().substring(0, 8000) + "…") : node; + if (node.isArray()) { + ArrayNode result = objectMapper.createArrayNode(); + node.forEach(item -> result.add(sanitize(item))); + return result; + } + if (node.isObject()) { + ObjectNode result = objectMapper.createObjectNode(); + node.fields().forEachRemaining(entry -> { + String key = entry.getKey().toLowerCase(); + if (key.contains("authorization") || key.contains("api_key") || key.contains("apikey") || key.contains("token") || key.contains("secret") || key.contains("password")) result.put(entry.getKey(), "[REDACTED]"); + else result.set(entry.getKey(), sanitize(entry.getValue())); + }); + return result; + } + return node; + } + + private Object readPayload(String value) { + if (value == null) return null; + try { return objectMapper.readTree(value); } catch (JsonProcessingException exception) { return value; } + } + + private String row(Object... values) { List cells = new ArrayList<>(); for (Object value : values) cells.add(csv(value)); return String.join(",", cells); } + private String csv(Object value) { String text = value == null ? "" : String.valueOf(value); return "\"" + text.replace("\"", "\"\"").replace("\r", " ").replace("\n", " ") + "\""; } + private UUID parseUuid(String value) { try { return UUID.fromString(value); } catch (Exception exception) { throw new ApiException("INVALID_ID", "记录 ID 格式无效"); } } + private String blankToNull(String value) { return value == null || value.isBlank() ? null : value; } + private OffsetDateTime now() { return OffsetDateTime.now(ZoneOffset.UTC); } + private record Query(String sql, List params) {} +} diff --git a/control-plane-java/src/main/resources/db/migration/V8__usage_payload_audit.sql b/control-plane-java/src/main/resources/db/migration/V8__usage_payload_audit.sql new file mode 100644 index 0000000..e02655e --- /dev/null +++ b/control-plane-java/src/main/resources/db/migration/V8__usage_payload_audit.sql @@ -0,0 +1,17 @@ +ALTER TABLE usage_events + ADD COLUMN IF NOT EXISTS request_id varchar(96), + ADD COLUMN IF NOT EXISTS provider_id varchar(64), + ADD COLUMN IF NOT EXISTS input_payload jsonb, + ADD COLUMN IF NOT EXISTS output_payload jsonb, + ADD COLUMN IF NOT EXISTS error_code varchar(96), + ADD COLUMN IF NOT EXISTS error_message text, + ADD COLUMN IF NOT EXISTS source_ip inet, + ADD COLUMN IF NOT EXISTS user_agent text, + ADD COLUMN IF NOT EXISTS admin_note varchar(1000), + ADD COLUMN IF NOT EXISTS deleted_at timestamptz, + ADD COLUMN IF NOT EXISTS deleted_by uuid REFERENCES users(id) ON DELETE SET NULL; + +CREATE INDEX IF NOT EXISTS usage_events_key_created_idx ON usage_events(api_key_id, created_at DESC); +CREATE INDEX IF NOT EXISTS usage_events_model_created_idx ON usage_events(model_id, created_at DESC); +CREATE INDEX IF NOT EXISTS usage_events_status_created_idx ON usage_events(status, created_at DESC); +CREATE INDEX IF NOT EXISTS usage_events_visible_created_idx ON usage_events(deleted_at, created_at DESC); diff --git a/docs/09-java-control-plane-node.md b/docs/09-java-control-plane-node.md index 530955c..7676bb8 100644 --- a/docs/09-java-control-plane-node.md +++ b/docs/09-java-control-plane-node.md @@ -30,6 +30,12 @@ | `GET/POST /api/admin/invitations` | 管理员 | 邀请码管理 | | `GET /api/admin/users` | 管理员 | 用户列表 | | `GET /api/admin/audit` | 管理员 | 审计记录 | +| `GET /api/admin/usage` | 管理员 | 分页查询模型调用/任务记录,可按用户、分发 Key、模型、状态和时间筛选 | +| `GET /api/admin/usage/{id}` | 管理员 | 查看单条调用输入、输出、错误和元数据 | +| `PATCH /api/admin/usage/{id}` | 管理员 | 修改管理员备注 | +| `DELETE /api/admin/usage/{id}` | 管理员 | 软删除单条调用记录 | +| `DELETE /api/admin/usage?ids=...` | 管理员 | 批量软删除调用记录 | +| `GET /api/admin/usage/export` | 管理员 | 按当前筛选条件导出 UTF-8 CSV | | `GET /v1/models` | 平台 API Key | 返回该 Key 有权限的模型 | | `POST /v1/chat/completions` | 平台 API Key | 同步聊天调用(已配置供应商 Key 时转发真实上游) | | `POST /v1/3d/tasks` | 平台 API Key | 创建 3D 异步任务(当前 Mock 执行器) | @@ -47,6 +53,7 @@ - `V5__usage_events.sql`:用量事件基础表; - `V6__seed_catalog.sql`:本地首批模型目录初始数据,可由管理员继续增删改造。 - `V7__async_tasks.sql`:3D/视频异步任务、状态和结果元数据。 +- `V8__usage_payload_audit.sql`:调用/任务输入输出、分发 Key、供应商、错误、管理员备注和软删除字段。 Java 版本沿用现有 TypeScript 服务的表命名,便于后续迁移 RDS;供应商密钥只返回掩码,数据库保存 AES-GCM 密文,主密钥由 `CREDENTIAL_ENCRYPTION_KEY` 注入。生产环境应进一步使用 KMS/RAM 托管该主密钥。 @@ -71,6 +78,7 @@ Invoke-WebRequest http://localhost:8080/health - `/v1/3d/tasks` 和 `/v1/video/tasks` 已提供数据库持久化 Mock worker,真实供应商执行器尚未替换; - Seedance、Tripo/VAST 的异步任务和 OSS 结果存储尚未迁移到 Java; - 异步任务已持久化并提供按模型的排队上限(默认 100,可由 `TASK_MAX_QUEUED_PER_MODEL` 调整),但真实供应商执行器、优先级调度、价格/额度扣减和计费账单仍沿用下一节点计划; +- 模型调用记录会自动保存同步请求/响应和异步任务入队结果,输入输出中的 `authorization`、`api_key`、`token`、`secret`、`password` 等字段会脱敏,单个文本字段最多 8000 字符、单个 JSON 载荷最多 32000 字符;管理员可筛选、查看、备注、软删除和导出 CSV; - Docker 镜像需要在具备 Maven 和 Docker daemon 的环境中构建验证。 ## 下一节点 diff --git a/prototype/src/data.ts b/prototype/src/data.ts index 9c8aad9..647fdea 100644 --- a/prototype/src/data.ts +++ b/prototype/src/data.ts @@ -12,6 +12,7 @@ import { Settings2, ShieldCheck, Sparkles, + ScrollText, Users, } from 'lucide-vue-next' import type { NavGroup } from './types' @@ -49,6 +50,7 @@ export const adminNavigation: NavGroup[] = [ { id: 'admin-routing', label: '渠道与路由', icon: Network }, { id: 'admin-capacity', label: '并发与队列', icon: Gauge }, { id: 'admin-billing', label: '计费配置', icon: CircleDollarSign }, + { id: 'admin-usage', label: '模型调用记录', icon: ScrollText }, ], }, { diff --git a/prototype/src/services/catalog.ts b/prototype/src/services/catalog.ts index 583eea0..d08ac4d 100644 --- a/prototype/src/services/catalog.ts +++ b/prototype/src/services/catalog.ts @@ -75,6 +75,44 @@ export interface PlatformOverview { ledger: Array<{ id: string; title: string; amount: number; createdAt: string }> } +export interface UsageAuditRecord { + id: string + requestId?: string + userId?: string + userAccount?: string + userName?: string + apiKeyId?: string + keyName?: string + keyPrefix?: string + modelId?: string + modelName?: string + providerId?: string + providerName?: string + eventKind: 'call' | 'task' + status: string + latencyMs?: number + inputUnits?: number + outputUnits?: number + costAmount?: number + providerTaskId?: string + errorCode?: string + errorMessage?: string + adminNote?: string + sourceIp?: string + createdAt: string + updatedAt?: string + input?: unknown + output?: unknown +} + +export interface UsageAuditPage { + records: UsageAuditRecord[] + page: number + size: number + total: number + pages: number +} + export interface AdminCatalogUser { id: string account: string @@ -216,6 +254,34 @@ class HttpCatalogClient { return this.request<{ models: CatalogModel[] }>('/api/admin/models') } + async listAdminUsage(filters: { q?: string; keyId?: string; modelId?: string; status?: string; eventKind?: string; page?: number; size?: number } = {}) { + const params = new URLSearchParams() + Object.entries({ ...filters, page: filters.page || 1, size: filters.size || 50 }).forEach(([key, value]) => { if (value !== undefined && value !== '') params.set(key, String(value)) }) + return this.request(`/api/admin/usage?${params.toString()}`) + } + + async getAdminUsage(id: string) { + return this.request<{ record: UsageAuditRecord }>(`/api/admin/usage/${encodeURIComponent(id)}`) + } + + async updateAdminUsageNote(id: string, adminNote: string) { + return this.request(`/api/admin/usage/${encodeURIComponent(id)}`, { method: 'PATCH', body: JSON.stringify({ adminNote }) }) + } + + async deleteAdminUsage(id: string) { + await this.request(`/api/admin/usage/${encodeURIComponent(id)}`, { method: 'DELETE' }) + } + + async deleteAdminUsageMany(ids: string[]) { + return this.request<{ deleted: number }>(`/api/admin/usage?ids=${encodeURIComponent(ids.join(','))}`, { method: 'DELETE' }) + } + + adminUsageExportUrl(filters: { q?: string; keyId?: string; modelId?: string; status?: string; eventKind?: string } = {}) { + const params = new URLSearchParams() + Object.entries(filters).forEach(([key, value]) => { if (value) params.set(key, value) }) + return `${controlPlaneUrl}/api/admin/usage/export?${params.toString()}` + } + async listAdminUsers() { return this.request<{ users: AdminCatalogUser[] }>('/api/admin/users') } diff --git a/prototype/src/styles.css b/prototype/src/styles.css index b0cf75f..b53057e 100644 --- a/prototype/src/styles.css +++ b/prototype/src/styles.css @@ -202,3 +202,5 @@ td strong{font-size:12px} .model-filter-panel{display:flex;flex-direction:column;gap:13px;padding:16px;border:1px solid var(--border);border-radius:12px;background:#fff;box-shadow:var(--shadow)}.model-filter-head{display:flex;align-items:center;justify-content:space-between;gap:12px}.model-filter-head>div{display:flex;align-items:baseline;gap:10px}.model-filter-head strong{color:var(--text);font-size:13px}.model-filter-head span{color:var(--muted);font-size:11px}.model-filter-grid{display:grid;grid-template-columns:minmax(220px,1.7fr) repeat(4,minmax(125px,1fr));gap:9px}.model-filter-search{width:auto;height:42px}.select-filter{display:flex;min-width:0;flex-direction:column;gap:5px}.select-filter span{color:var(--muted);font-size:10px}.select-filter select{width:100%;height:42px;padding:0 11px;border:1px solid var(--border);border-radius:8px;color:var(--text-soft);font-size:11px;background:var(--soft)}.select-filter select:focus{outline:0;border-color:#bdb2f2;box-shadow:0 0 0 3px rgba(104,72,232,.07)}.filter-summary{display:flex;align-items:center;gap:12px;color:var(--muted);font-size:10px}.filter-summary span+span{padding-left:12px;border-left:1px solid var(--border);color:var(--primary)} .provider-source-tag{display:inline-flex;align-items:center;gap:4px;padding:4px 7px;border-radius:5px;color:#5d54b8;font-size:10px;background:#f2efff}.provider-source-tag.relay{color:#176f91;background:#e9f9fd}.provider-source-tag.self-hosted{color:#317a5d;background:#ebf9f0}.provider-source-tag.custom{color:#6d7583;background:#f1f3f6}.provider-meta{display:flex;align-items:center;flex-wrap:wrap;gap:6px;margin-top:5px}.provider-endpoint{overflow:hidden;max-width:250px;color:var(--muted);font-family:"DM Mono",monospace;font-size:10px;text-overflow:ellipsis;white-space:nowrap}.provider-credential{color:#5f6b7c;font-size:10px}.admin-model-grid article{position:relative}.admin-model-grid article .model-source-line{display:flex;align-items:center;gap:7px;margin-top:8px;color:var(--muted);font-size:10px}.model-route-meta{display:flex;align-items:center;flex-wrap:wrap;gap:7px;margin-top:10px}.model-route-meta span{padding:4px 6px;border-radius:5px;color:#596579;font-size:10px;background:var(--soft)}.model-route-meta span strong{color:var(--text);font-weight:700}.admin-config-section{margin-top:16px}.admin-config-section .section-title{margin-bottom:11px} @media(max-width:1150px){.model-filter-grid{grid-template-columns:1fr 1fr 1fr}.model-filter-search{grid-column:1/-1}}@media(max-width:720px){.model-filter-grid{grid-template-columns:1fr 1fr}.model-filter-search{grid-column:1/-1}.model-filter-head>div{align-items:flex-start;flex-direction:column;gap:4px}.filter-summary{align-items:flex-start;flex-direction:column;gap:5px}.filter-summary span+span{padding:0;border:0}}@media(max-width:480px){.model-filter-grid{grid-template-columns:1fr}.model-filter-search{grid-column:auto}} +/* Usage audit console */ +.usage-filter{display:flex;align-items:center;gap:10px;flex-wrap:wrap}.usage-filter .search-input{min-width:260px;flex:1}.usage-filter select{min-width:120px}.button.danger{color:#fff;border-color:#d94b62;background:#d94b62}.button.danger:hover{background:#bd354d}.danger-icon{color:#c43d55}.usage-table th:first-child,.usage-table td:first-child{width:36px}.usage-table input[type=checkbox]{width:15px;height:15px;accent-color:#6351df}.usage-table code{font-size:10px}.usage-detail-list{margin-bottom:18px}.usage-payload{max-height:180px;overflow:auto;margin:6px 0 15px;padding:11px;border:1px solid var(--border);border-radius:8px;color:#344054;font:11px/1.55 "DM Mono",monospace;white-space:pre-wrap;word-break:break-word;background:#f7f8fb}.table-pagination{display:flex;align-items:center;justify-content:space-between;padding:12px 16px;border-top:1px solid var(--border);color:var(--muted);font-size:11px}.table-pagination>div{display:flex;gap:6px}.rotate-90{transform:rotate(90deg)}.rotate--90{transform:rotate(-90deg)} diff --git a/prototype/src/views/AdminConsole.vue b/prototype/src/views/AdminConsole.vue index 03f76e5..e6ab1de 100644 --- a/prototype/src/views/AdminConsole.vue +++ b/prototype/src/views/AdminConsole.vue @@ -15,20 +15,24 @@ import { Cloud, Copy, Download, + Eye, + FileText, Gauge, KeyRound, Network, Plus, + RefreshCcw, Search, Settings2, ShieldCheck, SlidersHorizontal, Timer, + Trash2, Users, WalletCards, } from 'lucide-vue-next' import type { AdminUser, ModelItem, ProviderItem, RouteItem } from '../types' -import { catalogClient, type AdminAuditEvent, type CatalogModel, type CatalogProvider } from '../services/catalog' +import { catalogClient, type AdminAuditEvent, type CatalogModel, type CatalogProvider, type UsageAuditRecord } from '../services/catalog' import { copyText } from '../services/clipboard' import SlidePanel from '../components/SlidePanel.vue' import UiModal from '../components/UiModal.vue' @@ -73,6 +77,17 @@ const modelPriceUnit = ref('1K tokens') const modelPriority = ref('100') const modelMaxConcurrency = ref('') const auditQuery = ref('') +const usageRecords = ref([]) +const usageQuery = ref('') +const usageStatus = ref('') +const usageKind = ref('') +const usagePage = ref(1) +const usagePages = ref(1) +const usageTotal = ref(0) +const usageLoading = ref(false) +const usageSelectedIds = ref([]) +const selectedUsage = ref(null) +const usageNote = ref('') const settings = reactive({ inviteOnly: false, emailSignup: false, phoneSignup: false, automaticCredit: false, maintenanceNotice: false, auditRetention: false }) onMounted(async () => { @@ -86,8 +101,78 @@ onMounted(async () => { } catch { catalogConnected.value = false } + void refreshUsage() }) +async function refreshUsage() { + usageLoading.value = true + try { + const result = await catalogClient.listAdminUsage({ q: usageQuery.value, status: usageStatus.value, eventKind: usageKind.value, page: usagePage.value, size: 50 }) + usageRecords.value = result.records + usagePages.value = result.pages + usageTotal.value = result.total + usageSelectedIds.value = usageSelectedIds.value.filter((id) => result.records.some((record) => record.id === id)) + } catch (error) { + if (error instanceof Error) emit('notify', error.message) + } finally { + usageLoading.value = false + } +} + +function openUsage(record: UsageAuditRecord) { + selectedUsage.value = record + usageNote.value = record.adminNote || '' +} + +function toggleUsage(id: string) { + usageSelectedIds.value = usageSelectedIds.value.includes(id) ? usageSelectedIds.value.filter((item) => item !== id) : [...usageSelectedIds.value, id] +} + +function toggleAllUsage() { + usageSelectedIds.value = usageSelectedIds.value.length === usageRecords.value.length ? [] : usageRecords.value.map((record) => record.id) +} + +async function saveUsageNote() { + if (!selectedUsage.value) return + try { + const result = await catalogClient.updateAdminUsageNote(selectedUsage.value.id, usageNote.value) + selectedUsage.value = result + const index = usageRecords.value.findIndex((record) => record.id === result.id) + if (index >= 0) usageRecords.value[index] = result + emit('notify', '管理员备注已保存') + } catch (error) { emit('notify', error instanceof Error ? error.message : '保存备注失败') } +} + +async function deleteUsage(id: string) { + if (!window.confirm('确认删除这条调用记录?删除后后台不再展示输入输出内容。')) return + try { + await catalogClient.deleteAdminUsage(id) + selectedUsage.value = null + await refreshUsage() + emit('notify', '调用记录已删除') + } catch (error) { emit('notify', error instanceof Error ? error.message : '删除调用记录失败') } +} + +async function deleteSelectedUsage() { + if (!usageSelectedIds.value.length) return + if (!window.confirm(`确认删除选中的 ${usageSelectedIds.value.length} 条调用记录?`)) return + try { + const result = await catalogClient.deleteAdminUsageMany(usageSelectedIds.value) + usageSelectedIds.value = [] + await refreshUsage() + emit('notify', `已删除 ${result.deleted} 条调用记录`) + } catch (error) { emit('notify', error instanceof Error ? error.message : '批量删除失败') } +} + +function exportUsage() { + window.open(catalogClient.adminUsageExportUrl({ q: usageQuery.value, status: usageStatus.value, eventKind: usageKind.value }), '_blank', 'noopener,noreferrer') +} + +function formatUsagePayload(value: unknown) { + if (value === undefined || value === null) return '无' + try { return JSON.stringify(value, null, 2) } catch { return String(value) } +} + const filteredUsers = computed(() => { const query = userQuery.value.trim().toLowerCase() return users.value.filter((user) => (userStatus.value === '全部' || user.status === userStatus.value) && (!query || `${user.name} ${user.email} ${user.id}`.toLowerCase().includes(query))) @@ -298,12 +383,19 @@ function mapModels(items: CatalogModel[], providersList: CatalogProvider[]): Mod
IMMUTABLE RECORDS

运营事件

{{ filteredAudits.length }} 条记录
时间操作人动作目标来源级别
{{ event.time }}{{ event.actor }}{{ event.action }}{{ event.target }}{{ event.source }}{{ event.level }}
暂无审计记录真实管理操作发生后会显示在这里
+ +
用户 ID
{{ selectedUser.id }}
额度余额
{{ selectedUser.balance === undefined ? '--(账本未接入)' : `¥ ${selectedUser.balance.toFixed(2)}` }}
累计用量
{{ selectedUser.usage || '--(用量统计未接入)' }}
最近活跃
{{ selectedUser.lastActive || '--' }}
+
记录 ID
{{ selectedUsage.id }}
请求时间
{{ new Date(selectedUsage.createdAt).toLocaleString('zh-CN') }}
用户 / Key
{{ selectedUsage.userName || selectedUsage.userAccount || '--' }} / {{ selectedUsage.keyName || selectedUsage.keyPrefix || '--' }}
模型 / 供应商
{{ selectedUsage.modelName || selectedUsage.modelId }} / {{ selectedUsage.providerName || selectedUsage.providerId || '--' }}
状态与耗时
{{ selectedUsage.status }} · {{ selectedUsage.latencyMs ?? '--' }} ms
输入 / 输出单位
{{ selectedUsage.inputUnits ?? 0 }} / {{ selectedUsage.outputUnits ?? 0 }}
{{ formatUsagePayload(selectedUsage.input) }}
{{ formatUsagePayload(selectedUsage.output) }}
{{ selectedUsage.errorCode }} · {{ selectedUsage.errorMessage }}
{{ createdInviteCode }}