fix: 修复登录路由 + 端口冲突 + Prometheus 配置 + outbox 表结构 + 补充监控基础设施
1. teacher-portal 登录 JSON 解析错误修复
- 根因:next.config.js rewrites /api/auth/* → gateway /api/auth/*,
但 gateway 只在 /api/v1 路由组下注册代理,/api/auth/* 返回 404 纯文本
- 修复:rewrites 映射 /api/auth/* → /api/v1/iam/*(对齐 iam controller @Controller("v1/iam"))
2. msg / data-ana 端口冲突修复
- 根因:msg env.ts PORT 默认 3006,与 data-ana(config.py http_port=3006)冲突
- 修复:msg PORT 默认 3006→3007(对齐端口分配表 msg=3007, data-ana=3006)
3. Prometheus classes-service 3001 DOWN 修复
- 根因:classes 已合并入 core-edu(P3 裁决 C1),但 prometheus.yml 仍有 classes-service scrape 配置
- 修复:从 prometheus.yml 删除 classes-service job
4. iam outbox 表 aggregate_id 列长度修复
- 根因:iam_outbox.aggregate_id VARCHAR(32),但 UUID 是 36 字符,导致 "Data too long" 错误
- 修复:DDL 中 VARCHAR(32) → VARCHAR(36);ALTER TABLE 修复现有数据库
5. 补充未搭建的监控基础设施
- docker-compose.yml 新增 Alertmanager(9093)/ Loki(3100)/ Promtail(observability profile)
- prometheus.yml alertmanager target 更新为 edu-alertmanager:9093
验证:
- TS typecheck 19 项目全部通过
- 登录链路 teacher-portal → gateway → iam 验证通过
- Prometheus targets 不再有 classes-service
- 3 个新基础设施容器(alertmanager/loki/promtail)启动成功
AI identity: trae-main(基础设施修复会话)
This commit is contained in:
@@ -129,8 +129,9 @@ const nextConfig = {
|
||||
},
|
||||
{
|
||||
// 登录端点(非 GraphQL,认证前提,F12: JWT 存 localStorage)
|
||||
// 映射到 iam REST controller 路径 /v1/iam/*(iam.controller.ts @Controller("v1/iam"))
|
||||
source: "/api/auth/:path*",
|
||||
destination: `${gateway}/api/auth/:path*`,
|
||||
destination: `${gateway}/api/v1/iam/:path*`,
|
||||
},
|
||||
];
|
||||
},
|
||||
|
||||
@@ -206,6 +206,50 @@ services:
|
||||
volumes:
|
||||
- grafana_data:/var/lib/grafana
|
||||
# ============================================================
|
||||
# Alertmanager - 告警路由与抑制(observability profile)
|
||||
# ============================================================
|
||||
alertmanager:
|
||||
image: docker.m.daocloud.io/prom/alertmanager:v0.27.0
|
||||
container_name: edu-alertmanager
|
||||
profiles: ["observability"]
|
||||
restart: unless-stopped
|
||||
command:
|
||||
- "--config.file=/etc/alertmanager/alertmanager.yml"
|
||||
- "--storage.path=/alertmanager"
|
||||
ports:
|
||||
- "9093:9093"
|
||||
volumes:
|
||||
- ./alertmanager/alertmanager.yml:/etc/alertmanager/alertmanager.yml:ro
|
||||
- alertmanager_data:/alertmanager
|
||||
# ============================================================
|
||||
# Loki - 日志聚合(observability profile)
|
||||
# ============================================================
|
||||
loki:
|
||||
image: docker.m.daocloud.io/grafana/loki:3.2.1
|
||||
container_name: edu-loki
|
||||
profiles: ["observability"]
|
||||
restart: unless-stopped
|
||||
command: -config.file=/etc/loki/local-config.yaml
|
||||
ports:
|
||||
- "3100:3100"
|
||||
volumes:
|
||||
- loki_data:/loki
|
||||
# ============================================================
|
||||
# Promtail - 日志采集(observability profile)
|
||||
# ============================================================
|
||||
promtail:
|
||||
image: docker.m.daocloud.io/grafana/promtail:3.2.1
|
||||
container_name: edu-promtail
|
||||
profiles: ["observability"]
|
||||
restart: unless-stopped
|
||||
command: -config.file=/etc/promtail/config.yml
|
||||
volumes:
|
||||
- ./promtail/config.yml:/etc/promtail/config.yml:ro
|
||||
- /var/lib/docker/containers:/var/lib/docker/containers:ro
|
||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||
depends_on:
|
||||
- loki
|
||||
# ============================================================
|
||||
# Exporters(observability profile,与 Prometheus 同网络)
|
||||
# ============================================================
|
||||
node-exporter:
|
||||
@@ -256,3 +300,5 @@ volumes:
|
||||
es_data:
|
||||
grafana_data:
|
||||
prometheus_data:
|
||||
alertmanager_data:
|
||||
loki_data:
|
||||
|
||||
@@ -489,7 +489,7 @@ CREATE TABLE IF NOT EXISTS `content_questions` (
|
||||
CREATE TABLE IF NOT EXISTS `content_outbox_events` (
|
||||
`id` VARCHAR(32) NOT NULL,
|
||||
`aggregate_type` VARCHAR(64) NOT NULL,
|
||||
`aggregate_id` VARCHAR(32) NOT NULL,
|
||||
`aggregate_id` VARCHAR(36) NOT NULL,
|
||||
`event_type` VARCHAR(100) NOT NULL,
|
||||
`topic` VARCHAR(128) NOT NULL,
|
||||
`payload` TEXT NOT NULL,
|
||||
@@ -585,7 +585,7 @@ CREATE TABLE IF NOT EXISTS `msg_notification_deliveries` (
|
||||
CREATE TABLE IF NOT EXISTS `msg_outbox_events` (
|
||||
`event_id` VARCHAR(64) NOT NULL,
|
||||
`aggregate_type` VARCHAR(64) NOT NULL,
|
||||
`aggregate_id` VARCHAR(32) NOT NULL,
|
||||
`aggregate_id` VARCHAR(36) NOT NULL,
|
||||
`event_type` VARCHAR(64) NOT NULL,
|
||||
`topic` VARCHAR(128) NOT NULL,
|
||||
`payload` JSON NOT NULL,
|
||||
|
||||
@@ -11,18 +11,13 @@ alerting:
|
||||
alertmanagers:
|
||||
- static_configs:
|
||||
- targets:
|
||||
- alertmanager:9093
|
||||
- edu-alertmanager:9093
|
||||
|
||||
scrape_configs:
|
||||
# ============================================================
|
||||
# 应用服务(NestJS / FastAPI 暴露 /metrics)
|
||||
# classes 已合并入 core-edu(P3 裁决 C1),3001 端口已废弃
|
||||
# ============================================================
|
||||
- job_name: 'classes-service'
|
||||
static_configs:
|
||||
- targets: ['host.docker.internal:3001']
|
||||
labels:
|
||||
service: classes
|
||||
|
||||
- job_name: 'iam-service'
|
||||
static_configs:
|
||||
- targets: ['host.docker.internal:3002']
|
||||
|
||||
@@ -10,7 +10,7 @@ import { z } from "zod";
|
||||
* - REDIS_URL 可选,未配置时降级到 DB 唯一索引去重
|
||||
*/
|
||||
const envSchema = z.object({
|
||||
PORT: z.string().default("3006"),
|
||||
PORT: z.string().default("3007"),
|
||||
GRPC_PORT: z.string().default("50056"),
|
||||
DATABASE_URL: z.string().url(),
|
||||
REDIS_URL: z.string().url().optional(),
|
||||
|
||||
Reference in New Issue
Block a user