feat(server/db): 数据层多库支持(1/4)— 连接分派 + 双方言迁移管线
- config 增 DB_DRIVER(mysql 默认 | sqlite);DSN 对 sqlite 为文件路径
- db.OpenDriver 按驱动分派:sqlite 用 modernc(纯 Go 免 CGO)+ WAL/
busy_timeout/foreign_keys/_txlock=immediate;mysql 路径不变
- store.Open 分派;mysql 保留 UTC/collation 断言,sqlite 跳过
- 迁移拆 migrations/{mysql,sqlite}/ 双套,embed 双 FS,migrate 按驱动选源
与 golang-migrate 驱动;修复 m.Close() 误关调用方 *sql.DB 的坑
- cmd/migrate 串入 DB_DRIVER;集成测试 MigrateUp 签名更新
- 新增 SQLite 时间往返 smoke 测试与端到端迁移测试(免 docker)
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
wangjia
@@ -0,0 +1,3 @@
|
||||
-- 逆序删除：子表先于父表
|
||||
DROP TABLE IF EXISTS devices;
|
||||
DROP TABLE IF EXISTS users;
|
||||
@@ -0,0 +1,22 @@
|
||||
-- 账户与设备
|
||||
CREATE TABLE users (
|
||||
id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||
uuid CHAR(36) NOT NULL UNIQUE,
|
||||
email VARCHAR(255) NOT NULL UNIQUE,
|
||||
pw_hash VARCHAR(255) NOT NULL, -- argon2id
|
||||
dp_uuid CHAR(36) NOT NULL, -- 数据面凭证 UUID（可轮换，节点侧只见它）
|
||||
status ENUM('active','banned') NOT NULL DEFAULT 'active',
|
||||
created_at DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
CREATE TABLE devices (
|
||||
id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||
uuid CHAR(36) NOT NULL UNIQUE,
|
||||
user_id BIGINT UNSIGNED NOT NULL,
|
||||
name VARCHAR(64) NOT NULL,
|
||||
platform ENUM('ios','android','windows','macos') NOT NULL,
|
||||
last_seen DATETIME(6) NULL,
|
||||
created_at DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
|
||||
FOREIGN KEY (user_id) REFERENCES users(id),
|
||||
INDEX idx_user (user_id)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
@@ -0,0 +1,3 @@
|
||||
-- 逆序删除：子表先于父表
|
||||
DROP TABLE IF EXISTS subscriptions;
|
||||
DROP TABLE IF EXISTS plans;
|
||||
@@ -0,0 +1,20 @@
|
||||
-- 套餐与订阅（数字口径 = design/CLAUDE.md §7）
|
||||
CREATE TABLE plans (
|
||||
id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||
code ENUM('free','pro','team') NOT NULL UNIQUE,
|
||||
max_devices INT NOT NULL, -- free 1 / pro 5 / team 10
|
||||
daily_minutes INT NULL, -- free 10；NULL = 不限
|
||||
ad_gate BOOLEAN NOT NULL DEFAULT FALSE -- free 每日看广告解锁
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
CREATE TABLE subscriptions (
|
||||
id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||
user_id BIGINT UNSIGNED NOT NULL,
|
||||
plan_id BIGINT UNSIGNED NOT NULL,
|
||||
expires_at DATETIME(6) NOT NULL,
|
||||
source ENUM('trial','code') NOT NULL, -- 注册自动 7 天试用 source='trial'
|
||||
created_at DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
|
||||
FOREIGN KEY (user_id) REFERENCES users(id),
|
||||
FOREIGN KEY (plan_id) REFERENCES plans(id),
|
||||
INDEX idx_user_exp (user_id, expires_at)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
@@ -0,0 +1,3 @@
|
||||
-- 逆序删除：子表先于父表
|
||||
DROP TABLE IF EXISTS codes;
|
||||
DROP TABLE IF EXISTS code_batches;
|
||||
@@ -0,0 +1,22 @@
|
||||
-- 激活码（App 内无支付，资金流外部化）
|
||||
CREATE TABLE code_batches (
|
||||
id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||
channel ENUM('store','tg','line','manual') NOT NULL,
|
||||
created_by VARCHAR(64) NOT NULL,
|
||||
note VARCHAR(255) NULL,
|
||||
created_at DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
CREATE TABLE codes (
|
||||
id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||
code_hash CHAR(64) NOT NULL UNIQUE, -- SHA-256；明文只出现一次
|
||||
plan_id BIGINT UNSIGNED NOT NULL,
|
||||
duration_days INT NOT NULL,
|
||||
batch_id BIGINT UNSIGNED NOT NULL,
|
||||
status ENUM('unused','redeemed','void') NOT NULL DEFAULT 'unused',
|
||||
redeemed_by BIGINT UNSIGNED NULL,
|
||||
redeemed_at DATETIME(6) NULL,
|
||||
FOREIGN KEY (plan_id) REFERENCES plans(id),
|
||||
FOREIGN KEY (batch_id) REFERENCES code_batches(id),
|
||||
INDEX idx_status (status)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
@@ -0,0 +1,3 @@
|
||||
-- 逆序删除
|
||||
DROP TABLE IF EXISTS audit_log;
|
||||
DROP TABLE IF EXISTS usage_daily;
|
||||
@@ -0,0 +1,21 @@
|
||||
-- 用量（最小数据原则：仅字节/分钟，无目的地）
|
||||
CREATE TABLE usage_daily (
|
||||
user_id BIGINT UNSIGNED NOT NULL,
|
||||
date DATE NOT NULL,
|
||||
bytes_up BIGINT UNSIGNED NOT NULL DEFAULT 0,
|
||||
bytes_down BIGINT UNSIGNED NOT NULL DEFAULT 0,
|
||||
minutes_used INT NOT NULL DEFAULT 0,
|
||||
ad_unlocked_at DATETIME(6) NULL, -- 免费版当日激励视频解锁时刻
|
||||
PRIMARY KEY (user_id, date)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- 审计（兑换/封禁/节点操作必记）
|
||||
CREATE TABLE audit_log (
|
||||
id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||
actor VARCHAR(64) NOT NULL,
|
||||
action VARCHAR(64) NOT NULL,
|
||||
target VARCHAR(128) NOT NULL,
|
||||
meta JSON NULL,
|
||||
at DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
|
||||
INDEX idx_at (at)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
@@ -0,0 +1,3 @@
|
||||
-- 逆序删除：nodes 先于 providers（子表先于父表）
|
||||
DROP TABLE IF EXISTS nodes;
|
||||
DROP TABLE IF EXISTS providers;
|
||||
@@ -0,0 +1,33 @@
|
||||
-- VPS 厂商池（先建，nodes 有 FK 引用）
|
||||
CREATE TABLE providers (
|
||||
id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||
name VARCHAR(64) NOT NULL,
|
||||
api_kind VARCHAR(32) NOT NULL, -- 开通自动化所用 API 适配器
|
||||
regions JSON NOT NULL,
|
||||
pool ENUM('consumable','premium') NOT NULL,
|
||||
enabled BOOLEAN NOT NULL DEFAULT TRUE,
|
||||
note VARCHAR(255) NULL -- 凭证不入库，存独立 secrets 管理
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- 节点：蓝本 nodes 表 + 拓扑/生命周期扩展字段
|
||||
CREATE TABLE nodes (
|
||||
id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||
uuid CHAR(36) NOT NULL UNIQUE,
|
||||
region VARCHAR(8) NOT NULL, -- HK / JP / SG / US…
|
||||
name_zh VARCHAR(64) NOT NULL,
|
||||
name_en VARCHAR(64) NOT NULL,
|
||||
role ENUM('entry','relay','exit') NOT NULL DEFAULT 'entry',
|
||||
tier ENUM('free','pro') NOT NULL, -- 消耗品池 / 精品池
|
||||
endpoint VARCHAR(255) NOT NULL, -- ip:port（REALITY）
|
||||
hy2_port INT NULL, -- Hysteria2 端口跳跃区间起点
|
||||
reality_pbk VARCHAR(64) NOT NULL,
|
||||
reality_sni VARCHAR(128) NOT NULL, -- 伪装目标 SNI
|
||||
provider_id BIGINT UNSIGNED NOT NULL,
|
||||
tags JSON NULL,
|
||||
status ENUM('provisioning','probing','up','draining','down','destroyed')
|
||||
NOT NULL DEFAULT 'provisioning', -- 生命周期状态机
|
||||
weight INT NOT NULL DEFAULT 100,
|
||||
created_at DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
|
||||
FOREIGN KEY (provider_id) REFERENCES providers(id),
|
||||
INDEX idx_status_tier (status, tier)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
@@ -0,0 +1,3 @@
|
||||
-- 逆序删除：directory_version 先，再 node_events
|
||||
DROP TABLE IF EXISTS directory_version;
|
||||
DROP TABLE IF EXISTS node_events;
|
||||
@@ -0,0 +1,19 @@
|
||||
-- 节点事件：状态迁移与判封依据（探针明细在 Redis，结论落库）
|
||||
CREATE TABLE node_events (
|
||||
id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||
node_id BIGINT UNSIGNED NOT NULL,
|
||||
event ENUM('provisioned','probe_pass','probe_fail','marked_up','draining',
|
||||
'blocked_suspect','blocked_confirmed','replaced','destroyed') NOT NULL,
|
||||
detail JSON NULL, -- 探针命中率、判封依据等
|
||||
at DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
|
||||
FOREIGN KEY (node_id) REFERENCES nodes(id),
|
||||
INDEX idx_node_at (node_id, at)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- 目录版本：nodes 任何变更 bump，客户端 if_version 灰度
|
||||
-- CHECK (id = 1) 需要 MySQL >= 8.0.16
|
||||
CREATE TABLE directory_version (
|
||||
id TINYINT PRIMARY KEY DEFAULT 1,
|
||||
version BIGINT UNSIGNED NOT NULL,
|
||||
CHECK (id = 1)
|
||||
) ENGINE=InnoDB;
|
||||
@@ -0,0 +1,3 @@
|
||||
-- 删除 seed 行（逆序：directory_version 先，plans 后）
|
||||
DELETE FROM directory_version WHERE id = 1;
|
||||
DELETE FROM plans WHERE code IN ('free', 'pro', 'team');
|
||||
@@ -0,0 +1,19 @@
|
||||
-- plans seed（口径来源：design/CLAUDE.md §7，价格不入表）
|
||||
-- free: 1 设备，10 分钟/天，每日广告解锁
|
||||
-- pro: 5 设备，不限时长，无广告门槛
|
||||
-- team: 10 设备，不限时长，无广告门槛
|
||||
INSERT INTO plans (code, max_devices, daily_minutes, ad_gate)
|
||||
VALUES
|
||||
('free', 1, 10, TRUE),
|
||||
('pro', 5, NULL, FALSE),
|
||||
('team', 10, NULL, FALSE)
|
||||
ON DUPLICATE KEY UPDATE
|
||||
max_devices = VALUES(max_devices),
|
||||
daily_minutes = VALUES(daily_minutes),
|
||||
ad_gate = VALUES(ad_gate);
|
||||
|
||||
-- directory_version 单例初始化
|
||||
INSERT INTO directory_version (id, version)
|
||||
VALUES (1, 1)
|
||||
ON DUPLICATE KEY UPDATE
|
||||
version = VALUES(version);
|
||||
@@ -0,0 +1,8 @@
|
||||
DROP TABLE IF EXISTS replacements;
|
||||
DROP TABLE IF EXISTS provision_idempotency;
|
||||
ALTER TABLE node_events
|
||||
MODIFY COLUMN event ENUM('provisioned','probe_pass','probe_fail','marked_up','draining',
|
||||
'blocked_suspect','blocked_confirmed','replaced','destroyed') NOT NULL;
|
||||
ALTER TABLE nodes
|
||||
DROP COLUMN elastic_ip_id,
|
||||
DROP COLUMN provider_instance_id;
|
||||
@@ -0,0 +1,37 @@
|
||||
-- 弹性节点基建（task #14 / tsk_6u0FxmbC7Yeq）
|
||||
-- 厂商 API 适配层与一键更换编排所需的最小附加结构。全部为附加式变更，
|
||||
-- 不触碰现网生产 EC2（deploy/ 的 marzban 机器）。
|
||||
|
||||
-- nodes 增补：厂商实例标识与弹性 IP 标识（销毁 / 换 IP 不换机所需）。
|
||||
-- 凭证仍不入库；这里只存厂商侧的资源 ID，便于幂等地销毁与换绑。
|
||||
ALTER TABLE nodes
|
||||
ADD COLUMN provider_instance_id VARCHAR(128) NULL AFTER provider_id,
|
||||
ADD COLUMN elastic_ip_id VARCHAR(128) NULL AFTER provider_instance_id;
|
||||
|
||||
-- node_events 增补 ip_rotated（换 IP 不换机的审计事件）。
|
||||
ALTER TABLE node_events
|
||||
MODIFY COLUMN event ENUM('provisioned','probe_pass','probe_fail','marked_up','draining',
|
||||
'blocked_suspect','blocked_confirmed','replaced','destroyed','ip_rotated') NOT NULL;
|
||||
|
||||
-- 开退机幂等表：幂等键 → 已开机节点 uuid。重放同一幂等键不重复开机。
|
||||
CREATE TABLE provision_idempotency (
|
||||
idempotency_key VARCHAR(128) NOT NULL PRIMARY KEY,
|
||||
node_uuid CHAR(36) NOT NULL,
|
||||
created_at DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- 一键更换编排记录：make-before-break 的可恢复状态机。
|
||||
-- 进程崩溃后可凭 uuid 续跑，step 标记进度，不重复开机 / 不重复销毁。
|
||||
CREATE TABLE replacements (
|
||||
uuid CHAR(36) NOT NULL PRIMARY KEY,
|
||||
old_node_id BIGINT UNSIGNED NOT NULL,
|
||||
new_node_id BIGINT UNSIGNED NULL,
|
||||
pool ENUM('consumable','premium') NOT NULL,
|
||||
status ENUM('running','done','failed') NOT NULL DEFAULT 'running',
|
||||
step VARCHAR(32) NOT NULL DEFAULT 'open_new',
|
||||
detail JSON NULL,
|
||||
created_at DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
|
||||
updated_at DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
|
||||
INDEX idx_status (status),
|
||||
INDEX idx_old_node (old_node_id)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
@@ -0,0 +1 @@
|
||||
DROP TABLE IF EXISTS admins;
|
||||
@@ -0,0 +1,11 @@
|
||||
-- 管理端账户（独立监听 + 内网白名单 + 2FA 的身份表）
|
||||
-- 凭证最小化：密码 argon2id，TOTP 密钥 AES-GCM 加密后以二进制存储，明文绝不入库。
|
||||
CREATE TABLE admins (
|
||||
id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
||||
username VARCHAR(64) NOT NULL UNIQUE,
|
||||
pw_hash VARCHAR(255) NOT NULL, -- argon2id（PHC 编码）
|
||||
totp_secret VARBINARY(255) NOT NULL, -- AES-GCM(密钥来自 ADMIN_SECRET_KEY)
|
||||
status ENUM('active','disabled') NOT NULL DEFAULT 'active',
|
||||
created_at DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
|
||||
last_login_at DATETIME(6) NULL
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
@@ -0,0 +1,7 @@
|
||||
-- Revert nodes.status ENUM to the original six values.
|
||||
-- WARNING: any rows currently in 'blocked_suspect' or 'blocked_confirmed'
|
||||
-- will be rejected; run only after verifying no nodes are in those states.
|
||||
ALTER TABLE nodes
|
||||
MODIFY COLUMN status
|
||||
ENUM('provisioning','probing','up','draining','down','destroyed')
|
||||
NOT NULL DEFAULT 'provisioning';
|
||||
@@ -0,0 +1,13 @@
|
||||
-- Extend nodes.status ENUM to include the two intermediate blocking states
|
||||
-- added by the detection engine (task 15D).
|
||||
--
|
||||
-- blocked_suspect : domestic probes failing + overseas OK for ≥ 2 cycles
|
||||
-- blocked_confirmed: suspect held for ≥ 6 cycles → immediately taken off-directory
|
||||
--
|
||||
-- Note: MySQL ENUM modification rebuilds the table in-place for InnoDB;
|
||||
-- on production, run during a low-traffic window.
|
||||
ALTER TABLE nodes
|
||||
MODIFY COLUMN status
|
||||
ENUM('provisioning','probing','up','draining','down','destroyed',
|
||||
'blocked_suspect','blocked_confirmed')
|
||||
NOT NULL DEFAULT 'provisioning';
|
||||
@@ -0,0 +1,3 @@
|
||||
ALTER TABLE nodes
|
||||
DROP COLUMN reality_short_id,
|
||||
DROP COLUMN reality_prk;
|
||||
@@ -0,0 +1,10 @@
|
||||
-- Add reality_prk to store the REALITY private key on the node row.
|
||||
-- Previously reality_pbk was overloaded to hold the private key (which the
|
||||
-- agent needs for its inbound); this migration separates concerns:
|
||||
-- reality_pbk = REALITY x25519 PUBLIC key (used in client connect config)
|
||||
-- reality_prk = REALITY x25519 PRIVATE key (used by the agent for its inbound TLS)
|
||||
-- Existing rows: reality_pbk continues to hold whatever was there until the
|
||||
-- operator seeds / updates the node row via nodectl or direct SQL.
|
||||
ALTER TABLE nodes
|
||||
ADD COLUMN reality_prk VARCHAR(64) NOT NULL DEFAULT '' AFTER reality_pbk,
|
||||
ADD COLUMN reality_short_id VARCHAR(16) NOT NULL DEFAULT '' AFTER reality_prk;
|
||||
@@ -0,0 +1 @@
|
||||
DROP TABLE IF EXISTS connect_credentials;
|
||||
@@ -0,0 +1,15 @@
|
||||
-- Persist active connect credentials so the agent can replay them on reconnect.
|
||||
-- Without this table, an agent restart drops all active user tunnels until each
|
||||
-- user reconnects. The connect handler writes here; disconnect deletes; the
|
||||
-- gRPC Register handler calls CredentialsForNode to replay on full resync.
|
||||
CREATE TABLE connect_credentials (
|
||||
node_id BIGINT UNSIGNED NOT NULL,
|
||||
dp_uuid CHAR(36) NOT NULL,
|
||||
protocol TINYINT NOT NULL DEFAULT 3, -- agentv1.ProtocolBoth = 3
|
||||
flow VARCHAR(64) NOT NULL DEFAULT 'xtls-rprx-vision',
|
||||
expires_at DATETIME(6) NOT NULL,
|
||||
created_at DATETIME(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
|
||||
PRIMARY KEY (node_id, dp_uuid),
|
||||
INDEX idx_node_expires (node_id, expires_at),
|
||||
CONSTRAINT fk_cc_node FOREIGN KEY (node_id) REFERENCES nodes(id) ON DELETE CASCADE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
@@ -0,0 +1,4 @@
|
||||
ALTER TABLE users
|
||||
DROP COLUMN totp_enabled,
|
||||
DROP COLUMN totp_secret_enc,
|
||||
DROP COLUMN sub_token;
|
||||
@@ -0,0 +1,10 @@
|
||||
-- Web 用户中心所需的用户级字段：
|
||||
-- sub_token 个人订阅 URL 的不可猜测 token（GET /v1/me/subscription 返回，
|
||||
-- /sub/{token} 据此渲染该用户的 sing-box 订阅配置）。可轮换。
|
||||
-- totp_secret_enc TOTP 密钥（AES-256-GCM 加密存储，复用 admin/crypto）。NULL=未设置。
|
||||
-- totp_enabled 是否已启用两步验证（verify 通过后置 true）。
|
||||
-- 全部可空/带默认，存量用户无需回填即生效（首次访问按需生成 sub_token）。
|
||||
ALTER TABLE users
|
||||
ADD COLUMN sub_token CHAR(36) NULL UNIQUE AFTER dp_uuid,
|
||||
ADD COLUMN totp_secret_enc VARBINARY(255) NULL AFTER sub_token,
|
||||
ADD COLUMN totp_enabled BOOLEAN NOT NULL DEFAULT FALSE AFTER totp_secret_enc;
|
||||
Reference in New Issue
Block a user