From 6d9f267593548c5a2fc1c42d06367620e149287a Mon Sep 17 00:00:00 2001 From: yml2213 Date: Tue, 26 May 2026 09:56:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=8091=E5=8D=A1=E5=88=B8=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.mac-docker.example | 4 ++-- .env.server.example | 4 ++-- README.md | 2 +- apps/backend/README.md | 2 +- apps/backend/src/config/env-overrides.test.ts | 4 ++++ apps/backend/src/config/env-overrides.ts | 14 +++++++------- docs/91卡券/6.开发设计.md | 14 +++++++------- 7 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.env.mac-docker.example b/.env.mac-docker.example index 0c834f2c..47226826 100644 --- a/.env.mac-docker.example +++ b/.env.mac-docker.example @@ -25,5 +25,5 @@ ADMIN_SESSION_SECRET=dev-local-session-secret ADMIN_DEFAULT_USERS_JSON=[{"username":"admin","password":"dev-admin-123456","role":"admin"},{"username":"operator","password":"dev-operator-123456","role":"operator"}] # 91Kaquan -NINETYONE_USER_ID= -NINETYONE_SECRET= +KAQUAN91_USER_ID= +KAQUAN91_SECRET= diff --git a/.env.server.example b/.env.server.example index a5e0a88a..46f5f3ce 100644 --- a/.env.server.example +++ b/.env.server.example @@ -24,5 +24,5 @@ ADMIN_SESSION_SECRET=change-me-long-random-session-secret ADMIN_DEFAULT_USERS_JSON=[{"username":"admin","password":"change-me-admin-password","role":"admin"},{"username":"operator","password":"change-me-operator-password","role":"operator"}] # 91Kaquan -NINETYONE_USER_ID= -NINETYONE_SECRET= +KAQUAN91_USER_ID= +KAQUAN91_SECRET= diff --git a/README.md b/README.md index 0bbaee3a..6fcab299 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ cp .env.server.example .env - `DATABASE_URL`：PostgreSQL 连接串 - `ADMIN_SESSION_SECRET`：后台登录态签名密钥 - `ADMIN_DEFAULT_USERS_JSON`：默认后台用户 -- `NINETYONE_USER_ID` / `NINETYONE_SECRET`：91 卡券开放接口凭据 +- `KAQUAN91_USER_ID` / `KAQUAN91_SECRET`：91 卡券开放接口凭据 ## 运行数据 diff --git a/apps/backend/README.md b/apps/backend/README.md index 52e45f65..0caa9f8e 100644 --- a/apps/backend/README.md +++ b/apps/backend/README.md @@ -48,7 +48,7 @@ npm test - 数据库连接 `DATABASE_URL` - 后台登录密钥 `ADMIN_SESSION_SECRET` - 默认后台用户 `ADMIN_DEFAULT_USERS_JSON` -- 91 卡券开放接口凭据 `NINETYONE_USER_ID` / `NINETYONE_SECRET` +- 91 卡券开放接口凭据 `KAQUAN91_USER_ID` / `KAQUAN91_SECRET` ## 接口 diff --git a/apps/backend/src/config/env-overrides.test.ts b/apps/backend/src/config/env-overrides.test.ts index 2f3cdb0b..6b7b86af 100644 --- a/apps/backend/src/config/env-overrides.test.ts +++ b/apps/backend/src/config/env-overrides.test.ts @@ -13,6 +13,8 @@ test('applyEnvOverrides maps typed environment values without mutating base conf DATA_ROOT: './tmp/backend-data', DATABASE_SSL: 'yes', ADMIN_DEFAULT_USERS_JSON: '[{"username":"admin","password":"secret","role":"admin"}]', + KAQUAN91_USER_ID: 'kaquan-user', + KAQUAN91_SECRET: 'kaquan-secret', CLOUDTENTACLES_DEVICE_TYPE: '3', }) @@ -22,6 +24,8 @@ test('applyEnvOverrides maps typed environment values without mutating base conf assert.deepEqual(config.admin.defaultUsers, [ { username: 'admin', password: 'secret', role: 'admin' }, ]) + assert.equal(config.platforms.ninetyone.userId, 'kaquan-user') + assert.equal(config.platforms.ninetyone.secret, 'kaquan-secret') assert.equal(config.platforms.cloudtentacles.deviceType, 3) assert.equal(baseConfig.server.port, 3000) diff --git a/apps/backend/src/config/env-overrides.ts b/apps/backend/src/config/env-overrides.ts index 0f3ae4ac..3de2c3bf 100644 --- a/apps/backend/src/config/env-overrides.ts +++ b/apps/backend/src/config/env-overrides.ts @@ -38,17 +38,17 @@ export const ENV_OVERRIDES: readonly EnvOverride[] = [ stringEnv("ADMIN_SESSION_SECRET", ["admin", "sessionSecret"]), integerEnv("ADMIN_SESSION_TTL_HOURS", ["admin", "sessionTtlHours"]), adminUsersJsonEnv("ADMIN_DEFAULT_USERS_JSON", ["admin", "defaultUsers"]), - stringEnv("NINETYONE_USER_ID", ["platforms", "ninetyone", "userId"]), - stringEnv("NINETYONE_SECRET", ["platforms", "ninetyone", "secret"]), - stringEnv("NINETYONE_VERSION", ["platforms", "ninetyone", "version"]), - stringEnv("NINETYONE_SHOP_ID", ["platforms", "ninetyone", "shopId"]), - stringEnv("NINETYONE_SHOP_NAME", ["platforms", "ninetyone", "shopName"]), - integerEnv("NINETYONE_TIMESTAMP_TOLERANCE_SECONDS", [ + stringEnv("KAQUAN91_USER_ID", ["platforms", "ninetyone", "userId"]), + stringEnv("KAQUAN91_SECRET", ["platforms", "ninetyone", "secret"]), + stringEnv("KAQUAN91_VERSION", ["platforms", "ninetyone", "version"]), + stringEnv("KAQUAN91_SHOP_ID", ["platforms", "ninetyone", "shopId"]), + stringEnv("KAQUAN91_SHOP_NAME", ["platforms", "ninetyone", "shopName"]), + integerEnv("KAQUAN91_TIMESTAMP_TOLERANCE_SECONDS", [ "platforms", "ninetyone", "timestampToleranceSeconds", ]), - stringEnv("NINETYONE_CARDS_ENCODING", [ + stringEnv("KAQUAN91_CARDS_ENCODING", [ "platforms", "ninetyone", "cardsEncoding", diff --git a/docs/91卡券/6.开发设计.md b/docs/91卡券/6.开发设计.md index ae572be3..1b871482 100644 --- a/docs/91卡券/6.开发设计.md +++ b/docs/91卡券/6.开发设计.md @@ -100,13 +100,13 @@ platforms: { 建议环境变量： -- `NINETYONE_USER_ID` -- `NINETYONE_SECRET` -- `NINETYONE_VERSION` -- `NINETYONE_SHOP_ID` -- `NINETYONE_SHOP_NAME` -- `NINETYONE_TIMESTAMP_TOLERANCE_SECONDS` -- `NINETYONE_CARDS_ENCODING` +- `KAQUAN91_USER_ID` +- `KAQUAN91_SECRET` +- `KAQUAN91_VERSION` +- `KAQUAN91_SHOP_ID` +- `KAQUAN91_SHOP_NAME` +- `KAQUAN91_TIMESTAMP_TOLERANCE_SECONDS` +- `KAQUAN91_CARDS_ENCODING` ## 6. 签名设计