feat: add java sync provider gateway

This commit is contained in:
wlx committed 2026-09-07 17:04:23 +08:00
1 parent 9da175c040
commit 31a34757be
4 files changed
+114 -6

No files matched your search

@@ -2,6 +2,7 @@ package com.moyi.controlplane.gateway;
import com.moyi.controlplane.catalog.CatalogService;
import com.moyi.controlplane.common.ApiException;
import com.moyi.controlplane.provider.OpenAiCompatibleProvider;
import java.time.Instant;
import java.util.LinkedHashMap;
import java.util.List;
@@ -20,9 +21,11 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/v1")
public class GatewayController {
private final CatalogService catalogService;
private final OpenAiCompatibleProvider provider;
public GatewayController(CatalogService catalogService) {
public GatewayController(CatalogService catalogService, OpenAiCompatibleProvider provider) {
this.catalogService = catalogService;
this.provider = provider;
}
@GetMapping("/models")
@@ -54,6 +57,15 @@ public class GatewayController {
if (model == null) throw new ApiException("MODEL_NOT_FOUND", "模型不存在或已下线", 404);
if (!catalogService.keyCanInvoke(key, modelId)) throw new ApiException("MODEL_FORBIDDEN", "当前 Key 无权调用该模型", 403);
if ("async".equals(model.get("mode"))) throw new ApiException("ASYNC_MODEL", "该模型需要使用异步任务接口", 400);
String providerId = String.valueOf(model.get("providerId"));
if (provider.isConfigured(providerId)) {
if (Boolean.TRUE.equals(input.get("stream"))) throw new ApiException("STREAM_NOT_IMPLEMENTED", "流式转发将在下一节点开放", 501);
List<?> messages = input.get("messages") instanceof List<?> values ? values : List.of();
Map<String, Object> upstream = provider.chat(providerId, String.valueOf(model.get("upstreamModel")), messages);
upstream.put("model", modelId);
catalogService.touchKey(key);
return ResponseEntity.ok(upstream);
}
String prompt = extractPrompt(input.get("messages"));
String content = "MOYI Java Mock 已收到:" + (prompt.isBlank() ? "(空消息)" : prompt);
catalogService.touchKey(key);
@@ -0,0 +1,86 @@
package com.moyi.controlplane.provider;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.moyi.controlplane.common.ApiException;
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.time.Duration;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Service;
@Service
public class OpenAiCompatibleProvider {
private final ObjectMapper objectMapper;
private final HttpClient httpClient;
private final Map<String, ProviderConfig> providers;
public OpenAiCompatibleProvider(
ObjectMapper objectMapper,
org.springframework.core.env.Environment environment
) {
this.objectMapper = objectMapper;
this.httpClient = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build();
this.providers = Map.of(
"provider-deepseek", new ProviderConfig(environment.getProperty("moyi.providers.deepseek.api-key", ""), environment.getProperty("moyi.providers.deepseek.base-url", "https://api.deepseek.com")),
"provider-kimi", new ProviderConfig(environment.getProperty("moyi.providers.kimi.api-key", ""), environment.getProperty("moyi.providers.kimi.base-url", "https://api.moonshot.ai/v1")),
"provider-zhipu", new ProviderConfig(environment.getProperty("moyi.providers.zhipu.api-key", ""), environment.getProperty("moyi.providers.zhipu.base-url", "https://open.bigmodel.cn/api/paas/v4"))
);
}
public boolean isConfigured(String providerId) {
ProviderConfig provider = providers.get(providerId);
return provider != null && !provider.apiKey().isBlank();
}
public Map<String, Object> chat(String providerId, String upstreamModel, List<?> messages) {
ProviderConfig provider = providers.get(providerId);
if (provider == null || provider.apiKey().isBlank()) {
throw new ApiException("PROVIDER_NOT_CONFIGURED", "该模型的供应商尚未配置服务端 API Key", 503);
}
Map<String, Object> body = new LinkedHashMap<>();
body.put("model", upstreamModel);
body.put("messages", messages == null ? List.of() : messages);
body.put("stream", false);
String json = writeJson(body);
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(normalizeUrl(provider.baseUrl()) + "/chat/completions"))
.timeout(Duration.ofSeconds(90))
.header("Authorization", "Bearer " + provider.apiKey())
.header("Content-Type", "application/json")
.POST(HttpRequest.BodyPublishers.ofString(json))
.build();
try {
HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
if (response.statusCode() < 200 || response.statusCode() >= 300) {
throw new ApiException("UPSTREAM_PROVIDER_ERROR", "上游模型供应商请求失败", 502);
}
return objectMapper.readValue(response.body(), new com.fasterxml.jackson.core.type.TypeReference<>() {});
} catch (ApiException exception) {
throw exception;
} catch (InterruptedException exception) {
Thread.currentThread().interrupt();
throw new ApiException("UPSTREAM_PROVIDER_TIMEOUT", "上游模型供应商请求被中断", 502);
} catch (Exception exception) {
throw new ApiException("UPSTREAM_PROVIDER_ERROR", "上游模型供应商请求失败", 502);
}
}
private String normalizeUrl(String value) {
return value == null ? "" : value.replaceAll("/+$", "");
}
private String writeJson(Object value) {
try {
return objectMapper.writeValueAsString(value);
} catch (JsonProcessingException exception) {
throw new ApiException("INVALID_REQUEST", "请求内容无法编码", 400);
}
}
private record ProviderConfig(String apiKey, String baseUrl) {}
}
@@ -49,3 +49,13 @@ moyi:
oss-bucket: ${OSS_BUCKET:}
oss-access-key-id: ${OSS_ACCESS_KEY_ID:}
oss-access-key-secret: ${OSS_ACCESS_KEY_SECRET:}
providers:
deepseek:
api-key: ${DEEPSEEK_API_KEY:}
base-url: ${DEEPSEEK_BASE_URL:https://api.deepseek.com}
kimi:
api-key: ${KIMI_API_KEY:}
base-url: ${KIMI_BASE_URL:https://api.moonshot.ai/v1}
zhipu:
api-key: ${ZHIPU_API_KEY:}
base-url: ${ZHIPU_BASE_URL:https://open.bigmodel.cn/api/paas/v4}
+5 -5
View File
@@ -9,7 +9,7 @@
- 供应商和模型目录读取;
- 项目创建与查询;
- API Key 创建、明文一次性返回、撤销和模型权限配置;
- 最小 OpenAI 兼容 `GET /v1/models` 与 `POST /v1/chat/completions` Mock 接口。
- 最小 OpenAI 兼容 `GET /v1/models` 与 `POST /v1/chat/completions` 接口;DeepSeek、Kimi、GLM 配置服务端 Key 后走真实上游,未配置时保留 Mock。
## 已落地接口
@@ -30,7 +30,7 @@
| `GET /api/admin/users` | 管理员 | 用户列表 |
| `GET /api/admin/audit` | 管理员 | 审计记录 |
| `GET /v1/models` | 平台 API Key | 返回该 Key 有权限的模型 |
| `POST /v1/chat/completions` | 平台 API Key | Mock 同步聊天调用 |
| `POST /v1/chat/completions` | 平台 API Key | 同步聊天调用(已配置供应商 Key 时转发真实上游) |
## 数据库迁移
@@ -57,17 +57,17 @@ Invoke-WebRequest http://localhost:8080/health
## 验收边界
本节点完成的是“控制面基础闭环”,不是生产网关完成版:
本节点完成的是“控制面基础闭环 + 同步供应商转发”,不是生产网关完成版:
- 数据已写入 PostgreSQL,Redis 连接配置已预留,但限流、队列和分布式幂等尚未接入;
- `/v1/chat/completions` 目前返回 Java Mock,不会自动调用 DeepSeek、Kimi 或 GLM;
- `/v1/chat/completions` 已支持 DeepSeek、Kimi、GLM 的 OpenAI 兼容转发;未配置 Key 时返回 Mock,流式响应暂未开放;
- Seedance、Tripo/VAST 的异步任务和 OSS 结果存储尚未迁移到 Java;
- 价格、额度扣减、计费账单和并发排队仍沿用下一节点计划;
- Docker 镜像需要在具备 Maven 和 Docker daemon 的环境中构建验证。
## 下一节点
1. 把模型供应商适配器迁移为 Java HTTP 客户端,先接入一个同步模型;
1. 为真实同步转发补充超时、重试、熔断、响应脱敏和用量事件记录;
2. 接入 Redis 限流、并发计数、幂等键和异步任务状态;
3. 接入 Tripo/Seedance 异步任务与 OSS 私有对象;
4. 用 RDS、Redis、OSS 的测试资源完成云上验收,再切换前端的 Java API 地址。