From 9da175c040c939425c2d1223d7ec8a02f1b48ad7 Mon Sep 17 00:00:00 2001
From: WangLX <519407855@qq.com>
Date: Mon, 7 Sep 2026 16:54:43 +0800
Subject: [PATCH] feat: migrate java control plane foundation
---
.gitignore | 2 +
README.md | 5 +-
control-plane-java/README.md | 4 +-
control-plane-java/pom.xml | 4 +
.../moyi/controlplane/HealthController.java | 6 +-
.../controlplane/auth/AdminBootstrap.java | 40 ++
.../controlplane/auth/AuthController.java | 140 ++++++
.../moyi/controlplane/auth/AuthService.java | 407 ++++++++++++++++++
.../controlplane/auth/PasswordHasher.java | 68 +++
.../catalog/CatalogController.java | 118 +++++
.../controlplane/catalog/CatalogService.java | 372 ++++++++++++++++
.../controlplane/common/ApiException.java | 24 ++
.../common/ApiExceptionHandler.java | 34 ++
.../moyi/controlplane/config/WebConfig.java | 29 ++
.../gateway/GatewayController.java | 84 ++++
.../src/main/resources/application.yml | 9 +
.../db/migration/V4__catalog_channels.sql | 14 +
.../db/migration/V5__usage_events.sql | 18 +
.../db/migration/V6__seed_catalog.sql | 20 +
docs/08-java-container-deployment.md | 12 +-
docs/09-java-control-plane-node.md | 73 ++++
infra/moyi/.env.cloud.example | 30 ++
infra/moyi/README.md | 15 +-
infra/moyi/docker-compose.cloud.yml | 39 ++
24 files changed, 1555 insertions(+), 12 deletions(-)
create mode 100644 control-plane-java/src/main/java/com/moyi/controlplane/auth/AdminBootstrap.java
create mode 100644 control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java
create mode 100644 control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthService.java
create mode 100644 control-plane-java/src/main/java/com/moyi/controlplane/auth/PasswordHasher.java
create mode 100644 control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogController.java
create mode 100644 control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogService.java
create mode 100644 control-plane-java/src/main/java/com/moyi/controlplane/common/ApiException.java
create mode 100644 control-plane-java/src/main/java/com/moyi/controlplane/common/ApiExceptionHandler.java
create mode 100644 control-plane-java/src/main/java/com/moyi/controlplane/config/WebConfig.java
create mode 100644 control-plane-java/src/main/java/com/moyi/controlplane/gateway/GatewayController.java
create mode 100644 control-plane-java/src/main/resources/db/migration/V4__catalog_channels.sql
create mode 100644 control-plane-java/src/main/resources/db/migration/V5__usage_events.sql
create mode 100644 control-plane-java/src/main/resources/db/migration/V6__seed_catalog.sql
create mode 100644 docs/09-java-control-plane-node.md
create mode 100644 infra/moyi/.env.cloud.example
create mode 100644 infra/moyi/docker-compose.cloud.yml
diff --git a/.gitignore b/.gitignore
index 950164d..20e5615 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,6 @@ control-plane/node_modules/
control-plane/dist/
control-plane/.env
infra/control-plane/.env
+infra/moyi/.env
+infra/moyi/.env.cloud
prototype/.env
diff --git a/README.md b/README.md
index 706fa60..b52c290 100644
--- a/README.md
+++ b/README.md
@@ -302,16 +302,17 @@ MaaS 模型服务与应用开发
- [D4 密钥与模型目录实施计划](docs/06-d4-integration-plan.md)
- [首批模型供应商接入节点](docs/07-provider-integration.md)
- [Java 后端与容器化部署基线](docs/08-java-container-deployment.md)
+- [Java Control Plane 节点一:基础控制面](docs/09-java-control-plane-node.md)
## 前端原型
阶段 2 的可交互 Vue 原型位于 `prototype/`,包含用户控制台、模型广场、Playground、API Key、任务中心、用量与账单、接入文档和运营后台。
-Java 后端迁移基线位于 `control-plane-java/`,前后端生产容器编排位于 `infra/moyi/`。现有 TypeScript Control Plane 在 Java 接口迁移完成前继续作为过渡实现。
+Java 后端位于 `control-plane-java/`,前后端生产容器编排位于 `infra/moyi/`。Java 当前已覆盖认证、模型目录、项目、API Key、模型权限和最小 OpenAI 兼容接口;真实供应商、队列和计费完成前,TypeScript Control Plane 继续作为过渡实现。
Otari 本地网关基座位于 `infra/otari/`,仅用于后续联调和开发环境,不包含真实供应商密钥。
-身份与权限服务位于 `control-plane/`,本地 PostgreSQL 基座位于 `infra/control-plane/`;认证接口、邀请码和角色守卫将在 D3 逐步接入前端。
+身份与权限服务的 TypeScript 参考实现位于 `control-plane/`,本地 PostgreSQL 基座位于 `infra/control-plane/`;Java 迁移使用同一套基础表和 Flyway 脚本。
```bash
cd prototype
diff --git a/control-plane-java/README.md b/control-plane-java/README.md
index 92904ab..ac11ed7 100644
--- a/control-plane-java/README.md
+++ b/control-plane-java/README.md
@@ -1,6 +1,6 @@
# MOYI Java Control Plane
-这是 MOYI Control Plane 的 Java 迁移基线,目标运行时为 Java 21,框架为 Spring Boot。当前提供健康检查、Flyway 数据库迁移和容器启动骨架,后续按接口契约逐步迁移现有 TypeScript 服务的认证、模型目录、API Key、路由和任务能力。
+这是 MOYI Control Plane 的 Java 版本,目标运行时为 Java 21,框架为 Spring Boot。当前已提供健康检查、Flyway 数据库迁移、邀请码认证、用户会话、供应商/模型目录、项目、API Key、模型权限和最小 OpenAI 兼容接口;真实供应商适配、异步任务队列和计费仍按后续节点迁移。
目标依赖边界:
@@ -11,4 +11,4 @@
Flyway 脚本位于 `src/main/resources/db/migration/`,与现有 TypeScript 服务使用同一套基础表命名,后续迁移数据时可以按表逐步切换。
-本目录的镜像由 `infra/moyi/docker-compose.yml` 构建。当前 TypeScript Control Plane 仍是迁移期间的可用实现,不要在 Java 接口尚未完成前直接切换生产流量。
+本目录的镜像由 `infra/moyi/docker-compose.yml` 构建。切换生产流量前仍需完成真实供应商适配、Redis 限流/队列和完整集成测试;TypeScript Control Plane 继续作为迁移期间的参考实现。
diff --git a/control-plane-java/pom.xml b/control-plane-java/pom.xml
index 3b09108..98a63f8 100644
--- a/control-plane-java/pom.xml
+++ b/control-plane-java/pom.xml
@@ -40,6 +40,10 @@
org.springframework.boot
spring-boot-starter-data-redis
+
+ org.springframework.security
+ spring-security-crypto
+
org.postgresql
postgresql
diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/HealthController.java b/control-plane-java/src/main/java/com/moyi/controlplane/HealthController.java
index 2460a9e..2ddcbfe 100644
--- a/control-plane-java/src/main/java/com/moyi/controlplane/HealthController.java
+++ b/control-plane-java/src/main/java/com/moyi/controlplane/HealthController.java
@@ -11,7 +11,11 @@ public class HealthController {
return Map.of(
"status", "ok",
"service", "moyi-control-plane-java",
- "migration", "bootstrap"
+ "migration", "catalog",
+ "capabilities", Map.of(
+ "verificationCode", false,
+ "passwordReset", false
+ )
);
}
}
diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/auth/AdminBootstrap.java b/control-plane-java/src/main/java/com/moyi/controlplane/auth/AdminBootstrap.java
new file mode 100644
index 0000000..d1cb14e
--- /dev/null
+++ b/control-plane-java/src/main/java/com/moyi/controlplane/auth/AdminBootstrap.java
@@ -0,0 +1,40 @@
+package com.moyi.controlplane.auth;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+@Component
+public class AdminBootstrap implements ApplicationRunner {
+ private final AuthService authService;
+ private final Environment environment;
+ private final String account;
+ private final String password;
+ private final String displayName;
+
+ public AdminBootstrap(
+ AuthService authService,
+ Environment environment,
+ @Value("${moyi.bootstrap.admin-account}") String account,
+ @Value("${moyi.bootstrap.admin-password}") String password,
+ @Value("${moyi.bootstrap.admin-display-name}") String displayName
+ ) {
+ this.authService = authService;
+ this.environment = environment;
+ this.account = account;
+ this.password = password;
+ this.displayName = displayName;
+ }
+
+ @Override
+ public void run(ApplicationArguments arguments) {
+ for (String profile : environment.getActiveProfiles()) {
+ if ("production".equals(profile) && "admin123".equals(password)) {
+ throw new IllegalStateException("ADMIN_PASSWORD must be changed in production");
+ }
+ }
+ authService.ensureAdmin(account, password, displayName);
+ }
+}
diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java b/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java
new file mode 100644
index 0000000..5a313f1
--- /dev/null
+++ b/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java
@@ -0,0 +1,140 @@
+package com.moyi.controlplane.auth;
+
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.time.Duration;
+import java.time.OffsetDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseCookie;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api")
+public class AuthController {
+ private static final String SESSION_COOKIE = "moyi_session";
+ private final AuthService authService;
+ private final int sessionTtlHours;
+ private final boolean secureCookie;
+
+ public AuthController(
+ AuthService authService,
+ @Value("${moyi.auth.session-ttl-hours}") int sessionTtlHours,
+ @Value("${moyi.auth.secure-cookie}") boolean secureCookie
+ ) {
+ this.authService = authService;
+ this.sessionTtlHours = sessionTtlHours;
+ this.secureCookie = secureCookie;
+ }
+
+ public record LoginRequest(String account, String password) {}
+
+ public record RegisterRequest(String invitationCode, String account, String password, String displayName) {}
+
+ public record InvitationRequest(String label, Integer maxUses, OffsetDateTime expiresAt) {}
+
+ @PostMapping("/auth/login")
+ public Map login(
+ @RequestBody LoginRequest input,
+ HttpServletRequest request,
+ HttpServletResponse response
+ ) {
+ AuthService.AuthResult result = authService.login(input.account(), input.password(), meta(request));
+ response.addHeader(HttpHeaders.SET_COOKIE, sessionCookie(result.token(), Duration.ofHours(sessionTtlHours)).toString());
+ return Map.of("user", result.user());
+ }
+
+ @PostMapping("/auth/register")
+ public ResponseEntity