diff --git a/README.md b/README.md index 2eb96be..6e3ab0d 100644 --- a/README.md +++ b/README.md @@ -304,6 +304,8 @@ MaaS 模型服务与应用开发 - [Java 后端与容器化部署基线](docs/08-java-container-deployment.md) - [Java Control Plane 节点一:基础控制面](docs/09-java-control-plane-node.md) - [北京服务器测试部署与发布包](docs/11-server-test-deployment.md) +- [模型分组、注册验证与人民币额度](docs/13-model-groups-registration-credit.md) +- [目录删除、使用记录与额度调整](docs/14-lifecycle-usage-credit-adjustments.md) ## 前端原型 diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogController.java b/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogController.java index 06bf4ed..8261ef7 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogController.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogController.java @@ -7,6 +7,7 @@ import java.util.Map; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -91,6 +92,36 @@ public class CatalogController { return Map.of("providers", catalogService.listProviders(true)); } + @PatchMapping("/keys/{id}/status") + public ResponseEntity keyStatus(@PathVariable String id, @RequestBody Map input, jakarta.servlet.http.HttpServletRequest request) { + catalogService.setKeyStatus(AuthController.sessionToken(request),id,input.getOrDefault("status",""),authService); + return ResponseEntity.noContent().build(); + } + + @DeleteMapping("/keys/{id}") + public ResponseEntity deleteKey(@PathVariable String id, jakarta.servlet.http.HttpServletRequest request) { + catalogService.deleteKey(AuthController.sessionToken(request),id,authService); + return ResponseEntity.noContent().build(); + } + + @DeleteMapping("/admin/providers/{id}") + public ResponseEntity deleteProvider(@PathVariable String id, jakarta.servlet.http.HttpServletRequest request) { + catalogService.deleteCatalog("channel",id,AuthController.sessionToken(request),authService); + return ResponseEntity.noContent().build(); + } + + @DeleteMapping("/admin/models/{id}") + public ResponseEntity deleteGroup(@PathVariable String id, jakarta.servlet.http.HttpServletRequest request) { + catalogService.deleteCatalog("group",id,AuthController.sessionToken(request),authService); + return ResponseEntity.noContent().build(); + } + + @DeleteMapping("/admin/model-definitions/{id}") + public ResponseEntity deleteDefinition(@PathVariable String id, jakarta.servlet.http.HttpServletRequest request) { + catalogService.deleteCatalog("model",id,AuthController.sessionToken(request),authService); + return ResponseEntity.noContent().build(); + } + @PostMapping("/admin/providers") public ResponseEntity> createProvider( @RequestBody Map input, 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 828cc5f..92e52bc 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 @@ -43,17 +43,17 @@ public class CatalogService { } public List> listProviders(boolean includeDisabled) { - String statusClause = includeDisabled ? "" : " WHERE status = 'active'"; + String statusClause = " WHERE deleted_at IS NULL" + (includeDisabled ? "" : " AND status = 'active'"); return jdbc.query("SELECT * FROM model_providers" + statusClause + " ORDER BY name", this::mapProvider); } public List> listModels(boolean includeDisabled) { - String statusClause = includeDisabled ? "" : " WHERE m.status = 'active' AND p.status = 'active' AND d.status = 'active'"; + String statusClause = " WHERE m.deleted_at IS NULL AND p.deleted_at IS NULL AND d.deleted_at IS NULL" + (includeDisabled ? "" : " AND m.status = 'active' AND p.status = 'active' AND d.status = 'active'"); return jdbc.query("SELECT m.* FROM model_catalog m JOIN model_providers p ON p.id=m.provider_id JOIN model_definitions d ON d.id=m.logical_model_id" + statusClause + " ORDER BY m.public_name, m.source_label", this::mapModel); } public List> listDefinitions(boolean includeDisabled) { - return jdbc.query("SELECT * FROM model_definitions" + (includeDisabled ? "" : " WHERE status='active'") + " ORDER BY public_name", (rs, n) -> { + return jdbc.query("SELECT * FROM model_definitions WHERE deleted_at IS NULL" + (includeDisabled ? "" : " AND status='active'") + " ORDER BY public_name", (rs, n) -> { Map item = new LinkedHashMap<>(); item.put("id", rs.getString("id")); item.put("publicName", rs.getString("public_name")); @@ -71,6 +71,7 @@ public class CatalogService { @Transactional public Map saveDefinition(String id, Map input, String token, AuthService auth) { UserView admin = auth.requireAdmin(token); + lockCatalog(); boolean creating = id == null; Map value = creating ? new LinkedHashMap<>() : new LinkedHashMap<>(definition(id)); value.putAll(input); @@ -84,7 +85,7 @@ public class CatalogService { jdbc.update("INSERT INTO model_definitions (id, model_key, public_name, model_type, call_mode, description, input_types, output_types, status) VALUES (?, ?, ?, ?, ?, ?, CAST(? AS jsonb), CAST(? AS jsonb), ?)", id, optional(value, "modelKey", null), name, type, mode, optional(value, "description", ""), jsonArray(value.get("inputTypes")), jsonArray(value.get("outputTypes")), status); } else { jdbc.update("UPDATE model_definitions SET model_key=?, public_name=?, model_type=?, call_mode=?, description=?, input_types=CAST(? AS jsonb), output_types=CAST(? AS jsonb), status=?, updated_at=now() WHERE id=?", optional(value,"modelKey",null), name, type, mode, optional(value,"description",""), jsonArray(value.get("inputTypes")), jsonArray(value.get("outputTypes")), status, id); - jdbc.update("UPDATE model_catalog SET model_key=?, public_name=?, model_type=?, call_mode=?, description=?, input_types=CAST(? AS jsonb), output_types=CAST(? AS jsonb), updated_at=now() WHERE logical_model_id=?", optional(value,"modelKey",null), name, type, mode, optional(value,"description",""), jsonArray(value.get("inputTypes")), jsonArray(value.get("outputTypes")), id); + jdbc.update("UPDATE model_catalog SET model_key=?, public_name=?, model_type=?, call_mode=?, description=?, input_types=CAST(? AS jsonb), output_types=CAST(? AS jsonb), updated_at=now() WHERE logical_model_id=? AND deleted_at IS NULL", optional(value,"modelKey",null), name, type, mode, optional(value,"description",""), jsonArray(value.get("inputTypes")), jsonArray(value.get("outputTypes")), id); } auth.audit(creating ? "model_definition.created" : "model_definition.updated", admin.id(), new AuthService.RequestMeta(null,null), Map.of("modelId",id)); return definition(id); @@ -103,6 +104,7 @@ public class CatalogService { @Transactional public Map createProvider(Map input, String token, AuthService auth) { UserView admin = auth.requireAdmin(token); + lockCatalog(); String code = required(input, "code").toLowerCase(); String name = required(input, "name"); String protocol = optional(input, "protocol", "http"); @@ -129,6 +131,7 @@ public class CatalogService { @Transactional public Map updateProvider(String id, Map input, String token, AuthService auth) { UserView admin = auth.requireAdmin(token); + lockCatalog(); Map previous = findProvider(id); if (previous == null) throw new ApiException("PROVIDER_NOT_FOUND", "渠道不存在", 404); Map value = new LinkedHashMap<>(previous); @@ -158,6 +161,7 @@ public class CatalogService { @Transactional public Map createModel(Map input, String token, AuthService auth) { UserView admin = auth.requireAdmin(token); + lockCatalog(); input = new LinkedHashMap<>(input); String logicalId = optional(input, "logicalModelId", null); if (logicalId == null) logicalId = String.valueOf(saveDefinition(null, input, token, auth).get("id")); @@ -197,6 +201,7 @@ public class CatalogService { @Transactional public Map updateModel(String id, Map input, String token, AuthService auth) { UserView admin=auth.requireAdmin(token); + lockCatalog(); Map old=findModel(id); if (old==null) throw new ApiException("MODEL_NOT_FOUND","分组不存在",404); Map value=new LinkedHashMap<>(old); @@ -245,7 +250,7 @@ public class CatalogService { public List> listKeys(String token, AuthService auth) { UserView user = auth.requireUser(token); - return jdbc.query("SELECT * FROM platform_api_keys WHERE user_id = ? ORDER BY created_at DESC", this::mapApiKey, user.id()); + return jdbc.query("SELECT * FROM platform_api_keys WHERE user_id = ? AND deleted_at IS NULL ORDER BY created_at DESC", this::mapApiKey, user.id()); } @Transactional @@ -275,7 +280,7 @@ public class CatalogService { @Transactional public Map updateKeyModels(String token, String keyId, List modelIds, AuthService auth) { UserView user = auth.requireUser(token); - var existing = jdbc.query("SELECT * FROM platform_api_keys WHERE id=? AND user_id=? AND status='active' FOR UPDATE", this::mapApiKey, UUID.fromString(keyId), user.id()); + var existing = jdbc.query("SELECT * FROM platform_api_keys WHERE id=? AND user_id=? AND status='active' AND deleted_at IS NULL FOR UPDATE", this::mapApiKey, UUID.fromString(keyId), user.id()); if (existing.isEmpty()) throw new ApiException("KEY_NOT_FOUND", "Key 不存在、已停用或无权修改", 404); List priorIds = (List) existing.getFirst().get("modelIds"); List uniqueIds = modelIds == null ? List.of() : modelIds.stream().filter(java.util.Objects::nonNull).map(String::trim).filter(value -> !value.isBlank()).distinct().toList(); @@ -287,9 +292,50 @@ public class CatalogService { @Transactional public void revokeKey(String token, String keyId, AuthService auth) { + setKeyStatus(token, keyId, "disabled", auth); + } + + @Transactional + public void setKeyStatus(String token, String keyId, String status, AuthService auth) { + if (!List.of("active", "disabled").contains(status)) throw new ApiException("INVALID_STATUS", "Key 状态无效"); UserView user = auth.requireUser(token); - int changed = jdbc.update("UPDATE platform_api_keys SET status = 'disabled', revoked_at = ? WHERE id = ? AND user_id = ? AND status = 'active'", now(), UUID.fromString(keyId), user.id()); - if (changed == 0) throw new ApiException("KEY_NOT_FOUND", "Key 不存在或已停用", 404); + int changed = jdbc.update("UPDATE platform_api_keys SET status=?, revoked_at=? WHERE id=? AND user_id=? AND deleted_at IS NULL", status, "active".equals(status) ? null : now(), UUID.fromString(keyId), user.id()); + if (changed == 0) throw new ApiException("KEY_NOT_FOUND", "Key 不存在或无权操作", 404); + auth.audit("key." + ("active".equals(status) ? "enabled" : "disabled"), user.id(), new AuthService.RequestMeta(null,null), Map.of("keyId",keyId)); + } + + @Transactional + public void deleteKey(String token, String keyId, AuthService auth) { + UserView user = auth.requireUser(token); + var states = jdbc.queryForList("SELECT status FROM platform_api_keys WHERE id=? AND user_id=? AND deleted_at IS NULL FOR UPDATE", String.class, UUID.fromString(keyId), user.id()); + if (states.isEmpty()) throw new ApiException("KEY_NOT_FOUND", "Key 不存在或无权操作", 404); + if ("active".equals(states.getFirst())) throw new ApiException("KEY_ACTIVE", "请先停用 Key,再删除", 409); + jdbc.update("UPDATE platform_api_keys SET deleted_at=now() WHERE id=?", UUID.fromString(keyId)); + auth.audit("key.deleted",user.id(),new AuthService.RequestMeta(null,null),Map.of("keyId",keyId)); + } + + private void lockCatalog() { + jdbc.queryForList("SELECT pg_advisory_xact_lock(hashtextextended('moyi:catalog-lifecycle', 0))"); + } + + @Transactional + public void deleteCatalog(String kind, String id, String token, AuthService auth) { + UserView admin = auth.requireAdmin(token); + lockCatalog(); + if ("channel".equals(kind)) { + if (findProvider(id)==null) throw new ApiException("PROVIDER_NOT_FOUND","渠道不存在",404); + if (jdbc.queryForObject("SELECT count(*) FROM model_catalog WHERE provider_id=? AND deleted_at IS NULL",Integer.class,id)>0) + throw new ApiException("CHANNEL_IN_USE","渠道仍有关联分组,请先删除分组或将其改为其他渠道",409); + jdbc.update("UPDATE model_providers SET status='disabled', deleted_at=now(), updated_at=now() WHERE id=?",id); + } else if ("model".equals(kind)) { + definition(id); + jdbc.update("UPDATE model_catalog SET status='disabled', deleted_at=now(), updated_at=now() WHERE logical_model_id=? AND deleted_at IS NULL",id); + jdbc.update("UPDATE model_definitions SET status='disabled', deleted_at=now(), updated_at=now() WHERE id=?",id); + } else if ("group".equals(kind)) { + if (findModel(id)==null) throw new ApiException("MODEL_NOT_FOUND","分组不存在",404); + jdbc.update("UPDATE model_catalog SET status='disabled', deleted_at=now(), updated_at=now() WHERE id=?",id); + } else throw new ApiException("INVALID_KIND","删除对象无效"); + auth.audit("catalog."+kind+"_deleted",admin.id(),new AuthService.RequestMeta(null,null),Map.of("id",id)); } public Map overview(String token, AuthService auth) { @@ -314,7 +360,7 @@ public class CatalogService { public Map authenticateKey(String plaintext) { if (plaintext == null || plaintext.isBlank()) return null; try { - return jdbc.queryForObject("SELECT k.* FROM platform_api_keys k JOIN users u ON u.id=k.user_id WHERE k.key_hash = ? AND k.status = 'active' AND u.status='active'", this::mapApiKey, sha256(plaintext.trim())); + return jdbc.queryForObject("SELECT k.* FROM platform_api_keys k JOIN users u ON u.id=k.user_id WHERE k.key_hash = ? AND k.status = 'active' AND k.deleted_at IS NULL AND u.status='active'", this::mapApiKey, sha256(plaintext.trim())); } catch (EmptyResultDataAccessException exception) { return null; } @@ -337,7 +383,7 @@ public class CatalogService { } public UUID keyOwnerId(UUID apiKeyId) { - try { return jdbc.queryForObject("SELECT user_id FROM platform_api_keys WHERE id = ? AND status = 'active'", UUID.class, apiKeyId); } + try { return jdbc.queryForObject("SELECT user_id FROM platform_api_keys WHERE id = ? AND status = 'active' AND deleted_at IS NULL", UUID.class, apiKeyId); } catch (EmptyResultDataAccessException exception) { throw new ApiException("INVALID_API_KEY", "API Key 无效或已停用", 401); } } @@ -350,17 +396,17 @@ public class CatalogService { } private Map findProvider(String id) { - try { return jdbc.queryForObject("SELECT * FROM model_providers WHERE id = ?", this::mapProvider, id); } + try { return jdbc.queryForObject("SELECT * FROM model_providers WHERE id = ? AND deleted_at IS NULL", this::mapProvider, id); } catch (EmptyResultDataAccessException exception) { return null; } } private Map findModel(String id) { - try { return jdbc.queryForObject("SELECT * FROM model_catalog WHERE id = ?", this::mapModel, id); } + try { return jdbc.queryForObject("SELECT * FROM model_catalog WHERE id = ? AND deleted_at IS NULL", this::mapModel, id); } catch (EmptyResultDataAccessException exception) { return null; } } private Map findActiveModel(String id) { - try { return jdbc.queryForObject("SELECT m.* FROM model_catalog m JOIN model_providers p ON p.id=m.provider_id JOIN model_definitions d ON d.id=m.logical_model_id WHERE m.id = ? AND m.status = 'active' AND p.status='active' AND d.status='active'", this::mapModel, id); } + try { return jdbc.queryForObject("SELECT m.* FROM model_catalog m JOIN model_providers p ON p.id=m.provider_id JOIN model_definitions d ON d.id=m.logical_model_id WHERE m.id = ? AND m.status = 'active' AND p.status='active' AND d.status='active' AND m.deleted_at IS NULL AND p.deleted_at IS NULL AND d.deleted_at IS NULL", this::mapModel, id); } catch (EmptyResultDataAccessException exception) { return null; } } diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/config/WebConfig.java b/control-plane-java/src/main/java/com/moyi/controlplane/config/WebConfig.java index 3f4537b..e64a7ac 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/config/WebConfig.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/config/WebConfig.java @@ -22,7 +22,7 @@ public class WebConfig implements WebMvcConfigurer { registry.addMapping("/**") .allowedOrigins(allowedOrigins) .allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS") - .allowedHeaders("Content-Type", "Authorization") + .allowedHeaders("Content-Type", "Authorization", "X-Moyi-Source") .allowCredentials(true) .maxAge(3600); } 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 index 5c092a6..f00b7d0 100644 --- 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 @@ -52,8 +52,8 @@ public class UsageAuditService { 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 + "UPDATE usage_events SET status = ?, output_payload = CAST(? AS jsonb), error_code = ?, error_message = ?, latency_ms = CASE WHEN ? IN ('succeeded','failed','cancelled') THEN LEAST(2147483647, GREATEST(0, EXTRACT(EPOCH FROM (now()-created_at))*1000))::integer ELSE latency_ms END, updated_at = ? WHERE provider_task_id = ? AND event_kind = 'task' AND deleted_at IS NULL", + status, json(output), errorCode, errorMessage, status, now(), taskId ); } @@ -211,13 +211,31 @@ public class UsageAuditService { } 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) { + String endpoint=null, source=null; + var attributes=org.springframework.web.context.request.RequestContextHolder.getRequestAttributes(); + if(attributes instanceof org.springframework.web.context.request.ServletRequestAttributes servlet) { + var request=servlet.getRequest(); + endpoint=request.getRequestURI(); + userAgent=request.getHeader("User-Agent"); + source="playground".equals(request.getHeader("X-Moyi-Source")) ? "playground" : "api"; + } + JsonNode payload=objectMapper.valueToTree(output); + Long cached=usageNumber(payload,"/usage/prompt_tokens_details/cached_tokens"); + if(cached==null) cached=usageNumber(payload,"/usage/prompt_cache_hit_tokens"); + Long cacheWrite=usageNumber(payload,"/usage/cache_creation_input_tokens"); 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), ?, ?, ?)", + "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, endpoint, call_mode, request_source, cached_input_units, cache_write_units) 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() + json(input), json(output), errorCode, errorMessage, blankToNull(ip), userAgent==null?null:userAgent.substring(0,Math.min(userAgent.length(),1000)), now(), now(), endpoint, "task".equals(kind)?"async":"sync", source, cached, cacheWrite ); } + private Long usageNumber(JsonNode payload, String path) { + if(payload==null) return null; + JsonNode value=payload.at(path); + return value.isIntegralNumber() && value.canConvertToLong() && value.longValue()>=0 ? value.longValue() : null; + } + private String json(Object value) { if (value == null) return null; try { diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/usage/UserUsageController.java b/control-plane-java/src/main/java/com/moyi/controlplane/usage/UserUsageController.java new file mode 100644 index 0000000..fe57fc9 --- /dev/null +++ b/control-plane-java/src/main/java/com/moyi/controlplane/usage/UserUsageController.java @@ -0,0 +1,39 @@ +package com.moyi.controlplane.usage; + +import com.moyi.controlplane.auth.AuthController; +import jakarta.servlet.http.HttpServletRequest; +import java.time.OffsetDateTime; +import java.util.Map; +import java.util.UUID; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/usage") +public class UserUsageController { + private final UserUsageService usage; + public UserUsageController(UserUsageService usage) { this.usage=usage; } + // Shared binding keeps the list and export filters identical. + @ModelAttribute + public UserUsageService.Filters filters( + @RequestParam(required=false) String keyId, @RequestParam(required=false) String modelId, + @RequestParam(required=false) String groupId, @RequestParam(required=false) String status, + @RequestParam(required=false) String eventKind, @RequestParam(required=false) String callMode, + @RequestParam(required=false) String source, @RequestParam(required=false) String costState, + @RequestParam(required=false) String userAgent, @RequestParam(required=false) OffsetDateTime from, + @RequestParam(required=false) OffsetDateTime to, @RequestParam(defaultValue="1") int page, + @RequestParam(defaultValue="20") int size, @RequestParam(defaultValue="time") String sort, + @RequestParam(defaultValue="desc") String direction) { + return new UserUsageService.Filters(keyId,modelId,groupId,status,eventKind,callMode,source,costState,userAgent,from,to,page,size,sort,direction); + } + @GetMapping + public Map list(HttpServletRequest request,@ModelAttribute UserUsageService.Filters filters) { return usage.list(AuthController.sessionToken(request),filters); } + @GetMapping("/options") + public Map options(HttpServletRequest request) { return usage.options(AuthController.sessionToken(request)); } + @GetMapping("/{id}") + public Map detail(@PathVariable UUID id,HttpServletRequest request) { return Map.of("record",usage.detail(AuthController.sessionToken(request),id)); } + @GetMapping("/export") + public ResponseEntity export(HttpServletRequest request,@ModelAttribute UserUsageService.Filters filters) { + return ResponseEntity.ok().header("Content-Type","text/csv; charset=UTF-8").header("Content-Disposition","attachment; filename=moyi-usage.csv").body(usage.exportCsv(AuthController.sessionToken(request),filters)); + } +} diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/usage/UserUsageService.java b/control-plane-java/src/main/java/com/moyi/controlplane/usage/UserUsageService.java new file mode 100644 index 0000000..9502592 --- /dev/null +++ b/control-plane-java/src/main/java/com/moyi/controlplane/usage/UserUsageService.java @@ -0,0 +1,109 @@ +package com.moyi.controlplane.usage; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.moyi.controlplane.auth.AuthService; +import com.moyi.controlplane.common.ApiException; +import java.time.OffsetDateTime; +import java.util.*; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Isolation; +import org.springframework.transaction.annotation.Transactional; + +@Service +public class UserUsageService { + private final JdbcTemplate jdbc; + private final AuthService auth; + private final ObjectMapper json; + private static final String JOINS=" FROM usage_events ue 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 LEFT JOIN model_tasks t ON t.id=ue.provider_task_id"; + private static final String MODE="COALESCE(ue.call_mode, CASE WHEN ue.event_kind='task' THEN 'async' ELSE 'sync' END)"; + private static final String COLUMNS="ue.id, ue.created_at AS \"createdAt\", ue.api_key_id AS \"apiKeyId\", k.name AS \"keyName\", k.key_prefix AS \"keyPrefix\", ue.model_id AS \"modelId\", m.logical_model_id AS \"logicalModelId\", m.public_name AS \"modelName\", m.source_label AS \"groupName\", p.name AS \"providerName\", ue.event_kind AS \"eventKind\", ue.status, ue.endpoint, "+MODE+" AS \"callMode\", ue.request_source AS \"requestSource\", ue.user_agent AS \"userAgent\", ue.input_units AS \"inputUnits\", ue.output_units AS \"outputUnits\", ue.cached_input_units AS \"cachedInputUnits\", ue.cache_write_units AS \"cacheWriteUnits\", ue.cost_amount AS \"costAmount\", ue.first_token_ms AS \"firstTokenMs\", ue.reasoning_effort AS \"reasoningEffort\", ue.latency_ms AS \"latencyMs\", ue.provider_task_id AS \"taskId\", t.progress, ue.error_code AS \"errorCode\", ue.error_message AS \"errorMessage\""; + + public UserUsageService(JdbcTemplate jdbc, AuthService auth, ObjectMapper json) { this.jdbc=jdbc; this.auth=auth; this.json=json; } + + public record Filters(String keyId, String modelId, String groupId, String status, String eventKind, String callMode, + String source, String costState, String userAgent, OffsetDateTime from, OffsetDateTime to, + int page, int size, String sort, String direction) { + public Filters { + page=Math.max(1,page); size=Math.max(1,Math.min(100,size)); + if(from!=null && to!=null && !from.isBefore(to)) throw new ApiException("INVALID_DATE_RANGE","开始时间必须早于结束时间"); + } + } + private record Query(String where, List params) {} + private Query filter(UUID userId, Filters f) { + StringBuilder sql=new StringBuilder(" WHERE ue.user_id=? AND ue.deleted_at IS NULL"); + List args=new ArrayList<>(List.of(userId)); + if(present(f.keyId())) { sql.append(" AND ue.api_key_id::text=?"); args.add(f.keyId()); } + add(sql,args,"m.logical_model_id",f.modelId()); + add(sql,args,"ue.model_id",f.groupId()); + add(sql,args,"ue.status",f.status()); add(sql,args,"ue.event_kind",f.eventKind()); + add(sql,args,MODE,f.callMode()); add(sql,args,"COALESCE(ue.request_source,'unknown')",f.source()); + if("recorded".equals(f.costState())) sql.append(" AND ue.cost_amount IS NOT NULL"); + else if("pending".equals(f.costState())) sql.append(" AND ue.cost_amount IS NULL"); + if(present(f.userAgent())) { sql.append(" AND ue.user_agent ILIKE ? ESCAPE '!'"); args.add("%"+f.userAgent().replace("!","!!").replace("%","!%").replace("_","!_")+"%"); } + if(f.from()!=null) { sql.append(" AND ue.created_at>=?"); args.add(f.from()); } + if(f.to()!=null) { sql.append(" AND ue.created_at args,String column,String value) { if(present(value)) { sql.append(" AND ").append(column).append("=?"); args.add(value); } } + private String order(Filters f) { + String column=switch(f.sort()==null?"":f.sort()) { case "model" -> "m.public_name"; case "cost" -> "ue.cost_amount"; case "latency" -> "ue.latency_ms"; default -> "ue.created_at"; }; + return " ORDER BY "+column+("asc".equals(f.direction())?" ASC":" DESC")+" NULLS LAST, ue.id DESC"; + } + + @Transactional(readOnly=true, isolation=Isolation.REPEATABLE_READ) + public Map list(String token, Filters f) { + UUID userId=auth.requireUser(token).id(); + Query q=filter(userId,f); + Map stats=jdbc.queryForMap("SELECT COUNT(*) AS \"totalRequests\", COALESCE(SUM(ue.input_units),0) AS \"inputUnits\", COALESCE(SUM(ue.output_units),0) AS \"outputUnits\", SUM(ue.cached_input_units) AS \"cachedInputUnits\", SUM(ue.cache_write_units) AS \"cacheWriteUnits\", SUM(ue.cost_amount) AS \"totalCost\", COUNT(ue.cost_amount) AS \"pricedRequests\", AVG(ue.latency_ms) AS \"averageLatencyMs\""+JOINS+q.where(),q.params().toArray()); + long total=((Number)stats.get("totalRequests")).longValue(); + long pages=Math.max(1,(total+f.size()-1)/f.size()); + int page=(int)Math.min(f.page(),pages); + List args=new ArrayList<>(q.params()); args.add(f.size()); args.add((long)(page-1)*f.size()); + var records=jdbc.queryForList("SELECT "+COLUMNS+JOINS+q.where()+order(f)+" LIMIT ? OFFSET ?",args.toArray()); + return Map.of("records",records,"summary",stats,"total",total,"pages",pages,"page",page,"size",f.size()); + } + + public Map options(String token) { + UUID userId=auth.requireUser(token).id(); + return Map.of( + "keys",jdbc.queryForList("SELECT DISTINCT k.id, k.name, (k.deleted_at IS NOT NULL) AS deleted FROM platform_api_keys k WHERE k.user_id=? ORDER BY k.name",userId), + "models",jdbc.queryForList("SELECT DISTINCT m.logical_model_id AS id, m.public_name AS name"+JOINS+" WHERE ue.user_id=? AND ue.deleted_at IS NULL AND m.id IS NOT NULL ORDER BY name",userId), + "groups",jdbc.queryForList("SELECT DISTINCT m.id, m.logical_model_id AS \"modelId\", m.source_label AS name, p.name AS channel"+JOINS+" WHERE ue.user_id=? AND ue.deleted_at IS NULL AND m.id IS NOT NULL ORDER BY name",userId)); + } + + public Map detail(String token, UUID id) { + UUID userId=auth.requireUser(token).id(); + var records=jdbc.queryForList("SELECT "+COLUMNS+", ue.input_payload::text AS input, ue.output_payload::text AS output, t.result::text AS result"+JOINS+" WHERE ue.user_id=? AND ue.id=? AND ue.deleted_at IS NULL",userId,id); + if(records.isEmpty()) throw new ApiException("USAGE_NOT_FOUND","调用记录不存在",404); + var record=records.getFirst(); + for(String field:List.of("input","output","result")) { + Object raw=record.get(field); + if(raw!=null) try { record.put(field,json.readTree(raw.toString())); } catch(Exception ignored) { record.put(field,null); } + } + return record; + } + + @Transactional(readOnly=true, isolation=Isolation.REPEATABLE_READ) + public String exportCsv(String token, Filters f) { + UUID userId=auth.requireUser(token).id(); + Query q=filter(userId,f); + Long count=jdbc.queryForObject("SELECT COUNT(*)"+JOINS+q.where(),Long.class,q.params().toArray()); + if(count!=null && count>10000) throw new ApiException("EXPORT_TOO_LARGE","单次最多导出 10000 条,请缩小时间或筛选范围"); + var records=jdbc.queryForList("SELECT "+COLUMNS+JOINS+q.where()+order(f),q.params().toArray()); + StringBuilder csv=new StringBuilder("\uFEFF记录ID,时间,API Key,模型,分组,渠道,端点,类型,状态,来源,输入Token,输出Token,缓存命中Token,缓存写入Token,费用(CNY),首Token(ms),耗时(ms),User-Agent,任务ID,错误\r\n"); + for(var record:records) { + var cells=new ArrayList(); + for(String field:List.of("id","createdAt","keyName","modelName","groupName","providerName","endpoint","callMode","status","requestSource","inputUnits","outputUnits","cachedInputUnits","cacheWriteUnits","costAmount","firstTokenMs","latencyMs","userAgent","taskId","errorMessage")) cells.add(csvCell(record.get(field))); + csv.append(String.join(",",cells)).append("\r\n"); + } + return csv.toString(); + } + private String csvCell(Object value) { + String text=value==null?"":value.toString().replace('\r',' ').replace('\n',' '); + // Keep untrusted model/key names from becoming spreadsheet formulas. + if(text.stripLeading().matches("^[=+@\\-].*") || text.startsWith("\t")) text="'"+text; + return "\""+text.replace("\"","\"\"")+"\""; + } +} diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/wallet/WalletController.java b/control-plane-java/src/main/java/com/moyi/controlplane/wallet/WalletController.java index 059a651..4820bef 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/wallet/WalletController.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/wallet/WalletController.java @@ -12,6 +12,11 @@ public class WalletController { private final WalletService wallet; public WalletController(WalletService wallet) { this.wallet=wallet; } public record GrantRequest(UUID requestId, String amount, String reason) {} + public record AdjustmentRequest(UUID requestId, String operation, String amount, String reason, String expectedBalance) {} + @PostMapping("/users/{id}/wallet/adjustments") + public Map adjust(@PathVariable UUID id,@RequestBody AdjustmentRequest input,HttpServletRequest request) { + return wallet.adjust(AuthController.sessionToken(request),id,input.requestId(),input.operation(),input.amount(),input.reason(),input.expectedBalance(),AuthController.meta(request)); + } @GetMapping("/wallets") public Map balances(HttpServletRequest request) { return Map.of("wallets",wallet.balances(AuthController.sessionToken(request))); } @GetMapping("/users/{id}/wallet") diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/wallet/WalletService.java b/control-plane-java/src/main/java/com/moyi/controlplane/wallet/WalletService.java index d30c2c3..bb6a1b8 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/wallet/WalletService.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/wallet/WalletService.java @@ -25,36 +25,51 @@ public class WalletService { public List> entries(String token, UUID userId) { auth.requireAdmin(token); - return jdbc.queryForList("SELECT e.id, e.amount, e.balance_after AS \"balanceAfter\", e.currency, e.reason, e.created_at AS \"createdAt\", u.display_name AS actor FROM wallet_entries e JOIN users u ON u.id=e.actor_user_id WHERE e.user_id=? ORDER BY e.created_at DESC LIMIT 100",userId); + return jdbc.queryForList("SELECT e.id, e.amount, e.operation, e.balance_before AS \"balanceBefore\", e.balance_after AS \"balanceAfter\", e.currency, e.reason, e.created_at AS \"createdAt\", u.display_name AS actor FROM wallet_entries e JOIN users u ON u.id=e.actor_user_id WHERE e.user_id=? ORDER BY e.created_at DESC LIMIT 100",userId); } @Transactional public Map grant(String token, UUID userId, UUID requestId, String amountInput, String reasonInput, AuthService.RequestMeta meta) { + return adjust(token,userId,requestId,"increase",amountInput,reasonInput,null,meta); + } + + @Transactional + public Map adjust(String token, UUID userId, UUID requestId, String operation, String amountInput, String reasonInput, String expectedBalanceInput, AuthService.RequestMeta meta) { var actor=auth.requireAdmin(token); - if(requestId==null) throw new ApiException("INVALID_REQUEST_ID","请提供发放请求编号"); + if(requestId==null) throw new ApiException("INVALID_REQUEST_ID","请提供调整请求编号"); + if(operation==null || !List.of("increase","decrease","set").contains(operation)) throw new ApiException("INVALID_OPERATION","请选择增加、减少或设置余额"); BigDecimal amount; try { amount=new BigDecimal(amountInput).setScale(2,RoundingMode.UNNECESSARY); - if(amount.signum()<=0 || amount.compareTo(new BigDecimal("1000000"))>0) throw new NumberFormatException(); - } catch(Exception exception) { throw new ApiException("INVALID_AMOUNT","金额需大于 0,最多两位小数,单次不超过 100 万元"); } + if(amount.signum()<0 || (!"set".equals(operation) && amount.signum()==0) || amount.compareTo(new BigDecimal("1000000"))>0) throw new NumberFormatException(); + } catch(Exception exception) { throw new ApiException("INVALID_AMOUNT","金额最多两位小数,不超过 100 万元;增减金额需大于 0,目标余额可为 0"); } + BigDecimal expected=null; + if(expectedBalanceInput!=null) { + try { expected=new BigDecimal(expectedBalanceInput); } + catch(Exception e) { throw new ApiException("INVALID_BALANCE","当前余额格式无效"); } + } + if("set".equals(operation) && expected==null) throw new ApiException("BALANCE_REQUIRED","设置余额前请刷新当前余额"); String reason=reasonInput==null?"":reasonInput.trim(); - if(reason.isBlank() || reason.length()>500) throw new ApiException("INVALID_REASON","请填写发放原因(最多 500 字符)"); + if(reason.isBlank() || reason.length()>500) throw new ApiException("INVALID_REASON","请填写调整原因(最多 500 字符)"); if(jdbc.queryForObject("SELECT count(*) FROM users WHERE id=? AND status='active'",Integer.class,userId)==0) throw new ApiException("USER_NOT_FOUND","用户不存在或已停用",404); // Lock the idempotency key before the wallet so concurrent retries cannot grant twice. jdbc.queryForList("SELECT pg_advisory_xact_lock(hashtextextended(?, 0))",requestId.toString()); List> existing=jdbc.queryForList("SELECT * FROM wallet_entries WHERE request_id=?",requestId); if(!existing.isEmpty()) { var entry=existing.getFirst(); - if(!userId.equals(entry.get("user_id")) || !actor.id().equals(entry.get("actor_user_id")) || amount.compareTo((BigDecimal)entry.get("amount"))!=0 || !reason.equals(entry.get("reason"))) throw new ApiException("REQUEST_CONFLICT","请求编号已被另一笔发放使用",409); + if(!userId.equals(entry.get("user_id")) || !actor.id().equals(entry.get("actor_user_id")) || !operation.equals(entry.get("operation")) || amount.compareTo((BigDecimal)entry.get("requested_amount"))!=0 || !reason.equals(entry.get("reason")) || (expected!=null && expected.compareTo((BigDecimal)entry.get("balance_before"))!=0)) throw new ApiException("REQUEST_CONFLICT","请求编号已被另一笔调整使用",409); return Map.of("id",entry.get("id"),"balance",entry.get("balance_after"),"currency","CNY","replayed",true); } jdbc.update("INSERT INTO user_wallets(user_id) VALUES (?) ON CONFLICT DO NOTHING",userId); BigDecimal balance=jdbc.queryForObject("SELECT balance FROM user_wallets WHERE user_id=? FOR UPDATE",BigDecimal.class,userId); - BigDecimal next=balance.add(amount); + if(expected!=null && balance.compareTo(expected)!=0) throw new ApiException("BALANCE_CHANGED","余额已变化,请刷新后重新确认调整",409); + BigDecimal next=switch(operation) { case "decrease" -> balance.subtract(amount); case "set" -> amount; default -> balance.add(amount); }; + if(next.signum()<0) throw new ApiException("INSUFFICIENT_BALANCE","减少金额不能超过当前余额",409); + BigDecimal delta=next.subtract(balance); UUID id=UUID.randomUUID(); jdbc.update("UPDATE user_wallets SET balance=?, updated_at=now() WHERE user_id=?",next,userId); - jdbc.update("INSERT INTO wallet_entries(id,user_id,actor_user_id,request_id,amount,balance_after,reason) VALUES (?,?,?,?,?,?,?)",id,userId,actor.id(),requestId,amount,next,reason); - auth.audit("wallet.credit_granted",actor.id(),meta,Map.of("userId",userId,"entryId",id,"amount",amount,"currency","CNY","reason",reason)); + jdbc.update("INSERT INTO wallet_entries(id,user_id,actor_user_id,request_id,amount,balance_before,balance_after,reason,operation,requested_amount) VALUES (?,?,?,?,?,?,?,?,?,?)",id,userId,actor.id(),requestId,delta,balance,next,reason,operation,amount); + auth.audit("increase".equals(operation)?"wallet.credit_granted":"wallet.credit_adjusted",actor.id(),meta,Map.of("userId",userId,"entryId",id,"amount",delta,"balanceBefore",balance,"balanceAfter",next,"operation",operation,"currency","CNY","reason",reason)); return Map.of("id",id,"balance",next,"currency","CNY","replayed",false); } } diff --git a/control-plane-java/src/main/resources/db/migration/V12__lifecycle_and_usage_history.sql b/control-plane-java/src/main/resources/db/migration/V12__lifecycle_and_usage_history.sql new file mode 100644 index 0000000..c96529a --- /dev/null +++ b/control-plane-java/src/main/resources/db/migration/V12__lifecycle_and_usage_history.sql @@ -0,0 +1,28 @@ +-- Keep references for historical usage and in-flight tasks when removing catalog items or keys. +ALTER TABLE model_providers ADD COLUMN deleted_at timestamptz; +ALTER TABLE model_definitions ADD COLUMN deleted_at timestamptz; +ALTER TABLE model_catalog ADD COLUMN deleted_at timestamptz; +ALTER TABLE platform_api_keys ADD COLUMN deleted_at timestamptz; +ALTER TABLE model_providers DROP CONSTRAINT model_providers_code_key; +CREATE UNIQUE INDEX model_providers_live_code_idx ON model_providers(code) WHERE deleted_at IS NULL; +DROP INDEX model_catalog_group_name_idx; +CREATE UNIQUE INDEX model_catalog_group_name_idx ON model_catalog(logical_model_id, source_label) WHERE deleted_at IS NULL; + +ALTER TABLE wallet_entries DROP CONSTRAINT wallet_entries_amount_check; +ALTER TABLE wallet_entries ADD COLUMN operation varchar(16) NOT NULL DEFAULT 'increase' + CHECK (operation IN ('increase', 'decrease', 'set')); +ALTER TABLE wallet_entries ADD COLUMN requested_amount numeric(20,8); +ALTER TABLE wallet_entries ADD COLUMN balance_before numeric(20,8); +UPDATE wallet_entries SET requested_amount=amount, balance_before=balance_after-amount; +ALTER TABLE wallet_entries ALTER COLUMN requested_amount SET NOT NULL; +ALTER TABLE wallet_entries ALTER COLUMN balance_before SET NOT NULL; +ALTER TABLE wallet_entries ADD CONSTRAINT wallet_entries_balance_check CHECK (balance_before >= 0 AND balance_after >= 0 AND balance_after=balance_before+amount); + +ALTER TABLE usage_events ADD COLUMN endpoint varchar(160); +ALTER TABLE usage_events ADD COLUMN call_mode varchar(16); +ALTER TABLE usage_events ADD COLUMN request_source varchar(24); +ALTER TABLE usage_events ADD COLUMN cached_input_units bigint; +ALTER TABLE usage_events ADD COLUMN cache_write_units bigint; +ALTER TABLE usage_events ADD COLUMN first_token_ms integer; +ALTER TABLE usage_events ADD COLUMN reasoning_effort varchar(32); +CREATE INDEX usage_events_user_key_created_idx ON usage_events(user_id, api_key_id, created_at DESC); diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/PlatformAdminPostgresTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/PlatformAdminPostgresTest.java index a4076a4..6f206b1 100644 --- a/control-plane-java/src/test/java/com/moyi/controlplane/PlatformAdminPostgresTest.java +++ b/control-plane-java/src/test/java/com/moyi/controlplane/PlatformAdminPostgresTest.java @@ -7,6 +7,8 @@ import com.moyi.controlplane.common.ApiException; import com.moyi.controlplane.common.ApiExceptionHandler; import com.moyi.controlplane.security.SecretCipher; import com.moyi.controlplane.wallet.WalletService; +import com.moyi.controlplane.catalog.CatalogController; +import com.moyi.controlplane.usage.*; import jakarta.servlet.http.Cookie; import java.math.BigDecimal; import java.util.*; @@ -156,6 +158,134 @@ class PlatformAdminPostgresTest { assertEquals(0,new BigDecimal("12.60").compareTo((BigDecimal)catalog.overview(memberToken,auth).get("availableCredit"))); } + @Test void deletedCatalogAndKeysCannotReturnButHistorySurvives() throws Exception { + var channel=catalog.createProvider(Map.of("code","lifecycle-channel","name","Lifecycle Channel"),ownerToken,auth); + String channelId=channel.get("id").toString(); + var model=catalog.saveDefinition(null,Map.of("publicName","Lifecycle Model","type","text","mode","sync"),ownerToken,auth); + String modelId=model.get("id").toString(); + var group=catalog.createModel(Map.of("logicalModelId",modelId,"providerId",channelId,"sourceLabel","Primary","upstreamModel","test"),ownerToken,auth); + String groupId=group.get("id").toString(); + var created=catalog.createKey(memberToken,Map.of("name","History Key","modelIds",List.of(groupId)),auth); + String secret=created.get("key").toString(); + UUID keyId=(UUID)catalog.authenticateKey(secret).get("id"); + MockMvc http=MockMvcBuilders.standaloneSetup(new CatalogController(catalog,auth)).setControllerAdvice(new ApiExceptionHandler()).build(); + http.perform(delete("/api/keys/"+keyId).cookie(new Cookie("moyi_session",memberToken))).andExpect(status().isConflict()); + http.perform(patch("/api/keys/"+keyId+"/status").cookie(new Cookie("moyi_session",ownerToken)).contentType("application/json").content("{\"status\":\"disabled\"}")).andExpect(status().isNotFound()); + catalog.revokeKey(memberToken,keyId.toString(),auth); + assertNull(catalog.authenticateKey(secret)); + catalog.setKeyStatus(memberToken,keyId.toString(),"active",auth); + assertNotNull(catalog.authenticateKey(secret)); + new UsageAuditService(jdbc,json).recordCall(memberId,keyId,groupId,channelId,"succeeded",120,10,20,Map.of("messages",List.of(Map.of("role","user","content","history prompt"))),Map.of("reply","saved response"),null,null); + jdbc.update("INSERT INTO model_tasks(id,user_id,api_key_id,model_id,task_type,status,prompt) VALUES ('history-task',?,?,?,'3d','succeeded','test')",memberId,keyId,groupId); + catalog.revokeKey(memberToken,keyId.toString(),auth); + http.perform(delete("/api/keys/"+keyId).cookie(new Cookie("moyi_session",memberToken))).andExpect(status().isNoContent()); + assertTrue(catalog.listKeys(memberToken,auth).isEmpty()); + assertNull(catalog.authenticateKey(secret)); + assertThrows(ApiException.class,()->catalog.setKeyStatus(memberToken,keyId.toString(),"active",auth)); + assertEquals(1,jdbc.queryForObject("SELECT count(*) FROM model_tasks WHERE id='history-task'",Integer.class)); + assertThrows(ApiException.class,()->catalog.deleteCatalog("model",modelId,memberToken,auth)); + assertEquals("CHANNEL_IN_USE",assertThrows(ApiException.class,()->catalog.deleteCatalog("channel",channelId,ownerToken,auth)).getCode()); + catalog.deleteCatalog("group",groupId,ownerToken,auth); + assertNull(catalog.activeModel(groupId)); + assertThrows(ApiException.class,()->catalog.updateModel(groupId,Map.of("status","active"),ownerToken,auth)); + // The removed name can be reused without granting the replacement to existing keys. + var replacement=catalog.createModel(Map.of("logicalModelId",modelId,"providerId",channelId,"sourceLabel","Primary","upstreamModel","test"),ownerToken,auth); + catalog.deleteCatalog("model",modelId,ownerToken,auth); + assertNull(catalog.activeModel(replacement.get("id").toString())); + catalog.deleteCatalog("channel",channelId,ownerToken,auth); + assertThrows(ApiException.class,()->catalog.updateProvider(channelId,Map.of("status","active"),ownerToken,auth)); + assertDoesNotThrow(()->catalog.createProvider(Map.of("code","lifecycle-channel","name","New Channel"),ownerToken,auth)); + var history=new UserUsageService(jdbc,auth,json); + UUID usageId=jdbc.queryForObject("SELECT id FROM usage_events WHERE user_id=?",UUID.class,memberId); + var detail=history.detail(memberToken,usageId); + assertEquals("History Key",detail.get("keyName")); + assertEquals("Lifecycle Model",detail.get("modelName")); + assertEquals("Lifecycle Channel",detail.get("providerName")); + assertEquals("saved response",json.valueToTree(detail.get("output")).get("reply").asText()); + } + + @Test void walletAdjustmentsSerializeAndCannotOverdrawOrReplayTwice() throws Exception { + wallet.grant(ownerToken,memberId,UUID.randomUUID(),"100","initial",meta); + UUID request=UUID.randomUUID(); + try(var pool=Executors.newFixedThreadPool(2)) { + var a=pool.submit(()->wallet.adjust(ownerToken,memberId,request,"decrease","20","correction","100",meta)); + var b=pool.submit(()->wallet.adjust(ownerToken,memberId,request,"decrease","20","correction","100",meta)); + assertEquals(a.get(10,TimeUnit.SECONDS).get("id"),b.get(10,TimeUnit.SECONDS).get("id")); + } + assertEquals("BALANCE_CHANGED",assertThrows(ApiException.class,()->wallet.adjust(ownerToken,memberId,UUID.randomUUID(),"set","50","stale","100",meta)).getCode()); + assertEquals("INSUFFICIENT_BALANCE",assertThrows(ApiException.class,()->wallet.adjust(ownerToken,memberId,UUID.randomUUID(),"decrease","81","too much","80",meta)).getCode()); + assertThrows(ApiException.class,()->wallet.adjust(memberToken,memberId,UUID.randomUUID(),"set","10","forbidden","80",meta)); + wallet.adjust(ownerToken,memberId,UUID.randomUUID(),"set","0","reset","80",meta); + assertEquals(0,BigDecimal.ZERO.compareTo(jdbc.queryForObject("SELECT balance FROM user_wallets WHERE user_id=?",BigDecimal.class,memberId))); + assertEquals(3,wallet.entries(ownerToken,memberId).size()); + assertEquals(0,BigDecimal.ZERO.compareTo(jdbc.queryForObject("SELECT SUM(amount) FROM wallet_entries WHERE user_id=?",BigDecimal.class,memberId))); + assertThrows(ApiException.class,()->wallet.adjust(ownerToken,memberId,request,"increase","20","correction","100",meta)); + } + + @Test void usageFiltersSummaryDetailsAndExportsStayWithinTheSessionOwner() throws Exception { + var key=catalog.createKey(memberToken,Map.of("name","=formula key"),auth); + UUID keyId=(UUID)catalog.authenticateKey(key.get("key").toString()).get("id"); + String groupId=jdbc.queryForObject("SELECT id FROM model_catalog ORDER BY id LIMIT 1",String.class); + String modelId=jdbc.queryForObject("SELECT logical_model_id FROM model_catalog WHERE id=?",String.class,groupId); + String providerId=jdbc.queryForObject("SELECT provider_id FROM model_catalog WHERE id=?",String.class,groupId); + var audit=new UsageAuditService(jdbc,json); + for(int i=0;i<23;i++) audit.recordCall(memberId,keyId,groupId,providerId,"succeeded",100,10,20,Map.of("prompt","member only","api_key","hidden"),Map.of("reply","saved"),null,null); + UUID other=auth.requireUser(ownerToken).id(); + audit.recordCall(other,null,groupId,providerId,"failed",900,1000,1000,Map.of("prompt","owner confidential"),null,"ERR","internal"); + jdbc.update("UPDATE usage_events SET user_agent='Test Client', request_source='playground', endpoint='/v1/chat/completions', cost_amount=0.5, cached_input_units=2 WHERE user_id=?",memberId); + jdbc.update("UPDATE usage_events SET admin_note='admin private note' WHERE user_id=?",memberId); + var service=new UserUsageService(jdbc,auth,json); + var f=new UserUsageService.Filters(keyId.toString(),modelId,groupId,"succeeded","call","sync","playground","recorded","Client",null,null,2,20,"time","desc"); + var result=service.list(memberToken,f); + assertEquals(23L,result.get("total")); assertEquals(3,((List)result.get("records")).size()); + var summary=(Map)result.get("summary"); + assertEquals(0,new BigDecimal("11.5").compareTo((BigDecimal)summary.get("totalCost"))); + assertEquals(0,new BigDecimal("230").compareTo((BigDecimal)summary.get("inputUnits"))); + var csv=service.exportCsv(memberToken,f); + assertEquals(24,csv.lines().count()); assertTrue(csv.contains("'=formula key")); assertFalse(csv.contains("owner confidential")); + UUID otherId=jdbc.queryForObject("SELECT id FROM usage_events WHERE user_id=?",UUID.class,other); + assertThrows(ApiException.class,()->service.detail(memberToken,otherId)); + UUID ownId=jdbc.queryForObject("SELECT id FROM usage_events WHERE user_id=? LIMIT 1",UUID.class,memberId); + var detail=service.detail(memberToken,ownId); + assertFalse(detail.containsKey("adminNote")); assertFalse(detail.containsKey("sourceIp")); + assertEquals("[REDACTED]",json.valueToTree(detail.get("input")).get("api_key").asText()); + MockMvc http=MockMvcBuilders.standaloneSetup(new UserUsageController(service)).setControllerAdvice(new ApiExceptionHandler()).build(); + http.perform(get("/api/usage").cookie(new Cookie("moyi_session",memberToken)).param("keyId",keyId.toString()).param("page","2").param("size","20")) + .andExpect(status().isOk()).andExpect(jsonPath("$.total").value(23)).andExpect(jsonPath("$.records.length()").value(3)); + http.perform(get("/api/usage/"+otherId).cookie(new Cookie("moyi_session",memberToken))).andExpect(status().isNotFound()); + http.perform(get("/api/usage/options").cookie(new Cookie("moyi_session",memberToken))).andExpect(status().isOk()); + http.perform(get("/api/usage/export").cookie(new Cookie("moyi_session",memberToken)).param("status","failed")) + .andExpect(status().isOk()).andExpect(content().string(org.hamcrest.Matchers.not(org.hamcrest.Matchers.containsString("owner confidential")))); + } + + @Test void requestMetadataAndCacheUsageAreRecordedWithoutExposingSecrets() throws Exception { + String groupId=jdbc.queryForObject("SELECT id FROM model_catalog ORDER BY id LIMIT 1",String.class); + String providerId=jdbc.queryForObject("SELECT provider_id FROM model_catalog WHERE id=?",String.class,groupId); + var audit=new UsageAuditService(jdbc,json); + var request=new org.springframework.mock.web.MockHttpServletRequest("POST","/v1/chat/completions"); + request.addHeader("X-Moyi-Source","playground"); + request.addHeader("User-Agent","Local test browser"); + org.springframework.web.context.request.RequestContextHolder.setRequestAttributes(new org.springframework.web.context.request.ServletRequestAttributes(request)); + try { + audit.recordCall(memberId,null,groupId,providerId,"succeeded",200,100,20, + Map.of("prompt","hello","authorization","hidden"), + Map.of("usage",Map.of("prompt_tokens_details",Map.of("cached_tokens",80),"cache_creation_input_tokens",5)),null,null); + } finally { org.springframework.web.context.request.RequestContextHolder.resetRequestAttributes(); } + var saved=jdbc.queryForMap("SELECT * FROM usage_events WHERE user_id=?",memberId); + assertEquals("/v1/chat/completions",saved.get("endpoint")); + assertEquals("playground",saved.get("request_source")); + assertEquals("Local test browser",saved.get("user_agent")); + assertEquals(80L,saved.get("cached_input_units")); + assertEquals(5L,saved.get("cache_write_units")); + assertNull(saved.get("cost_amount")); + assertNull(saved.get("first_token_ms")); + assertFalse(saved.get("input_payload").toString().contains("hidden")); + audit.recordTask(memberId,null,groupId,providerId,"local-timing-task","queued",Map.of("prompt","hello"),null,null,null); + jdbc.update("UPDATE usage_events SET created_at=now()-interval '2 seconds' WHERE provider_task_id='local-timing-task'"); + audit.updateTask("local-timing-task","succeeded",Map.of("url","https://example.test/result"),null,null); + assertTrue(jdbc.queryForObject("SELECT latency_ms>=2000 FROM usage_events WHERE provider_task_id='local-timing-task'",Boolean.class)); + } + @Test void directCreationCannotEscalateAndOtpIsRequiredOnBothChannels() throws Exception { MockMvc http = MockMvcBuilders.standaloneSetup(new AuthController(auth,verification,168,false)).setControllerAdvice(new ApiExceptionHandler()).build(); http.perform(post("/api/admin/users").cookie(new Cookie("moyi_session",ownerToken)).contentType("application/json").content("{\"account\":\"created_user\",\"password\":\"test-password\",\"role\":\"super_admin\"}")) diff --git a/docs/14-lifecycle-usage-credit-adjustments.md b/docs/14-lifecycle-usage-credit-adjustments.md new file mode 100644 index 0000000..64f15dc --- /dev/null +++ b/docs/14-lifecycle-usage-credit-adjustments.md @@ -0,0 +1,65 @@ +# 目录删除、使用记录与额度调整 + +- 状态:实现完成,本地验收;待部署到服务器并验收。 +- 负责人:Codex;产品验收:项目负责人。 +- 更新时间:2026-09-19。 +- 评审结论:在原有渠道、模型、分组与人民币账本上补齐生命周期操作;历史引用继续保留。 + +## 功能与验收标准 + +| 编号 | 入口 | 行为 | +| --- | --- | --- | +| LC-01 | 管理端 → 渠道管理 | 增加删除及确认弹窗;有未删除分组时阻止删除,提示先转移或删除分组。 | +| LC-02 | 管理端 → 模型与分组 | 模型和分组均可删除;删除模型会一并移除其全部分组。 | +| LC-03 | 用户端 → API Keys | 停用后可重新启用或删除;启用中的 Key 必须先停用。删除后不能从页面恢复。 | +| UH-01 | 用户端 → 任务中心 | 按使用记录显示同步调用及异步任务;统计筛选范围内的请求数、输入输出 Token、缓存、已记录人民币费用及平均耗时。 | +| UH-02 | 使用记录筛选 | 按 Key、模型、分组、状态、调用类型、请求类别、来源、费用记录状态、User-Agent、时间筛选;分页、排序、自定义列、刷新及 CSV 导出。 | +| UH-03 | 用户端 → 在线调试 → 调用历史 | 服务端持久保存的记录在刷新、重新登录后仍可查看;详情展示请求与响应,支持将文本输入和原分组载入调试。 | +| WC-01 | 管理端 → 用户与额度 → 调整额度 | 支持增加、减少、设置指定余额;人民币元,最多两位小数,目标余额可以为零,不得扣为负数。 | +| WC-02 | 用户与额度 → 额度流水 | 保留每笔增减差额、操作方式、调整原因、操作人、时间、调整前后余额。 | + +删除采用数据库标记,列表和新调用入口会立即排除已删除项。已有调用、任务和额度流水保留。已删除模型/分组不能通过旧编辑接口重新启用;删除后新建同名渠道或分组取得新 ID,不继承旧 Key 授权。单纯“停用”仍可恢复。 + +用户只能查询、导出自己的使用记录和操作自己的 Key;管理员备注、来源 IP、凭据字段不出现在用户记录接口中。CSV 对公式前缀进行转义;最多导出 10000 条,超限要求缩小筛选范围,不静默截断。列表统计针对整个筛选结果,而非当前页。 + +调整额度的请求 ID 保证网络重试不会重复记账;数据库行锁串行化余额修改。页面提交时携带已看到的余额,余额被其他操作改变时要求刷新后重试。旧增加额度接口保留兼容。 + +## 数据边界 + +- 历史记录只展示服务端已经保存的数据,不能恢复升级前从未保存或已被管理员删除的记录。 +- 旧调用没有端点、来源、缓存等字段时显示空缺;在线调试默认展示本账号全部历史,也可筛选“在线调试”来源。 +- 本次不新增计价、实际扣费或汇率换算。费用显示已有 `cost_amount`,未记录显示“—”,不把未计费伪装成免费。金额展示以平台人民币账本为准。 +- 当前 Java 网关未实现流式转发,首 Token 时延和推理强度没有数据时显示“—”,不会伪造或回填。类型筛选保留流式选项供已记录数据使用。 +- 输入、输出 Token 采用现有网关记录;缓存计数仅在上游提供相应字段时采集。异步耗时包含排队,统计至任务进入终态。 +- 在线调试“载入调试”仅恢复可识别的文本提示和仍存在的分组,不自动执行请求,不恢复明文 Key,也不承诺还原多轮上下文或附件。 + +## 接口 + +| 方法 | 路径 | 用途 | +| --- | --- | --- | +| DELETE | `/api/admin/providers/{id}` | 删除无关联分组的渠道 | +| DELETE | `/api/admin/model-definitions/{id}` | 删除模型及其分组 | +| DELETE | `/api/admin/models/{id}` | 删除分组 | +| PATCH | `/api/keys/{id}/status` | `status` 为 `active` 或 `disabled` | +| DELETE | `/api/keys/{id}` | 删除本人的已停用 Key | +| GET | `/api/usage` | 分页记录及同条件统计 | +| GET | `/api/usage/options` | 当前用户可筛选的 Key、模型和分组 | +| GET | `/api/usage/{id}` | 本人的调用详情 | +| GET | `/api/usage/export` | 使用相同筛选和排序导出 CSV | +| POST | `/api/admin/users/{id}/wallet/adjustments` | `requestId`、`operation`(increase/decrease/set)、`amount`、`reason`、`expectedBalance` | + +## 迁移与部署 + +Flyway V12 增加目录/Key 删除时间、使用记录元数据、额度调整类型和前后余额;旧发放流水保留,自动标记为 increase 并计算 balance_before。运行迁移前先备份专用 `moyi_control` 数据库及原配置/证书。无需新增环境变量,继续保留 SMTP/SMS、数据库和加密配置。 + +新版前后端必须配套更新。V12 之后不要仅切换旧应用镜像:旧程序不了解删除标记,并且旧额度写入不满足新版账本字段约束。需要回退时使用升级前数据库备份和配套旧应用/配置,事先确认恢复备份会丢失备份后的写入。部署步骤见 `11-server-test-deployment.md`。 + +## 本地验证 + +隔离 PostgreSQL 位于 `127.0.0.1:55439`,测试按随机 schema 隔离。页面验收使用本机 `127.0.0.1:8788` / `5178` 与专用 schema,所有账号、Key 和使用记录均为本地验收数据,未连接云数据库或发送真实邮件/短信。 + +- Java:Maven clean verify;生命周期权限、删除后认证拒绝、历史引用保留、负余额拒绝、余额并发及幂等、使用记录分页/过滤/CSV、跨用户隔离、元数据采集、异步终态耗时。 +- 前端:vue-tsc 类型检查与 Vite 构建。 +- 浏览器:设置余额 100 元后扣减 25.50 元得到 74.50 元,流水前后余额正确;Key 停用/重新启用/删除;23 条使用记录分页及失败筛选;自定义列和 CSV;历史详情和输入恢复;删除渠道时关联检查;删除分组、模型后成功删除渠道,历史仍保留。 + +真实供应商计费、流式转发与公网升级不属于本次本地验收。页面中的费用样例仅在隔离测试库生成。 diff --git a/prototype/src/components/AccountAdmin.vue b/prototype/src/components/AccountAdmin.vue index 3f517a5..8002e19 100644 --- a/prototype/src/components/AccountAdmin.vue +++ b/prototype/src/components/AccountAdmin.vue @@ -1,7 +1,7 @@ + + + + diff --git a/prototype/src/services/catalog.ts b/prototype/src/services/catalog.ts index 0a48593..3f777e4 100644 --- a/prototype/src/services/catalog.ts +++ b/prototype/src/services/catalog.ts @@ -50,6 +50,8 @@ export interface WalletEntry { id: string amount: number balanceAfter: number + balanceBefore: number + operation: 'increase' | 'decrease' | 'set' currency: 'CNY' reason: string createdAt: string @@ -200,6 +202,31 @@ export class CatalogApiError extends Error { } } +export interface UserUsageRecord extends UsageAuditRecord { + logicalModelId?: string + groupName?: string + endpoint?: string + callMode?: string + requestSource?: string + userAgent?: string + cachedInputUnits?: number + cacheWriteUnits?: number + firstTokenMs?: number + reasoningEffort?: string + taskId?: string + progress?: number + result?: unknown +} +export interface UserUsagePage extends UsageAuditPage { + records: UserUsageRecord[] + summary: { totalRequests: number; inputUnits: number; outputUnits: number; cachedInputUnits?: number; cacheWriteUnits?: number; totalCost?: number; pricedRequests: number; averageLatencyMs?: number } +} +export interface UsageOptions { + keys: Array<{ id: string; name: string; deleted: boolean }> + models: Array<{ id: string; name: string }> + groups: Array<{ id: string; modelId: string; name: string; channel: string }> +} + class HttpCatalogClient { constructor(private readonly baseUrl: string) {} @@ -238,10 +265,32 @@ class HttpCatalogClient { await this.request(`/api/keys/${encodeURIComponent(id)}/revoke`, { method: 'POST' }) } + async setKeyStatus(id: string, status: 'active' | 'disabled') { + await this.request(`/api/keys/${encodeURIComponent(id)}/status`, { method: 'PATCH', body: JSON.stringify({ status }) }) + } + async deleteKey(id: string) { await this.request(`/api/keys/${encodeURIComponent(id)}`, { method: 'DELETE' }) } + async deleteCatalog(kind: 'channel' | 'model' | 'group', id: string) { + const resource = { channel: 'providers', model: 'model-definitions', group: 'models' }[kind] + await this.request(`/api/admin/${resource}/${encodeURIComponent(id)}`, { method: 'DELETE' }) + } + async adjustCredit(userId: string, input: { requestId: string; operation: 'increase' | 'decrease' | 'set'; amount: string; reason: string; expectedBalance: string }) { + return this.request<{ id: string; balance: number; currency: 'CNY' }>(`/api/admin/users/${encodeURIComponent(userId)}/wallet/adjustments`, { method: 'POST', body: JSON.stringify(input) }) + } + async listUsage(filters: Record) { + return this.request(`/api/usage?${new URLSearchParams(Object.entries(filters).map(([k, v]) => [k, String(v)]))}`) + } + async usageOptions() { return this.request('/api/usage/options') } + async usageDetail(id: string) { return this.request<{ record: UserUsageRecord }>(`/api/usage/${encodeURIComponent(id)}`) } + async exportUsage(filters: Record) { + const response = await fetch(`${this.baseUrl}/api/usage/export?${new URLSearchParams(Object.entries(filters).map(([k,v]) => [k,String(v)]))}`, { credentials: 'include' }) + if (!response.ok) { const data = await response.json().catch(() => ({})); throw new Error(data.error?.message || '导出失败') } + return response.blob() + } + async chatCompletion(apiKey: string, input: { model: string; prompt: string }) { return this.request('/v1/chat/completions', { method: 'POST', - headers: { Authorization: `Bearer ${apiKey}` }, + headers: { Authorization: `Bearer ${apiKey}`, 'X-Moyi-Source': 'playground' }, body: JSON.stringify({ model: input.model, messages: [{ role: 'user', content: input.prompt }] }), }) } @@ -249,7 +298,7 @@ class HttpCatalogClient { async createMediaTask(apiKey: string, input: { model: string; prompt: string; mediaType: '3d' | 'video' }) { const payload = await this.request<{ task: AsyncTaskResult }>(input.mediaType === 'video' ? '/v1/video/tasks' : '/v1/3d/tasks', { method: 'POST', - headers: { Authorization: `Bearer ${apiKey}` }, + headers: { Authorization: `Bearer ${apiKey}`, 'X-Moyi-Source': 'playground' }, body: JSON.stringify({ model: input.model, prompt: input.prompt }), }) return payload.task diff --git a/prototype/src/views/UserConsole.vue b/prototype/src/views/UserConsole.vue index 6518430..f5bde47 100644 --- a/prototype/src/views/UserConsole.vue +++ b/prototype/src/views/UserConsole.vue @@ -10,7 +10,6 @@ import { CheckCircle2, ChevronDown, CircleDollarSign, - Clock3, Code2, Copy, Download, @@ -33,15 +32,17 @@ import { Sparkles, Terminal, Timer, + Trash2, WalletCards, Zap, } from 'lucide-vue-next' import type { ApiKeyItem, CallMode, ModelItem, ModelType, TaskItem, TaskStatus } from '../types' -import { catalogClient, platformApiBaseUrl, type AsyncTaskResult, type CatalogApiKey, type CatalogModel, type CatalogProject, type PlatformOverview } from '../services/catalog' +import { catalogClient, platformApiBaseUrl, type AsyncTaskResult, type CatalogApiKey, type CatalogModel, type CatalogProject, type PlatformOverview, type UserUsageRecord } from '../services/catalog' import { copyText, type CopyResult } from '../services/clipboard' import SlidePanel from '../components/SlidePanel.vue' import UiModal from '../components/UiModal.vue' import ModelGroupPermissions from '../components/ModelGroupPermissions.vue' +import UsageHistory from '../components/UsageHistory.vue' defineProps<{ view: string; displayName?: string }>() const emit = defineEmits<{ navigate: [view: string]; notify: [message: string]; balance: [value: number | undefined] }>() @@ -71,7 +72,19 @@ const running = ref(false) const response = ref('') const keys = ref([]) const tasks = ref([]) -const taskFilter = ref<'全部' | TaskStatus>('全部') +const historyRevision = ref(0) +const keyBusy = ref(false) +const deleteKeyTarget = ref() +function restoreHistory(record: UserUsageRecord) { + const input = record.input as { prompt?: unknown; messages?: unknown } | undefined + const group = catalogModels.value.find(item => item.id === record.modelId) + if (group) selectPlaygroundGroup(group.id) + const messages = Array.isArray(input?.messages) ? input.messages : [] + const text = typeof input?.prompt === 'string' ? input.prompt : messages.filter(message => message?.role === 'user' && typeof message.content === 'string').map(message => message.content).join('\n') + prompt.value = text.slice(0, 4000) + response.value = '' + emit('notify', !group ? '历史文本已载入,原分组已不可用,请重新选择模型和分组' : text.length > 4000 ? '已载入前 4000 字,请检查输入后再调用' : text ? '历史输入已载入,确认配置后可再次调用' : '该记录没有可恢复的纯文本输入,请手动填写') +} const selectedTask = ref(null) const createKeyOpen = ref(false) const secretOpen = ref(false) @@ -149,11 +162,7 @@ const activeModelFilters = computed(() => [ modelMode.value !== '全部' ? modelMode.value : '', modelAvailability.value !== '全部' ? modelAvailability.value : '', ].filter(Boolean)) -const filteredTasks = computed(() => taskFilter.value === '全部' ? tasks.value : tasks.value.filter((task) => task.status === taskFilter.value)) const activeTask = computed(() => tasks.value.find((task) => task.id === activeTaskId.value)) -const runningTaskCount = computed(() => tasks.value.filter((task) => task.status === '执行中').length) -const queuedTaskCount = computed(() => tasks.value.filter((task) => task.status === '排队中').length) -const completedTaskCount = computed(() => tasks.value.filter((task) => task.status === '已完成').length) const usageSeries = computed(() => { const maximum = Math.max(...overview.value.series.map((item) => item.count), 0) return overview.value.series.map((item) => ({ @@ -239,6 +248,7 @@ async function runModel() { emit('notify', error instanceof Error ? error.message : '模型调用失败') } finally { running.value = false + historyRevision.value++ } } @@ -412,17 +422,28 @@ async function saveModelPermissions() { } async function toggleKey(key: ApiKeyItem) { - if (catalogConnected.value && key.status === '正常') { - try { - await catalogClient.revokeKey(String(key.id)) - key.status = '已停用' - emit('notify', `${key.name} 已停用`) - } catch (error) { - emit('notify', error instanceof Error ? error.message : '停用 Key 失败') - } - return - } - emit('notify', key.status === '已停用' ? '已停用的 Key 不能重新启用,请创建新 Key' : 'Control Plane 未连接') + if (keyBusy.value) return + keyBusy.value = true + try { + const enabled = key.status !== '正常' + await catalogClient.setKeyStatus(String(key.id), enabled ? 'active' : 'disabled') + key.status = enabled ? '正常' : '已停用' + emit('notify', `${key.name} ${enabled ? '已重新启用' : '已停用'}`) + } catch (error) { emit('notify', error instanceof Error ? error.message : '更新 Key 状态失败') } + finally { keyBusy.value = false } +} +async function deleteKey() { + if (!deleteKeyTarget.value || keyBusy.value) return + keyBusy.value = true + try { + const id = deleteKeyTarget.value.id + await catalogClient.deleteKey(String(id)) + keys.value = keys.value.filter(key => key.id !== id) + if (id === createdKeyId.value) { remoteApiKey.value = ''; createdSecret.value = ''; createdKeyId.value = '' } + deleteKeyTarget.value = undefined + emit('notify', 'API Key 已删除,使用记录已保留') + } catch (error) { emit('notify', error instanceof Error ? error.message : '删除 Key 失败') } + finally { keyBusy.value = false } } async function createProject() { @@ -515,18 +536,18 @@ async function createProject() {
等待模型响应

配置请求并点击“开始调用”

+