feat(fulfillment): 增加事务 Outbox 同步履约状态
- 用事务 Outbox 和签名 Webhook 替换直接状态回调 - 增加 Outbox 投递 worker、重试与低频对账兜底 - 缓存客户领取页绑定状态并补充签名与迁移测试
This commit is contained in:
@@ -14,6 +14,11 @@ HTTP_TRUST_PROXY=1
|
|||||||
CLAIM_BASE_URL=http://localhost/h5
|
CLAIM_BASE_URL=http://localhost/h5
|
||||||
LIVE_HUB_PLATFORM_FULFILLMENT_URL=http://host.docker.internal:8800
|
LIVE_HUB_PLATFORM_FULFILLMENT_URL=http://host.docker.internal:8800
|
||||||
PLATFORM_FULFILLMENT_INTEGRATION_KEY=
|
PLATFORM_FULFILLMENT_INTEGRATION_KEY=
|
||||||
|
PLATFORM_FULFILLMENT_WEBHOOK_TOLERANCE_SECONDS=300
|
||||||
|
INTEGRATION_OUTBOX_INTERVAL_MS=1000
|
||||||
|
INTEGRATION_OUTBOX_BATCH_SIZE=20
|
||||||
|
INTEGRATION_OUTBOX_MAX_ATTEMPTS=12
|
||||||
|
PLATFORM_FULFILLMENT_RECONCILE_SECONDS=900
|
||||||
|
|
||||||
# Database
|
# Database
|
||||||
POSTGRES_DB=order_site
|
POSTGRES_DB=order_site
|
||||||
|
|||||||
@@ -27,6 +27,12 @@ CLAIM_BASE_URL=https://order.khhao.com/h5
|
|||||||
# 生产服务器间优先走私网;直播运营后台私网地址为 172.23.71.41
|
# 生产服务器间优先走私网;直播运营后台私网地址为 172.23.71.41
|
||||||
LIVE_HUB_PLATFORM_FULFILLMENT_URL=http://172.23.71.41
|
LIVE_HUB_PLATFORM_FULFILLMENT_URL=http://172.23.71.41
|
||||||
PLATFORM_FULFILLMENT_INTEGRATION_KEY=
|
PLATFORM_FULFILLMENT_INTEGRATION_KEY=
|
||||||
|
# 签名 Webhook 时间窗;Outbox worker 与低频对账兜底
|
||||||
|
PLATFORM_FULFILLMENT_WEBHOOK_TOLERANCE_SECONDS=300
|
||||||
|
INTEGRATION_OUTBOX_INTERVAL_MS=1000
|
||||||
|
INTEGRATION_OUTBOX_BATCH_SIZE=20
|
||||||
|
INTEGRATION_OUTBOX_MAX_ATTEMPTS=12
|
||||||
|
PLATFORM_FULFILLMENT_RECONCILE_SECONDS=900
|
||||||
CLAIM_TOKEN_TTL_HOURS=0
|
CLAIM_TOKEN_TTL_HOURS=0
|
||||||
|
|
||||||
# Database
|
# Database
|
||||||
|
|||||||
@@ -66,6 +66,21 @@ docker compose -f docker-compose.dev.yml logs -f frontend
|
|||||||
docker compose -f docker-compose.dev.yml down
|
docker compose -f docker-compose.dev.yml down
|
||||||
```
|
```
|
||||||
|
|
||||||
|
`order_site` 根目录提供 `./dev.sh` 快捷入口。默认直接启动源码挂载开发环境:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./dev.sh # 启动/更新 dev 环境
|
||||||
|
./dev.sh logs # 跟踪全部 dev 日志
|
||||||
|
./dev.sh logs frontend # 只看 Vite HMR 日志
|
||||||
|
./dev.sh logs backend # 只看后端热重载日志
|
||||||
|
./dev.sh ps # 查看 dev 容器
|
||||||
|
./dev.sh down # 停止 dev 容器
|
||||||
|
```
|
||||||
|
|
||||||
|
开发编排会把 `apps/frontend` 和 `apps/backend` 直接挂载进容器,前端由 Vite
|
||||||
|
提供 HMR,后端由 `tsx watch` 热重载;不要用生产 `docker-compose.yml` 重建
|
||||||
|
`web` 看页面改动。
|
||||||
|
|
||||||
Mac 也可使用:
|
Mac 也可使用:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -208,6 +223,19 @@ SEMI_AUTO_TASK_TEST_DATABASE_URL=postgres://postgres:postgres@127.0.0.1:5432/ord
|
|||||||
npx tsx --test src/services/semi-auto/semi-auto-task.integration.test.ts
|
npx tsx --test src/services/semi-auto/semi-auto-task.integration.test.ts
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### 斗鱼履约跨项目同步
|
||||||
|
|
||||||
|
订单变化、绑定阶段和二维码投影走“事务 Outbox + 签名 Webhook”:
|
||||||
|
|
||||||
|
- 业务变更与 `integration_outbox` 同事务提交,worker 使用
|
||||||
|
`FOR UPDATE SKIP LOCKED` 领取并指数退避;
|
||||||
|
- 请求携带 `X-Integration-Key`、`X-Integration-Event-Id`、
|
||||||
|
`X-Integration-Timestamp`、`X-Integration-Signature`;
|
||||||
|
- 接收端用 `integration_inbox.event_id` 幂等,重复投递不会重复写业务状态;
|
||||||
|
- 工作台通过现有 SSE 收到刷新通知,不再定时向 live-hub 拉取状态;
|
||||||
|
- 15 分钟低频对账只作漏单兜底,可通过
|
||||||
|
`PLATFORM_FULFILLMENT_RECONCILE_SECONDS` 调整。
|
||||||
|
|
||||||
## 运行数据
|
## 运行数据
|
||||||
|
|
||||||
| 环境 | 路径 / Volume |
|
| 环境 | 路径 / Volume |
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import test from 'node:test'
|
|||||||
|
|
||||||
import { createApp } from './app.js'
|
import { createApp } from './app.js'
|
||||||
import { createDefaultRuntimeConfig } from './config/defaults.js'
|
import { createDefaultRuntimeConfig } from './config/defaults.js'
|
||||||
|
import { buildWebhookSignature } from './services/integration/webhook-signature.js'
|
||||||
import { createStartupState } from './startup/state.js'
|
import { createStartupState } from './startup/state.js'
|
||||||
|
|
||||||
test('HTTP health route and explicit CORS preflight', async () => {
|
test('HTTP health route and explicit CORS preflight', async () => {
|
||||||
@@ -64,13 +65,26 @@ test('履约状态集成接口要求密钥并接受空快照', async () => {
|
|||||||
})
|
})
|
||||||
assert.equal(unauthorized.status, 401)
|
assert.equal(unauthorized.status, 401)
|
||||||
|
|
||||||
|
const rawBody = JSON.stringify({
|
||||||
|
eventId: '8a8da35c-46c3-45a8-a914-3d7f28ee91ca',
|
||||||
|
eventType: 'platform_fulfillment.binding_state_changed',
|
||||||
|
items: [],
|
||||||
|
})
|
||||||
|
const timestamp = String(Math.floor(Date.now() / 1000))
|
||||||
const accepted = await fetch(endpoint, {
|
const accepted = await fetch(endpoint, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
'X-Integration-Key': 'integration-test-key',
|
'X-Integration-Key': 'integration-test-key',
|
||||||
|
'X-Integration-Event-Id': '8a8da35c-46c3-45a8-a914-3d7f28ee91ca',
|
||||||
|
'X-Integration-Timestamp': timestamp,
|
||||||
|
'X-Integration-Signature': buildWebhookSignature(
|
||||||
|
'integration-test-key',
|
||||||
|
timestamp,
|
||||||
|
rawBody,
|
||||||
|
),
|
||||||
},
|
},
|
||||||
body: JSON.stringify({ items: [] }),
|
body: rawBody,
|
||||||
})
|
})
|
||||||
assert.equal(accepted.status, 200)
|
assert.equal(accepted.status, 200)
|
||||||
assert.deepEqual((await accepted.json()).data, { received: 0, updated: 0 })
|
assert.deepEqual((await accepted.json()).data, { received: 0, updated: 0 })
|
||||||
|
|||||||
@@ -13,8 +13,13 @@ const WORKSPACE_ROOT = process.env.WORKSPACE_ROOT || path.resolve(BACKEND_ROOT,
|
|||||||
const SPECIAL_RUNTIME_ENV_NAMES = [
|
const SPECIAL_RUNTIME_ENV_NAMES = [
|
||||||
'APP_BASE_URL',
|
'APP_BASE_URL',
|
||||||
'CLAIM_BASE_URL',
|
'CLAIM_BASE_URL',
|
||||||
|
'INTEGRATION_OUTBOX_BATCH_SIZE',
|
||||||
|
'INTEGRATION_OUTBOX_INTERVAL_MS',
|
||||||
|
'INTEGRATION_OUTBOX_MAX_ATTEMPTS',
|
||||||
'LIVE_HUB_PLATFORM_FULFILLMENT_URL',
|
'LIVE_HUB_PLATFORM_FULFILLMENT_URL',
|
||||||
'PLATFORM_FULFILLMENT_INTEGRATION_KEY',
|
'PLATFORM_FULFILLMENT_INTEGRATION_KEY',
|
||||||
|
'PLATFORM_FULFILLMENT_RECONCILE_SECONDS',
|
||||||
|
'PLATFORM_FULFILLMENT_WEBHOOK_TOLERANCE_SECONDS',
|
||||||
]
|
]
|
||||||
|
|
||||||
const DEPLOYMENT_ONLY_ENV_NAMES = [
|
const DEPLOYMENT_ONLY_ENV_NAMES = [
|
||||||
|
|||||||
@@ -0,0 +1,254 @@
|
|||||||
|
-- 172_platform_fulfillment_outbox.sql
|
||||||
|
--
|
||||||
|
-- 事务 Outbox:
|
||||||
|
-- 业务表变更与待发送事件同事务落库,进程崩溃后仍可由 worker 继续投递。
|
||||||
|
-- live-hub 接收端通过 integration_inbox 的 event_id 做幂等。
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS integration_outbox (
|
||||||
|
id BIGSERIAL PRIMARY KEY,
|
||||||
|
event_id UUID NOT NULL UNIQUE,
|
||||||
|
destination TEXT NOT NULL DEFAULT 'live_hub',
|
||||||
|
event_type TEXT NOT NULL,
|
||||||
|
dedupe_key TEXT UNIQUE,
|
||||||
|
payload_json JSONB NOT NULL,
|
||||||
|
status TEXT NOT NULL DEFAULT 'pending'
|
||||||
|
CHECK (status IN ('pending', 'processing', 'sent', 'dead')),
|
||||||
|
attempts INTEGER NOT NULL DEFAULT 0,
|
||||||
|
next_attempt_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
locked_at TIMESTAMPTZ,
|
||||||
|
sent_at TIMESTAMPTZ,
|
||||||
|
last_error TEXT NOT NULL DEFAULT '',
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_integration_outbox_due
|
||||||
|
ON integration_outbox (status, next_attempt_at, id);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_integration_outbox_destination
|
||||||
|
ON integration_outbox (destination, status, id);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS integration_inbox (
|
||||||
|
event_id UUID PRIMARY KEY,
|
||||||
|
source TEXT NOT NULL DEFAULT '',
|
||||||
|
event_type TEXT NOT NULL DEFAULT '',
|
||||||
|
received_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
processed_at TIMESTAMPTZ
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION enqueue_live_hub_platform_fulfillment_event(
|
||||||
|
p_order_id BIGINT,
|
||||||
|
p_order_item_id BIGINT,
|
||||||
|
p_fulfillment_id BIGINT,
|
||||||
|
p_reason TEXT
|
||||||
|
) RETURNS VOID
|
||||||
|
LANGUAGE plpgsql
|
||||||
|
AS $$
|
||||||
|
DECLARE
|
||||||
|
v_event_id UUID := gen_random_uuid();
|
||||||
|
v_platform_order_id TEXT := '';
|
||||||
|
v_dedupe_key TEXT;
|
||||||
|
BEGIN
|
||||||
|
SELECT platform_order_id
|
||||||
|
INTO v_platform_order_id
|
||||||
|
FROM orders
|
||||||
|
WHERE id = p_order_id;
|
||||||
|
|
||||||
|
IF COALESCE(v_platform_order_id, '') = '' THEN
|
||||||
|
RETURN;
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
v_dedupe_key := CONCAT(
|
||||||
|
'platform-fulfillment-order:',
|
||||||
|
COALESCE(p_order_item_id, 0),
|
||||||
|
':',
|
||||||
|
p_reason
|
||||||
|
);
|
||||||
|
|
||||||
|
INSERT INTO integration_outbox (
|
||||||
|
event_id, destination, event_type, dedupe_key, payload_json, status, created_at
|
||||||
|
) VALUES (
|
||||||
|
v_event_id,
|
||||||
|
'live_hub',
|
||||||
|
'platform_fulfillment.order_changed',
|
||||||
|
v_dedupe_key,
|
||||||
|
jsonb_build_object(
|
||||||
|
'eventId', v_event_id::text,
|
||||||
|
'eventType', 'platform_fulfillment.order_changed',
|
||||||
|
'occurredAt', to_char(
|
||||||
|
clock_timestamp() AT TIME ZONE 'UTC',
|
||||||
|
'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
|
||||||
|
),
|
||||||
|
'data', jsonb_build_object(
|
||||||
|
'orderId', p_order_id,
|
||||||
|
'orderItemId', p_order_item_id,
|
||||||
|
'fulfillmentId', p_fulfillment_id,
|
||||||
|
'platformOrderId', v_platform_order_id,
|
||||||
|
'reason', p_reason
|
||||||
|
)
|
||||||
|
),
|
||||||
|
'pending',
|
||||||
|
NOW()
|
||||||
|
)
|
||||||
|
ON CONFLICT (dedupe_key) DO NOTHING;
|
||||||
|
END;
|
||||||
|
$$;
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION enqueue_platform_fulfillment_from_order()
|
||||||
|
RETURNS TRIGGER
|
||||||
|
LANGUAGE plpgsql
|
||||||
|
AS $$
|
||||||
|
DECLARE
|
||||||
|
v_row RECORD;
|
||||||
|
BEGIN
|
||||||
|
FOR v_row IN
|
||||||
|
SELECT oi.id AS order_item_id, f.id AS fulfillment_id
|
||||||
|
FROM order_items oi
|
||||||
|
JOIN fulfillments f ON f.order_item_id = oi.id
|
||||||
|
JOIN manual_fulfillment_configs cfg ON cfg.id = f.fulfillment_config_id
|
||||||
|
WHERE oi.order_id = NEW.id
|
||||||
|
AND cfg.douyu_fulfillment_enabled = TRUE
|
||||||
|
AND f.channel = 'manual'
|
||||||
|
AND f.status IN ('assigned', 'processing', 'completed')
|
||||||
|
LOOP
|
||||||
|
PERFORM enqueue_live_hub_platform_fulfillment_event(
|
||||||
|
NEW.id,
|
||||||
|
v_row.order_item_id,
|
||||||
|
v_row.fulfillment_id,
|
||||||
|
CONCAT('order:', NEW.pay_status, ':', NEW.order_status)
|
||||||
|
);
|
||||||
|
END LOOP;
|
||||||
|
RETURN NEW;
|
||||||
|
END;
|
||||||
|
$$;
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION enqueue_platform_fulfillment_from_fulfillment()
|
||||||
|
RETURNS TRIGGER
|
||||||
|
LANGUAGE plpgsql
|
||||||
|
AS $$
|
||||||
|
DECLARE
|
||||||
|
v_order_id BIGINT;
|
||||||
|
v_enabled BOOLEAN := FALSE;
|
||||||
|
BEGIN
|
||||||
|
SELECT oi.order_id
|
||||||
|
INTO v_order_id
|
||||||
|
FROM order_items oi
|
||||||
|
WHERE oi.id = NEW.order_item_id;
|
||||||
|
|
||||||
|
SELECT cfg.douyu_fulfillment_enabled
|
||||||
|
INTO v_enabled
|
||||||
|
FROM manual_fulfillment_configs cfg
|
||||||
|
WHERE cfg.id = NEW.fulfillment_config_id;
|
||||||
|
|
||||||
|
IF v_order_id IS NOT NULL
|
||||||
|
AND v_enabled = TRUE
|
||||||
|
AND NEW.channel = 'manual'
|
||||||
|
AND NEW.status IN ('assigned', 'processing', 'completed') THEN
|
||||||
|
PERFORM enqueue_live_hub_platform_fulfillment_event(
|
||||||
|
v_order_id,
|
||||||
|
NEW.order_item_id,
|
||||||
|
NEW.id,
|
||||||
|
CONCAT('fulfillment:', NEW.status)
|
||||||
|
);
|
||||||
|
END IF;
|
||||||
|
RETURN NEW;
|
||||||
|
END;
|
||||||
|
$$;
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION enqueue_platform_fulfillment_from_config()
|
||||||
|
RETURNS TRIGGER
|
||||||
|
LANGUAGE plpgsql
|
||||||
|
AS $$
|
||||||
|
DECLARE
|
||||||
|
v_row RECORD;
|
||||||
|
BEGIN
|
||||||
|
IF NEW.douyu_fulfillment_enabled = TRUE THEN
|
||||||
|
FOR v_row IN
|
||||||
|
SELECT o.id AS order_id, oi.id AS order_item_id, f.id AS fulfillment_id
|
||||||
|
FROM order_items oi
|
||||||
|
JOIN orders o ON o.id = oi.order_id
|
||||||
|
JOIN fulfillments f ON f.order_item_id = oi.id
|
||||||
|
WHERE f.fulfillment_config_id = NEW.id
|
||||||
|
AND f.channel = 'manual'
|
||||||
|
AND f.status IN ('assigned', 'processing', 'completed')
|
||||||
|
LOOP
|
||||||
|
PERFORM enqueue_live_hub_platform_fulfillment_event(
|
||||||
|
v_row.order_id,
|
||||||
|
v_row.order_item_id,
|
||||||
|
v_row.fulfillment_id,
|
||||||
|
'config_enabled'
|
||||||
|
);
|
||||||
|
END LOOP;
|
||||||
|
END IF;
|
||||||
|
RETURN NEW;
|
||||||
|
END;
|
||||||
|
$$;
|
||||||
|
|
||||||
|
DROP TRIGGER IF EXISTS trg_platform_fulfillment_order_sync ON orders;
|
||||||
|
CREATE TRIGGER trg_platform_fulfillment_order_sync
|
||||||
|
AFTER INSERT OR UPDATE OF pay_status, order_status ON orders
|
||||||
|
FOR EACH ROW
|
||||||
|
EXECUTE FUNCTION enqueue_platform_fulfillment_from_order();
|
||||||
|
|
||||||
|
DROP TRIGGER IF EXISTS trg_platform_fulfillment_fulfillment_sync ON fulfillments;
|
||||||
|
CREATE TRIGGER trg_platform_fulfillment_fulfillment_sync
|
||||||
|
AFTER INSERT OR UPDATE OF channel, status, fulfillment_config_id ON fulfillments
|
||||||
|
FOR EACH ROW
|
||||||
|
EXECUTE FUNCTION enqueue_platform_fulfillment_from_fulfillment();
|
||||||
|
|
||||||
|
DROP TRIGGER IF EXISTS trg_platform_fulfillment_config_sync
|
||||||
|
ON manual_fulfillment_configs;
|
||||||
|
CREATE TRIGGER trg_platform_fulfillment_config_sync
|
||||||
|
AFTER UPDATE OF douyu_fulfillment_enabled ON manual_fulfillment_configs
|
||||||
|
FOR EACH ROW
|
||||||
|
WHEN (OLD.douyu_fulfillment_enabled IS DISTINCT FROM NEW.douyu_fulfillment_enabled)
|
||||||
|
EXECUTE FUNCTION enqueue_platform_fulfillment_from_config();
|
||||||
|
|
||||||
|
-- 上线时补一次存量待履约订单;之后全部由业务写入同事务触发。
|
||||||
|
INSERT INTO integration_outbox (
|
||||||
|
event_id, destination, event_type, dedupe_key, payload_json, status, created_at
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
event_id,
|
||||||
|
'live_hub',
|
||||||
|
'platform_fulfillment.order_changed',
|
||||||
|
CONCAT('platform-fulfillment-backfill:', candidate.order_item_id),
|
||||||
|
jsonb_build_object(
|
||||||
|
'eventId', event_id::text,
|
||||||
|
'eventType', 'platform_fulfillment.order_changed',
|
||||||
|
'occurredAt', to_char(
|
||||||
|
clock_timestamp() AT TIME ZONE 'UTC',
|
||||||
|
'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
|
||||||
|
),
|
||||||
|
'data', jsonb_build_object(
|
||||||
|
'orderId', candidate.order_id,
|
||||||
|
'orderItemId', candidate.order_item_id,
|
||||||
|
'fulfillmentId', candidate.fulfillment_id,
|
||||||
|
'platformOrderId', candidate.platform_order_id,
|
||||||
|
'reason', 'migration_backfill'
|
||||||
|
)
|
||||||
|
),
|
||||||
|
'pending',
|
||||||
|
NOW()
|
||||||
|
FROM (
|
||||||
|
SELECT
|
||||||
|
gen_random_uuid() AS event_id,
|
||||||
|
o.id AS order_id,
|
||||||
|
oi.id AS order_item_id,
|
||||||
|
f.id AS fulfillment_id,
|
||||||
|
o.platform_order_id
|
||||||
|
FROM orders o
|
||||||
|
JOIN order_items oi ON oi.order_id = o.id
|
||||||
|
JOIN fulfillments f ON f.order_item_id = oi.id
|
||||||
|
JOIN manual_fulfillment_configs cfg ON cfg.id = f.fulfillment_config_id
|
||||||
|
WHERE cfg.douyu_fulfillment_enabled = TRUE
|
||||||
|
AND f.channel = 'manual'
|
||||||
|
AND f.status = 'assigned'
|
||||||
|
AND o.pay_status = 'paid'
|
||||||
|
AND o.order_status NOT IN ('refunded', 'cancelled', 'closed')
|
||||||
|
AND oi.quantity = 1
|
||||||
|
) candidate
|
||||||
|
ON CONFLICT (dedupe_key) DO NOTHING;
|
||||||
|
|
||||||
|
COMMENT ON TABLE integration_outbox IS
|
||||||
|
'order_site 事务 Outbox;业务提交与待发送事件同事务,worker 负责签名投递';
|
||||||
|
COMMENT ON TABLE integration_inbox IS
|
||||||
|
'order_site 入站 Webhook 幂等表;event_id 全局唯一';
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
-- 173_douyu_fulfillment_cached_binding.sql
|
||||||
|
--
|
||||||
|
-- 客户领取页的绑定状态改由 live-hub 签名 Webhook 投影到本地,
|
||||||
|
-- 页面刷新只读这些缓存字段,不再服务端反向轮询 live-hub。
|
||||||
|
|
||||||
|
ALTER TABLE douyu_fulfillment_tasks
|
||||||
|
ADD COLUMN IF NOT EXISTS qr_url TEXT NOT NULL DEFAULT '',
|
||||||
|
ADD COLUMN IF NOT EXISTS qr_generated_at TIMESTAMPTZ,
|
||||||
|
ADD COLUMN IF NOT EXISTS qr_expires_at TIMESTAMPTZ;
|
||||||
|
|
||||||
|
COMMENT ON COLUMN douyu_fulfillment_tasks.qr_url IS
|
||||||
|
'live-hub 绑定二维码的客户页投影;仅用于展示,不包含内部账号或 CK';
|
||||||
@@ -2,8 +2,8 @@ import { Router } from 'express'
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
confirmDouyuCustomerBinding,
|
confirmDouyuCustomerBinding,
|
||||||
|
getDouyuCustomerFulfillmentCached,
|
||||||
getCustomerDouyuFulfillment,
|
getCustomerDouyuFulfillment,
|
||||||
refreshDouyuCustomerBinding,
|
|
||||||
saveDouyuCustomerProfile,
|
saveDouyuCustomerProfile,
|
||||||
startDouyuCustomerBinding,
|
startDouyuCustomerBinding,
|
||||||
} from '../services/douyu-fulfillment/douyu-fulfillment-service.js'
|
} from '../services/douyu-fulfillment/douyu-fulfillment-service.js'
|
||||||
@@ -46,8 +46,8 @@ router.post(
|
|||||||
|
|
||||||
router.get(
|
router.get(
|
||||||
'/:orderNo/binding/status',
|
'/:orderNo/binding/status',
|
||||||
createRouteHandler((req) => refreshDouyuCustomerBinding(String(req.params.orderNo || '')), {
|
createRouteHandler((req) => getDouyuCustomerFulfillmentCached(String(req.params.orderNo || '')), {
|
||||||
errorMessage: '刷新绑定状态失败',
|
errorMessage: '读取绑定状态失败',
|
||||||
scope: '[douyu-fulfillment/:orderNo/binding/status]',
|
scope: '[douyu-fulfillment/:orderNo/binding/status]',
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -3,7 +3,11 @@ import { timingSafeEqual } from 'node:crypto'
|
|||||||
import { Router } from 'express'
|
import { Router } from 'express'
|
||||||
|
|
||||||
import { applyLiveBindingStateSnapshot } from '../services/douyu-fulfillment/douyu-fulfillment-service.js'
|
import { applyLiveBindingStateSnapshot } from '../services/douyu-fulfillment/douyu-fulfillment-service.js'
|
||||||
import { createRouteHandler } from '../utils/http.js'
|
import {
|
||||||
|
verifyWebhookSignature,
|
||||||
|
webhookToleranceSeconds,
|
||||||
|
} from '../services/integration/webhook-signature.js'
|
||||||
|
import { createHttpError, createRouteHandler } from '../utils/http.js'
|
||||||
|
|
||||||
const router = Router()
|
const router = Router()
|
||||||
|
|
||||||
@@ -41,11 +45,44 @@ router.use('/platform-fulfillment', (req, res, next) => {
|
|||||||
|
|
||||||
router.post(
|
router.post(
|
||||||
'/platform-fulfillment/binding-state',
|
'/platform-fulfillment/binding-state',
|
||||||
createRouteHandler((req) => applyLiveBindingStateSnapshot(req.body), {
|
createRouteHandler(
|
||||||
successMessage: '履约状态已同步',
|
(req) => {
|
||||||
errorMessage: '同步履约状态失败',
|
const integrationKey = String(process.env.PLATFORM_FULFILLMENT_INTEGRATION_KEY || '').trim()
|
||||||
scope: '[integration/platform-fulfillment/binding-state]',
|
const eventId = String(req.header('x-integration-event-id') || '').trim()
|
||||||
}),
|
const timestamp = String(req.header('x-integration-timestamp') || '').trim()
|
||||||
|
const signature = String(req.header('x-integration-signature') || '').trim()
|
||||||
|
const body = req.body as Record<string, unknown> | undefined
|
||||||
|
if (
|
||||||
|
!verifyWebhookSignature({
|
||||||
|
secret: integrationKey,
|
||||||
|
timestamp,
|
||||||
|
rawBody: req.rawBody || '',
|
||||||
|
signature,
|
||||||
|
toleranceSeconds: webhookToleranceSeconds(),
|
||||||
|
})
|
||||||
|
) {
|
||||||
|
throw createHttpError('履约 Webhook 签名无效', {
|
||||||
|
statusCode: 401,
|
||||||
|
errorCode: 'integration_signature_invalid',
|
||||||
|
})
|
||||||
|
}
|
||||||
|
if (!body || String(body.eventId || '').trim() !== eventId) {
|
||||||
|
throw createHttpError('履约 Webhook 事件编号不一致', {
|
||||||
|
statusCode: 400,
|
||||||
|
errorCode: 'integration_event_id_mismatch',
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return applyLiveBindingStateSnapshot(body, {
|
||||||
|
eventId,
|
||||||
|
eventType: String(body.eventType || ''),
|
||||||
|
})
|
||||||
|
},
|
||||||
|
{
|
||||||
|
successMessage: '履约状态已同步',
|
||||||
|
errorMessage: '同步履约状态失败',
|
||||||
|
scope: '[integration/platform-fulfillment/binding-state]',
|
||||||
|
},
|
||||||
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
export default router
|
export default router
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
import type { PoolClient } from 'pg'
|
import type { PoolClient } from 'pg'
|
||||||
|
|
||||||
import { query, withTransaction } from '../../db/client.js'
|
import { query, withTransaction } from '../../db/client.js'
|
||||||
|
import { publishRealtimeEvent } from '../realtime/realtime-event-service.js'
|
||||||
import { nowIso } from '../../utils/time.js'
|
import { nowIso } from '../../utils/time.js'
|
||||||
import { createHttpError } from '../../utils/http.js'
|
import { createHttpError } from '../../utils/http.js'
|
||||||
import { logWarn } from '../../utils/logger.js'
|
import { logWarn } from '../../utils/logger.js'
|
||||||
import { notifyLiveHubOrderSyncAsync } from './live-hub-notifier.js'
|
|
||||||
|
|
||||||
type DouyuTaskRow = {
|
type DouyuTaskRow = {
|
||||||
id: number
|
id: number
|
||||||
@@ -30,6 +30,9 @@ type DouyuTaskRow = {
|
|||||||
bound_at: string | null
|
bound_at: string | null
|
||||||
completed_at: string | null
|
completed_at: string | null
|
||||||
last_synced_at: string | null
|
last_synced_at: string | null
|
||||||
|
qr_url: string
|
||||||
|
qr_generated_at: string | null
|
||||||
|
qr_expires_at: string | null
|
||||||
created_at: string
|
created_at: string
|
||||||
updated_at: string
|
updated_at: string
|
||||||
platform_order_id: string
|
platform_order_id: string
|
||||||
@@ -230,9 +233,6 @@ export async function ensureDouyuFulfillmentTasks(orderNo = '') {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
if (created > 0) {
|
|
||||||
notifyLiveHubOrderSyncAsync({ created, updated: candidates.rows.length - created })
|
|
||||||
}
|
|
||||||
return { created, updated: candidates.rows.length - created }
|
return { created, updated: candidates.rows.length - created }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -374,8 +374,11 @@ async function updateTaskFromLiveState(
|
|||||||
WHEN $14 THEN COALESCE(completed_at, NOW())
|
WHEN $14 THEN COALESCE(completed_at, NOW())
|
||||||
ELSE completed_at
|
ELSE completed_at
|
||||||
END,
|
END,
|
||||||
|
qr_url = $15,
|
||||||
|
qr_generated_at = NULLIF($16, '')::timestamptz,
|
||||||
|
qr_expires_at = NULLIF($17, '')::timestamptz,
|
||||||
last_synced_at = NOW(),
|
last_synced_at = NOW(),
|
||||||
updated_at = $15
|
updated_at = $18
|
||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
`,
|
`,
|
||||||
[
|
[
|
||||||
@@ -393,6 +396,9 @@ async function updateTaskFromLiveState(
|
|||||||
live.qrUrl,
|
live.qrUrl,
|
||||||
live.bindConfirmed,
|
live.bindConfirmed,
|
||||||
live.executionStatus === 'completed',
|
live.executionStatus === 'completed',
|
||||||
|
live.qrUrl,
|
||||||
|
live.qrGeneratedAt,
|
||||||
|
live.qrExpiresAt,
|
||||||
now,
|
now,
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@@ -437,29 +443,121 @@ function isLiveBindingState(value: unknown): value is LiveBindingState {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function applyLiveBindingStateSnapshot(input: unknown) {
|
function liveBindingStateFromTask(task: DouyuTaskRow): LiveBindingState {
|
||||||
|
return {
|
||||||
|
sessionId: Number(task.live_session_id),
|
||||||
|
platformOrderId: task.platform_order_id,
|
||||||
|
sourceOrderItemId: String(task.order_item_id),
|
||||||
|
productName: task.product_name,
|
||||||
|
quantity: Number(task.quantity || 1),
|
||||||
|
executionStatus: task.live_execution_status || 'preparing',
|
||||||
|
bindingStatus: task.live_binding_status || 'not_started',
|
||||||
|
exchangeStatus: '',
|
||||||
|
issueCode: task.issue_code || '',
|
||||||
|
message: task.last_error || '',
|
||||||
|
accountReady: !['waiting_profile', 'preparing'].includes(task.status),
|
||||||
|
bindTaskId: null,
|
||||||
|
bindTaskStatus: '',
|
||||||
|
bindPhase: task.binding_phase || '',
|
||||||
|
qrUrl: task.qr_url || '',
|
||||||
|
qrGeneratedAt: task.qr_generated_at || '',
|
||||||
|
qrExpiresAt: task.qr_expires_at || '',
|
||||||
|
roleName: task.bound_role_name || '',
|
||||||
|
areaName: task.bound_area_name || '',
|
||||||
|
platName: task.bound_plat_name || '',
|
||||||
|
bindReadyForConfirm: task.status === 'role_ready',
|
||||||
|
bindConfirmed: ['bound', 'waiting_operator', 'processing', 'completed'].includes(task.status),
|
||||||
|
completedAt: task.completed_at,
|
||||||
|
updatedAt: task.updated_at,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function applyLiveBindingStateSnapshot(
|
||||||
|
input: unknown,
|
||||||
|
options: { eventId?: string; eventType?: string } = {},
|
||||||
|
) {
|
||||||
const rawItems =
|
const rawItems =
|
||||||
input && typeof input === 'object' && Array.isArray((input as { items?: unknown }).items)
|
input && typeof input === 'object' && Array.isArray((input as { items?: unknown }).items)
|
||||||
? (input as { items: unknown[] }).items
|
? (input as { items: unknown[] }).items
|
||||||
: []
|
: []
|
||||||
const items = rawItems.filter(isLiveBindingState)
|
const items = rawItems.filter(isLiveBindingState)
|
||||||
|
if (items.length === 0) {
|
||||||
|
return { received: rawItems.length, updated: 0 }
|
||||||
|
}
|
||||||
|
|
||||||
const sessionIds = Array.from(
|
const sessionIds = Array.from(
|
||||||
new Set(items.map((item) => Number(item.sessionId)).filter((id) => id > 0)),
|
new Set(items.map((item) => Number(item.sessionId)).filter((id) => id > 0)),
|
||||||
)
|
)
|
||||||
if (sessionIds.length === 0) return { received: rawItems.length, updated: 0 }
|
const orderNos = Array.from(
|
||||||
|
new Set(items.map((item) => String(item.platformOrderId || '').trim()).filter(Boolean)),
|
||||||
const tasks = await query<DouyuTaskRow>(
|
).slice(0, 50)
|
||||||
`${TASK_SELECT}
|
const orderItemIds = Array.from(
|
||||||
WHERE task.live_session_id = ANY($1::bigint[])`,
|
new Set(items.map((item) => String(item.sourceOrderItemId || '').trim()).filter(Boolean)),
|
||||||
[sessionIds],
|
|
||||||
)
|
)
|
||||||
const taskBySessionId = new Map(tasks.rows.map((task) => [Number(task.live_session_id), task]))
|
if (sessionIds.length === 0 && orderNos.length === 0 && orderItemIds.length === 0) {
|
||||||
const entries = items.flatMap((live) => {
|
return { received: rawItems.length, updated: 0 }
|
||||||
const task = taskBySessionId.get(Number(live.sessionId))
|
}
|
||||||
return task ? [{ task, live }] : []
|
|
||||||
|
// Webhook 可能先于客户首次打开领取页到达;先幂等补齐本地订单投影。
|
||||||
|
for (const orderNo of orderNos) {
|
||||||
|
await ensureDouyuFulfillmentTasks(orderNo)
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = await withTransaction(async (client) => {
|
||||||
|
const eventId = String(options.eventId || '').trim()
|
||||||
|
if (eventId) {
|
||||||
|
const claimed = await client.query(
|
||||||
|
`
|
||||||
|
INSERT INTO integration_inbox (
|
||||||
|
event_id, source, event_type, received_at, processed_at
|
||||||
|
) VALUES ($1, 'live_hub', $2, NOW(), NOW())
|
||||||
|
ON CONFLICT (event_id) DO NOTHING
|
||||||
|
RETURNING event_id
|
||||||
|
`,
|
||||||
|
[eventId, String(options.eventType || '')],
|
||||||
|
)
|
||||||
|
if (claimed.rowCount === 0) {
|
||||||
|
return { received: rawItems.length, updated: 0 }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const tasks = await client.query<DouyuTaskRow>(
|
||||||
|
`${TASK_SELECT}
|
||||||
|
WHERE task.live_session_id = ANY($1::bigint[])
|
||||||
|
OR CAST(task.order_item_id AS text) = ANY($2::text[])
|
||||||
|
OR o.platform_order_id = ANY($3::text[])`,
|
||||||
|
[sessionIds, orderItemIds, orderNos],
|
||||||
|
)
|
||||||
|
const taskBySessionId = new Map(
|
||||||
|
tasks.rows
|
||||||
|
.filter((task) => task.live_session_id)
|
||||||
|
.map((task) => [Number(task.live_session_id), task]),
|
||||||
|
)
|
||||||
|
const taskByOrderItemId = new Map(tasks.rows.map((task) => [String(task.order_item_id), task]))
|
||||||
|
const now = nowIso()
|
||||||
|
const entries = items.flatMap((live) => {
|
||||||
|
const task =
|
||||||
|
taskBySessionId.get(Number(live.sessionId)) ||
|
||||||
|
taskByOrderItemId.get(String(live.sourceOrderItemId || ''))
|
||||||
|
return task ? [{ task, live }] : []
|
||||||
|
})
|
||||||
|
for (const entry of entries) {
|
||||||
|
await updateTaskFromLiveState(client, entry.task, entry.live, now)
|
||||||
|
}
|
||||||
|
return { received: rawItems.length, updated: entries.length }
|
||||||
})
|
})
|
||||||
await applyLiveStates(entries)
|
|
||||||
return { received: rawItems.length, updated: entries.length }
|
if (result.updated > 0) {
|
||||||
|
publishRealtimeEvent({
|
||||||
|
type: 'order.changed',
|
||||||
|
entityId: 0,
|
||||||
|
scopes: ['admin_douyu_fulfillment'],
|
||||||
|
operation: 'refresh',
|
||||||
|
data: { douyuFulfillmentUpdated: true },
|
||||||
|
admin: true,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
async function ensureLiveSession(task: DouyuTaskRow) {
|
async function ensureLiveSession(task: DouyuTaskRow) {
|
||||||
@@ -572,6 +670,21 @@ export async function refreshDouyuCustomerBinding(orderNo: string) {
|
|||||||
return applyLiveState(task, live)
|
return applyLiveState(task, live)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function getDouyuCustomerFulfillmentCached(orderNo: string) {
|
||||||
|
let task = await loadTaskByOrderNo(orderNo)
|
||||||
|
if (!task.live_session_id) {
|
||||||
|
return ensureLiveSession(task)
|
||||||
|
}
|
||||||
|
task = await loadTask(task.id)
|
||||||
|
const live = liveBindingStateFromTask(task)
|
||||||
|
return {
|
||||||
|
task,
|
||||||
|
live,
|
||||||
|
comparison: compareCustomerRole(task, live),
|
||||||
|
linkPath: `/coll/d/${encodeURIComponent(task.platform_order_id)}`,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export async function confirmDouyuCustomerBinding(orderNo: string) {
|
export async function confirmDouyuCustomerBinding(orderNo: string) {
|
||||||
const refreshed = await refreshDouyuCustomerBinding(orderNo)
|
const refreshed = await refreshDouyuCustomerBinding(orderNo)
|
||||||
if (!refreshed.comparison.matched) {
|
if (!refreshed.comparison.matched) {
|
||||||
@@ -594,10 +707,11 @@ export async function confirmDouyuCustomerBinding(orderNo: string) {
|
|||||||
return applyLiveState(task, live)
|
return applyLiveState(task, live)
|
||||||
}
|
}
|
||||||
|
|
||||||
async function syncLiveStatesForTasks(tasks: DouyuTaskRow[]) {
|
async function syncLiveStatesForTasks(tasks: DouyuTaskRow[], force = false) {
|
||||||
const now = Date.now()
|
const now = Date.now()
|
||||||
const candidates = tasks.filter((task) => {
|
const candidates = tasks.filter((task) => {
|
||||||
if (!task.live_session_id || TERMINAL_TASK_STATUSES.has(task.status)) return false
|
if (!task.live_session_id || TERMINAL_TASK_STATUSES.has(task.status)) return false
|
||||||
|
if (force) return true
|
||||||
const lastSyncedAt = Date.parse(task.last_synced_at || '')
|
const lastSyncedAt = Date.parse(task.last_synced_at || '')
|
||||||
return !lastSyncedAt || now - lastSyncedAt >= LIVE_STATE_SYNC_INTERVAL_MS
|
return !lastSyncedAt || now - lastSyncedAt >= LIVE_STATE_SYNC_INTERVAL_MS
|
||||||
})
|
})
|
||||||
@@ -619,11 +733,33 @@ async function syncLiveStatesForTasks(tasks: DouyuTaskRow[]) {
|
|||||||
return task ? [{ task, live }] : []
|
return task ? [{ task, live }] : []
|
||||||
})
|
})
|
||||||
await applyLiveStates(entries)
|
await applyLiveStates(entries)
|
||||||
|
if (entries.length > 0) {
|
||||||
|
publishRealtimeEvent({
|
||||||
|
type: 'order.changed',
|
||||||
|
entityId: 0,
|
||||||
|
scopes: ['admin_douyu_fulfillment'],
|
||||||
|
operation: 'refresh',
|
||||||
|
data: { douyuFulfillmentUpdated: true },
|
||||||
|
admin: true,
|
||||||
|
})
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logWarn('[douyu-fulfillment]', '自动同步直播账号履约状态失败', { error })
|
logWarn('[douyu-fulfillment]', '自动同步直播账号履约状态失败', { error })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function reconcileDouyuFulfillmentStates() {
|
||||||
|
const rows = await query<DouyuTaskRow>(
|
||||||
|
`${TASK_SELECT}
|
||||||
|
WHERE task.live_session_id IS NOT NULL
|
||||||
|
AND task.status NOT IN ('completed', 'cancelled')
|
||||||
|
ORDER BY task.updated_at ASC, task.id ASC
|
||||||
|
LIMIT 100`,
|
||||||
|
)
|
||||||
|
await syncLiveStatesForTasks(rows.rows, true)
|
||||||
|
return { checked: rows.rows.length }
|
||||||
|
}
|
||||||
|
|
||||||
export async function listDouyuFulfillmentTasks(
|
export async function listDouyuFulfillmentTasks(
|
||||||
input: {
|
input: {
|
||||||
keyword?: unknown
|
keyword?: unknown
|
||||||
@@ -661,15 +797,7 @@ export async function listDouyuFulfillmentTasks(
|
|||||||
params,
|
params,
|
||||||
)
|
)
|
||||||
params.push(pageSize, (page - 1) * pageSize)
|
params.push(pageSize, (page - 1) * pageSize)
|
||||||
let rows = await query<DouyuTaskRow>(
|
const rows = await query<DouyuTaskRow>(
|
||||||
`${TASK_SELECT}
|
|
||||||
${where}
|
|
||||||
ORDER BY task.updated_at DESC, task.id DESC
|
|
||||||
LIMIT $${params.length - 1} OFFSET $${params.length}`,
|
|
||||||
params,
|
|
||||||
)
|
|
||||||
await syncLiveStatesForTasks(rows.rows)
|
|
||||||
rows = await query<DouyuTaskRow>(
|
|
||||||
`${TASK_SELECT}
|
`${TASK_SELECT}
|
||||||
${where}
|
${where}
|
||||||
ORDER BY task.updated_at DESC, task.id DESC
|
ORDER BY task.updated_at DESC, task.id DESC
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
import { logWarn } from '../../utils/logger.js'
|
||||||
|
import { reconcileDouyuFulfillmentStates } from './douyu-fulfillment-service.js'
|
||||||
|
|
||||||
|
const DEFAULT_RECONCILE_SECONDS = 900
|
||||||
|
|
||||||
|
let timer: NodeJS.Timeout | null = null
|
||||||
|
let stopped = true
|
||||||
|
|
||||||
|
function intervalMs() {
|
||||||
|
const value = Number(process.env.PLATFORM_FULFILLMENT_RECONCILE_SECONDS)
|
||||||
|
const seconds =
|
||||||
|
Number.isFinite(value) && value > 0
|
||||||
|
? Math.max(60, Math.trunc(value))
|
||||||
|
: DEFAULT_RECONCILE_SECONDS
|
||||||
|
return seconds * 1000
|
||||||
|
}
|
||||||
|
|
||||||
|
async function run() {
|
||||||
|
if (stopped) return
|
||||||
|
try {
|
||||||
|
await reconcileDouyuFulfillmentStates()
|
||||||
|
} catch (error) {
|
||||||
|
logWarn('[douyu-fulfillment]', '低频对账失败', { error })
|
||||||
|
} finally {
|
||||||
|
if (!stopped) {
|
||||||
|
timer = setTimeout(() => {
|
||||||
|
void run()
|
||||||
|
}, intervalMs())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function startDouyuFulfillmentReconciler() {
|
||||||
|
if (timer || !stopped) return
|
||||||
|
stopped = false
|
||||||
|
// 启动后先让 Webhook 工作一分钟,再执行首轮兜底对账。
|
||||||
|
timer = setTimeout(
|
||||||
|
() => {
|
||||||
|
void run()
|
||||||
|
},
|
||||||
|
Math.min(60_000, intervalMs()),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function stopDouyuFulfillmentReconciler() {
|
||||||
|
stopped = true
|
||||||
|
if (timer) {
|
||||||
|
clearTimeout(timer)
|
||||||
|
timer = null
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
import { randomUUID } from 'node:crypto'
|
|
||||||
|
|
||||||
import { logWarn } from '../../utils/logger.js'
|
|
||||||
|
|
||||||
const PUBLISH_ATTEMPTS = 3
|
|
||||||
const PUBLISH_TIMEOUT_MS = 5000
|
|
||||||
|
|
||||||
function liveHubBaseUrl() {
|
|
||||||
return String(process.env.LIVE_HUB_PLATFORM_FULFILLMENT_URL || '')
|
|
||||||
.trim()
|
|
||||||
.replace(/\/+$/, '')
|
|
||||||
}
|
|
||||||
|
|
||||||
export function notifyLiveHubOrderSyncAsync(detail: Record<string, unknown> = {}) {
|
|
||||||
const baseUrl = liveHubBaseUrl()
|
|
||||||
const integrationKey = String(process.env.PLATFORM_FULFILLMENT_INTEGRATION_KEY || '').trim()
|
|
||||||
if (!baseUrl || !integrationKey) return
|
|
||||||
|
|
||||||
const event = {
|
|
||||||
eventId: randomUUID(),
|
|
||||||
occurredAt: new Date().toISOString(),
|
|
||||||
...detail,
|
|
||||||
}
|
|
||||||
void publish(`${baseUrl}/api/integration/platform-fulfillment/events/order-sync`, event)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function publish(url: string, event: Record<string, unknown>) {
|
|
||||||
const integrationKey = String(process.env.PLATFORM_FULFILLMENT_INTEGRATION_KEY || '').trim()
|
|
||||||
for (let attempt = 1; attempt <= PUBLISH_ATTEMPTS; attempt += 1) {
|
|
||||||
try {
|
|
||||||
const response = await fetch(url, {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
'X-Integration-Key': integrationKey,
|
|
||||||
},
|
|
||||||
body: JSON.stringify(event),
|
|
||||||
signal: AbortSignal.timeout(PUBLISH_TIMEOUT_MS),
|
|
||||||
})
|
|
||||||
if (response.ok) return
|
|
||||||
throw new Error(`live-hub 返回 HTTP ${response.status}`)
|
|
||||||
} catch (error) {
|
|
||||||
if (attempt >= PUBLISH_ATTEMPTS) {
|
|
||||||
logWarn('[douyu-fulfillment]', '推送 live-hub 订单同步事件失败', {
|
|
||||||
eventId: event.eventId,
|
|
||||||
attempts: attempt,
|
|
||||||
error,
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
await new Promise((resolve) => setTimeout(resolve, attempt * 500))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
import assert from 'node:assert/strict'
|
||||||
|
import { readFileSync } from 'node:fs'
|
||||||
|
import test from 'node:test'
|
||||||
|
|
||||||
|
test('Outbox migration keeps header event id and payload eventId identical', () => {
|
||||||
|
const sql = readFileSync(
|
||||||
|
new URL('../../db/migrations/172_platform_fulfillment_outbox.sql', import.meta.url),
|
||||||
|
'utf8',
|
||||||
|
)
|
||||||
|
|
||||||
|
assert.match(sql, /'eventId', event_id::text/)
|
||||||
|
assert.doesNotMatch(sql, /'eventId', gen_random_uuid\(\)::text/)
|
||||||
|
assert.match(sql, /CREATE TABLE IF NOT EXISTS integration_outbox/)
|
||||||
|
assert.match(sql, /CREATE TABLE IF NOT EXISTS integration_inbox/)
|
||||||
|
})
|
||||||
@@ -0,0 +1,209 @@
|
|||||||
|
import { query, withTransaction } from '../../db/client.js'
|
||||||
|
import { logError, logInfo, logWarn } from '../../utils/logger.js'
|
||||||
|
import { buildWebhookSignature } from './webhook-signature.js'
|
||||||
|
|
||||||
|
const DEFAULT_INTERVAL_MS = 1000
|
||||||
|
const DEFAULT_BATCH_SIZE = 20
|
||||||
|
const DEFAULT_MAX_ATTEMPTS = 12
|
||||||
|
const REQUEST_TIMEOUT_MS = 5000
|
||||||
|
const PROCESSING_STALE_SECONDS = 120
|
||||||
|
|
||||||
|
type OutboxRow = {
|
||||||
|
id: string
|
||||||
|
event_id: string
|
||||||
|
payload_json: unknown
|
||||||
|
attempts: number
|
||||||
|
}
|
||||||
|
|
||||||
|
let timer: NodeJS.Timeout | null = null
|
||||||
|
let running = false
|
||||||
|
let stopped = true
|
||||||
|
|
||||||
|
function envInt(name: string, fallback: number, min: number, max: number) {
|
||||||
|
const parsed = Number(process.env[name])
|
||||||
|
if (!Number.isFinite(parsed)) return fallback
|
||||||
|
return Math.max(min, Math.min(max, Math.trunc(parsed)))
|
||||||
|
}
|
||||||
|
|
||||||
|
export function integrationOutboxConfigured() {
|
||||||
|
return Boolean(
|
||||||
|
String(process.env.LIVE_HUB_PLATFORM_FULFILLMENT_URL || '').trim() &&
|
||||||
|
String(process.env.PLATFORM_FULFILLMENT_INTEGRATION_KEY || '').trim(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function integrationOutboxBackoffSeconds(attempts: number) {
|
||||||
|
const normalized = Math.max(1, Math.trunc(Number(attempts) || 1))
|
||||||
|
return Math.min(3600, 5 * 2 ** Math.min(normalized - 1, 10))
|
||||||
|
}
|
||||||
|
|
||||||
|
async function claimDueEvents(limit: number): Promise<OutboxRow[]> {
|
||||||
|
return withTransaction(async (client) => {
|
||||||
|
await client.query(
|
||||||
|
`
|
||||||
|
UPDATE integration_outbox
|
||||||
|
SET status = 'pending',
|
||||||
|
locked_at = NULL,
|
||||||
|
next_attempt_at = NOW()
|
||||||
|
WHERE status = 'processing'
|
||||||
|
AND locked_at < NOW() - ($1 * INTERVAL '1 second')
|
||||||
|
`,
|
||||||
|
[PROCESSING_STALE_SECONDS],
|
||||||
|
)
|
||||||
|
|
||||||
|
const claimed = await client.query<OutboxRow>(
|
||||||
|
`
|
||||||
|
SELECT id, event_id, payload_json, attempts
|
||||||
|
FROM integration_outbox
|
||||||
|
WHERE status = 'pending'
|
||||||
|
AND next_attempt_at <= NOW()
|
||||||
|
ORDER BY id ASC
|
||||||
|
LIMIT $1
|
||||||
|
FOR UPDATE SKIP LOCKED
|
||||||
|
`,
|
||||||
|
[limit],
|
||||||
|
)
|
||||||
|
const ids = claimed.rows.map((row) => Number(row.id)).filter((id) => id > 0)
|
||||||
|
if (ids.length === 0) return []
|
||||||
|
|
||||||
|
await client.query(
|
||||||
|
`
|
||||||
|
UPDATE integration_outbox
|
||||||
|
SET status = 'processing',
|
||||||
|
locked_at = NOW()
|
||||||
|
WHERE id = ANY($1::bigint[])
|
||||||
|
`,
|
||||||
|
[ids],
|
||||||
|
)
|
||||||
|
return claimed.rows
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
async function deliverEvent(row: OutboxRow) {
|
||||||
|
const baseUrl = String(process.env.LIVE_HUB_PLATFORM_FULFILLMENT_URL || '')
|
||||||
|
.trim()
|
||||||
|
.replace(/\/+$/, '')
|
||||||
|
const integrationKey = String(process.env.PLATFORM_FULFILLMENT_INTEGRATION_KEY || '').trim()
|
||||||
|
const endpoint = `${baseUrl}/api/integration/platform-fulfillment/events/order-sync`
|
||||||
|
const rawBody =
|
||||||
|
typeof row.payload_json === 'string' ? row.payload_json : JSON.stringify(row.payload_json)
|
||||||
|
const timestamp = String(Math.floor(Date.now() / 1000))
|
||||||
|
const signature = buildWebhookSignature(integrationKey, timestamp, rawBody)
|
||||||
|
|
||||||
|
const response = await fetch(endpoint, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'X-Integration-Key': integrationKey,
|
||||||
|
'X-Integration-Event-Id': row.event_id,
|
||||||
|
'X-Integration-Timestamp': timestamp,
|
||||||
|
'X-Integration-Signature': signature,
|
||||||
|
},
|
||||||
|
body: rawBody,
|
||||||
|
signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
|
||||||
|
})
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`live-hub 返回 HTTP ${response.status}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function markSent(eventId: string) {
|
||||||
|
await query(
|
||||||
|
`
|
||||||
|
UPDATE integration_outbox
|
||||||
|
SET status = 'sent',
|
||||||
|
sent_at = NOW(),
|
||||||
|
locked_at = NULL,
|
||||||
|
last_error = ''
|
||||||
|
WHERE event_id = $1
|
||||||
|
`,
|
||||||
|
[eventId],
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
async function markFailed(row: OutboxRow, error: unknown) {
|
||||||
|
const attempts = Number(row.attempts || 0) + 1
|
||||||
|
const maxAttempts = envInt('INTEGRATION_OUTBOX_MAX_ATTEMPTS', DEFAULT_MAX_ATTEMPTS, 1, 100)
|
||||||
|
const dead = attempts >= maxAttempts
|
||||||
|
const message = (error instanceof Error ? error.message : String(error)).slice(0, 2000)
|
||||||
|
await query(
|
||||||
|
`
|
||||||
|
UPDATE integration_outbox
|
||||||
|
SET status = $2,
|
||||||
|
attempts = $3,
|
||||||
|
locked_at = NULL,
|
||||||
|
next_attempt_at = NOW() + ($4 * INTERVAL '1 second'),
|
||||||
|
last_error = $5
|
||||||
|
WHERE event_id = $1
|
||||||
|
`,
|
||||||
|
[
|
||||||
|
row.event_id,
|
||||||
|
dead ? 'dead' : 'pending',
|
||||||
|
attempts,
|
||||||
|
dead ? 0 : integrationOutboxBackoffSeconds(attempts),
|
||||||
|
message,
|
||||||
|
],
|
||||||
|
)
|
||||||
|
if (dead) {
|
||||||
|
logError('[integration/outbox]', '事件超过最大重试次数,已进入 dead', {
|
||||||
|
eventId: row.event_id,
|
||||||
|
attempts,
|
||||||
|
error: message,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function publishDueEvents() {
|
||||||
|
if (!integrationOutboxConfigured()) return
|
||||||
|
const batchSize = envInt('INTEGRATION_OUTBOX_BATCH_SIZE', DEFAULT_BATCH_SIZE, 1, 100)
|
||||||
|
const rows = await claimDueEvents(batchSize)
|
||||||
|
for (const row of rows) {
|
||||||
|
try {
|
||||||
|
await deliverEvent(row)
|
||||||
|
await markSent(row.event_id)
|
||||||
|
} catch (error) {
|
||||||
|
await markFailed(row, error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function runLoop() {
|
||||||
|
if (stopped || running) return
|
||||||
|
running = true
|
||||||
|
try {
|
||||||
|
await publishDueEvents()
|
||||||
|
} catch (error) {
|
||||||
|
logWarn('[integration/outbox]', '投递轮次失败', { error })
|
||||||
|
} finally {
|
||||||
|
running = false
|
||||||
|
if (!stopped) {
|
||||||
|
timer = setTimeout(
|
||||||
|
() => {
|
||||||
|
void runLoop()
|
||||||
|
},
|
||||||
|
envInt('INTEGRATION_OUTBOX_INTERVAL_MS', DEFAULT_INTERVAL_MS, 250, 60_000),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function startIntegrationOutboxWorker() {
|
||||||
|
if (timer || !stopped) return
|
||||||
|
stopped = false
|
||||||
|
if (!integrationOutboxConfigured()) {
|
||||||
|
logWarn('[integration/outbox]', '未配置 live-hub 地址或集成密钥,worker 仅保持待命')
|
||||||
|
} else {
|
||||||
|
logInfo('[integration/outbox]', '事务 Outbox worker 已启动')
|
||||||
|
}
|
||||||
|
timer = setTimeout(() => {
|
||||||
|
void runLoop()
|
||||||
|
}, 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function stopIntegrationOutboxWorker() {
|
||||||
|
stopped = true
|
||||||
|
if (timer) {
|
||||||
|
clearTimeout(timer)
|
||||||
|
timer = null
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import assert from 'node:assert/strict'
|
||||||
|
import test from 'node:test'
|
||||||
|
|
||||||
|
import { buildWebhookSignature, verifyWebhookSignature } from './webhook-signature.js'
|
||||||
|
|
||||||
|
test('webhook signature binds timestamp and raw body', () => {
|
||||||
|
const rawBody = '{"eventId":"evt-1","items":[]}'
|
||||||
|
const timestamp = '1783394219'
|
||||||
|
const signature = buildWebhookSignature('secret-key', timestamp, rawBody)
|
||||||
|
|
||||||
|
assert.equal(
|
||||||
|
verifyWebhookSignature({
|
||||||
|
secret: 'secret-key',
|
||||||
|
timestamp,
|
||||||
|
rawBody,
|
||||||
|
signature,
|
||||||
|
nowSeconds: Number(timestamp),
|
||||||
|
}),
|
||||||
|
true,
|
||||||
|
)
|
||||||
|
assert.equal(
|
||||||
|
verifyWebhookSignature({
|
||||||
|
secret: 'secret-key',
|
||||||
|
timestamp,
|
||||||
|
rawBody: `${rawBody} `,
|
||||||
|
signature,
|
||||||
|
nowSeconds: Number(timestamp),
|
||||||
|
}),
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('webhook signature rejects expired timestamps', () => {
|
||||||
|
const timestamp = '1783394219'
|
||||||
|
const rawBody = '{}'
|
||||||
|
const signature = buildWebhookSignature('secret-key', timestamp, rawBody)
|
||||||
|
|
||||||
|
assert.equal(
|
||||||
|
verifyWebhookSignature({
|
||||||
|
secret: 'secret-key',
|
||||||
|
timestamp,
|
||||||
|
rawBody,
|
||||||
|
signature,
|
||||||
|
toleranceSeconds: 300,
|
||||||
|
nowSeconds: Number(timestamp) + 301,
|
||||||
|
}),
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
})
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
import { createHmac, timingSafeEqual } from 'node:crypto'
|
||||||
|
|
||||||
|
const SIGNATURE_PREFIX = 'sha256='
|
||||||
|
const DEFAULT_TOLERANCE_SECONDS = 300
|
||||||
|
|
||||||
|
export function buildWebhookSignature(secret: string, timestamp: string, rawBody: string) {
|
||||||
|
return (
|
||||||
|
SIGNATURE_PREFIX + createHmac('sha256', secret).update(`${timestamp}.${rawBody}`).digest('hex')
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function verifyWebhookSignature(input: {
|
||||||
|
secret: string
|
||||||
|
timestamp: string
|
||||||
|
rawBody: string
|
||||||
|
signature: string
|
||||||
|
toleranceSeconds?: number
|
||||||
|
nowSeconds?: number
|
||||||
|
}) {
|
||||||
|
const secret = String(input.secret || '').trim()
|
||||||
|
const timestamp = String(input.timestamp || '').trim()
|
||||||
|
const signature = String(input.signature || '').trim()
|
||||||
|
if (!secret || !timestamp || !signature) return false
|
||||||
|
|
||||||
|
const timestampSeconds = Number(timestamp)
|
||||||
|
if (!Number.isInteger(timestampSeconds) || timestampSeconds <= 0) return false
|
||||||
|
|
||||||
|
const tolerance = Math.max(
|
||||||
|
1,
|
||||||
|
Math.trunc(Number(input.toleranceSeconds) || DEFAULT_TOLERANCE_SECONDS),
|
||||||
|
)
|
||||||
|
const nowSeconds = Math.trunc(Number(input.nowSeconds) || Date.now() / 1000)
|
||||||
|
if (Math.abs(nowSeconds - timestampSeconds) > tolerance) return false
|
||||||
|
|
||||||
|
const expected = buildWebhookSignature(secret, timestamp, String(input.rawBody || ''))
|
||||||
|
const expectedBuffer = Buffer.from(expected)
|
||||||
|
const providedBuffer = Buffer.from(signature)
|
||||||
|
if (expectedBuffer.length !== providedBuffer.length) return false
|
||||||
|
return timingSafeEqual(expectedBuffer, providedBuffer)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function webhookToleranceSeconds() {
|
||||||
|
const value = Number(process.env.PLATFORM_FULFILLMENT_WEBHOOK_TOLERANCE_SECONDS || 300)
|
||||||
|
return Number.isFinite(value) && value > 0 ? Math.trunc(value) : DEFAULT_TOLERANCE_SECONDS
|
||||||
|
}
|
||||||
@@ -1,8 +1,10 @@
|
|||||||
import { runDatabaseMigrations } from '../db/migrate.js'
|
import { runDatabaseMigrations } from '../db/migrate.js'
|
||||||
|
import { startIntegrationOutboxWorker } from '../services/integration/outbox-worker.js'
|
||||||
import { ensureAdminUsersBootstrapped } from '../services/admin/admin-auth-service.js'
|
import { ensureAdminUsersBootstrapped } from '../services/admin/admin-auth-service.js'
|
||||||
import { ensureFulfillmentCatalogBootstrapped } from '../services/bootstrap/fulfillment-bootstrap-service.js'
|
import { ensureFulfillmentCatalogBootstrapped } from '../services/bootstrap/fulfillment-bootstrap-service.js'
|
||||||
import { migrateJsonConfigFilesToDatabase } from '../services/config/json-config-migration-service.js'
|
import { migrateJsonConfigFilesToDatabase } from '../services/config/json-config-migration-service.js'
|
||||||
import { startKuaishouIndustrySendCallbackRetryWorker } from '../services/platforms/kuaishou-industry/send-code-service.js'
|
import { startKuaishouIndustrySendCallbackRetryWorker } from '../services/platforms/kuaishou-industry/send-code-service.js'
|
||||||
|
import { startDouyuFulfillmentReconciler } from '../services/douyu-fulfillment/fulfillment-reconciler.js'
|
||||||
import { startScheduledJobs } from '../services/scheduler/scheduler-service.js'
|
import { startScheduledJobs } from '../services/scheduler/scheduler-service.js'
|
||||||
import { logError, logInfo } from '../utils/logger.js'
|
import { logError, logInfo } from '../utils/logger.js'
|
||||||
import { startMemoryReporter } from './memory-reporter.js'
|
import { startMemoryReporter } from './memory-reporter.js'
|
||||||
@@ -46,6 +48,8 @@ export async function bootstrapCoreServices(
|
|||||||
|
|
||||||
startScheduledJobs()
|
startScheduledJobs()
|
||||||
startKuaishouIndustrySendCallbackRetryWorker()
|
startKuaishouIndustrySendCallbackRetryWorker()
|
||||||
|
startIntegrationOutboxWorker()
|
||||||
|
startDouyuFulfillmentReconciler()
|
||||||
startMemoryReporter()
|
startMemoryReporter()
|
||||||
break
|
break
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import type { Server } from 'node:http'
|
import type { Server } from 'node:http'
|
||||||
|
|
||||||
import { stopKuaishouIndustrySendCallbackRetryWorker } from '../services/platforms/kuaishou-industry/send-code-service.js'
|
import { stopKuaishouIndustrySendCallbackRetryWorker } from '../services/platforms/kuaishou-industry/send-code-service.js'
|
||||||
|
import { stopIntegrationOutboxWorker } from '../services/integration/outbox-worker.js'
|
||||||
|
import { stopDouyuFulfillmentReconciler } from '../services/douyu-fulfillment/fulfillment-reconciler.js'
|
||||||
import { stopScheduledJobs } from '../services/scheduler/scheduler-service.js'
|
import { stopScheduledJobs } from '../services/scheduler/scheduler-service.js'
|
||||||
import { closeDb } from '../db/client.js'
|
import { closeDb } from '../db/client.js'
|
||||||
import { logError, logInfo } from '../utils/logger.js'
|
import { logError, logInfo } from '../utils/logger.js'
|
||||||
@@ -28,6 +30,8 @@ export function createShutdownController(
|
|||||||
|
|
||||||
stopScheduledJobs()
|
stopScheduledJobs()
|
||||||
stopKuaishouIndustrySendCallbackRetryWorker()
|
stopKuaishouIndustrySendCallbackRetryWorker()
|
||||||
|
stopIntegrationOutboxWorker()
|
||||||
|
stopDouyuFulfillmentReconciler()
|
||||||
|
|
||||||
if (server.listening) {
|
if (server.listening) {
|
||||||
await new Promise<void>((resolve) => {
|
await new Promise<void>((resolve) => {
|
||||||
|
|||||||
@@ -188,6 +188,7 @@ export default function AdminLayout() {
|
|||||||
void queryClient.invalidateQueries({ queryKey: ['admin-notifications'] })
|
void queryClient.invalidateQueries({ queryKey: ['admin-notifications'] })
|
||||||
void queryClient.invalidateQueries({ queryKey: ['admin-tasks'] })
|
void queryClient.invalidateQueries({ queryKey: ['admin-tasks'] })
|
||||||
void queryClient.invalidateQueries({ queryKey: ['admin-orders'] })
|
void queryClient.invalidateQueries({ queryKey: ['admin-orders'] })
|
||||||
|
void queryClient.invalidateQueries({ queryKey: ['admin-douyu-fulfillment'] })
|
||||||
void queryClient.invalidateQueries({ queryKey: ['admin-dashboard-summary'] })
|
void queryClient.invalidateQueries({ queryKey: ['admin-dashboard-summary'] })
|
||||||
},
|
},
|
||||||
// 会话过期时清登录态回登录页,避免 SSE 带着失效 token 无限重连刷 401。
|
// 会话过期时清登录态回登录页,避免 SSE 带着失效 token 无限重连刷 401。
|
||||||
@@ -522,6 +523,10 @@ function applyAdminRealtimeEvent(
|
|||||||
event: RealtimeEvent,
|
event: RealtimeEvent,
|
||||||
queryClient: ReturnType<typeof useQueryClient>,
|
queryClient: ReturnType<typeof useQueryClient>,
|
||||||
) {
|
) {
|
||||||
|
if (event.type === 'order.changed' && event.scopes.includes('admin_douyu_fulfillment')) {
|
||||||
|
void queryClient.invalidateQueries({ queryKey: ['admin-douyu-fulfillment'] })
|
||||||
|
}
|
||||||
|
|
||||||
if (event.type === 'admin_notification.changed' && isRecord(event.data)) {
|
if (event.type === 'admin_notification.changed' && isRecord(event.data)) {
|
||||||
queryClient.setQueryData(['admin-notifications'], (current: unknown) => {
|
queryClient.setQueryData(['admin-notifications'], (current: unknown) => {
|
||||||
if (!isRecord(current) || !isRecord(current.data)) return current
|
if (!isRecord(current) || !isRecord(current.data)) return current
|
||||||
|
|||||||
@@ -93,13 +93,11 @@ export default function AdminDouyuFulfillmentPage() {
|
|||||||
page,
|
page,
|
||||||
pageSize,
|
pageSize,
|
||||||
}),
|
}),
|
||||||
refetchInterval: 5000,
|
|
||||||
})
|
})
|
||||||
const detailQuery = useQuery({
|
const detailQuery = useQuery({
|
||||||
queryKey: ['admin-douyu-fulfillment-detail', detailOrderNo],
|
queryKey: ['admin-douyu-fulfillment-detail', detailOrderNo],
|
||||||
queryFn: () => fetchAdminDouyuFulfillmentDetail(detailOrderNo),
|
queryFn: () => fetchAdminDouyuFulfillmentDetail(detailOrderNo),
|
||||||
enabled: Boolean(detailOrderNo),
|
enabled: Boolean(detailOrderNo),
|
||||||
refetchInterval: detailOrderNo ? 3000 : false,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
const list = listQuery.data?.data.items || []
|
const list = listQuery.data?.data.items || []
|
||||||
|
|||||||
@@ -52,6 +52,13 @@ function systemLabel(value: string) {
|
|||||||
return '未填写'
|
return '未填写'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function formatRemainingTime(totalSeconds: number) {
|
||||||
|
const seconds = Math.max(0, Math.ceil(totalSeconds))
|
||||||
|
const minutes = Math.floor(seconds / 60)
|
||||||
|
const rest = seconds % 60
|
||||||
|
return `${String(minutes).padStart(2, '0')}:${String(rest).padStart(2, '0')}`
|
||||||
|
}
|
||||||
|
|
||||||
export default function DouyuFulfillmentPage() {
|
export default function DouyuFulfillmentPage() {
|
||||||
const { message } = App.useApp()
|
const { message } = App.useApp()
|
||||||
const { orderNo = '' } = useParams<{ orderNo: string }>()
|
const { orderNo = '' } = useParams<{ orderNo: string }>()
|
||||||
@@ -65,7 +72,7 @@ export default function DouyuFulfillmentPage() {
|
|||||||
const [system, setSystem] = useState<DouyuCustomerSystem>('android')
|
const [system, setSystem] = useState<DouyuCustomerSystem>('android')
|
||||||
const [qrImage, setQrImage] = useState('')
|
const [qrImage, setQrImage] = useState('')
|
||||||
const [bindingQrExpanded, setBindingQrExpanded] = useState(false)
|
const [bindingQrExpanded, setBindingQrExpanded] = useState(false)
|
||||||
const [nowMs, setNowMs] = useState(0)
|
const [nowMs, setNowMs] = useState(() => Date.now())
|
||||||
const autoStartRef = useRef('')
|
const autoStartRef = useRef('')
|
||||||
|
|
||||||
const applyData = useCallback((next: DouyuCustomerFulfillment) => {
|
const applyData = useCallback((next: DouyuCustomerFulfillment) => {
|
||||||
@@ -177,6 +184,16 @@ export default function DouyuFulfillmentPage() {
|
|||||||
if (!expiresAt || Number.isNaN(expiresAt)) return 0
|
if (!expiresAt || Number.isNaN(expiresAt)) return 0
|
||||||
return Math.max(0, Math.floor((expiresAt - nowMs) / 1000))
|
return Math.max(0, Math.floor((expiresAt - nowMs) / 1000))
|
||||||
}, [live?.qrExpiresAt, nowMs])
|
}, [live?.qrExpiresAt, nowMs])
|
||||||
|
const qrExpired = Boolean(live?.qrUrl && live.qrExpiresAt && expiresInSeconds <= 0)
|
||||||
|
const qrTotalSeconds = useMemo(() => {
|
||||||
|
const generatedAt = live?.qrGeneratedAt ? Date.parse(live.qrGeneratedAt) : 0
|
||||||
|
const expiresAt = live?.qrExpiresAt ? Date.parse(live.qrExpiresAt) : 0
|
||||||
|
if (!generatedAt || !expiresAt || Number.isNaN(generatedAt) || Number.isNaN(expiresAt)) {
|
||||||
|
return 600
|
||||||
|
}
|
||||||
|
return Math.max(1, Math.floor((expiresAt - generatedAt) / 1000))
|
||||||
|
}, [live?.qrExpiresAt, live?.qrGeneratedAt])
|
||||||
|
const qrProgressPercent = Math.max(0, Math.min(100, (expiresInSeconds / qrTotalSeconds) * 100))
|
||||||
const canRevealBindingQr = Boolean(
|
const canRevealBindingQr = Boolean(
|
||||||
live?.qrUrl && (live.bindReadyForConfirm || live.bindConfirmed),
|
live?.qrUrl && (live.bindReadyForConfirm || live.bindConfirmed),
|
||||||
)
|
)
|
||||||
@@ -188,7 +205,19 @@ export default function DouyuFulfillmentPage() {
|
|||||||
? '角色绑定已完成,待客服处理。'
|
? '角色绑定已完成,待客服处理。'
|
||||||
: live?.bindReadyForConfirm
|
: live?.bindReadyForConfirm
|
||||||
? '已识别游戏角色,请核对并确认绑定。'
|
? '已识别游戏角色,请核对并确认绑定。'
|
||||||
: live?.message || '请使用微信扫描下方二维码,按提示选择和平精英角色。二维码仅用于本次订单。'
|
: qrExpired
|
||||||
|
? '当前二维码已过期,请刷新二维码后重新扫码。'
|
||||||
|
: live?.issueCode === 'binding_failed'
|
||||||
|
? '暂未识别到绑定角色,请继续使用当前二维码完成扫码。'
|
||||||
|
: !live?.accountReady
|
||||||
|
? '系统正在自动准备账号和二维码,请稍候,无需重复操作。'
|
||||||
|
: live?.qrUrl
|
||||||
|
? '必须使用微信扫码。请选择与资料一致的和平精英角色,QQ 扫码或其他方式无效。'
|
||||||
|
: live?.message || '正在准备绑定二维码,请稍候。'
|
||||||
|
const bindingStageTitle =
|
||||||
|
task?.status === 'qr_pending' && live?.qrUrl
|
||||||
|
? '必须使用微信扫码绑定'
|
||||||
|
: STATUS_LABELS[task?.status || ''] || '等待处理'
|
||||||
|
|
||||||
async function submitProfile() {
|
async function submitProfile() {
|
||||||
if (!roleName.trim()) {
|
if (!roleName.trim()) {
|
||||||
@@ -212,6 +241,10 @@ export default function DouyuFulfillmentPage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function startBinding(forceRefresh = false) {
|
async function startBinding(forceRefresh = false) {
|
||||||
|
if (forceRefresh && !qrExpired) {
|
||||||
|
message.info('二维码有效期内无需刷新')
|
||||||
|
return
|
||||||
|
}
|
||||||
setBindingLoading(true)
|
setBindingLoading(true)
|
||||||
try {
|
try {
|
||||||
const response = await startDouyuBinding(orderNo, forceRefresh)
|
const response = await startDouyuBinding(orderNo, forceRefresh)
|
||||||
@@ -295,7 +328,10 @@ export default function DouyuFulfillmentPage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<CustomerFrame title="斗鱼精英宝典领取">
|
<CustomerFrame
|
||||||
|
title="斗鱼精英宝典领取"
|
||||||
|
compact={Boolean(live?.qrUrl && !live.bindReadyForConfirm && !live.bindConfirmed)}
|
||||||
|
>
|
||||||
<OrderCard data={data} />
|
<OrderCard data={data} />
|
||||||
|
|
||||||
{needsProfile ? (
|
{needsProfile ? (
|
||||||
@@ -353,9 +389,10 @@ export default function DouyuFulfillmentPage() {
|
|||||||
) : (
|
) : (
|
||||||
<section className="customer-binding-stage">
|
<section className="customer-binding-stage">
|
||||||
<Alert
|
<Alert
|
||||||
type={live?.bindConfirmed ? 'success' : 'info'}
|
className={live?.qrUrl ? 'customer-douyu-binding-alert is-wechat' : undefined}
|
||||||
|
type={qrExpired ? 'warning' : live?.bindConfirmed ? 'success' : 'info'}
|
||||||
showIcon
|
showIcon
|
||||||
message={STATUS_LABELS[task.status] || '等待处理'}
|
message={bindingStageTitle}
|
||||||
description={bindingDescription}
|
description={bindingDescription}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@@ -370,17 +407,33 @@ export default function DouyuFulfillmentPage() {
|
|||||||
) : null}
|
) : null}
|
||||||
|
|
||||||
{!live?.qrUrl && task.status !== 'completed' ? (
|
{!live?.qrUrl && task.status !== 'completed' ? (
|
||||||
<div className="customer-binding-qr-card">
|
<div className="customer-binding-qr-card customer-douyu-preparing-card">
|
||||||
<h3>游戏角色绑定二维码</h3>
|
<h3>游戏角色绑定二维码</h3>
|
||||||
<div className="customer-binding-qr-code">
|
<div className="customer-douyu-qr-main">
|
||||||
<div className="customer-auth-qr-placeholder">
|
<span className="customer-douyu-qr-rail" aria-hidden="true">
|
||||||
<Spin />
|
必须使用微信扫码
|
||||||
<span>正在准备绑定二维码...</span>
|
</span>
|
||||||
|
<div className="customer-binding-qr-code">
|
||||||
|
<div className="customer-douyu-qr-preparing">
|
||||||
|
<div className="customer-douyu-qr-skeleton" aria-hidden="true" />
|
||||||
|
<div className="customer-douyu-qr-preparing-copy">
|
||||||
|
<Spin />
|
||||||
|
<strong>正在生成二维码</strong>
|
||||||
|
<span>系统会自动刷新,请稍候</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<span className="customer-douyu-qr-rail" aria-hidden="true">
|
||||||
|
必须使用微信扫码
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
<p className="customer-binding-qr-hint">
|
||||||
|
二维码准备完成后,必须使用微信扫码并选择游戏角色。
|
||||||
|
</p>
|
||||||
<Button
|
<Button
|
||||||
block
|
block
|
||||||
size="large"
|
size="large"
|
||||||
|
className="customer-douyu-preparing-button"
|
||||||
loading={bindingLoading}
|
loading={bindingLoading}
|
||||||
onClick={() => void startBinding(false)}
|
onClick={() => void startBinding(false)}
|
||||||
>
|
>
|
||||||
@@ -392,43 +445,55 @@ export default function DouyuFulfillmentPage() {
|
|||||||
{live?.qrUrl && showBindingQr ? (
|
{live?.qrUrl && showBindingQr ? (
|
||||||
<div className="customer-binding-qr-card">
|
<div className="customer-binding-qr-card">
|
||||||
<h3>游戏角色绑定二维码</h3>
|
<h3>游戏角色绑定二维码</h3>
|
||||||
<div className="customer-binding-qr-code">
|
<div className="customer-douyu-qr-main">
|
||||||
{qrImage ? (
|
<span className="customer-douyu-qr-rail" aria-hidden="true">
|
||||||
<Image src={qrImage} alt="和平精英角色绑定二维码" width="100%" preview={false} />
|
必须使用微信扫码
|
||||||
) : (
|
</span>
|
||||||
<div className="customer-auth-qr-placeholder">
|
<div className="customer-binding-qr-code">
|
||||||
<Spin />
|
{qrImage ? (
|
||||||
<span>正在生成二维码图片...</span>
|
<Image
|
||||||
</div>
|
src={qrImage}
|
||||||
)}
|
alt="和平精英角色绑定二维码"
|
||||||
|
width="100%"
|
||||||
|
preview={false}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<div className="customer-auth-qr-placeholder">
|
||||||
|
<Spin />
|
||||||
|
<span>正在生成二维码图片...</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<span className="customer-douyu-qr-rail" aria-hidden="true">
|
||||||
|
必须使用微信扫码
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<p className="customer-binding-qr-hint">
|
<p className="customer-binding-qr-hint">
|
||||||
请使用微信扫码,并选择与资料一致的和平精英角色。
|
必须使用微信扫码,并选择与资料一致的和平精英角色。
|
||||||
</p>
|
</p>
|
||||||
{expiresInSeconds > 0 ? (
|
{qrExpired ? (
|
||||||
|
<div className="customer-binding-qr-countdown is-expired">二维码已过期</div>
|
||||||
|
) : (
|
||||||
<div className="customer-binding-qr-countdown">
|
<div className="customer-binding-qr-countdown">
|
||||||
二维码剩余 {Math.ceil(expiresInSeconds / 60)} 分钟
|
二维码有效期剩余 {formatRemainingTime(expiresInSeconds)}
|
||||||
</div>
|
</div>
|
||||||
) : null}
|
)}
|
||||||
<Progress percent={Math.min(100, (expiresInSeconds / 600) * 100)} showInfo={false} />
|
<Progress percent={qrProgressPercent} showInfo={false} />
|
||||||
<div className="customer-binding-qr-actions">
|
<div className="customer-binding-qr-actions is-single">
|
||||||
<Button
|
<Button
|
||||||
icon={<ReloadOutlined />}
|
icon={<ReloadOutlined />}
|
||||||
loading={bindingLoading}
|
loading={bindingLoading}
|
||||||
|
disabled={!qrExpired}
|
||||||
onClick={() => void startBinding(true)}
|
onClick={() => void startBinding(true)}
|
||||||
>
|
>
|
||||||
刷新二维码
|
刷新二维码
|
||||||
</Button>
|
</Button>
|
||||||
<Button
|
|
||||||
icon={<QrcodeOutlined />}
|
|
||||||
loading={bindingLoading}
|
|
||||||
onClick={() =>
|
|
||||||
void pollDouyuBinding(orderNo).then((response) => applyData(response.data))
|
|
||||||
}
|
|
||||||
>
|
|
||||||
刷新状态
|
|
||||||
</Button>
|
|
||||||
</div>
|
</div>
|
||||||
|
<p className="customer-douyu-qr-refresh-note">
|
||||||
|
{qrExpired
|
||||||
|
? '二维码已过期,请刷新后重新扫码'
|
||||||
|
: '二维码有效期内无需刷新,过期后可重新生成'}
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
||||||
@@ -506,9 +571,17 @@ function ChoiceSwitch<T extends string>(input: {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function CustomerFrame({ title, children }: { title: string; children: ReactNode }) {
|
function CustomerFrame({
|
||||||
|
title,
|
||||||
|
compact = false,
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
title: string
|
||||||
|
compact?: boolean
|
||||||
|
children: ReactNode
|
||||||
|
}) {
|
||||||
return (
|
return (
|
||||||
<div className="customer-auth-page is-huya is-douyu">
|
<div className={`customer-auth-page is-huya is-douyu${compact ? ' is-compact' : ''}`}>
|
||||||
<div className="customer-auth-shell">
|
<div className="customer-auth-shell">
|
||||||
<header className="customer-auth-hero">
|
<header className="customer-auth-hero">
|
||||||
<div className="customer-auth-brand">
|
<div className="customer-auth-brand">
|
||||||
|
|||||||
@@ -3117,6 +3117,288 @@
|
|||||||
background: rgba(127, 29, 29, 0.24);
|
background: rgba(127, 29, 29, 0.24);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.customer-douyu-qr-main {
|
||||||
|
width: 100%;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 30px minmax(0, 220px) 30px;
|
||||||
|
align-items: stretch;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 7px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-douyu-qr-rail {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
min-height: 0;
|
||||||
|
padding: 0;
|
||||||
|
color: #ff5a67;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 800;
|
||||||
|
line-height: 1.05;
|
||||||
|
letter-spacing: 1px;
|
||||||
|
text-align: center;
|
||||||
|
writing-mode: vertical-rl;
|
||||||
|
text-orientation: upright;
|
||||||
|
background: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu .customer-douyu-qr-main .customer-binding-qr-code {
|
||||||
|
width: 100%;
|
||||||
|
max-width: none;
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu .customer-douyu-qr-preparing {
|
||||||
|
position: relative;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
min-height: 100%;
|
||||||
|
display: grid;
|
||||||
|
place-items: center;
|
||||||
|
overflow: hidden;
|
||||||
|
border-radius: 7px;
|
||||||
|
background: #171c24;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu .customer-douyu-qr-skeleton {
|
||||||
|
position: absolute;
|
||||||
|
inset: 18px;
|
||||||
|
opacity: 0.16;
|
||||||
|
background-image:
|
||||||
|
linear-gradient(90deg, #9fb1ca 50%, transparent 50%),
|
||||||
|
linear-gradient(#9fb1ca 50%, transparent 50%);
|
||||||
|
background-position:
|
||||||
|
0 0,
|
||||||
|
0 0;
|
||||||
|
background-size:
|
||||||
|
18px 18px,
|
||||||
|
18px 18px;
|
||||||
|
-webkit-mask-image: linear-gradient(135deg, #000 12%, transparent 82%);
|
||||||
|
mask-image: linear-gradient(135deg, #000 12%, transparent 82%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu .customer-douyu-qr-preparing-copy {
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
color: #b8c1cf;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu .customer-douyu-qr-preparing-copy strong {
|
||||||
|
color: #e2e8f0;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu .customer-douyu-qr-preparing-copy span {
|
||||||
|
color: #8f9aaa;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu .customer-douyu-preparing-button.ant-btn {
|
||||||
|
color: #e2e8f0;
|
||||||
|
border-color: #465063;
|
||||||
|
background: #2a313d;
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu .customer-douyu-preparing-button.ant-btn:hover,
|
||||||
|
.customer-auth-page.is-douyu .customer-douyu-preparing-button.ant-btn:focus-visible {
|
||||||
|
color: #fff;
|
||||||
|
border-color: #657186;
|
||||||
|
background: #343c4a;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu .customer-binding-qr-actions.is-single {
|
||||||
|
grid-template-columns: minmax(0, 1fr);
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu .customer-binding-qr-actions .ant-btn:disabled {
|
||||||
|
color: #7d8797;
|
||||||
|
border-color: #394353;
|
||||||
|
background: #252c37;
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu .customer-binding-qr-countdown.is-expired {
|
||||||
|
color: #ff7a84;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu .customer-douyu-qr-refresh-note {
|
||||||
|
margin: -2px 0 0;
|
||||||
|
color: #8f9aaa;
|
||||||
|
font-size: 11px;
|
||||||
|
line-height: 1.4;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu .customer-douyu-binding-alert.is-wechat {
|
||||||
|
border-color: rgba(248, 113, 113, 0.34);
|
||||||
|
background: linear-gradient(135deg, rgba(127, 29, 29, 0.26), rgba(32, 38, 49, 0.9));
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu .customer-douyu-binding-alert.is-wechat .ant-alert-icon,
|
||||||
|
.customer-auth-page.is-douyu .customer-douyu-binding-alert.is-wechat .ant-alert-message,
|
||||||
|
.customer-auth-page.is-douyu .customer-douyu-binding-alert.is-wechat .ant-alert-title {
|
||||||
|
color: #ff8a92;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact {
|
||||||
|
height: 100vh;
|
||||||
|
height: 100dvh;
|
||||||
|
min-height: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-auth-shell {
|
||||||
|
height: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-auth-hero {
|
||||||
|
min-height: 148px;
|
||||||
|
padding: 0 16px 18px;
|
||||||
|
background-position: center 34%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-auth-warning {
|
||||||
|
padding: 8px 16px 12px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-auth-main {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
flex: 1 1 auto;
|
||||||
|
min-height: 0;
|
||||||
|
padding-bottom: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-douyu-order-card {
|
||||||
|
flex: none;
|
||||||
|
margin: 10px 16px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-douyu-order-head {
|
||||||
|
padding: 13px 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-douyu-order-field {
|
||||||
|
grid-template-columns: 72px minmax(0, 1fr);
|
||||||
|
gap: 12px;
|
||||||
|
padding: 11px 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-douyu-order-field > span,
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-douyu-order-field > strong {
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-binding-stage {
|
||||||
|
flex: 1 1 auto;
|
||||||
|
min-height: 0;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 14px;
|
||||||
|
padding: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-binding-stage .ant-alert {
|
||||||
|
flex: none;
|
||||||
|
padding: 12px 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-binding-stage .ant-alert-description {
|
||||||
|
margin-top: 4px;
|
||||||
|
font-size: 13px;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-binding-qr-card {
|
||||||
|
flex: 0 1 auto;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-binding-qr-card h3 {
|
||||||
|
font-size: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-binding-qr-hint {
|
||||||
|
font-size: 13px;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-binding-qr-countdown {
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-binding-qr-card .ant-progress {
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-binding-qr-actions {
|
||||||
|
margin-top: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-binding-qr-actions .ant-btn {
|
||||||
|
height: 40px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-height: 720px) {
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-auth-hero {
|
||||||
|
min-height: 60px;
|
||||||
|
padding-bottom: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-auth-warning {
|
||||||
|
padding-block: 1px 4px;
|
||||||
|
font-size: 11px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-douyu-order-head {
|
||||||
|
padding-block: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-douyu-order-field {
|
||||||
|
padding-block: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-binding-stage {
|
||||||
|
justify-content: flex-start;
|
||||||
|
gap: 6px;
|
||||||
|
padding-block: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-binding-stage .ant-alert-description {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-binding-qr-card {
|
||||||
|
gap: 4px;
|
||||||
|
padding-block: 7px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-douyu-qr-main {
|
||||||
|
grid-template-columns: 26px minmax(0, clamp(154px, 30dvh, 190px)) 26px;
|
||||||
|
gap: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.customer-auth-page.is-douyu.is-compact .customer-douyu-qr-rail {
|
||||||
|
font-size: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.customer-choice-switch {
|
.customer-choice-switch {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -Eeuo pipefail
|
||||||
|
|
||||||
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
COMPOSE_FILE="${ROOT_DIR}/docker-compose.dev.yml"
|
||||||
|
|
||||||
|
case "${1:-}" in
|
||||||
|
up|start)
|
||||||
|
exec bash "${ROOT_DIR}/deploy/mac-dev.sh"
|
||||||
|
;;
|
||||||
|
logs)
|
||||||
|
shift
|
||||||
|
exec docker compose -f "${COMPOSE_FILE}" logs -f --tail=200 "$@"
|
||||||
|
;;
|
||||||
|
down|stop)
|
||||||
|
exec docker compose -f "${COMPOSE_FILE}" down
|
||||||
|
;;
|
||||||
|
ps|status)
|
||||||
|
exec docker compose -f "${COMPOSE_FILE}" ps
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
exec bash "${ROOT_DIR}/deploy/mac-dev.sh" "$@"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
Reference in New Issue
Block a user