合并 dev_11.9_2 到 dev_11.13
This commit is contained in:
@@ -0,0 +1,108 @@
|
||||
-- 153_semi_auto_fulfillment.sql
|
||||
--
|
||||
-- 人工履约渠道下的半自动任务:
|
||||
-- 1. 人工 SKU 配置可显式启用虎牙/微博等半自动平台;
|
||||
-- 2. 半自动任务绑定订单项和正式履约,不另建接单平台工单;
|
||||
-- 3. 登录、绑定、执行状态正交保存,客户链接只按订单号展示必要信息;
|
||||
-- 4. CK 不进入 order_site;由外部 Connector 加密托管,任务只保存平台账号快照。
|
||||
|
||||
ALTER TABLE manual_fulfillment_configs
|
||||
ADD COLUMN IF NOT EXISTS semi_auto_enabled BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
ADD COLUMN IF NOT EXISTS semi_auto_platform TEXT NOT NULL DEFAULT '',
|
||||
ADD COLUMN IF NOT EXISTS semi_auto_config_json JSONB NOT NULL DEFAULT '{}'::jsonb;
|
||||
|
||||
DO $$
|
||||
BEGIN
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM pg_constraint
|
||||
WHERE conname = 'chk_manual_fulfillment_configs_semi_auto_platform'
|
||||
) THEN
|
||||
ALTER TABLE manual_fulfillment_configs
|
||||
ADD CONSTRAINT chk_manual_fulfillment_configs_semi_auto_platform
|
||||
CHECK (semi_auto_platform IN ('', 'huya', 'weibo'));
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS semi_auto_tasks (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
order_id BIGINT NOT NULL REFERENCES orders(id) ON DELETE CASCADE,
|
||||
order_item_id BIGINT NOT NULL UNIQUE REFERENCES order_items(id) ON DELETE CASCADE,
|
||||
fulfillment_id BIGINT REFERENCES fulfillments(id) ON DELETE SET NULL,
|
||||
manual_fulfillment_config_id BIGINT
|
||||
REFERENCES manual_fulfillment_configs(id) ON DELETE SET NULL,
|
||||
platform TEXT NOT NULL CHECK (platform IN ('huya', 'weibo')),
|
||||
login_status TEXT NOT NULL DEFAULT 'waiting_login'
|
||||
CHECK (login_status IN (
|
||||
'waiting_login', 'qr_pending', 'scanned', 'authenticated', 'failed', 'expired'
|
||||
)),
|
||||
binding_status TEXT NOT NULL DEFAULT 'not_started'
|
||||
CHECK (binding_status IN (
|
||||
'not_started', 'qr_pending', 'scanned', 'role_ready', 'confirmed', 'failed', 'expired'
|
||||
)),
|
||||
execution_status TEXT NOT NULL DEFAULT 'waiting_customer'
|
||||
CHECK (execution_status IN (
|
||||
'waiting_customer', 'waiting_operator', 'processing', 'completed', 'failed', 'cancelled'
|
||||
)),
|
||||
connector_session_id TEXT NOT NULL DEFAULT '',
|
||||
huya_uid TEXT NOT NULL DEFAULT '',
|
||||
platform_nickname TEXT NOT NULL DEFAULT '',
|
||||
bind_game_account TEXT NOT NULL DEFAULT '',
|
||||
bind_game_role TEXT NOT NULL DEFAULT '',
|
||||
bind_game_channel TEXT NOT NULL DEFAULT '',
|
||||
target_quantity INTEGER NOT NULL DEFAULT 1 CHECK (target_quantity > 0),
|
||||
completed_quantity INTEGER NOT NULL DEFAULT 0
|
||||
CHECK (completed_quantity >= 0 AND completed_quantity <= target_quantity),
|
||||
assigned_admin_user_id BIGINT REFERENCES admin_users(id) ON DELETE SET NULL,
|
||||
customer_link_opened_at TIMESTAMPTZ,
|
||||
auth_started_at TIMESTAMPTZ,
|
||||
authenticated_at TIMESTAMPTZ,
|
||||
binding_started_at TIMESTAMPTZ,
|
||||
bound_at TIMESTAMPTZ,
|
||||
completed_at TIMESTAMPTZ,
|
||||
completion_note TEXT NOT NULL DEFAULT '',
|
||||
external_order_no TEXT NOT NULL DEFAULT '',
|
||||
completion_evidence_json JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||
last_error TEXT NOT NULL DEFAULT '',
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_semi_auto_tasks_status
|
||||
ON semi_auto_tasks (execution_status, platform, updated_at DESC, id DESC);
|
||||
CREATE INDEX IF NOT EXISTS idx_semi_auto_tasks_order
|
||||
ON semi_auto_tasks (order_id, id);
|
||||
CREATE INDEX IF NOT EXISTS idx_semi_auto_tasks_operator
|
||||
ON semi_auto_tasks (assigned_admin_user_id, execution_status, updated_at DESC)
|
||||
WHERE assigned_admin_user_id IS NOT NULL;
|
||||
CREATE INDEX IF NOT EXISTS idx_semi_auto_tasks_connector
|
||||
ON semi_auto_tasks (connector_session_id)
|
||||
WHERE connector_session_id <> '';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS semi_auto_task_events (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
task_id BIGINT NOT NULL REFERENCES semi_auto_tasks(id) ON DELETE CASCADE,
|
||||
event_type TEXT NOT NULL,
|
||||
actor_type TEXT NOT NULL DEFAULT 'system'
|
||||
CHECK (actor_type IN ('system', 'customer', 'admin', 'connector')),
|
||||
actor_id TEXT NOT NULL DEFAULT '',
|
||||
from_login_status TEXT,
|
||||
to_login_status TEXT,
|
||||
from_binding_status TEXT,
|
||||
to_binding_status TEXT,
|
||||
from_execution_status TEXT,
|
||||
to_execution_status TEXT,
|
||||
detail_json JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_semi_auto_task_events_task
|
||||
ON semi_auto_task_events (task_id, id DESC);
|
||||
|
||||
COMMENT ON TABLE semi_auto_tasks IS
|
||||
'人工履约渠道下的半自动任务;绑定订单项和正式履约,不承载平台 CK';
|
||||
COMMENT ON COLUMN semi_auto_tasks.connector_session_id IS
|
||||
'外部平台 Connector 的短期登录/绑定会话 ID;CK 仅保存在 Connector 加密凭证域';
|
||||
COMMENT ON COLUMN semi_auto_tasks.completion_evidence_json IS
|
||||
'可选交付证据(截图 object_key、备注、外部单号等),不得保存 Cookie 或令牌';
|
||||
COMMENT ON COLUMN manual_fulfillment_configs.semi_auto_config_json IS
|
||||
'半自动履约展示与目标页配置;不得保存平台 CK 或运行时状态';
|
||||
@@ -0,0 +1,23 @@
|
||||
-- 154_semi_auto_connector_mode.sql
|
||||
--
|
||||
-- 半自动任务记录登录/绑定/票据注入使用的 Connector 来源:
|
||||
-- external:配置的远程 Connector,作为首版默认值;
|
||||
-- mock:order_site 内置开发 Mock Connector,仅开发环境可用。
|
||||
|
||||
ALTER TABLE semi_auto_tasks
|
||||
ADD COLUMN IF NOT EXISTS connector_mode TEXT NOT NULL DEFAULT 'external';
|
||||
|
||||
DO $$
|
||||
BEGIN
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM pg_constraint
|
||||
WHERE conname = 'chk_semi_auto_tasks_connector_mode'
|
||||
) THEN
|
||||
ALTER TABLE semi_auto_tasks
|
||||
ADD CONSTRAINT chk_semi_auto_tasks_connector_mode
|
||||
CHECK (connector_mode IN ('external', 'mock'));
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
COMMENT ON COLUMN semi_auto_tasks.connector_mode IS
|
||||
'Connector 来源;external 为远程真实实现,mock 仅开发环境可用';
|
||||
@@ -0,0 +1,25 @@
|
||||
-- 155_semi_auto_connector_mode_embedded.sql
|
||||
--
|
||||
-- 内置真实 Connector 成为默认实现,不再依赖外部 live-hub-py 进程:
|
||||
-- embedded:order_site 进程内真实虎牙 Connector,默认值;
|
||||
-- external:显式配置的远程 Connector,保留用于隔离部署;
|
||||
-- mock:order_site 内置开发 Mock Connector,仅开发环境可用。
|
||||
|
||||
ALTER TABLE semi_auto_tasks
|
||||
ALTER COLUMN connector_mode SET DEFAULT 'embedded';
|
||||
|
||||
ALTER TABLE semi_auto_tasks
|
||||
DROP CONSTRAINT IF EXISTS chk_semi_auto_tasks_connector_mode;
|
||||
|
||||
-- 154 时代创建的存量任务均由远程 Connector 完成;切换到内置实现后仍需继续可操作。
|
||||
UPDATE semi_auto_tasks
|
||||
SET connector_mode = 'embedded',
|
||||
updated_at = NOW()
|
||||
WHERE connector_mode = 'external';
|
||||
|
||||
ALTER TABLE semi_auto_tasks
|
||||
ADD CONSTRAINT chk_semi_auto_tasks_connector_mode
|
||||
CHECK (connector_mode IN ('embedded', 'external', 'mock'));
|
||||
|
||||
COMMENT ON COLUMN semi_auto_tasks.connector_mode IS
|
||||
'Connector 来源;embedded 为内置真实实现,external 为远程实现,mock 仅开发环境可用';
|
||||
@@ -0,0 +1,65 @@
|
||||
-- 156_semi_auto_credentials.sql
|
||||
--
|
||||
-- 半自动履约平台账号凭证:
|
||||
-- 1. CK 是账号级凭证,挂到平台 UID,而不是只保存在进程内存或单次任务上;
|
||||
-- 2. 数据库只保存加密后的 Cookie 集合,任务仅引用 credential_id;
|
||||
-- 3. 记录凭证来源、更新时间和健康状态,供执行器失效判定与人工重登使用。
|
||||
|
||||
CREATE TABLE IF NOT EXISTS semi_auto_credentials (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
platform TEXT NOT NULL CHECK (platform IN ('huya', 'weibo')),
|
||||
platform_uid TEXT NOT NULL,
|
||||
platform_nickname TEXT NOT NULL DEFAULT '',
|
||||
credential_ciphertext TEXT NOT NULL,
|
||||
credential_source TEXT NOT NULL DEFAULT ''
|
||||
CHECK (credential_source IN ('', 'qr', 'sms', 'web', 'app', 'import')),
|
||||
credential_status TEXT NOT NULL DEFAULT 'unknown'
|
||||
CHECK (credential_status IN ('unknown', 'valid', 'invalid', 'error')),
|
||||
credential_updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
last_checked_at TIMESTAMPTZ,
|
||||
last_check_error TEXT NOT NULL DEFAULT '',
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
UNIQUE (platform, platform_uid)
|
||||
);
|
||||
|
||||
ALTER TABLE semi_auto_tasks
|
||||
ADD COLUMN IF NOT EXISTS credential_id BIGINT
|
||||
REFERENCES semi_auto_credentials(id) ON DELETE SET NULL;
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_semi_auto_credentials_status
|
||||
ON semi_auto_credentials (platform, credential_status, updated_at DESC);
|
||||
CREATE INDEX IF NOT EXISTS idx_semi_auto_tasks_credential
|
||||
ON semi_auto_tasks (credential_id)
|
||||
WHERE credential_id IS NOT NULL;
|
||||
|
||||
COMMENT ON TABLE semi_auto_credentials IS
|
||||
'半自动履约平台账号级加密凭证;原始 CK 不得进入接口响应、日志或页面';
|
||||
COMMENT ON COLUMN semi_auto_credentials.credential_ciphertext IS
|
||||
'AES-256-GCM 加密后的 Cookie JSON;密钥来自 SEMI_AUTO_CREDENTIAL_ENCRYPTION_KEY';
|
||||
COMMENT ON COLUMN semi_auto_credentials.credential_source IS
|
||||
'凭证来源:qr / sms / web / app / import';
|
||||
COMMENT ON COLUMN semi_auto_credentials.credential_status IS
|
||||
'执行器最近一次检查结论:unknown / valid / invalid / error';
|
||||
COMMENT ON COLUMN semi_auto_tasks.credential_id IS
|
||||
'该订单当前使用的平台账号凭证;task 不保存 CK 明文';
|
||||
|
||||
INSERT INTO admin_permissions (
|
||||
permission_key, permission_name, permission_group, description
|
||||
) VALUES (
|
||||
'semi_auto.credential.export',
|
||||
'导出半自动履约账号 CK',
|
||||
'半自动履约',
|
||||
'受控导出单个半自动履约任务的账号级 Cookie;导出动作写入审计但不记录 CK'
|
||||
)
|
||||
ON CONFLICT (permission_key) DO UPDATE SET
|
||||
permission_name = EXCLUDED.permission_name,
|
||||
permission_group = EXCLUDED.permission_group,
|
||||
description = EXCLUDED.description,
|
||||
updated_at = NOW();
|
||||
|
||||
INSERT INTO admin_role_permissions (role_key, permission_key)
|
||||
SELECT 'admin', 'semi_auto.credential.export'
|
||||
FROM admin_roles
|
||||
WHERE role_key = 'admin'
|
||||
ON CONFLICT DO NOTHING;
|
||||
Reference in New Issue
Block a user