From 99b13b99fc44d71f34b9a2e47f72d07862f8c57b Mon Sep 17 00:00:00 2001 From: nav Date: Wed, 13 May 2026 12:58:42 +0000 Subject: [PATCH] chore(env): standardize prefixed env names across center and guild --- Fabric.Backend.Center | 2 +- Fabric.Backend.Guild | 2 +- docker-compose.prod.yml | 42 +++++++++++++++++----------------- docker-compose.yml | 42 +++++++++++++++++----------------- docs/DEPLOY_AUTH_FLOW.md | 10 ++++---- scripts/register-guild-node.sh | 2 +- 6 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Fabric.Backend.Center b/Fabric.Backend.Center index 0a4cb62..81dfc22 160000 --- a/Fabric.Backend.Center +++ b/Fabric.Backend.Center @@ -1 +1 @@ -Subproject commit 0a4cb62065e0381b9852541804d9911534a122fe +Subproject commit 81dfc227e32cbd8324f82b79b92ed6086921be31 diff --git a/Fabric.Backend.Guild b/Fabric.Backend.Guild index 392534a..fdb661f 160000 --- a/Fabric.Backend.Guild +++ b/Fabric.Backend.Guild @@ -1 +1 @@ -Subproject commit 392534a6acb90148b7eb97531e54c311652b5927 +Subproject commit fdb661f32b868642aa62c05a4e4619b36cd40626 diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 932774c..d68957c 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -47,16 +47,16 @@ services: mysql-center: condition: service_healthy environment: - PORT: 7001 - DB_HOST: mysql-center - DB_PORT: 3306 - DB_USER: ${MYSQL_CENTER_USER:-fabric} - DB_PASSWORD: ${MYSQL_CENTER_PASSWORD} - DB_NAME: ${MYSQL_CENTER_DATABASE:-fabric_center} - DB_SYNC: "false" - DB_LOGGING: "false" - JWT_ACCESS_SECRET: ${JWT_ACCESS_SECRET} - JWT_REFRESH_SECRET: ${JWT_REFRESH_SECRET} + FABRIC_BACKEND_CENTER_PORT: 7001 + FABRIC_BACKEND_CENTER_DB_HOST: mysql-center + FABRIC_BACKEND_CENTER_DB_PORT: 3306 + FABRIC_BACKEND_CENTER_DB_USER: ${MYSQL_CENTER_USER:-fabric} + FABRIC_BACKEND_CENTER_DB_PASSWORD: ${MYSQL_CENTER_PASSWORD} + FABRIC_BACKEND_CENTER_DB_NAME: ${MYSQL_CENTER_DATABASE:-fabric_center} + FABRIC_BACKEND_CENTER_DB_SYNC: "false" + FABRIC_BACKEND_CENTER_DB_LOGGING: "false" + FABRIC_BACKEND_CENTER_JWT_ACCESS_SECRET: ${FABRIC_BACKEND_CENTER_JWT_ACCESS_SECRET} + FABRIC_BACKEND_CENTER_JWT_REFRESH_SECRET: ${FABRIC_BACKEND_CENTER_JWT_REFRESH_SECRET} ports: - "7001:7001" @@ -70,17 +70,17 @@ services: mysql-guild: condition: service_healthy environment: - PORT: 7002 - DB_HOST: mysql-guild - DB_PORT: 3306 - DB_USER: ${MYSQL_GUILD_USER:-fabric} - DB_PASSWORD: ${MYSQL_GUILD_PASSWORD} - DB_NAME: ${MYSQL_GUILD_DATABASE:-fabric_guild} - DB_SYNC: "false" - DB_LOGGING: "false" - CENTER_BASE_URL: ${CENTER_BASE_URL:-http://backend-center:7001} - GUILD_NODE_ID: ${GUILD_NODE_ID:-guild-node-1} - CENTER_API_KEY: ${CENTER_API_KEY} + FABRIC_BACKEND_GUILD_PORT: 7002 + FABRIC_BACKEND_GUILD_DB_HOST: mysql-guild + FABRIC_BACKEND_GUILD_DB_PORT: 3306 + FABRIC_BACKEND_GUILD_DB_USER: ${MYSQL_GUILD_USER:-fabric} + FABRIC_BACKEND_GUILD_DB_PASSWORD: ${MYSQL_GUILD_PASSWORD} + FABRIC_BACKEND_GUILD_DB_NAME: ${MYSQL_GUILD_DATABASE:-fabric_guild} + FABRIC_BACKEND_GUILD_DB_SYNC: "false" + FABRIC_BACKEND_GUILD_DB_LOGGING: "false" + FABRIC_BACKEND_GUILD_CENTER_BASE_URL: ${FABRIC_BACKEND_GUILD_CENTER_BASE_URL:-http://backend-center:7001} + FABRIC_BACKEND_GUILD_NODE_ID: ${FABRIC_BACKEND_GUILD_NODE_ID:-guild-node-1} + FABRIC_BACKEND_GUILD_CENTER_API_KEY: ${FABRIC_BACKEND_GUILD_CENTER_API_KEY} FABRIC_WEBHOOK_URL: ${FABRIC_WEBHOOK_URL:-} FABRIC_WEBHOOK_SECRET: ${FABRIC_WEBHOOK_SECRET:-} ports: diff --git a/docker-compose.yml b/docker-compose.yml index 59c73ea..8a2cc9f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,16 +47,16 @@ services: mysql-center: condition: service_healthy environment: - PORT: 7001 - DB_HOST: mysql-center - DB_PORT: 3306 - DB_USER: fabric - DB_PASSWORD: fabric - DB_NAME: fabric_center - DB_SYNC: "true" - DB_LOGGING: "false" - JWT_ACCESS_SECRET: change-me-access - JWT_REFRESH_SECRET: change-me-refresh + FABRIC_BACKEND_CENTER_PORT: 7001 + FABRIC_BACKEND_CENTER_DB_HOST: mysql-center + FABRIC_BACKEND_CENTER_DB_PORT: 3306 + FABRIC_BACKEND_CENTER_DB_USER: fabric + FABRIC_BACKEND_CENTER_DB_PASSWORD: fabric + FABRIC_BACKEND_CENTER_DB_NAME: fabric_center + FABRIC_BACKEND_CENTER_DB_SYNC: "true" + FABRIC_BACKEND_CENTER_DB_LOGGING: "false" + FABRIC_BACKEND_CENTER_JWT_ACCESS_SECRET: change-me-access + FABRIC_BACKEND_CENTER_JWT_REFRESH_SECRET: change-me-refresh ports: - "7001:7001" @@ -70,17 +70,17 @@ services: mysql-guild: condition: service_healthy environment: - PORT: 7002 - DB_HOST: mysql-guild - DB_PORT: 3306 - DB_USER: fabric - DB_PASSWORD: fabric - DB_NAME: fabric_guild - DB_SYNC: "true" - DB_LOGGING: "false" - CENTER_BASE_URL: http://backend-center:7001 - GUILD_NODE_ID: guild-node-1 - CENTER_API_KEY: ${CENTER_API_KEY:-} + FABRIC_BACKEND_GUILD_PORT: 7002 + FABRIC_BACKEND_GUILD_DB_HOST: mysql-guild + FABRIC_BACKEND_GUILD_DB_PORT: 3306 + FABRIC_BACKEND_GUILD_DB_USER: fabric + FABRIC_BACKEND_GUILD_DB_PASSWORD: fabric + FABRIC_BACKEND_GUILD_DB_NAME: fabric_guild + FABRIC_BACKEND_GUILD_DB_SYNC: "true" + FABRIC_BACKEND_GUILD_DB_LOGGING: "false" + FABRIC_BACKEND_GUILD_CENTER_BASE_URL: http://backend-center:7001 + FABRIC_BACKEND_GUILD_NODE_ID: guild-node-1 + FABRIC_BACKEND_GUILD_CENTER_API_KEY: ${FABRIC_BACKEND_GUILD_CENTER_API_KEY:-} ports: - "7002:7002" diff --git a/docs/DEPLOY_AUTH_FLOW.md b/docs/DEPLOY_AUTH_FLOW.md index ce29937..382e7de 100644 --- a/docs/DEPLOY_AUTH_FLOW.md +++ b/docs/DEPLOY_AUTH_FLOW.md @@ -9,7 +9,7 @@ scripts/register-guild-node.sh 成功后会输出： ```bash -CENTER_API_KEY=... +FABRIC_BACKEND_GUILD_CENTER_API_KEY=... ``` > `nodes/register` 仅允许 localhost 调用。 @@ -20,9 +20,9 @@ CENTER_API_KEY=... 在 Guild 的部署配置（`.env` / compose）填写： -- `CENTER_BASE_URL` -- `CENTER_API_KEY`（上一步拿到） -- `GUILD_NODE_ID` +- `FABRIC_BACKEND_GUILD_CENTER_BASE_URL` +- `FABRIC_BACKEND_GUILD_CENTER_API_KEY`（上一步拿到） +- `FABRIC_BACKEND_GUILD_NODE_ID` Guild 启动前会强校验这三项，缺失即启动失败。 @@ -56,4 +56,4 @@ Frontend 使用这些 token 直连各 Guild 拉 channels/messages。 - `401 missing/invalid api key`：Center API Key 未传或错误 - `403 register endpoint only allows localhost caller`：注册接口不是本机调用 -- Guild 启动失败 `Missing required env`：缺 `CENTER_BASE_URL` / `CENTER_API_KEY` / `GUILD_NODE_ID` +- Guild 启动失败 `Missing required env`：缺 `FABRIC_BACKEND_GUILD_CENTER_BASE_URL` / `FABRIC_BACKEND_GUILD_CENTER_API_KEY` / `FABRIC_BACKEND_GUILD_NODE_ID` diff --git a/scripts/register-guild-node.sh b/scripts/register-guild-node.sh index 1ed25ba..5ff5082 100755 --- a/scripts/register-guild-node.sh +++ b/scripts/register-guild-node.sh @@ -68,4 +68,4 @@ if [[ -z "$API_KEY" ]]; then fi echo "Node registered: $NODE_ID_OUT" -echo "CENTER_API_KEY=$API_KEY" +echo "FABRIC_BACKEND_GUILD_CENTER_API_KEY=$API_KEY"