feat(console): add deletion lifecycle, usage history and balance adjustments

This commit is contained in:
wlx committed 2026-09-19 21:08:45 +08:00
1 parent 32e977df5c
commit 7360cf3ebe
18 files changed
+830 -66

No files matched your search

+2
View File
@@ -304,6 +304,8 @@ MaaS 模型服务与应用开发
- [Java 后端与容器化部署基线](docs/08-java-container-deployment.md) - [Java 后端与容器化部署基线](docs/08-java-container-deployment.md)
- [Java Control Plane 节点一:基础控制面](docs/09-java-control-plane-node.md) - [Java Control Plane 节点一:基础控制面](docs/09-java-control-plane-node.md)
- [北京服务器测试部署与发布包](docs/11-server-test-deployment.md) - [北京服务器测试部署与发布包](docs/11-server-test-deployment.md)
- [模型分组、注册验证与人民币额度](docs/13-model-groups-registration-credit.md)
- [目录删除、使用记录与额度调整](docs/14-lifecycle-usage-credit-adjustments.md)
## 前端原型 ## 前端原型
@@ -7,6 +7,7 @@ import java.util.Map;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping; 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.PathVariable;
import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@@ -91,6 +92,36 @@ public class CatalogController {
return Map.of("providers", catalogService.listProviders(true)); return Map.of("providers", catalogService.listProviders(true));
} }
@PatchMapping("/keys/{id}/status")
public ResponseEntity<Void> keyStatus(@PathVariable String id, @RequestBody Map<String,String> 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<Void> 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<Void> 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<Void> 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<Void> deleteDefinition(@PathVariable String id, jakarta.servlet.http.HttpServletRequest request) {
catalogService.deleteCatalog("model",id,AuthController.sessionToken(request),authService);
return ResponseEntity.noContent().build();
}
@PostMapping("/admin/providers") @PostMapping("/admin/providers")
public ResponseEntity<Map<String, Object>> createProvider( public ResponseEntity<Map<String, Object>> createProvider(
@RequestBody Map<String, Object> input, @RequestBody Map<String, Object> input,
@@ -43,17 +43,17 @@ public class CatalogService {
} }
public List<Map<String, Object>> listProviders(boolean includeDisabled) { public List<Map<String, Object>> 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); return jdbc.query("SELECT * FROM model_providers" + statusClause + " ORDER BY name", this::mapProvider);
} }
public List<Map<String, Object>> listModels(boolean includeDisabled) { public List<Map<String, Object>> 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); 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<Map<String, Object>> listDefinitions(boolean includeDisabled) { public List<Map<String, Object>> 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<String, Object> item = new LinkedHashMap<>(); Map<String, Object> item = new LinkedHashMap<>();
item.put("id", rs.getString("id")); item.put("id", rs.getString("id"));
item.put("publicName", rs.getString("public_name")); item.put("publicName", rs.getString("public_name"));
@@ -71,6 +71,7 @@ public class CatalogService {
@Transactional @Transactional
public Map<String, Object> saveDefinition(String id, Map<String, Object> input, String token, AuthService auth) { public Map<String, Object> saveDefinition(String id, Map<String, Object> input, String token, AuthService auth) {
UserView admin = auth.requireAdmin(token); UserView admin = auth.requireAdmin(token);
lockCatalog();
boolean creating = id == null; boolean creating = id == null;
Map<String, Object> value = creating ? new LinkedHashMap<>() : new LinkedHashMap<>(definition(id)); Map<String, Object> value = creating ? new LinkedHashMap<>() : new LinkedHashMap<>(definition(id));
value.putAll(input); 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); 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 { } 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_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)); auth.audit(creating ? "model_definition.created" : "model_definition.updated", admin.id(), new AuthService.RequestMeta(null,null), Map.of("modelId",id));
return definition(id); return definition(id);
@@ -103,6 +104,7 @@ public class CatalogService {
@Transactional @Transactional
public Map<String, Object> createProvider(Map<String, Object> input, String token, AuthService auth) { public Map<String, Object> createProvider(Map<String, Object> input, String token, AuthService auth) {
UserView admin = auth.requireAdmin(token); UserView admin = auth.requireAdmin(token);
lockCatalog();
String code = required(input, "code").toLowerCase(); String code = required(input, "code").toLowerCase();
String name = required(input, "name"); String name = required(input, "name");
String protocol = optional(input, "protocol", "http"); String protocol = optional(input, "protocol", "http");
@@ -129,6 +131,7 @@ public class CatalogService {
@Transactional @Transactional
public Map<String, Object> updateProvider(String id, Map<String, Object> input, String token, AuthService auth) { public Map<String, Object> updateProvider(String id, Map<String, Object> input, String token, AuthService auth) {
UserView admin = auth.requireAdmin(token); UserView admin = auth.requireAdmin(token);
lockCatalog();
Map<String, Object> previous = findProvider(id); Map<String, Object> previous = findProvider(id);
if (previous == null) throw new ApiException("PROVIDER_NOT_FOUND", "渠道不存在", 404); if (previous == null) throw new ApiException("PROVIDER_NOT_FOUND", "渠道不存在", 404);
Map<String, Object> value = new LinkedHashMap<>(previous); Map<String, Object> value = new LinkedHashMap<>(previous);
@@ -158,6 +161,7 @@ public class CatalogService {
@Transactional @Transactional
public Map<String, Object> createModel(Map<String, Object> input, String token, AuthService auth) { public Map<String, Object> createModel(Map<String, Object> input, String token, AuthService auth) {
UserView admin = auth.requireAdmin(token); UserView admin = auth.requireAdmin(token);
lockCatalog();
input = new LinkedHashMap<>(input); input = new LinkedHashMap<>(input);
String logicalId = optional(input, "logicalModelId", null); String logicalId = optional(input, "logicalModelId", null);
if (logicalId == null) logicalId = String.valueOf(saveDefinition(null, input, token, auth).get("id")); if (logicalId == null) logicalId = String.valueOf(saveDefinition(null, input, token, auth).get("id"));
@@ -197,6 +201,7 @@ public class CatalogService {
@Transactional @Transactional
public Map<String, Object> updateModel(String id, Map<String, Object> input, String token, AuthService auth) { public Map<String, Object> updateModel(String id, Map<String, Object> input, String token, AuthService auth) {
UserView admin=auth.requireAdmin(token); UserView admin=auth.requireAdmin(token);
lockCatalog();
Map<String,Object> old=findModel(id); Map<String,Object> old=findModel(id);
if (old==null) throw new ApiException("MODEL_NOT_FOUND","分组不存在",404); if (old==null) throw new ApiException("MODEL_NOT_FOUND","分组不存在",404);
Map<String,Object> value=new LinkedHashMap<>(old); Map<String,Object> value=new LinkedHashMap<>(old);
@@ -245,7 +250,7 @@ public class CatalogService {
public List<Map<String, Object>> listKeys(String token, AuthService auth) { public List<Map<String, Object>> listKeys(String token, AuthService auth) {
UserView user = auth.requireUser(token); 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 @Transactional
@@ -275,7 +280,7 @@ public class CatalogService {
@Transactional @Transactional
public Map<String, Object> updateKeyModels(String token, String keyId, List<String> modelIds, AuthService auth) { public Map<String, Object> updateKeyModels(String token, String keyId, List<String> modelIds, AuthService auth) {
UserView user = auth.requireUser(token); 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); if (existing.isEmpty()) throw new ApiException("KEY_NOT_FOUND", "Key 不存在、已停用或无权修改", 404);
List<?> priorIds = (List<?>) existing.getFirst().get("modelIds"); List<?> priorIds = (List<?>) existing.getFirst().get("modelIds");
List<String> uniqueIds = modelIds == null ? List.of() : modelIds.stream().filter(java.util.Objects::nonNull).map(String::trim).filter(value -> !value.isBlank()).distinct().toList(); List<String> 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 @Transactional
public void revokeKey(String token, String keyId, AuthService auth) { 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); 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()); 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); 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<String, Object> overview(String token, AuthService auth) { public Map<String, Object> overview(String token, AuthService auth) {
@@ -314,7 +360,7 @@ public class CatalogService {
public Map<String, Object> authenticateKey(String plaintext) { public Map<String, Object> authenticateKey(String plaintext) {
if (plaintext == null || plaintext.isBlank()) return null; if (plaintext == null || plaintext.isBlank()) return null;
try { 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) { } catch (EmptyResultDataAccessException exception) {
return null; return null;
} }
@@ -337,7 +383,7 @@ public class CatalogService {
} }
public UUID keyOwnerId(UUID apiKeyId) { 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); } catch (EmptyResultDataAccessException exception) { throw new ApiException("INVALID_API_KEY", "API Key 无效或已停用", 401); }
} }
@@ -350,17 +396,17 @@ public class CatalogService {
} }
private Map<String, Object> findProvider(String id) { private Map<String, Object> 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; } catch (EmptyResultDataAccessException exception) { return null; }
} }
private Map<String, Object> findModel(String id) { private Map<String, Object> 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; } catch (EmptyResultDataAccessException exception) { return null; }
} }
private Map<String, Object> findActiveModel(String id) { private Map<String, Object> 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; } catch (EmptyResultDataAccessException exception) { return null; }
} }
@@ -22,7 +22,7 @@ public class WebConfig implements WebMvcConfigurer {
registry.addMapping("/**") registry.addMapping("/**")
.allowedOrigins(allowedOrigins) .allowedOrigins(allowedOrigins)
.allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS") .allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")
.allowedHeaders("Content-Type", "Authorization") .allowedHeaders("Content-Type", "Authorization", "X-Moyi-Source")
.allowCredentials(true) .allowCredentials(true)
.maxAge(3600); .maxAge(3600);
} }
@@ -52,8 +52,8 @@ public class UsageAuditService {
public void updateTask(String taskId, String status, Object output, String errorCode, String errorMessage) { public void updateTask(String taskId, String status, Object output, String errorCode, String errorMessage) {
jdbc.update( 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", "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, now(), taskId 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) { 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( 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, 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) { private String json(Object value) {
if (value == null) return null; if (value == null) return null;
try { try {
@@ -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<String,Object> list(HttpServletRequest request,@ModelAttribute UserUsageService.Filters filters) { return usage.list(AuthController.sessionToken(request),filters); }
@GetMapping("/options")
public Map<String,Object> options(HttpServletRequest request) { return usage.options(AuthController.sessionToken(request)); }
@GetMapping("/{id}")
public Map<String,Object> detail(@PathVariable UUID id,HttpServletRequest request) { return Map.of("record",usage.detail(AuthController.sessionToken(request),id)); }
@GetMapping("/export")
public ResponseEntity<String> 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));
}
}
@@ -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<Object> params) {}
private Query filter(UUID userId, Filters f) {
StringBuilder sql=new StringBuilder(" WHERE ue.user_id=? AND ue.deleted_at IS NULL");
List<Object> 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.add(f.to()); }
return new Query(sql.toString(),args);
}
private boolean present(String value) { return value!=null && !value.isBlank(); }
private void add(StringBuilder sql,List<Object> 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<String,Object> list(String token, Filters f) {
UUID userId=auth.requireUser(token).id();
Query q=filter(userId,f);
Map<String,Object> 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<Object> 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<String,Object> 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<String,Object> 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<String>();
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("\"","\"\"")+"\"";
}
}
@@ -12,6 +12,11 @@ public class WalletController {
private final WalletService wallet; private final WalletService wallet;
public WalletController(WalletService wallet) { this.wallet=wallet; } public WalletController(WalletService wallet) { this.wallet=wallet; }
public record GrantRequest(UUID requestId, String amount, String reason) {} 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<String,Object> 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") @GetMapping("/wallets")
public Map<String,Object> balances(HttpServletRequest request) { return Map.of("wallets",wallet.balances(AuthController.sessionToken(request))); } public Map<String,Object> balances(HttpServletRequest request) { return Map.of("wallets",wallet.balances(AuthController.sessionToken(request))); }
@GetMapping("/users/{id}/wallet") @GetMapping("/users/{id}/wallet")
@@ -25,36 +25,51 @@ public class WalletService {
public List<Map<String,Object>> entries(String token, UUID userId) { public List<Map<String,Object>> entries(String token, UUID userId) {
auth.requireAdmin(token); 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 @Transactional
public Map<String,Object> grant(String token, UUID userId, UUID requestId, String amountInput, String reasonInput, AuthService.RequestMeta meta) { public Map<String,Object> 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<String,Object> adjust(String token, UUID userId, UUID requestId, String operation, String amountInput, String reasonInput, String expectedBalanceInput, AuthService.RequestMeta meta) {
var actor=auth.requireAdmin(token); 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; BigDecimal amount;
try { try {
amount=new BigDecimal(amountInput).setScale(2,RoundingMode.UNNECESSARY); amount=new BigDecimal(amountInput).setScale(2,RoundingMode.UNNECESSARY);
if(amount.signum()<=0 || amount.compareTo(new BigDecimal("1000000"))>0) throw new NumberFormatException(); 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","金额需大于 0,最多两位小数,单次不超过 100 万元"); } } 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(); 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); 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. // Lock the idempotency key before the wallet so concurrent retries cannot grant twice.
jdbc.queryForList("SELECT pg_advisory_xact_lock(hashtextextended(?, 0))",requestId.toString()); jdbc.queryForList("SELECT pg_advisory_xact_lock(hashtextextended(?, 0))",requestId.toString());
List<Map<String,Object>> existing=jdbc.queryForList("SELECT * FROM wallet_entries WHERE request_id=?",requestId); List<Map<String,Object>> existing=jdbc.queryForList("SELECT * FROM wallet_entries WHERE request_id=?",requestId);
if(!existing.isEmpty()) { if(!existing.isEmpty()) {
var entry=existing.getFirst(); 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); 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); 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 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(); UUID id=UUID.randomUUID();
jdbc.update("UPDATE user_wallets SET balance=?, updated_at=now() WHERE user_id=?",next,userId); 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); 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("wallet.credit_granted",actor.id(),meta,Map.of("userId",userId,"entryId",id,"amount",amount,"currency","CNY","reason",reason)); 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); return Map.of("id",id,"balance",next,"currency","CNY","replayed",false);
} }
} }
@@ -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);
@@ -7,6 +7,8 @@ import com.moyi.controlplane.common.ApiException;
import com.moyi.controlplane.common.ApiExceptionHandler; import com.moyi.controlplane.common.ApiExceptionHandler;
import com.moyi.controlplane.security.SecretCipher; import com.moyi.controlplane.security.SecretCipher;
import com.moyi.controlplane.wallet.WalletService; import com.moyi.controlplane.wallet.WalletService;
import com.moyi.controlplane.catalog.CatalogController;
import com.moyi.controlplane.usage.*;
import jakarta.servlet.http.Cookie; import jakarta.servlet.http.Cookie;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
@@ -156,6 +158,134 @@ class PlatformAdminPostgresTest {
assertEquals(0,new BigDecimal("12.60").compareTo((BigDecimal)catalog.overview(memberToken,auth).get("availableCredit"))); 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 { @Test void directCreationCannotEscalateAndOtpIsRequiredOnBothChannels() throws Exception {
MockMvc http = MockMvcBuilders.standaloneSetup(new AuthController(auth,verification,168,false)).setControllerAdvice(new ApiExceptionHandler()).build(); 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\"}")) 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\"}"))
@@ -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;历史详情和输入恢复;删除渠道时关联检查;删除分组、模型后成功删除渠道,历史仍保留。
真实供应商计费、流式转发与公网升级不属于本次本地验收。页面中的费用样例仅在隔离测试库生成。
+27 -12
View File
@@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed, onMounted, reactive, ref } from 'vue' import { computed, onMounted, reactive, ref } from 'vue'
import { Plus, KeyRound, CircleDollarSign, RefreshCcw, Search, ShieldCheck, List, Copy, Ban } from 'lucide-vue-next' import { Plus, KeyRound, CircleDollarSign, RefreshCcw, Search, ShieldCheck, List, Copy, Ban } from 'lucide-vue-next'
import { catalogClient, type AdminCatalogUser, type AdminInvitation, type WalletEntry } from '../services/catalog' import { catalogClient, CatalogApiError, type AdminCatalogUser, type AdminInvitation, type WalletEntry } from '../services/catalog'
import type { AuthUser } from '../services/auth' import type { AuthUser } from '../services/auth'
import UiModal from './UiModal.vue' import UiModal from './UiModal.vue'
import SlidePanel from './SlidePanel.vue' import SlidePanel from './SlidePanel.vue'
@@ -21,9 +21,15 @@ const role = ref<'user' | 'admin'>('user')
const inviteLabel = ref('') const inviteLabel = ref('')
const inviteCode = ref('') const inviteCode = ref('')
const amount = ref('') const amount = ref('')
const creditOperation = ref<'increase' | 'decrease' | 'set'>('increase')
const creditError = ref('')
const projectedBalance = computed(() => {
const current = Number(balances.value[target.value?.id || ''] || 0), value = Number(amount.value)
return creditOperation.value === 'set' ? value : creditOperation.value === 'decrease' ? current - value : current + value
})
const reason = ref('') const reason = ref('')
const requestId = ref('') const requestId = ref('')
const submittedGrant = ref<{ requestId: string; amount: string; reason: string }>() const submittedGrant = ref<{ requestId: string; operation: 'increase' | 'decrease' | 'set'; amount: string; reason: string; expectedBalance: string }>()
const ledgerUser = ref<AdminCatalogUser>() const ledgerUser = ref<AdminCatalogUser>()
const entries = ref<WalletEntry[]>([]) const entries = ref<WalletEntry[]>([])
const ledgerLoading = ref(false) const ledgerLoading = ref(false)
@@ -46,7 +52,7 @@ onMounted(refresh)
function createAccount() { Object.assign(account, { account: '', displayName: '', password: '' }); editor.value = 'account' } function createAccount() { Object.assign(account, { account: '', displayName: '', password: '' }); editor.value = 'account' }
function createInvite() { inviteCode.value = ''; inviteLabel.value = ''; editor.value = 'invite' } function createInvite() { inviteCode.value = ''; inviteLabel.value = ''; editor.value = 'invite' }
function credit(user: AdminCatalogUser) { function credit(user: AdminCatalogUser) {
target.value = user; amount.value = ''; reason.value = ''; requestId.value = crypto.randomUUID(); submittedGrant.value = undefined; editor.value = 'credit' target.value = user; amount.value = ''; reason.value = ''; creditOperation.value = 'increase'; creditError.value = ''; requestId.value = crypto.randomUUID(); submittedGrant.value = undefined; editor.value = 'credit'
} }
function editRole(user: AdminCatalogUser) { target.value = user; role.value = user.role === 'admin' ? 'admin' : 'user'; editor.value = 'role' } function editRole(user: AdminCatalogUser) { target.value = user; role.value = user.role === 'admin' ? 'admin' : 'user'; editor.value = 'role' }
async function ledger(user: AdminCatalogUser) { async function ledger(user: AdminCatalogUser) {
@@ -70,14 +76,22 @@ async function save() {
} else if (editor.value === 'role' && target.value) { } else if (editor.value === 'role' && target.value) {
await catalogClient.changeUserRole(target.value.id, role.value) await catalogClient.changeUserRole(target.value.id, role.value)
} else if (editor.value === 'credit' && target.value) { } else if (editor.value === 'credit' && target.value) {
if (!reason.value.trim()) throw new Error('请填写发放原因') creditError.value = ''
if (!submittedGrant.value) submittedGrant.value = { requestId: requestId.value, amount: amount.value, reason: reason.value.trim() } if (!reason.value.trim()) throw new Error('请填写调整原因')
await catalogClient.grantCredit(target.value.id, submittedGrant.value) if (projectedBalance.value < 0) throw new Error('减少金额不能超过当前余额')
if (!submittedGrant.value) submittedGrant.value = { requestId: requestId.value, operation: creditOperation.value, amount: amount.value, reason: reason.value.trim(), expectedBalance: String(balances.value[target.value.id] || 0) }
await catalogClient.adjustCredit(target.value.id, submittedGrant.value)
} }
editor.value = '' editor.value = ''
await refresh() await refresh()
emit('notify', '操作已完成') emit('notify', '操作已完成')
} catch (e) { emit('notify', e instanceof Error ? e.message : '操作失败') } } catch (e) {
const message = e instanceof Error ? e.message : '操作失败'
if (editor.value === 'credit') {
creditError.value = message
if (e instanceof CatalogApiError && e.status >= 400 && e.status < 500) { submittedGrant.value = undefined; requestId.value = crypto.randomUUID(); await refresh() }
} else emit('notify', message)
}
finally { saving.value = false } finally { saving.value = false }
} }
async function revokeInvitation(invitation: AdminInvitation) { async function revokeInvitation(invitation: AdminInvitation) {
@@ -101,18 +115,18 @@ async function copyText(value: string) {
<div class="account-summary"><span>用户 <strong>{{ users.length }}</strong></span><span>人民币余额合计 <strong>{{ money(totalBalance) }}</strong></span></div> <div class="account-summary"><span>用户 <strong>{{ users.length }}</strong></span><span>人民币余额合计 <strong>{{ money(totalBalance) }}</strong></span></div>
<label class="search-input account-search"><Search :size="16" /><input v-model="query" placeholder="搜索账号或姓名" /></label> <label class="search-input account-search"><Search :size="16" /><input v-model="query" placeholder="搜索账号或姓名" /></label>
<p v-if="error" role="alert">{{ error }}</p><p v-if="loading">加载中…</p> <p v-if="error" role="alert">{{ error }}</p><p v-if="loading">加载中…</p>
<div class="responsive-table"><table><thead><tr><th>用户</th><th>角色</th><th>人民币余额</th><th>状态</th><th>操作</th></tr></thead><tbody><tr v-for="user in filteredUsers" :key="user.id"><td><strong>{{ user.displayName }}</strong><small class="account-secondary">{{ user.account }}</small></td><td>{{ roleName(user.role) }}</td><td>{{ money(balances[user.id]) }}</td><td>{{ user.status === 'active' ? '正常' : '已停用' }}</td><td><div class="heading-actions"><button class="button secondary small" :disabled="user.status !== 'active'" @click="credit(user)"><CircleDollarSign :size="15" />发放额度</button><button class="button secondary small" @click="editRole(user)" v-if="props.currentUser?.role === 'super_admin' && user.role !== 'super_admin'"><ShieldCheck :size="15" />修改角色</button><button class="icon-button" :title="`${user.account} 额度流水`" @click="ledger(user)"><List :size="16" /></button></div></td></tr><tr v-if="!filteredUsers.length && !loading"><td colspan="5">暂无用户</td></tr></tbody></table></div> <div class="responsive-table"><table><thead><tr><th>用户</th><th>角色</th><th>人民币余额</th><th>状态</th><th>操作</th></tr></thead><tbody><tr v-for="user in filteredUsers" :key="user.id"><td><strong>{{ user.displayName }}</strong><small class="account-secondary">{{ user.account }}</small></td><td>{{ roleName(user.role) }}</td><td>{{ money(balances[user.id]) }}</td><td>{{ user.status === 'active' ? '正常' : '已停用' }}</td><td><div class="heading-actions"><button class="button secondary small" :disabled="user.status !== 'active'" @click="credit(user)"><CircleDollarSign :size="15" />调整额度</button><button class="button secondary small" @click="editRole(user)" v-if="props.currentUser?.role === 'super_admin' && user.role !== 'super_admin'"><ShieldCheck :size="15" />修改角色</button><button class="icon-button" :title="`${user.account} 额度流水`" @click="ledger(user)"><List :size="16" /></button></div></td></tr><tr v-if="!filteredUsers.length && !loading"><td colspan="5">暂无用户</td></tr></tbody></table></div>
<section class="panel invitation-panel"><header class="panel-header"><div><span>INVITATION RECORDS</span><h3>邀请码记录</h3></div><small>{{ invitations.length }} 条</small></header><div class="responsive-table"><table><thead><tr><th>邀请码</th><th>备注</th><th>使用情况</th><th>创建时间</th><th>操作</th></tr></thead><tbody><tr v-for="invitation in invitations" :key="invitation.id"><td><code>{{ invitation.code || `${invitation.codePrefix}…(旧记录仅保留前缀)` }}</code><button v-if="invitation.code" class="icon-button" title="复制邀请码" @click="copyText(invitation.code)"><Copy :size="14" /></button></td><td>{{ invitation.label }}</td><td>{{ invitation.usedCount }} / {{ invitation.maxUses }}{{ invitation.disabledAt ? ' · 已停用' : '' }}</td><td>{{ new Date(invitation.createdAt).toLocaleString('zh-CN') }}</td><td><button v-if="!invitation.disabledAt" class="button danger small" :disabled="saving" @click="revokeInvitation(invitation)"><Ban :size="14" />停用</button><span v-else>—</span></td></tr><tr v-if="!invitations.length"><td colspan="5">暂无邀请码记录</td></tr></tbody></table></div></section> <section class="panel invitation-panel"><header class="panel-header"><div><span>INVITATION RECORDS</span><h3>邀请码记录</h3></div><small>{{ invitations.length }} 条</small></header><div class="responsive-table"><table><thead><tr><th>邀请码</th><th>备注</th><th>使用情况</th><th>创建时间</th><th>操作</th></tr></thead><tbody><tr v-for="invitation in invitations" :key="invitation.id"><td><code>{{ invitation.code || `${invitation.codePrefix}…(旧记录仅保留前缀)` }}</code><button v-if="invitation.code" class="icon-button" title="复制邀请码" @click="copyText(invitation.code)"><Copy :size="14" /></button></td><td>{{ invitation.label }}</td><td>{{ invitation.usedCount }} / {{ invitation.maxUses }}{{ invitation.disabledAt ? ' · 已停用' : '' }}</td><td>{{ new Date(invitation.createdAt).toLocaleString('zh-CN') }}</td><td><button v-if="!invitation.disabledAt" class="button danger small" :disabled="saving" @click="revokeInvitation(invitation)"><Ban :size="14" />停用</button><span v-else>—</span></td></tr><tr v-if="!invitations.length"><td colspan="5">暂无邀请码记录</td></tr></tbody></table></div></section>
<UiModal v-if="editor" :title="editor === 'account' ? '开通账号' : editor === 'invite' ? '创建邀请' : editor === 'credit' ? '发放人民币额度' : '修改角色'" @close="!saving && (editor = '')"> <UiModal v-if="editor" :title="editor === 'account' ? '开通账号' : editor === 'invite' ? '创建邀请' : editor === 'credit' ? '调整人民币额度' : '修改角色'" @close="!saving && (editor = '')">
<form id="account-editor" @submit.prevent="save"> <form id="account-editor" @submit.prevent="save">
<template v-if="editor === 'account'"><label class="form-label" for="new-account">账号</label><input id="new-account" v-model="account.account" class="text-input" required maxlength="254" autocomplete="off" placeholder="用户名、邮箱或手机号" /><label class="form-label" for="new-display">显示名称</label><input id="new-display" v-model="account.displayName" class="text-input" maxlength="80" /><label class="form-label" for="new-password">初始密码</label><input id="new-password" v-model="account.password" type="password" class="text-input" required minlength="8" maxlength="256" autocomplete="new-password" /></template> <template v-if="editor === 'account'"><label class="form-label" for="new-account">账号</label><input id="new-account" v-model="account.account" class="text-input" required maxlength="254" autocomplete="off" placeholder="用户名、邮箱或手机号" /><label class="form-label" for="new-display">显示名称</label><input id="new-display" v-model="account.displayName" class="text-input" maxlength="80" /><label class="form-label" for="new-password">初始密码</label><input id="new-password" v-model="account.password" type="password" class="text-input" required minlength="8" maxlength="256" autocomplete="new-password" /></template>
<template v-else-if="editor === 'invite'"><label class="form-label" for="invite-label">邀请备注</label><input id="invite-label" v-model="inviteLabel" class="text-input" :disabled="!!inviteCode" /><label v-if="inviteCode" class="form-label" for="invite-code">邀请码</label><input v-if="inviteCode" id="invite-code" :value="inviteCode" class="text-input" readonly /><p v-if="inviteCode" class="form-hint">邀请码已保存到下方记录,可稍后再次复制。</p></template> <template v-else-if="editor === 'invite'"><label class="form-label" for="invite-label">邀请备注</label><input id="invite-label" v-model="inviteLabel" class="text-input" :disabled="!!inviteCode" /><label v-if="inviteCode" class="form-label" for="invite-code">邀请码</label><input v-if="inviteCode" id="invite-code" :value="inviteCode" class="text-input" readonly /><p v-if="inviteCode" class="form-hint">邀请码已保存到下方记录,可稍后再次复制。</p></template>
<template v-else-if="editor === 'credit'"><p>{{ target?.displayName }} · {{ target?.account }}</p><p>当前余额:{{ money(balances[target?.id || '']) }}</p><label class="form-label" for="grant-amount">发放金额(人民币元)</label><input id="grant-amount" v-model="amount" class="text-input" required type="number" min="0.01" max="1000000" step="0.01" :disabled="!!submittedGrant" /><label class="form-label" for="grant-reason">发放原因</label><textarea id="grant-reason" v-model="reason" class="text-input" required maxlength="500" :disabled="!!submittedGrant" /><p>本次增加:{{ money(Number(amount)) }}</p></template> <template v-else-if="editor === 'credit'"><p>{{ target?.displayName }} · {{ target?.account }}</p><p>当前余额:{{ money(balances[target?.id || '']) }}</p><label class="form-label" for="credit-operation">调整方式</label><select id="credit-operation" v-model="creditOperation" class="text-input" :disabled="!!submittedGrant"><option value="increase">增加额度</option><option value="decrease">减少额度</option><option value="set">设置为指定余额</option></select><label class="form-label" for="grant-amount">{{ creditOperation === 'set' ? '目标余额' : creditOperation === 'decrease' ? '减少金额' : '增加金额' }}(人民币元)</label><input id="grant-amount" v-model="amount" class="text-input" required type="number" :min="creditOperation === 'set' ? '0' : '0.01'" max="1000000" step="0.01" :disabled="!!submittedGrant" /><label class="form-label" for="grant-reason">调整原因</label><textarea id="grant-reason" v-model="reason" class="text-input" required maxlength="500" :disabled="!!submittedGrant" /><p>调整后余额:{{ money(projectedBalance) }}</p><p v-if="creditError" role="alert" class="credit-error">{{ creditError }}</p><p class="form-hint">每次调整均保留流水和操作人;余额不能为负数。</p></template>
<template v-else><p>{{ target?.displayName }} · {{ target?.account }}</p><label class="form-label" for="account-role">角色</label><select id="account-role" v-model="role" class="text-input"><option value="user">普通用户</option><option value="admin">管理员</option></select></template> <template v-else><p>{{ target?.displayName }} · {{ target?.account }}</p><label class="form-label" for="account-role">角色</label><select id="account-role" v-model="role" class="text-input"><option value="user">普通用户</option><option value="admin">管理员</option></select></template>
</form> </form>
<template #footer><button class="button secondary" :disabled="saving" @click="editor = ''">关闭</button><button v-if="!inviteCode || editor !== 'invite'" class="button primary" type="submit" form="account-editor" :disabled="saving">{{ saving ? '提交中…' : editor === 'credit' ? '确认发放' : '确认' }}</button></template> <template #footer><button class="button secondary" :disabled="saving" @click="editor = ''">关闭</button><button v-if="!inviteCode || editor !== 'invite'" class="button primary" type="submit" form="account-editor" :disabled="saving">{{ saving ? '提交中…' : editor === 'credit' ? '确认调整' : '确认' }}</button></template>
</UiModal> </UiModal>
<SlidePanel v-if="ledgerUser" :title="`${ledgerUser.displayName} · 额度流水`" @close="ledgerUser = undefined"><p>币种:人民币 CNY</p><p v-if="ledgerLoading">加载中…</p><div v-for="entry in entries" :key="entry.id" class="wallet-entry"><strong>+ {{ money(entry.amount) }}</strong><p>{{ entry.reason }}</p><small>{{ entry.actor }} · {{ new Date(entry.createdAt).toLocaleString('zh-CN') }}</small><p>余额 {{ money(entry.balanceAfter) }}</p></div><p v-if="!entries.length && !ledgerLoading">暂无流水</p></SlidePanel> <SlidePanel v-if="ledgerUser" :title="`${ledgerUser.displayName} · 额度流水`" @close="ledgerUser = undefined"><p>币种:人民币 CNY</p><p v-if="ledgerLoading">加载中…</p><div v-for="entry in entries" :key="entry.id" class="wallet-entry"><strong>{{ Number(entry.amount) >= 0 ? '+' : '−' }} {{ money(Math.abs(Number(entry.amount))) }}</strong><small> · {{ ({ increase: '增加', decrease: '减少', set: '设置余额' })[entry.operation] }}</small><p>{{ entry.reason }}</p><small>{{ entry.actor }} · {{ new Date(entry.createdAt).toLocaleString('zh-CN') }}</small><p>{{ money(entry.balanceBefore) }} → {{ money(entry.balanceAfter) }}</p></div><p v-if="!entries.length && !ledgerLoading">暂无流水</p></SlidePanel>
</template> </template>
<style scoped> <style scoped>
@@ -124,5 +138,6 @@ async function copyText(value: string) {
.invitation-panel code { overflow-wrap: anywhere; } .invitation-panel code { overflow-wrap: anywhere; }
.invitation-panel .icon-button { margin-left: 8px; vertical-align: middle; } .invitation-panel .icon-button { margin-left: 8px; vertical-align: middle; }
.form-hint { color: #687378; font-size: 13px; } .form-hint { color: #687378; font-size: 13px; }
.credit-error { color: #b44837; }
@media(max-width: 700px) { .heading-actions { flex-wrap: wrap; } } @media(max-width: 700px) { .heading-actions { flex-wrap: wrap; } }
</style> </style>
+16 -4
View File
@@ -1,6 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed, onMounted, reactive, ref, watch } from 'vue' import { computed, onMounted, reactive, ref, watch } from 'vue'
import { Plus, Pencil, RefreshCcw, Search } from 'lucide-vue-next' import { Plus, Pencil, RefreshCcw, Search, Trash2 } from 'lucide-vue-next'
import { catalogClient, type CatalogProvider, type CatalogModel, type LogicalModel } from '../services/catalog' import { catalogClient, type CatalogProvider, type CatalogModel, type LogicalModel } from '../services/catalog'
import UiModal from './UiModal.vue' import UiModal from './UiModal.vue'
@@ -15,6 +15,16 @@ const saving = ref(false)
const error = ref('') const error = ref('')
const editor = ref<'channel' | 'model' | 'group' | ''>('') const editor = ref<'channel' | 'model' | 'group' | ''>('')
const editingId = ref<string>() const editingId = ref<string>()
const deleting = ref<{ kind: 'channel' | 'model' | 'group'; id: string; name: string }>()
const deleteError = ref('')
function confirmDelete(kind: 'channel' | 'model' | 'group', id: string, name: string) { deleting.value = { kind, id, name }; deleteError.value = '' }
async function remove() {
if (!deleting.value || saving.value) return
saving.value = true; deleteError.value = ''
try { await catalogClient.deleteCatalog(deleting.value.kind, deleting.value.id); deleting.value = undefined; await refresh(); emit('notify', '已删除,调用历史已保留') }
catch (e) { deleteError.value = e instanceof Error ? e.message : '删除失败' }
finally { saving.value = false }
}
const channel = reactive({ code: '', name: '', protocol: 'openai-compatible' as CatalogProvider['protocol'], sourceType: 'relay' as CatalogProvider['sourceType'], baseUrl: '', credentialType: 'api-key' as NonNullable<CatalogProvider['credentialType']>, credentialSecret: '', description: '', status: 'active' as CatalogProvider['status'] }) const channel = reactive({ code: '', name: '', protocol: 'openai-compatible' as CatalogProvider['protocol'], sourceType: 'relay' as CatalogProvider['sourceType'], baseUrl: '', credentialType: 'api-key' as NonNullable<CatalogProvider['credentialType']>, credentialSecret: '', description: '', status: 'active' as CatalogProvider['status'] })
const model = reactive({ publicName: '', modelKey: '', type: 'text' as LogicalModel['type'], mode: 'sync' as LogicalModel['mode'], description: '', inputTypes: 'text', outputTypes: 'text', status: 'active' as LogicalModel['status'] }) const model = reactive({ publicName: '', modelKey: '', type: 'text' as LogicalModel['type'], mode: 'sync' as LogicalModel['mode'], description: '', inputTypes: 'text', outputTypes: 'text', status: 'active' as LogicalModel['status'] })
const group = reactive({ logicalModelId: '', providerId: '', sourceLabel: '', upstreamModel: '', input: '', output: '', unit: 'CNY / 1M tokens', priority: '100', maxConcurrency: '1', status: 'active' as CatalogModel['status'] }) const group = reactive({ logicalModelId: '', providerId: '', sourceLabel: '', upstreamModel: '', input: '', output: '', unit: 'CNY / 1M tokens', priority: '100', maxConcurrency: '1', status: 'active' as CatalogModel['status'] })
@@ -94,15 +104,16 @@ async function toggle(kind: 'channel' | 'model' | 'group', item: CatalogProvider
<label class="search-input catalog-search"><Search :size="16" /><input v-model="query" :placeholder="props.section === 'channels' ? '搜索渠道名称或 Code' : '搜索模型名称或标识'" /></label> <label class="search-input catalog-search"><Search :size="16" /><input v-model="query" :placeholder="props.section === 'channels' ? '搜索渠道名称或 Code' : '搜索模型名称或标识'" /></label>
<p v-if="error" role="alert">{{ error }}</p> <p v-if="error" role="alert">{{ error }}</p>
<p v-if="loading">加载中…</p> <p v-if="loading">加载中…</p>
<div v-if="props.section === 'channels'" class="responsive-table"><table><thead><tr><th>渠道</th><th>来源 / 协议</th><th>Base URL</th><th>凭据</th><th>状态</th><th>操作</th></tr></thead><tbody><tr v-for="item in shownChannels" :key="item.id"><td><strong>{{ item.name }}</strong><small class="catalog-secondary">{{ item.code }}</small></td><td>{{ item.sourceType }}<small class="catalog-secondary">{{ item.protocol }}</small></td><td class="catalog-url">{{ item.baseUrl || '未配置' }}</td><td>{{ item.credentialMasked || '未配置' }}</td><td><label class="catalog-toggle"><input type="checkbox" :checked="item.status === 'active'" :disabled="saving" :aria-label="`${item.name} 启用`" @change="toggle('channel', item)" />{{ item.status === 'active' ? '已启用' : '已停用' }}</label></td><td><button class="icon-button" :title="`编辑渠道 ${item.name}`" @click="editChannel(item)"><Pencil :size="16" /></button></td></tr><tr v-if="!shownChannels.length && !loading"><td colspan="6">暂无渠道</td></tr></tbody></table></div> <div v-if="props.section === 'channels'" class="responsive-table"><table><thead><tr><th>渠道</th><th>来源 / 协议</th><th>Base URL</th><th>凭据</th><th>状态</th><th>操作</th></tr></thead><tbody><tr v-for="item in shownChannels" :key="item.id"><td><strong>{{ item.name }}</strong><small class="catalog-secondary">{{ item.code }}</small></td><td>{{ item.sourceType }}<small class="catalog-secondary">{{ item.protocol }}</small></td><td class="catalog-url">{{ item.baseUrl || '未配置' }}</td><td>{{ item.credentialMasked || '未配置' }}</td><td><label class="catalog-toggle"><input type="checkbox" :checked="item.status === 'active'" :disabled="saving" :aria-label="`${item.name} 启用`" @change="toggle('channel', item)" />{{ item.status === 'active' ? '已启用' : '已停用' }}</label></td><td><button class="icon-button" :title="`编辑渠道 ${item.name}`" @click="editChannel(item)"><Pencil :size="16" /></button><button class="icon-button" :title="`删除渠道 ${item.name}`" :disabled="saving" @click="confirmDelete('channel', item.id, item.name)"><Trash2 :size="16" /></button></td></tr><tr v-if="!shownChannels.length && !loading"><td colspan="6">暂无渠道</td></tr></tbody></table></div>
<template v-else> <template v-else>
<section v-for="item in shownModels" :key="item.id" class="model-definition-section"> <section v-for="item in shownModels" :key="item.id" class="model-definition-section">
<header class="panel-header"><div><h3>{{ item.publicName }}</h3><small>{{ item.modelKey || item.id }} · {{ item.type }} · {{ item.mode }}</small></div><div class="heading-actions"><label class="catalog-toggle"><input type="checkbox" :checked="item.status === 'active'" :disabled="saving" :aria-label="`${item.publicName} 启用`" @change="toggle('model', item)" />启用</label><button class="icon-button" :title="`编辑模型 ${item.publicName}`" @click="editModel(item)"><Pencil :size="16" /></button><button class="button secondary small" @click="editGroup(item)"><Plus :size="15" />添加分组</button></div></header> <header class="panel-header"><div><h3>{{ item.publicName }}</h3><small>{{ item.modelKey || item.id }} · {{ item.type }} · {{ item.mode }}</small></div><div class="heading-actions"><label class="catalog-toggle"><input type="checkbox" :checked="item.status === 'active'" :disabled="saving" :aria-label="`${item.publicName} 启用`" @change="toggle('model', item)" />启用</label><button class="icon-button" :title="`编辑模型 ${item.publicName}`" @click="editModel(item)"><Pencil :size="16" /></button><button class="icon-button" :title="`删除模型 ${item.publicName}`" :disabled="saving" @click="confirmDelete('model', item.id, item.publicName)"><Trash2 :size="16" /></button><button class="button secondary small" @click="editGroup(item)"><Plus :size="15" />添加分组</button></div></header>
<p v-if="item.description" class="catalog-secondary">{{ item.description }}</p> <p v-if="item.description" class="catalog-secondary">{{ item.description }}</p>
<div class="responsive-table"><table><thead><tr><th>分组名称</th><th>渠道</th><th>上游模型</th><th>输入 / 输出价格</th><th>并发</th><th>状态</th><th>操作</th></tr></thead><tbody><tr v-for="route in modelGroups(item.id)" :key="route.id"><td>{{ route.sourceLabel }}</td><td>{{ channelName(route.providerId) }}</td><td><code>{{ route.upstreamModel }}</code></td><td>{{ route.pricing?.input ?? '—' }} / {{ route.pricing?.output ?? '—' }}<small class="catalog-secondary">{{ route.pricing?.unit }}</small></td><td>{{ route.maxConcurrency ?? '默认' }}</td><td><label class="catalog-toggle"><input type="checkbox" :checked="route.status === 'active'" :disabled="saving" :aria-label="`${route.sourceLabel} 启用`" @change="toggle('group', route)" />{{ route.status === 'active' ? '已启用' : '已停用' }}</label></td><td><button class="icon-button" :title="`编辑分组 ${route.sourceLabel}`" @click="editGroup(item, route)"><Pencil :size="16" /></button></td></tr><tr v-if="!modelGroups(item.id).length"><td colspan="7">暂无分组</td></tr></tbody></table></div> <div class="responsive-table"><table><thead><tr><th>分组名称</th><th>渠道</th><th>上游模型</th><th>输入 / 输出价格</th><th>并发</th><th>状态</th><th>操作</th></tr></thead><tbody><tr v-for="route in modelGroups(item.id)" :key="route.id"><td>{{ route.sourceLabel }}</td><td>{{ channelName(route.providerId) }}</td><td><code>{{ route.upstreamModel }}</code></td><td>{{ route.pricing?.input ?? '—' }} / {{ route.pricing?.output ?? '—' }}<small class="catalog-secondary">{{ route.pricing?.unit }}</small></td><td>{{ route.maxConcurrency ?? '默认' }}</td><td><label class="catalog-toggle"><input type="checkbox" :checked="route.status === 'active'" :disabled="saving" :aria-label="`${route.sourceLabel} 启用`" @change="toggle('group', route)" />{{ route.status === 'active' ? '已启用' : '已停用' }}</label></td><td><button class="icon-button" :title="`编辑分组 ${route.sourceLabel}`" @click="editGroup(item, route)"><Pencil :size="16" /></button><button class="icon-button" :title="`删除分组 ${route.sourceLabel}`" :disabled="saving" @click="confirmDelete('group', route.id, route.sourceLabel || '默认分组')"><Trash2 :size="16" /></button></td></tr><tr v-if="!modelGroups(item.id).length"><td colspan="7">暂无分组</td></tr></tbody></table></div>
</section> </section>
<p v-if="!shownModels.length && !loading">暂无模型</p> <p v-if="!shownModels.length && !loading">暂无模型</p>
</template> </template>
<UiModal v-if="deleting" title="确认删除" @close="!saving && (deleting = undefined)"><p>确认删除「{{ deleting.name }}」?</p><p>{{ deleting.kind === 'model' ? '该模型及全部分组将从目录移除,相关 API Key 将不能再调用它们。' : deleting.kind === 'channel' ? '请先将关联分组删除或改为其他渠道,再删除渠道。' : '分组将从目录移除,相关 API Key 将不能再调用它。' }}</p><p>调用历史和已有任务会保留。删除后无法从页面恢复。</p><p v-if="deleteError" role="alert" class="delete-error">{{ deleteError }}</p><template #footer><button class="button secondary" :disabled="saving" @click="deleting = undefined">取消</button><button class="button danger" :disabled="saving" @click="remove">{{ saving ? '删除中…' : '确认删除' }}</button></template></UiModal>
<UiModal v-if="editor" :title="`${editingId ? '编辑' : '添加'}${editor === 'channel' ? '渠道' : editor === 'model' ? '模型' : '分组'}`" @close="!saving && (editor = '')"> <UiModal v-if="editor" :title="`${editingId ? '编辑' : '添加'}${editor === 'channel' ? '渠道' : editor === 'model' ? '模型' : '分组'}`" @close="!saving && (editor = '')">
<form id="catalog-editor" @submit.prevent="save"> <form id="catalog-editor" @submit.prevent="save">
<template v-if="editor === 'channel'"> <template v-if="editor === 'channel'">
@@ -142,6 +153,7 @@ async function toggle(kind: 'channel' | 'model' | 'group', item: CatalogProvider
.catalog-secondary { display: block; color: #687378; font-size: 12px; margin-top: 5px; overflow-wrap: anywhere; } .catalog-secondary { display: block; color: #687378; font-size: 12px; margin-top: 5px; overflow-wrap: anywhere; }
.catalog-search { max-width: 420px; } .catalog-search { max-width: 420px; }
.catalog-url { max-width: 320px; overflow-wrap: anywhere; } .catalog-url { max-width: 320px; overflow-wrap: anywhere; }
.delete-error { color: #b44837; }
.catalog-toggle { display: inline-flex; align-items: center; gap: 7px; white-space: nowrap; } .catalog-toggle { display: inline-flex; align-items: center; gap: 7px; white-space: nowrap; }
.model-definition-section { padding: 20px 0; border-bottom: 1px solid #dce3e5; } .model-definition-section { padding: 20px 0; border-bottom: 1px solid #dce3e5; }
.model-definition-section h3 { margin: 0; font-size: 18px; } .model-definition-section h3 { margin: 0; font-size: 18px; }
+178
View File
@@ -0,0 +1,178 @@
<script setup lang="ts">
import { computed, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
import { Activity, Coins, Clock3, Download, Filter, RefreshCcw, SlidersHorizontal, ChevronLeft, ChevronRight, History } from 'lucide-vue-next'
import { catalogClient, type UserUsageRecord, type UserUsagePage, type UsageOptions } from '../services/catalog'
import SlidePanel from './SlidePanel.vue'
const props = defineProps<{ history?: boolean; revision?: number }>()
const emit = defineEmits<{ notify: [message: string]; restore: [record: UserUsageRecord] }>()
const filters = reactive({ keyId: '', modelId: '', groupId: '', status: '', eventKind: '', callMode: '', source: '', costState: '', userAgent: '' })
const range = ref(props.history ? 'all' : '7')
const from = ref(''), to = ref('')
const page = ref(1), size = ref(props.history ? 10 : 20), sort = ref('time'), direction = ref('desc')
const loading = ref(false), exporting = ref(false), error = ref(''), detailsLoading = ref(false)
const selected = ref<UserUsageRecord>(), selectedId = ref('')
const data = ref<UserUsagePage>({ records: [], total: 0, pages: 1, page: 1, size: size.value, summary: { totalRequests: 0, inputUnits: 0, outputUnits: 0, pricedRequests: 0 } })
const options = ref<UsageOptions>({ keys: [], models: [], groups: [] })
const groups = computed(() => options.value.groups.filter(g => !filters.modelId || g.modelId === filters.modelId))
const columnSettings = ref(false)
const columnLabels = { key: 'API Key', model: '模型', group: '分组 / 渠道', endpoint: '端点', mode: '类型 / 来源', tokens: 'Token', cost: '费用', first: '首 Token', latency: '耗时', time: '时间', status: '状态', agent: 'User-Agent', reasoning: '推理强度' }
type Column = keyof typeof columnLabels
const columns = ref<Column[]>(['key', 'model', 'group', 'endpoint', 'mode', 'tokens', 'cost', 'latency', 'time', 'status'])
const show = (name: Column) => columns.value.includes(name)
const number = (n: unknown) => n == null ? '—' : Number(n).toLocaleString('zh-CN')
const money = (n: unknown) => n == null ? '—' : `¥ ${Number(n).toFixed(6)}`
const duration = (n: unknown) => n == null ? '—' : `${(Number(n) / 1000).toFixed(2)}s`
const time = (value: string) => new Date(value).toLocaleString('zh-CN', { hour12: false })
const statusName = (v: string) => ({ succeeded: '成功', failed: '失败', queued: '排队中', running: '执行中', cancelled: '已取消' })[v] || v
const modeName = (v?: string) => ({ sync: '同步', stream: '流式', async: '异步' })[v || ''] || '—'
const sourceName = (v?: string) => ({ playground: '在线调试', api: 'API', unknown: '历史调用' })[v || 'unknown'] || '历史调用'
const pretty = (v: unknown) => v == null ? '未保存内容' : JSON.stringify(v, null, 2)
const resultUrl = computed(() => {
const result = selected.value?.result as { url?: string } | undefined
if (!result?.url) return ''
try { const url = new URL(result.url); return ['https:', 'http:'].includes(url.protocol) ? url.href : '' } catch { return '' }
})
let requestSequence = 0
let timer: number | undefined
let activeFilters: Record<string, string | number> = {}
function query() {
const value: Record<string, string | number> = { ...filters, sort: sort.value, direction: direction.value }
if (range.value === 'custom') {
if (!from.value || !to.value || new Date(from.value) >= new Date(to.value)) throw new Error('请选择有效的开始和结束时间')
value.from = new Date(from.value).toISOString(); value.to = new Date(to.value).toISOString()
} else if (range.value !== 'all') value.from = new Date(Date.now() - Number(range.value) * 86400000).toISOString()
return value
}
async function refresh(reset = false) {
const sequence = ++requestSequence
if (timer) window.clearTimeout(timer)
loading.value = true; error.value = ''
try {
if (reset) page.value = 1
const applied = query()
const [result, choices] = await Promise.all([catalogClient.listUsage({ ...applied, page: page.value, size: size.value }), catalogClient.usageOptions()])
if (sequence !== requestSequence) return
data.value = result; options.value = choices; page.value = result.page; activeFilters = applied
if (result.records.some(item => ['queued', 'running'].includes(item.status))) timer = window.setTimeout(() => void refresh(), 10000)
} catch (e) { if (sequence === requestSequence) error.value = e instanceof Error ? e.message : '加载使用记录失败' }
finally { if (sequence === requestSequence) loading.value = false }
}
function changePage(next: number) { page.value = next; void refresh() }
function reset() {
Object.keys(filters).forEach(key => { filters[key as keyof typeof filters] = '' })
range.value = props.history ? 'all' : '7'; from.value = ''; to.value = ''; void refresh(true)
}
function order(field: string) {
direction.value = sort.value === field && direction.value === 'desc' ? 'asc' : 'desc'; sort.value = field; void refresh(true)
}
async function detail(record: UserUsageRecord) {
selectedId.value = record.id; selected.value = undefined; detailsLoading.value = true
try { const result = await catalogClient.usageDetail(record.id); if (selectedId.value === record.id) selected.value = result.record }
catch (e) { if (selectedId.value === record.id) { emit('notify', e instanceof Error ? e.message : '读取详情失败'); selectedId.value = ''; detailsLoading.value = false } }
finally { if (selectedId.value === record.id) detailsLoading.value = false }
}
async function exportCsv() {
exporting.value = true
try {
const blob = await catalogClient.exportUsage(activeFilters)
const url = URL.createObjectURL(blob), link = document.createElement('a')
link.href = url; link.download = `moyi-usage-${new Date().toISOString().slice(0, 10)}.csv`; link.click()
window.setTimeout(() => URL.revokeObjectURL(url), 1000)
} catch (e) { emit('notify', e instanceof Error ? e.message : '导出失败') }
finally { exporting.value = false }
}
onMounted(() => {
try { const saved = JSON.parse(localStorage.getItem('moyi-usage-columns') || 'null'); if (Array.isArray(saved) && saved.some(k => k in columnLabels)) columns.value = saved.filter(k => k in columnLabels) } catch {}
void refresh()
})
watch(columns, () => { try { localStorage.setItem('moyi-usage-columns', JSON.stringify(columns.value)) } catch {} }, { deep: true })
watch(() => props.revision, () => void refresh(true))
onUnmounted(() => { requestSequence++; selectedId.value = ''; if (timer) window.clearTimeout(timer) })
</script>
<template>
<section class="usage-history">
<header v-if="history" class="history-heading"><h3><History :size="18" />调用历史</h3><span>按账号保存,可查看请求与结果</span></header>
<section v-else class="usage-metrics">
<article class="panel"><Activity :size="23" /><div><span>总请求数</span><strong>{{ number(data.summary.totalRequests) }}</strong><small>当前筛选范围</small></div></article>
<article class="panel"><SlidersHorizontal :size="23" /><div><span>总 Token</span><strong>{{ number(Number(data.summary.inputUnits) + Number(data.summary.outputUnits)) }}</strong><small>输入 {{ number(data.summary.inputUnits) }} · 输出 {{ number(data.summary.outputUnits) }}</small><small>缓存命中 {{ number(data.summary.cachedInputUnits) }} · 写入 {{ number(data.summary.cacheWriteUnits) }}</small></div></article>
<article class="panel"><Coins :size="23" /><div><span>已记录费用 · 人民币</span><strong>{{ money(data.summary.totalCost) }}</strong><small>{{ number(data.summary.pricedRequests) }} / {{ number(data.summary.totalRequests) }} 次有费用记录</small></div></article>
<article class="panel"><Clock3 :size="23" /><div><span>平均耗时</span><strong>{{ duration(data.summary.averageLatencyMs) }}</strong><small>有耗时记录的请求</small></div></article>
</section>
<details class="panel usage-filters" :open="!history">
<summary><Filter :size="17" />筛选条件</summary>
<form @submit.prevent="refresh(true)">
<div class="usage-filter-grid">
<label>API Key<select v-model="filters.keyId" class="text-input"><option value="">全部密钥</option><option v-for="key in options.keys" :key="key.id" :value="key.id">{{ key.name }}{{ key.deleted ? '(已删除)' : '' }}</option></select></label>
<label>模型<select v-model="filters.modelId" class="text-input" @change="filters.groupId = ''"><option value="">全部模型</option><option v-for="model in options.models" :key="model.id" :value="model.id">{{ model.name }}</option></select></label>
<label>分组<select v-model="filters.groupId" class="text-input"><option value="">全部分组</option><option v-for="group in groups" :key="group.id" :value="group.id">{{ group.name }} · {{ group.channel }}</option></select></label>
<label>调用类型<select v-model="filters.callMode" class="text-input"><option value="">全部类型</option><option value="sync">同步</option><option value="stream">流式</option><option value="async">异步</option></select></label>
<label>请求类别<select v-model="filters.eventKind" class="text-input"><option value="">全部请求</option><option value="call">模型调用</option><option value="task">异步任务</option></select></label>
<label>状态<select v-model="filters.status" class="text-input"><option value="">全部状态</option><option v-for="state in ['succeeded','failed','queued','running','cancelled']" :key="state" :value="state">{{ statusName(state) }}</option></select></label>
<label>费用记录<select v-model="filters.costState" class="text-input"><option value="">全部</option><option value="recorded">已记录</option><option value="pending">未记录</option></select></label>
<label>来源<select v-model="filters.source" class="text-input"><option value="">全部来源</option><option value="playground">在线调试</option><option value="api">API</option><option value="unknown">历史调用(未标记来源)</option></select></label>
<label>User-Agent<input v-model="filters.userAgent" class="text-input" maxlength="200" placeholder="模糊搜索客户端" /></label>
<label>时间范围<select v-model="range" class="text-input"><option value="1">近 24 小时</option><option value="7">近 7 天</option><option value="30">近 30 天</option><option value="all">全部时间</option><option value="custom">自定义</option></select></label>
<template v-if="range === 'custom'"><label>开始时间<input v-model="from" type="datetime-local" class="text-input" required /></label><label>结束时间<input v-model="to" type="datetime-local" class="text-input" required /></label></template>
</div>
<div class="usage-actions"><button type="button" class="button secondary small" @click="reset">重置</button><button class="button primary small" :disabled="loading">应用筛选</button></div>
</form>
</details>
<section class="panel usage-table-card">
<header class="usage-toolbar"><span>{{ history ? '历史调用' : '使用记录' }} · {{ data.total }} 条</span><div class="usage-actions"><button class="button secondary small" :disabled="loading" @click="refresh()"><RefreshCcw :size="15" />刷新</button><button class="button secondary small" :aria-expanded="columnSettings" @click="columnSettings = !columnSettings"><SlidersHorizontal :size="15" />列设置</button><button class="button primary small" :disabled="exporting || loading || !!error" @click="exportCsv"><Download :size="15" />{{ exporting ? '导出中…' : '导出 CSV' }}</button></div></header>
<div v-if="columnSettings" class="usage-columns"><label v-for="(label, name) in columnLabels" :key="name"><input v-model="columns" type="checkbox" :value="name" :disabled="show(name) && columns.length === 1" />{{ label }}</label></div>
<p v-if="error" class="usage-error" role="alert">{{ error }} <button class="text-link" @click="refresh()">重试</button></p>
<div class="responsive-table" :aria-busy="loading"><table><thead><tr>
<th v-if="show('key')">API Key</th><th v-if="show('model')"><button class="sort-button" @click="order('model')">模型 {{ sort === 'model' ? (direction === 'desc' ? '↓' : '↑') : '↕' }}</button></th><th v-if="show('group')">分组 / 渠道</th><th v-if="show('endpoint')">端点</th><th v-if="show('mode')">类型 / 来源</th><th v-if="show('tokens')">Token</th><th v-if="show('cost')"><button class="sort-button" @click="order('cost')">费用(CNY) ↕</button></th><th v-if="show('first')">首 Token</th><th v-if="show('latency')"><button class="sort-button" @click="order('latency')">耗时 ↕</button></th><th v-if="show('time')"><button class="sort-button" @click="order('time')">时间 {{ sort === 'time' ? (direction === 'desc' ? '↓' : '↑') : '↕' }}</button></th><th v-if="show('status')">状态</th><th v-if="show('agent')">User-Agent</th><th v-if="show('reasoning')">推理强度</th><th>详情</th>
</tr></thead><tbody><tr v-for="record in data.records" :key="record.id">
<td v-if="show('key')"><strong>{{ record.keyName || '—' }}</strong><small>{{ record.keyPrefix }}</small></td><td v-if="show('model')">{{ record.modelName || record.modelId || '—' }}</td><td v-if="show('group')">{{ record.groupName || '—' }}<small>{{ record.providerName }}</small></td><td v-if="show('endpoint')"><code>{{ record.endpoint || '—' }}</code></td><td v-if="show('mode')"><span class="status-chip violet">{{ modeName(record.callMode) }}</span><small>{{ sourceName(record.requestSource) }}</small></td><td v-if="show('tokens')"><span>输入 {{ number(record.inputUnits) }}</span><small>输出 {{ number(record.outputUnits) }}</small><small v-if="record.cachedInputUnits != null">缓存命中 {{ number(record.cachedInputUnits) }}</small><small v-if="record.cacheWriteUnits != null">缓存写入 {{ number(record.cacheWriteUnits) }}</small></td><td v-if="show('cost')" class="usage-cost">{{ money(record.costAmount) }}</td><td v-if="show('first')">{{ duration(record.firstTokenMs) }}</td><td v-if="show('latency')">{{ duration(record.latencyMs) }}</td><td v-if="show('time')">{{ time(record.createdAt) }}</td><td v-if="show('status')"><span class="status-chip" :class="record.status === 'succeeded' ? 'success' : record.status === 'failed' ? 'danger' : 'muted'">{{ statusName(record.status) }}</span><small v-if="record.progress != null">{{ record.progress }}%</small></td><td v-if="show('agent')" class="agent-cell">{{ record.userAgent || '—' }}</td><td v-if="show('reasoning')">{{ record.reasoningEffort || '—' }}</td><td><button class="text-link" :aria-label="`查看 ${record.modelName || '调用'} 详情`" @click="detail(record)">查看</button></td>
</tr><tr v-if="!data.records.length"><td :colspan="columns.length + 1"><div class="empty-state compact"><History :size="24" /><strong>{{ loading ? '加载中…' : error ? '使用记录暂不可用' : '暂无使用记录' }}</strong><span v-if="!loading && !error">调整筛选范围,或完成一次模型调用后查看</span></div></td></tr></tbody></table></div>
<footer class="usage-pagination"><span>显示 {{ data.total ? (data.page - 1) * data.size + 1 : 0 }}–{{ Math.min(data.page * data.size, data.total) }},共 {{ data.total }} 条</span><label>每页 <select v-model="size" :disabled="loading" @change="refresh(true)"><option :value="10">10</option><option :value="20">20</option><option :value="50">50</option><option :value="100">100</option></select></label><div><button class="icon-button" title="上一页" :disabled="loading || data.page <= 1" @click="changePage(data.page - 1)"><ChevronLeft :size="17" /></button><span>{{ data.page }} / {{ data.pages }}</span><button class="icon-button" title="下一页" :disabled="loading || data.page >= data.pages" @click="changePage(data.page + 1)"><ChevronRight :size="17" /></button></div></footer>
</section>
<p class="usage-footnote">费用以人民币展示。“—”表示未记录,历史记录不会补算费用或耗时。CSV 导出当前已应用的筛选结果,最多 10000 条。</p>
<SlidePanel v-if="selectedId" title="调用详情" @close="selectedId = ''; selected = undefined">
<p v-if="detailsLoading">加载中…</p>
<template v-else-if="selected"><dl class="detail-list"><div><dt>记录 ID</dt><dd>{{ selected.id }}</dd></div><div><dt>模型 / 分组</dt><dd>{{ selected.modelName }} / {{ selected.groupName }}</dd></div><div><dt>状态</dt><dd>{{ statusName(selected.status) }}</dd></div><div><dt>时间</dt><dd>{{ time(selected.createdAt) }}</dd></div><div><dt>费用</dt><dd>{{ money(selected.costAmount) }}</dd></div><div v-if="selected.taskId"><dt>任务 ID</dt><dd>{{ selected.taskId }}</dd></div></dl><p v-if="selected.errorMessage" class="usage-error">{{ selected.errorCode }}:{{ selected.errorMessage }}</p><a v-if="resultUrl" class="button secondary" :href="resultUrl" target="_blank" rel="noopener noreferrer">打开任务结果</a><h4>请求内容</h4><pre class="usage-payload">{{ pretty(selected.input) }}</pre><h4>响应内容</h4><pre class="usage-payload">{{ pretty(selected.result || selected.output) }}</pre><button v-if="history && selected.input" class="button primary" @click="emit('restore', selected); selectedId = ''">载入调试</button></template>
</SlidePanel>
</section>
</template>
<style scoped>
.usage-history { display: grid; gap: 16px; min-width: 0; }
.usage-metrics { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 16px; }
.usage-metrics article { padding: 22px; position: relative; }
.usage-metrics article > svg { color: #7663ab; position: absolute; right: 18px; top: 20px; opacity: .55; }
.usage-metrics article span { padding-right: 22px; }
.usage-metrics span, .usage-metrics small { color: #748082; display: block; font-size: 12px; }
.usage-metrics strong { display: block; font-size: clamp(20px, 1.9vw, 26px); margin: 10px 0 6px; overflow-wrap: anywhere; }
.usage-metrics small { line-height: 1.7; }
.usage-filters { padding: 18px 22px; }
.usage-filters summary { display: flex; align-items: center; gap: 9px; cursor: pointer; font-weight: 600; }
.usage-filter-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(170px, 1fr)); gap: 16px; margin: 22px 0; }
.usage-filter-grid label { display: grid; gap: 8px; color: #586467; font-size: 13px; }
.usage-filter-grid .text-input { width: 100%; min-width: 0; }
.usage-actions { display: flex; flex-wrap: wrap; gap: 8px; justify-content: flex-end; }
.usage-toolbar, .usage-pagination { display: flex; align-items: center; justify-content: space-between; gap: 14px; padding: 18px 22px; flex-wrap: wrap; }
.usage-toolbar > span { font-weight: 600; }
.usage-columns { display: flex; gap: 16px; flex-wrap: wrap; padding: 0 22px 18px; font-size: 13px; }
.usage-columns label { display: flex; gap: 6px; align-items: center; }
.usage-table-card { overflow: hidden; }
.usage-table-card table { font-size: 13px; white-space: nowrap; }
.usage-table-card td small { display: block; color: #7c898b; margin-top: 6px; font-size: 11px; }
.usage-table-card td { padding: 19px 16px; }
.usage-table-card td.agent-cell { max-width: 220px; white-space: normal; overflow-wrap: anywhere; }
.usage-cost { color: #168572; font-variant-numeric: tabular-nums; }
.sort-button { border: 0; background: none; color: inherit; padding: 0; font: inherit; cursor: pointer; }
.usage-pagination { border-top: 1px solid #e4e9e8; font-size: 12px; color: #6b777a; }
.usage-pagination > div { display: flex; align-items: center; gap: 12px; }
.usage-pagination select { border: 1px solid #dce4e3; border-radius: 6px; padding: 6px; background: white; }
.usage-error { color: #b44837; padding: 0 20px; }
.usage-footnote { font-size: 12px; color: #7c898b; margin: 0; }
.usage-payload { white-space: pre-wrap; overflow-wrap: anywhere; background: #f2f5f5; border-radius: 10px; padding: 16px; max-height: 380px; overflow: auto; font-size: 12px; }
.history-heading { display: flex; align-items: center; justify-content: space-between; flex-wrap: wrap; gap: 10px; }
.history-heading h3 { display: flex; align-items: center; gap: 8px; margin: 10px 0; }
.history-heading span { font-size: 12px; color: #7c898b; }
.detail-list dd { overflow-wrap: anywhere; }
@media(max-width: 1100px) { .usage-metrics { grid-template-columns: repeat(2, minmax(0, 1fr)); } }
@media(max-width: 650px) { .usage-metrics { grid-template-columns: 1fr; } .usage-filter-grid { grid-template-columns: 1fr; } .usage-toolbar { align-items: flex-start; } }
</style>
+51 -2
View File
@@ -50,6 +50,8 @@ export interface WalletEntry {
id: string id: string
amount: number amount: number
balanceAfter: number balanceAfter: number
balanceBefore: number
operation: 'increase' | 'decrease' | 'set'
currency: 'CNY' currency: 'CNY'
reason: string reason: string
createdAt: 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 { class HttpCatalogClient {
constructor(private readonly baseUrl: string) {} constructor(private readonly baseUrl: string) {}
@@ -238,10 +265,32 @@ class HttpCatalogClient {
await this.request(`/api/keys/${encodeURIComponent(id)}/revoke`, { method: 'POST' }) 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<string, string | number>) {
return this.request<UserUsagePage>(`/api/usage?${new URLSearchParams(Object.entries(filters).map(([k, v]) => [k, String(v)]))}`)
}
async usageOptions() { return this.request<UsageOptions>('/api/usage/options') }
async usageDetail(id: string) { return this.request<{ record: UserUsageRecord }>(`/api/usage/${encodeURIComponent(id)}`) }
async exportUsage(filters: Record<string, string | number>) {
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 }) { async chatCompletion(apiKey: string, input: { model: string; prompt: string }) {
return this.request<ChatCompletionResult>('/v1/chat/completions', { return this.request<ChatCompletionResult>('/v1/chat/completions', {
method: 'POST', 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 }] }), 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' }) { 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', { const payload = await this.request<{ task: AsyncTaskResult }>(input.mediaType === 'video' ? '/v1/video/tasks' : '/v1/3d/tasks', {
method: 'POST', method: 'POST',
headers: { Authorization: `Bearer ${apiKey}` }, headers: { Authorization: `Bearer ${apiKey}`, 'X-Moyi-Source': 'playground' },
body: JSON.stringify({ model: input.model, prompt: input.prompt }), body: JSON.stringify({ model: input.model, prompt: input.prompt }),
}) })
return payload.task return payload.task
+42 -20
View File
@@ -10,7 +10,6 @@ import {
CheckCircle2, CheckCircle2,
ChevronDown, ChevronDown,
CircleDollarSign, CircleDollarSign,
Clock3,
Code2, Code2,
Copy, Copy,
Download, Download,
@@ -33,15 +32,17 @@ import {
Sparkles, Sparkles,
Terminal, Terminal,
Timer, Timer,
Trash2,
WalletCards, WalletCards,
Zap, Zap,
} from 'lucide-vue-next' } from 'lucide-vue-next'
import type { ApiKeyItem, CallMode, ModelItem, ModelType, TaskItem, TaskStatus } from '../types' 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 { copyText, type CopyResult } from '../services/clipboard'
import SlidePanel from '../components/SlidePanel.vue' import SlidePanel from '../components/SlidePanel.vue'
import UiModal from '../components/UiModal.vue' import UiModal from '../components/UiModal.vue'
import ModelGroupPermissions from '../components/ModelGroupPermissions.vue' import ModelGroupPermissions from '../components/ModelGroupPermissions.vue'
import UsageHistory from '../components/UsageHistory.vue'
defineProps<{ view: string; displayName?: string }>() defineProps<{ view: string; displayName?: string }>()
const emit = defineEmits<{ navigate: [view: string]; notify: [message: string]; balance: [value: number | undefined] }>() 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 response = ref('')
const keys = ref<ApiKeyItem[]>([]) const keys = ref<ApiKeyItem[]>([])
const tasks = ref<TaskItem[]>([]) const tasks = ref<TaskItem[]>([])
const taskFilter = ref<'全部' | TaskStatus>('全部') const historyRevision = ref(0)
const keyBusy = ref(false)
const deleteKeyTarget = ref<ApiKeyItem>()
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<TaskItem | null>(null) const selectedTask = ref<TaskItem | null>(null)
const createKeyOpen = ref(false) const createKeyOpen = ref(false)
const secretOpen = ref(false) const secretOpen = ref(false)
@@ -149,11 +162,7 @@ const activeModelFilters = computed(() => [
modelMode.value !== '全部' ? modelMode.value : '', modelMode.value !== '全部' ? modelMode.value : '',
modelAvailability.value !== '全部' ? modelAvailability.value : '', modelAvailability.value !== '全部' ? modelAvailability.value : '',
].filter(Boolean)) ].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 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 usageSeries = computed(() => {
const maximum = Math.max(...overview.value.series.map((item) => item.count), 0) const maximum = Math.max(...overview.value.series.map((item) => item.count), 0)
return overview.value.series.map((item) => ({ return overview.value.series.map((item) => ({
@@ -239,6 +248,7 @@ async function runModel() {
emit('notify', error instanceof Error ? error.message : '模型调用失败') emit('notify', error instanceof Error ? error.message : '模型调用失败')
} finally { } finally {
running.value = false running.value = false
historyRevision.value++
} }
} }
@@ -412,17 +422,28 @@ async function saveModelPermissions() {
} }
async function toggleKey(key: ApiKeyItem) { async function toggleKey(key: ApiKeyItem) {
if (catalogConnected.value && key.status === '正常') { if (keyBusy.value) return
keyBusy.value = true
try { try {
await catalogClient.revokeKey(String(key.id)) const enabled = key.status !== '正常'
key.status = '已停用' await catalogClient.setKeyStatus(String(key.id), enabled ? 'active' : 'disabled')
emit('notify', `${key.name} 已停用`) key.status = enabled ? '正常' : '已停用'
} catch (error) { emit('notify', `${key.name} ${enabled ? '已重新启用' : '已停用'}`)
emit('notify', error instanceof Error ? error.message : '停用 Key 失败') } catch (error) { emit('notify', error instanceof Error ? error.message : '更新 Key 状态失败') }
finally { keyBusy.value = false }
} }
return async function deleteKey() {
} if (!deleteKeyTarget.value || keyBusy.value) return
emit('notify', key.status === '已停用' ? '已停用的 Key 不能重新启用,请创建新 Key' : 'Control Plane 未连接') 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() { async function createProject() {
@@ -515,18 +536,18 @@ async function createProject() {
<div v-else class="response-state empty"><span class="response-icon"><Sparkles :size="28" /></span><strong>等待模型响应</strong><p>配置请求并点击“开始调用”</p></div> <div v-else class="response-state empty"><span class="response-icon"><Sparkles :size="28" /></span><strong>等待模型响应</strong><p>配置请求并点击“开始调用”</p></div>
</article> </article>
</section> </section>
<UsageHistory history :revision="historyRevision" @notify="emit('notify', $event)" @restore="restoreHistory" />
</template> </template>
<template v-else-if="view === 'keys'"> <template v-else-if="view === 'keys'">
<section class="page-heading"><div><span>DEVELOPER ACCESS</span><h1>API Keys</h1><p>为不同应用和环境创建独立访问凭证。</p></div><button class="button primary" @click="createKeyOpen = true"><Plus :size="16" />创建 API Key</button></section> <section class="page-heading"><div><span>DEVELOPER ACCESS</span><h1>API Keys</h1><p>为不同应用和环境创建独立访问凭证。</p></div><button class="button primary" @click="createKeyOpen = true"><Plus :size="16" />创建 API Key</button></section>
<section class="notice"><ShieldCheck :size="19" /><div><strong>妥善保管访问凭证</strong><p>完整 Key 只在创建时展示一次,请存放在安全的环境变量或密钥管理服务中。</p></div></section> <section class="notice"><ShieldCheck :size="19" /><div><strong>妥善保管访问凭证</strong><p>完整 Key 只在创建时展示一次,请存放在安全的环境变量或密钥管理服务中。</p></div></section>
<section class="panel table-card"><header class="panel-header"><div><span>CREDENTIALS</span><h3>个人与项目 Keys</h3></div><small>{{ keys.length }} 个凭证{{ catalogConnected ? ' · 已连接 Control Plane' : ' · 服务未连接' }}</small></header><div class="responsive-table"><table><thead><tr><th>名称</th><th>Key</th><th>归属范围</th><th>模型权限</th><th>最近使用</th><th>状态</th><th></th></tr></thead><tbody><tr v-for="key in keys" :key="key.id"><td><div class="entity-cell"><span class="icon-tile violet"><KeyRound :size="16" /></span><div><strong>{{ key.name }}</strong><small>创建于 {{ key.createdAt }}</small></div></div></td><td><span class="code-value readonly" title="完整 Key 仅在创建时展示"><code>{{ key.value }}</code><ShieldCheck :size="14" /></span></td><td>{{ key.scope }}</td><td><button class="model-permission-summary" :disabled="key.status !== '正常'" @click="openModelPermissions(key)"><span>{{ key.modelIds.length ? `${key.modelIds.length} 个分组` : '未配置' }}</span><SlidersHorizontal :size="14" /></button></td><td>{{ key.lastUsed }}</td><td><span class="status-chip" :class="key.status === '正常' ? 'success' : 'muted'"><i></i>{{ key.status }}</span></td><td><button class="icon-button" :title="key.status === '正常' ? '停用 Key' : '已停用'" @click="toggleKey(key)"><EyeOff v-if="key.status === '正常'" :size="16" /><Eye v-else :size="16" /></button></td></tr><tr v-if="!keys.length"><td colspan="7"><div class="empty-state compact"><KeyRound :size="22" /><strong>暂无 API Key</strong><span>创建后完整 Key 只会展示一次</span></div></td></tr></tbody></table></div></section> <section class="panel table-card"><header class="panel-header"><div><span>CREDENTIALS</span><h3>个人与项目 Keys</h3></div><small>{{ keys.length }} 个凭证{{ catalogConnected ? ' · 已连接 Control Plane' : ' · 服务未连接' }}</small></header><div class="responsive-table"><table><thead><tr><th>名称</th><th>Key</th><th>归属范围</th><th>模型权限</th><th>最近使用</th><th>状态</th><th></th></tr></thead><tbody><tr v-for="key in keys" :key="key.id"><td><div class="entity-cell"><span class="icon-tile violet"><KeyRound :size="16" /></span><div><strong>{{ key.name }}</strong><small>创建于 {{ key.createdAt }}</small></div></div></td><td><span class="code-value readonly" title="完整 Key 仅在创建时展示"><code>{{ key.value }}</code><ShieldCheck :size="14" /></span></td><td>{{ key.scope }}</td><td><button class="model-permission-summary" :disabled="key.status !== '正常'" @click="openModelPermissions(key)"><span>{{ key.modelIds.length ? `${key.modelIds.length} 个分组` : '未配置' }}</span><SlidersHorizontal :size="14" /></button></td><td>{{ key.lastUsed }}</td><td><span class="status-chip" :class="key.status === '正常' ? 'success' : 'muted'"><i></i>{{ key.status }}</span></td><td><button class="icon-button" :title="key.status === '正常' ? '停用 Key' : '重新启用 Key'" :disabled="keyBusy" @click="toggleKey(key)"><EyeOff v-if="key.status === '正常'" :size="16" /><Eye v-else :size="16" /></button><button class="icon-button" :title="key.status === '正常' ? '请先停用后再删除' : '删除 Key'" :disabled="keyBusy || key.status === '正常'" @click="deleteKeyTarget = key"><Trash2 :size="16" /></button></td></tr><tr v-if="!keys.length"><td colspan="7"><div class="empty-state compact"><KeyRound :size="22" /><strong>暂无 API Key</strong><span>创建后完整 Key 只会展示一次</span></div></td></tr></tbody></table></div></section>
</template> </template>
<template v-else-if="view === 'tasks'"> <template v-else-if="view === 'tasks'">
<section class="page-heading"><div><span>ASYNC TASKS</span><h1>任务中心</h1><p>统一查看 3D、图像和视频等异步模型任务。</p></div><button class="button secondary" @click="emit('navigate', 'models')"><Plus :size="16" />新建任务</button></section> <section class="page-heading"><div><span>USAGE HISTORY</span><h1>任务中心 · 使用记录</h1><p>查看模型调用与异步任务,按密钥、模型、分组和时间追踪用量。</p></div><button class="button secondary" @click="emit('navigate', 'playground')"><Play :size="16" />在线调试</button></section>
<section class="compact-metrics"><article><Clock3 :size="18" /><div><span>执行中</span><strong>{{ runningTaskCount }}</strong></div></article><article><FileClock :size="18" /><div><span>排队中</span><strong>{{ queuedTaskCount }}</strong></div></article><article><CheckCircle2 :size="18" /><div><span>已完成</span><strong>{{ completedTaskCount }}</strong></div></article><article><Timer :size="18" /><div><span>实时任务</span><strong>{{ tasks.filter((task) => task.remote).length }}</strong></div></article></section> <UsageHistory @notify="emit('notify', $event)" />
<section class="panel table-card"><header class="panel-header table-toolbar"><div><span>TASK QUEUE</span><h3>当前会话任务</h3></div><div class="tabs compact"><button v-for="filter in ['全部','排队中','执行中','已完成','失败']" :key="filter" :class="{ active: taskFilter === filter }" @click="taskFilter = filter as '全部' | TaskStatus">{{ filter }}</button></div></header><div class="responsive-table"><table><thead><tr><th>任务</th><th>模型</th><th>进度</th><th>创建时间</th><th>状态</th></tr></thead><tbody><tr v-for="task in filteredTasks" :key="task.id" class="clickable" @click="selectedTask = task"><td><div class="entity-cell"><span class="icon-tile orange"><Box :size="16" /></span><div><strong>{{ task.name }}</strong><small>{{ task.id }}</small></div></div></td><td>{{ task.model }}</td><td><div class="progress-cell"><span><i :style="{ width: `${task.progress}%` }"></i></span><small>{{ task.progress }}%</small></div></td><td><div class="stacked-cell"><span>{{ task.createdAt }}</span><small>{{ task.duration }}</small></div></td><td><span class="status-chip" :class="task.status"><i></i>{{ task.status }}</span></td></tr><tr v-if="!filteredTasks.length"><td colspan="5"><div class="empty-state compact"><FileClock :size="22" /><strong>暂无任务</strong><span>提交异步模型后,任务会在这里显示</span></div></td></tr></tbody></table></div></section>
</template> </template>
<template v-else-if="view === 'usage'"> <template v-else-if="view === 'usage'">
@@ -549,6 +570,7 @@ MOYI_MODEL=&lt;model-id&gt;</code></pre></div></section><section><b>02</b><div><
<SlidePanel v-if="selectedModel" :title="selectedModel.name" eyebrow="MODEL DETAILS" @close="selectedModel = null"><div class="drawer-model-head"><span class="model-icon" :class="selectedModel.accent"><component :is="selectedModel.icon" :size="22" /></span><div><small>{{ selectedModel.provider }}</small><strong>{{ selectedModel.type }} · {{ selectedModel.mode }}调用</strong></div></div><p class="drawer-description">{{ selectedModel.description }}</p><div class="detail-health"><span class="status-chip" :class="selectedModel.availability === '在线' ? 'success' : 'muted'"><i></i>{{ selectedModel.availability }}</span><strong>{{ selectedModel.availability }}</strong></div><dl class="detail-list"><div><dt>模型名称</dt><dd><code>{{ selectedModel.id }}</code><button class="icon-button" title="复制模型名称" @click="copy(selectedModel.id, '模型名称', 'model-id')"><Check v-if="copySucceeded('model-id')" :size="14" /><Copy v-else :size="14" /></button></dd></div><div><dt>典型延迟</dt><dd>{{ selectedModel.latency }}</dd></div><div><dt>能力规格</dt><dd>{{ selectedModel.specification }}</dd></div><div><dt>调用模式</dt><dd>{{ selectedModel.mode }}</dd></div></dl><div class="drawer-note"><Info :size="16" /><span>{{ selectedModel.mode === '异步' ? '提交后进入任务队列,在任务中心查询进度与结果。' : '支持通过统一兼容接口直接调用。' }}</span></div><template #footer><button class="button primary full" @click="tryModel(selectedModel)"><Play :size="16" />在线试用</button><button class="button secondary full" @click="selectedModel = null; emit('navigate', 'docs')"><BookOpen :size="16" />查看文档</button></template></SlidePanel> <SlidePanel v-if="selectedModel" :title="selectedModel.name" eyebrow="MODEL DETAILS" @close="selectedModel = null"><div class="drawer-model-head"><span class="model-icon" :class="selectedModel.accent"><component :is="selectedModel.icon" :size="22" /></span><div><small>{{ selectedModel.provider }}</small><strong>{{ selectedModel.type }} · {{ selectedModel.mode }}调用</strong></div></div><p class="drawer-description">{{ selectedModel.description }}</p><div class="detail-health"><span class="status-chip" :class="selectedModel.availability === '在线' ? 'success' : 'muted'"><i></i>{{ selectedModel.availability }}</span><strong>{{ selectedModel.availability }}</strong></div><dl class="detail-list"><div><dt>模型名称</dt><dd><code>{{ selectedModel.id }}</code><button class="icon-button" title="复制模型名称" @click="copy(selectedModel.id, '模型名称', 'model-id')"><Check v-if="copySucceeded('model-id')" :size="14" /><Copy v-else :size="14" /></button></dd></div><div><dt>典型延迟</dt><dd>{{ selectedModel.latency }}</dd></div><div><dt>能力规格</dt><dd>{{ selectedModel.specification }}</dd></div><div><dt>调用模式</dt><dd>{{ selectedModel.mode }}</dd></div></dl><div class="drawer-note"><Info :size="16" /><span>{{ selectedModel.mode === '异步' ? '提交后进入任务队列,在任务中心查询进度与结果。' : '支持通过统一兼容接口直接调用。' }}</span></div><template #footer><button class="button primary full" @click="tryModel(selectedModel)"><Play :size="16" />在线试用</button><button class="button secondary full" @click="selectedModel = null; emit('navigate', 'docs')"><BookOpen :size="16" />查看文档</button></template></SlidePanel>
<SlidePanel v-if="selectedTask" :title="selectedTask.name" eyebrow="TASK DETAILS" @close="selectedTask = null"><div v-if="selectedTask.videoUrl || selectedTask.previewUrl" class="drawer-task-preview"><video v-if="selectedTask.videoUrl" :src="selectedTask.videoUrl" controls></video><img v-else :src="selectedTask.previewUrl" alt="任务结果预览" /></div><div class="task-drawer-status"><span class="status-chip" :class="selectedTask.status"><i></i>{{ selectedTask.status }}</span><strong>{{ selectedTask.progress }}%</strong></div><div class="drawer-progress"><span><i :style="{ width: `${selectedTask.progress}%` }"></i></span><small>{{ selectedTask.result }}</small></div><dl class="detail-list"><div><dt>任务 ID</dt><dd><code>{{ selectedTask.id }}</code></dd></div><div><dt>模型</dt><dd>{{ selectedTask.model }}</dd></div><div v-if="selectedTask.provider"><dt>上游通道</dt><dd>{{ selectedTask.provider }}</dd></div><div v-if="selectedTask.creditsConsumed !== undefined"><dt>任务消耗</dt><dd>{{ selectedTask.creditsConsumed }} credits</dd></div><div><dt>创建时间</dt><dd>{{ selectedTask.createdAt }}</dd></div><div><dt>耗时</dt><dd>{{ selectedTask.duration }}</dd></div></dl><div v-if="selectedTask.prompt" class="drawer-note"><Info :size="16" /><span>{{ selectedTask.prompt }}</span></div><template #footer><button v-if="selectedTask.modelUrl" class="button primary full" @click="openTaskAsset(selectedTask.modelUrl)"><Download :size="16" />下载 GLB 模型</button><button v-if="selectedTask.videoUrl" class="button primary full" @click="openTaskAsset(selectedTask.videoUrl)"><ExternalLink :size="16" />打开生成视频</button><button class="button secondary full" @click="selectedTask = null">关闭详情</button></template></SlidePanel> <SlidePanel v-if="selectedTask" :title="selectedTask.name" eyebrow="TASK DETAILS" @close="selectedTask = null"><div v-if="selectedTask.videoUrl || selectedTask.previewUrl" class="drawer-task-preview"><video v-if="selectedTask.videoUrl" :src="selectedTask.videoUrl" controls></video><img v-else :src="selectedTask.previewUrl" alt="任务结果预览" /></div><div class="task-drawer-status"><span class="status-chip" :class="selectedTask.status"><i></i>{{ selectedTask.status }}</span><strong>{{ selectedTask.progress }}%</strong></div><div class="drawer-progress"><span><i :style="{ width: `${selectedTask.progress}%` }"></i></span><small>{{ selectedTask.result }}</small></div><dl class="detail-list"><div><dt>任务 ID</dt><dd><code>{{ selectedTask.id }}</code></dd></div><div><dt>模型</dt><dd>{{ selectedTask.model }}</dd></div><div v-if="selectedTask.provider"><dt>上游通道</dt><dd>{{ selectedTask.provider }}</dd></div><div v-if="selectedTask.creditsConsumed !== undefined"><dt>任务消耗</dt><dd>{{ selectedTask.creditsConsumed }} credits</dd></div><div><dt>创建时间</dt><dd>{{ selectedTask.createdAt }}</dd></div><div><dt>耗时</dt><dd>{{ selectedTask.duration }}</dd></div></dl><div v-if="selectedTask.prompt" class="drawer-note"><Info :size="16" /><span>{{ selectedTask.prompt }}</span></div><template #footer><button v-if="selectedTask.modelUrl" class="button primary full" @click="openTaskAsset(selectedTask.modelUrl)"><Download :size="16" />下载 GLB 模型</button><button v-if="selectedTask.videoUrl" class="button primary full" @click="openTaskAsset(selectedTask.videoUrl)"><ExternalLink :size="16" />打开生成视频</button><button class="button secondary full" @click="selectedTask = null">关闭详情</button></template></SlidePanel>
<UiModal v-if="deleteKeyTarget" title="删除 API Key" @close="!keyBusy && (deleteKeyTarget = undefined)"><p>确认删除「{{ deleteKeyTarget.name }}」?删除后无法重新启用,已有调用记录和任务会保留。</p><template #footer><button class="button secondary" :disabled="keyBusy" @click="deleteKeyTarget = undefined">取消</button><button class="button danger" :disabled="keyBusy" @click="deleteKey">{{ keyBusy ? '删除中…' : '确认删除' }}</button></template></UiModal>
<UiModal v-if="createKeyOpen" title="创建 API Key" eyebrow="NEW CREDENTIAL" @close="createKeyOpen = false"><p class="modal-description">个人 Key 适合个人开发调试,项目 Key 适合服务端应用和团队协作。创建后再配置该 Key 可调用的具体模型。</p><label class="form-label">Key 名称</label><input v-model="keyName" class="text-input" placeholder="例如:生产环境" /><label class="form-label">Key 归属</label><div class="option-list"><button :class="{ active: keyScopeType === 'personal' }" @click="keyScopeType = 'personal'"><span><i></i><strong>个人 Key</strong><small>归属当前账号</small></span><Check v-if="keyScopeType === 'personal'" :size="16" /></button><button :class="{ active: keyScopeType === 'project' }" @click="keyScopeType = 'project'"><span><i></i><strong>项目 Key</strong><small>归属工作区/项目</small></span><Check v-if="keyScopeType === 'project'" :size="16" /></button></div><div v-if="keyScopeType === 'project'"><label class="form-label"><span>选择项目</span><button class="text-link" type="button" @click="openProjectModal">新建项目</button></label><select v-model="selectedProjectId" class="text-input"><option value="" disabled>请选择项目</option><option v-for="project in projects" :key="project.id" :value="project.id">{{ project.name }}</option></select></div><div class="permission-hint"><ShieldCheck :size="16" /><span>Key 创建后默认不开放模型权限,请在下一步选择具体可调用模型。</span></div><template #footer><button class="button secondary" @click="createKeyOpen = false">取消</button><button class="button primary" @click="createKey"><KeyRound :size="16" />生成 Key</button></template></UiModal> <UiModal v-if="createKeyOpen" title="创建 API Key" eyebrow="NEW CREDENTIAL" @close="createKeyOpen = false"><p class="modal-description">个人 Key 适合个人开发调试,项目 Key 适合服务端应用和团队协作。创建后再配置该 Key 可调用的具体模型。</p><label class="form-label">Key 名称</label><input v-model="keyName" class="text-input" placeholder="例如:生产环境" /><label class="form-label">Key 归属</label><div class="option-list"><button :class="{ active: keyScopeType === 'personal' }" @click="keyScopeType = 'personal'"><span><i></i><strong>个人 Key</strong><small>归属当前账号</small></span><Check v-if="keyScopeType === 'personal'" :size="16" /></button><button :class="{ active: keyScopeType === 'project' }" @click="keyScopeType = 'project'"><span><i></i><strong>项目 Key</strong><small>归属工作区/项目</small></span><Check v-if="keyScopeType === 'project'" :size="16" /></button></div><div v-if="keyScopeType === 'project'"><label class="form-label"><span>选择项目</span><button class="text-link" type="button" @click="openProjectModal">新建项目</button></label><select v-model="selectedProjectId" class="text-input"><option value="" disabled>请选择项目</option><option v-for="project in projects" :key="project.id" :value="project.id">{{ project.name }}</option></select></div><div class="permission-hint"><ShieldCheck :size="16" /><span>Key 创建后默认不开放模型权限,请在下一步选择具体可调用模型。</span></div><template #footer><button class="button secondary" @click="createKeyOpen = false">取消</button><button class="button primary" @click="createKey"><KeyRound :size="16" />生成 Key</button></template></UiModal>
<UiModal v-if="secretOpen" title="请立即保存你的 Key" eyebrow="CREDENTIAL CREATED" @close="secretOpen = false"><div class="secret-success"><CheckCircle2 :size="25" /><strong>API Key 创建成功</strong></div><p class="modal-description centered">完整 Key 只展示一次,关闭后无法再次查看。保存后继续配置模型权限。</p><div class="secret-box"><code>{{ revealSecret ? createdSecret : `${createdSecret.slice(0, 10)}••••••••••••` }}</code><button title="显示或隐藏 Key" @click="revealSecret = !revealSecret"><EyeOff v-if="revealSecret" :size="16" /><Eye v-else :size="16" /></button><button title="复制完整 Key" @click="copy(createdSecret, 'API Key', 'secret-key')"><Check v-if="copySucceeded('secret-key')" :size="16" /><Copy v-else :size="16" /></button></div><template #footer><button class="button secondary" @click="secretOpen = false; revealSecret = false">稍后配置</button><button class="button primary" @click="openCreatedKeyPermissions"><SlidersHorizontal :size="16" />配置可调用模型</button></template></UiModal> <UiModal v-if="secretOpen" title="请立即保存你的 Key" eyebrow="CREDENTIAL CREATED" @close="secretOpen = false"><div class="secret-success"><CheckCircle2 :size="25" /><strong>API Key 创建成功</strong></div><p class="modal-description centered">完整 Key 只展示一次,关闭后无法再次查看。保存后继续配置模型权限。</p><div class="secret-box"><code>{{ revealSecret ? createdSecret : `${createdSecret.slice(0, 10)}••••••••••••` }}</code><button title="显示或隐藏 Key" @click="revealSecret = !revealSecret"><EyeOff v-if="revealSecret" :size="16" /><Eye v-else :size="16" /></button><button title="复制完整 Key" @click="copy(createdSecret, 'API Key', 'secret-key')"><Check v-if="copySucceeded('secret-key')" :size="16" /><Copy v-else :size="16" /></button></div><template #footer><button class="button secondary" @click="secretOpen = false; revealSecret = false">稍后配置</button><button class="button primary" @click="openCreatedKeyPermissions"><SlidersHorizontal :size="16" />配置可调用模型</button></template></UiModal>
<UiModal v-if="projectOpen" title="新建工作区 / 项目" eyebrow="NEW PROJECT" @close="projectOpen = false"><p class="modal-description">项目用于归属团队 Key,并为后续用量、额度和权限隔离预留空间。</p><label class="form-label">项目名称</label><input v-model="projectName" class="text-input" placeholder="例如:AI SoulMate 研发项目" @keyup.enter="createProject" /><label class="form-label">项目描述(可选)</label><textarea v-model="projectDescription" class="text-input modal-textarea" placeholder="描述项目用途或成员范围"></textarea><template #footer><button class="button secondary" @click="projectOpen = false">取消</button><button class="button primary" @click="createProject"><Plus :size="16" />创建项目</button></template></UiModal> <UiModal v-if="projectOpen" title="新建工作区 / 项目" eyebrow="NEW PROJECT" @close="projectOpen = false"><p class="modal-description">项目用于归属团队 Key,并为后续用量、额度和权限隔离预留空间。</p><label class="form-label">项目名称</label><input v-model="projectName" class="text-input" placeholder="例如:AI SoulMate 研发项目" @keyup.enter="createProject" /><label class="form-label">项目描述(可选)</label><textarea v-model="projectDescription" class="text-input modal-textarea" placeholder="描述项目用途或成员范围"></textarea><template #footer><button class="button secondary" @click="projectOpen = false">取消</button><button class="button primary" @click="createProject"><Plus :size="16" />创建项目</button></template></UiModal>
+1 -1
View File
@@ -28,7 +28,7 @@ New-Item -ItemType Directory -Force -Path $artifactRoot | Out-Null
$staging = Join-Path $artifactRoot ('moyi-test-' + $releaseId) $staging = Join-Path $artifactRoot ('moyi-test-' + $releaseId)
New-Item -ItemType Directory -Path $staging | Out-Null New-Item -ItemType Directory -Path $staging | Out-Null
# Copy tracked deployment files only, never .env, certificates or .git. # Copy tracked deployment files only, never .env, certificates or .git.
$tracked = @(git ls-files infra/moyi docs/11-server-test-deployment.md docs/13-model-groups-registration-credit.md) $tracked = @(git ls-files infra/moyi docs/11-server-test-deployment.md docs/13-model-groups-registration-credit.md docs/14-lifecycle-usage-credit-adjustments.md)
foreach ($relative in $tracked) { foreach ($relative in $tracked) {
if ($relative -match '(^|/)(\.env\.cloud|\.deploy-mode|certs)(/|$)') { throw 'Sensitive path in release allowlist.' } if ($relative -match '(^|/)(\.env\.cloud|\.deploy-mode|certs)(/|$)') { throw 'Sensitive path in release allowlist.' }
$destination = Join-Path $staging $relative $destination = Join-Path $staging $relative