feat: migrate java control plane foundation
This commit is contained in:
1 parent
1615401185
commit
9da175c040
24 files changed
+1555
-12
No files matched your search
@@ -0,0 +1,30 @@
|
||||
# Copy to .env.cloud on the target server. Never commit the real file.
|
||||
MOYI_HTTP_PORT=8080
|
||||
CONTROL_PLANE_CORS_ORIGINS=https://moyi.example.com
|
||||
|
||||
# Alibaba Cloud RDS PostgreSQL private endpoint.
|
||||
MOYI_DB_URL=jdbc:postgresql://rds-private-endpoint:1921/moyi_control
|
||||
MOYI_DB_USERNAME=moyi_app
|
||||
MOYI_DB_PASSWORD=replace-with-a-long-random-password
|
||||
|
||||
# Alibaba Cloud Redis/Tair private endpoint. Use TLS parameters if enabled by the instance.
|
||||
MOYI_REDIS_URL=rediss://:replace-with-redis-password@redis-private-endpoint:6379/0
|
||||
|
||||
SESSION_TTL_HOURS=168
|
||||
AUTH_PASSWORD_PEPPER=replace-with-a-long-random-secret-at-least-32-chars
|
||||
ADMIN_ACCOUNT=adimin
|
||||
ADMIN_PASSWORD=replace-with-a-strong-initial-password
|
||||
ADMIN_DISPLAY_NAME=平台管理员
|
||||
AUTH_SECURE_COOKIE=true
|
||||
|
||||
OSS_ENDPOINT=
|
||||
OSS_REGION=
|
||||
OSS_BUCKET=
|
||||
OSS_ACCESS_KEY_ID=
|
||||
OSS_ACCESS_KEY_SECRET=
|
||||
|
||||
TRIPO_API_KEY=
|
||||
DEEPSEEK_API_KEY=
|
||||
KIMI_API_KEY=
|
||||
ZHIPU_API_KEY=
|
||||
VOLCENGINE_API_KEY=
|
||||
+13
-2
@@ -4,7 +4,7 @@
|
||||
|
||||
## 当前迁移状态
|
||||
|
||||
`control-plane-java/` 当前提供 Java 21 / Spring Boot 的启动和健康检查骨架。现有 TypeScript Control Plane 仍是接口迁移期间的可用实现,Java 服务完成认证、模型目录、Key、路由和任务接口迁移并通过 UAT 前,不要直接把生产流量切到 Java 服务。
|
||||
`control-plane-java/` 当前提供 Java 21 / Spring Boot 的认证、模型目录、项目、Key、权限和最小 OpenAI 兼容接口。真实供应商适配、Redis 队列/限流、异步任务和计费完成并通过 UAT 前,不要直接把生产流量切到 Java 服务。
|
||||
|
||||
## 启动
|
||||
|
||||
@@ -22,7 +22,18 @@ docker compose ps
|
||||
Invoke-WebRequest http://localhost:8080/health
|
||||
```
|
||||
|
||||
前端入口为 `http://localhost:8080`。当前 Java 骨架阶段只保证 `/health` 可用;业务接口仍需完成迁移后才适合用此 Compose 做完整用户验收。
|
||||
前端入口为 `http://localhost:8080`。可先使用邀请码登录、查看模型目录、创建项目和 API Key,并通过 Key 调用 Mock 的 `/v1/chat/completions`;真实供应商和异步任务仍需后续节点接入。
|
||||
|
||||
## 云上托管依赖
|
||||
|
||||
RDS、Redis 和 OSS 不需要部署在轻量应用服务器上。云上使用托管服务时,复制 `.env.cloud.example` 为 `.env.cloud`,填写 RDS/Redis 私网连接信息,然后执行:
|
||||
|
||||
```powershell
|
||||
docker compose --env-file .env.cloud -f docker-compose.cloud.yml build
|
||||
docker compose --env-file .env.cloud -f docker-compose.cloud.yml up -d
|
||||
```
|
||||
|
||||
轻量应用服务器与RDS/Redis通常需要在阿里云控制台配置同地域内网互通和白名单;如果直接使用ECS并放在同一VPC,则不需要这层轻量服务器互通配置。OSS优先填写同地域内网Endpoint。
|
||||
|
||||
## 停止与数据
|
||||
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
name: moyi
|
||||
|
||||
services:
|
||||
moyi-api:
|
||||
build:
|
||||
context: ../../control-plane-java
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- path: .env.cloud
|
||||
required: false
|
||||
environment:
|
||||
CONTROL_PLANE_HOST: 0.0.0.0
|
||||
CONTROL_PLANE_PORT: 8787
|
||||
CONTROL_PLANE_CORS_ORIGINS: ${CONTROL_PLANE_CORS_ORIGINS:-https://moyi.example.com}
|
||||
SPRING_DATASOURCE_URL: ${MOYI_DB_URL:?Set MOYI_DB_URL in infra/moyi/.env.cloud}
|
||||
SPRING_DATASOURCE_USERNAME: ${MOYI_DB_USERNAME:?Set MOYI_DB_USERNAME in infra/moyi/.env.cloud}
|
||||
SPRING_DATASOURCE_PASSWORD: ${MOYI_DB_PASSWORD:?Set MOYI_DB_PASSWORD in infra/moyi/.env.cloud}
|
||||
SPRING_DATA_REDIS_URL: ${MOYI_REDIS_URL:?Set MOYI_REDIS_URL in infra/moyi/.env.cloud}
|
||||
FLYWAY_ENABLED: true
|
||||
AUTH_SECURE_COOKIE: true
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "wget -q -O - http://127.0.0.1:8787/health | grep -q 'status'"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 12
|
||||
start_period: 20s
|
||||
|
||||
frontend:
|
||||
build:
|
||||
context: ../../prototype
|
||||
args:
|
||||
VITE_CONTROL_PLANE_URL: /
|
||||
VITE_AUTH_MODE: remote
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "${MOYI_HTTP_PORT:-8080}:80"
|
||||
depends_on:
|
||||
moyi-api:
|
||||
condition: service_healthy
|
||||
Reference in new issue
Block a user