fix: renumber withdrawal migration

Co-authored-by: multica-agent <github@multica.ai>
2026-05-26 09:01:17 -07:00
52 changed files with 151 additions and 3376 deletions
@@ -0,0 +1,76 @@
+upstream api_backend {
+    server 127.0.0.1:8080;
+}
+
+server {
+
+    listen 80;
+    server_name api.hifast.biz  4d3vsw888xgaen.hifast.biz;
+    location /.well-known/acme-challenge/ {
+        root /var/www/html;
+        allow all;
+    }
+    location / {
+        return 301 https://$host$request_uri;
+    }
+}
+
+server {
+    listen 443 ssl http2;
+    server_name api.hifast.biz;
+    client_max_body_size 150M;
+    ssl_certificate /etc/nginx/ssl/hifast.biz/_.hifast.biz.pem; # managed by Certbot
+    ssl_certificate_key /etc/nginx/ssl/hifast.biz/_.hifast.biz.key; # managed by Certbot
+
+    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
+    add_header X-Frame-Options "DENY";
+    
+    add_header X-Content-Type-Options nosniff;
+    if ($http_user_agent ~* '(9999|91\.78)') {
+        return 444;
+    }
+    location ~ ^/v1/common/client/download/file/(?<download_name>Hi快VPN-(?<os>windows|mac|android)-1.0.0-ic-.*\.(?<ext>exe|dmg|apk))$ {
+    alias /var/www/download/Hi快VPN-$os-1.0.0.$ext;
+    charset utf-8;
+    add_header Content-Disposition 'attachment; filename="$download_name"';
+    add_header Content-Type application/octet-stream;
+    }
+
+    location /v1/common/client/download/file/ {
+        alias /var/www/download/;
+    }
+
+    location / {
+        proxy_pass http://api_backend;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+
+}
+
+server {
+    listen 443 ssl http2;
+    server_name 4d3vsw888xgaen.hifast.biz;
+    client_max_body_size 150M;
+    ssl_certificate /etc/nginx/ssl/hifast.biz/_.hifast.biz.pem; # managed by Certbot
+    ssl_certificate_key /etc/nginx/ssl/hifast.biz/_.hifast.biz.key; # managed by Certbot
+
+    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
+    add_header X-Frame-Options DENY;
+    add_header X-Content-Type-Options nosniff;
+
+    gzip on;
+    gzip_vary on;
+    gzip_min_length 1024;
+    gzip_types text/plain text/css text/xml text/javascript application/javascript application/xml+rss application/json image/svg+xml;
+    root /var/www/admin;
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
+}
@@ -1,121 +0,0 @@
-syntax = "v1"
-
-info (
-	title:   "promo admin API"
-	desc:    "API for ppanel"
-	author:  "Tension"
-	email:   "tension@ppanel.com"
-	version: "0.0.1"
-)
-
-import "../types.api"
-
-type (
-	CreatePromoRuleRequest {
-		Name      string                 `json:"name" validate:"required,max=100"`
-		Type      string                 `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
-		Params    map[string]interface{} `json:"params"`
-		Priority  int64                  `json:"priority" validate:"gte=0"`
-		Enabled   *bool                  `json:"enabled"`
-		StartTime *int64                 `json:"start_time"`
-		EndTime   *int64                 `json:"end_time"`
-	}
-	UpdatePromoRuleRequest {
-		Id        int64                  `uri:"id" validate:"required,gt=0"`
-		Name      string                 `json:"name" validate:"required,max=100"`
-		Type      string                 `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
-		Params    map[string]interface{} `json:"params"`
-		Priority  int64                  `json:"priority" validate:"gte=0"`
-		Enabled   *bool                  `json:"enabled"`
-		StartTime *int64                 `json:"start_time"`
-		EndTime   *int64                 `json:"end_time"`
-	}
-	GetPromoRuleDetailRequest {
-		Id int64 `uri:"id" validate:"required,gt=0"`
-	}
-	DeletePromoRuleRequest {
-		Id int64 `uri:"id" validate:"required,gt=0"`
-	}
-	GetPromoRuleListRequest {
-		Page    int64  `form:"page" validate:"required"`
-		Size    int64  `form:"size" validate:"required"`
-		Type    string `form:"type" validate:"omitempty,oneof=new_user inactive_user campaign"`
-		Enabled *bool  `form:"enabled"`
-		Search  string `form:"search,omitempty"`
-	}
-	GetPromoRuleListResponse {
-		Total int64       `json:"total"`
-		List  []PromoRule `json:"list"`
-	}
-	SetPromoPriceRequest {
-		PromoRuleId int64            `json:"promo_rule_id" validate:"required,gt=0"`
-		Items       []PromoPriceItem `json:"items" validate:"required,dive"`
-	}
-	GetPromoPriceListRequest {
-		PromoRuleId int64 `form:"promo_rule_id" validate:"required,gt=0"`
-		Page        int64 `form:"page" validate:"required"`
-		Size        int64 `form:"size" validate:"required"`
-	}
-	GetPromoPriceListResponse {
-		Total int64        `json:"total"`
-		List  []PromoPrice `json:"list"`
-	}
-	DeletePromoPriceRequest {
-		Id int64 `uri:"id" validate:"required,gt=0"`
-	}
-	GetPromoUsageListRequest {
-		Page        int64  `form:"page" validate:"required"`
-		Size        int64  `form:"size" validate:"required"`
-		RuleId      int64  `form:"rule_id,omitempty"`
-		UserId      int64  `form:"user_id,omitempty"`
-		SubscribeId int64  `form:"subscribe_id,omitempty"`
-		OrderNo     string `form:"order_no,omitempty"`
-	}
-	GetPromoUsageListResponse {
-		Total int64        `json:"total"`
-		List  []PromoUsage `json:"list"`
-	}
-)
-
-@server (
-	prefix:     v1/admin/promo
-	group:      admin/promo
-	middleware: AuthMiddleware
-)
-service ppanel {
-	@doc "Create promo rule"
-	@handler CreateRule
-	post /rule (CreatePromoRuleRequest) returns (PromoRule)
-
-	@doc "Get promo rule list"
-	@handler GetRuleList
-	get /rule/list (GetPromoRuleListRequest) returns (GetPromoRuleListResponse)
-
-	@doc "Get promo rule detail"
-	@handler GetRuleDetail
-	get /rule/:id (GetPromoRuleDetailRequest) returns (PromoRule)
-
-	@doc "Update promo rule"
-	@handler UpdateRule
-	put /rule/:id (UpdatePromoRuleRequest) returns (PromoRule)
-
-	@doc "Delete promo rule"
-	@handler DeleteRule
-	delete /rule/:id (DeletePromoRuleRequest)
-
-	@doc "Set promo prices"
-	@handler SetPrice
-	post /price (SetPromoPriceRequest)
-
-	@doc "Get promo price list"
-	@handler GetPriceList
-	get /price/list (GetPromoPriceListRequest) returns (GetPromoPriceListResponse)
-
-	@doc "Delete promo price"
-	@handler DeletePrice
-	delete /price/:id (DeletePromoPriceRequest)
-
-	@doc "Get promo usage list"
-	@handler GetUsageList
-	get /usage/list (GetPromoUsageListRequest) returns (GetPromoUsageListResponse)
-}
@@ -76,6 +76,29 @@ type (
 		GiftAmount         int64  `json:"gift_amount"`
 		IsAdmin            bool   `json:"is_admin"`
 	}
+	UserSubscribeDetail {
+		Id             int64     `json:"id"`
+		UserId         int64     `json:"user_id"`
+		User           User      `json:"user"`
+		OrderId        int64     `json:"order_id"`
+		SubscribeId    int64     `json:"subscribe_id"`
+		Subscribe      Subscribe `json:"subscribe"`
+		NodeGroupId    int64     `json:"node_group_id"`
+		GroupLocked    bool      `json:"group_locked"`
+		StartTime      int64     `json:"start_time"`
+		ExpireTime     int64     `json:"expire_time"`
+		ResetTime      int64     `json:"reset_time"`
+		Traffic        int64     `json:"traffic"`
+		Download       int64     `json:"download"`
+		Upload         int64     `json:"upload"`
+		Token          string    `json:"token"`
+		Status         uint8     `json:"status"`
+		EffectiveSpeed int64     `json:"effective_speed"`
+		IsThrottled    bool      `json:"is_throttled"`
+		ThrottleRule   string    `json:"throttle_rule,omitempty"`
+		CreatedAt      int64     `json:"created_at"`
+		UpdatedAt      int64     `json:"updated_at"`
+	}
 	BatchDeleteUserRequest {
 		Ids []int64 `json:"ids" validate:"required"`
 	}
@@ -139,8 +162,6 @@ type (
 		ExpiredAt   int64 `json:"expired_at"`
 		Traffic     int64 `json:"traffic"`
 		SubscribeId int64 `json:"subscribe_id"`
-		SpeedLimit   int64  `json:"speed_limit,optional"`
-		TrafficLimit string `json:"traffic_limit,optional"`
 	}
 	UpdateUserSubscribeRequest {
 		UserSubscribeId int64 `json:"user_subscribe_id"`
@@ -149,8 +170,6 @@ type (
 		ExpiredAt       int64 `json:"expired_at"`
 		Upload          int64 `json:"upload"`
 		Download        int64 `json:"download"`
-		SpeedLimit      *int64  `json:"speed_limit,omitempty"`
-		TrafficLimit    *string `json:"traffic_limit,omitempty"`
 	}
 	GetUserLoginLogsRequest {
 		Page   int   `form:"page"`
@@ -230,41 +230,6 @@ type (
 		Discount float64 `json:"discount"`
 		MapApple string  `json:"map_apple"`
 	}
-	PromoPrice {
-		Id          int64 `json:"id"`
-		SubscribeId int64 `json:"subscribe_id"`
-		PromoRuleId int64 `json:"promo_rule_id"`
-		Quantity    int64 `json:"quantity"`
-		PromoPrice  int64 `json:"promo_price"`
-		CreatedAt   int64 `json:"created_at"`
-		UpdatedAt   int64 `json:"updated_at"`
-	}
-	PromoPriceItem {
-		SubscribeId int64 `json:"subscribe_id" validate:"required,gt=0"`
-		Quantity    int64 `json:"quantity" validate:"required,gt=0,lte=1000"`
-		PromoPrice  int64 `json:"promo_price" validate:"required,gt=0"`
-	}
-	PromoRule {
-		Id        int64                  `json:"id"`
-		Name      string                 `json:"name"`
-		Type      string                 `json:"type"`
-		Params    map[string]interface{} `json:"params"`
-		Priority  int64                  `json:"priority"`
-		Enabled   bool                   `json:"enabled"`
-		StartTime *int64                 `json:"start_time"`
-		EndTime   *int64                 `json:"end_time"`
-		CreatedAt int64                  `json:"created_at"`
-		UpdatedAt int64                  `json:"updated_at"`
-	}
-	PromoUsage {
-		Id          int64  `json:"id"`
-		UserId      int64  `json:"user_id"`
-		PromoRuleId int64  `json:"promo_rule_id"`
-		SubscribeId int64  `json:"subscribe_id"`
-		OrderNo     string `json:"order_no"`
-		PromoPrice  int64  `json:"promo_price"`
-		CreatedAt   int64  `json:"created_at"`
-	}
 	TrafficLimit {
 		StatType     string `json:"stat_type"`
 		StatValue    int64  `json:"stat_value"`
@@ -571,35 +536,6 @@ type (
 		CreatedAt              int64     `json:"created_at"`
 		UpdatedAt              int64     `json:"updated_at"`
 	}
-	UserSubscribeDetail {
-		Id             int64          `json:"id"`
-		UserId         int64          `json:"user_id"`
-		User           User           `json:"user"`
-		OrderId        int64          `json:"order_id"`
-		SubscribeId    int64          `json:"subscribe_id"`
-		Subscribe      Subscribe      `json:"subscribe"`
-		NodeGroupId    int64          `json:"node_group_id"`
-		NodeGroupName  string         `json:"node_group_name"`
-		GroupLocked    bool           `json:"group_locked"`
-		StartTime      int64          `json:"start_time"`
-		ExpireTime     int64          `json:"expire_time"`
-		ResetTime      int64          `json:"reset_time"`
-		Traffic        int64          `json:"traffic"`
-		Download       int64          `json:"download"`
-		Upload         int64          `json:"upload"`
-		SpeedLimit     int64          `json:"speed_limit"`
-		TrafficLimit   []TrafficLimit `json:"user_traffic_limit"`
-		PlanSpeedLimit int64          `json:"plan_speed_limit"`
-		Token          string         `json:"token"`
-		Status         uint8          `json:"status"`
-		EffectiveSpeed int64          `json:"effective_speed"`
-		IsThrottled    bool           `json:"is_throttled"`
-		ThrottleRule   string         `json:"throttle_rule,omitempty"`
-		ThrottleStart  int64          `json:"throttle_start,omitempty"`
-		ThrottleEnd    int64          `json:"throttle_end,omitempty"`
-		CreatedAt      int64          `json:"created_at"`
-		UpdatedAt      int64          `json:"updated_at"`
-	}
 	UserAffiliate {
 		Avatar       string `json:"avatar"`
 		Identifier   string `json:"identifier"`
@@ -1,358 +0,0 @@
-# PPanel 日本东京区 AWS 部署说明
-
-本目录用于在 **AWS 日本东京区 `ap-northeast-1`** 重建一套全新生产环境，并承接当前香港区 `ap-east-1` 的正式迁移。
-
-如果你要看“当前已经真实跑起来的东京架构”，优先看：
-
- [`ops/hifast-current-architecture-zh.md`](/Users/Apple/code_vpn/vpn/ppanel-server/ops/hifast-current-architecture-zh.md)
- [`configs/resource-inventory.current.md`](./configs/resource-inventory.current.md)
-
-这份 README 更偏向：
-
- 目标架构
- 资源规划
- 部署方法
- 后续待完成项
-
-目标架构：
-
-`DNS -> ALB -> WAF -> EC2(Nginx + ppanel-server + Redis + observability) -> RDS MySQL`
-
-灾备链路：
-
-`RDS MySQL / EC2 Redis -> 104.238.220.230 外部灾备`
-
-当前仓库内已补充：
-
- 东京基础设施参数模板：[`configs/aws-jp-infra.env.example`](./configs/aws-jp-infra.env.example)
- 东京真实实施状态登记：[`configs/resource-inventory.current.md`](./configs/resource-inventory.current.md)
- 东京底座资源创建脚本：[`../../scripts/aws_jp_create_base_infra.sh`](../../scripts/aws_jp_create_base_infra.sh)
- 东京资源状态检查脚本：[`../../scripts/aws_jp_describe_state.sh`](../../scripts/aws_jp_describe_state.sh)
- MySQL 备份脚本：[`../../scripts/mysql_backup_to_s3.sh`](../../scripts/mysql_backup_to_s3.sh)
- 10 分钟 MySQL 备份定时器安装脚本：[`../../scripts/install_mysql_backup_timer.sh`](../../scripts/install_mysql_backup_timer.sh)
-
-## 1. 资源清单
-
-按下面顺序创建资源：
-
-1. VPC
-2. 2 个公有子网 + 2 个私有子网
-3. Internet Gateway
-4. 公有 / 私有路由表
-5. 安全组
-6. RDS MySQL
-7. EC2 本机 Redis Docker
-8. EC2
-9. ACM 证书
-10. ALB + Target Group
-11. WAF Web ACL
-12. 东京平行环境域名
-13. 东京 S3 备份桶
-
-建议命名：
-
- VPC: `ppanel-jp-prod`
- EC2: `ppanel-app-jp-01`
- RDS: `ppanel-mysql-jp`
- Redis container: `hifast-redis`
- ALB: `ppanel-alb-jp`
- WAF: `ppanel-waf-jp`
- S3: `hifast-prod-backups-200810848252-ap-northeast-1`
-
-## 2. 默认规格
-
-### EC2
-
- Region: `ap-northeast-1`
- OS: Ubuntu 24.04 LTS
- Instance type: `t4g.large`
- Disk: `gp3 80GB`
- Public subnet: 是
- IAM Role:
-  - 允许读取 CloudWatch / SSM（如使用）
-  - 如果要在东京 EC2 上执行 S3 备份：额外允许写入东京备份桶
-
-### RDS MySQL
-
- Engine: `MySQL 8.4`
- Class: `db.r7g.xlarge`
- Storage: `gp3 100GB`
- DB name: `hifast`
- Username: `admin`
- Public access: `Yes`
- Charset: `utf8mb4`
- Backup retention: `7-14 days`
- Deletion protection: `On`
- Multi-AZ: `Yes`（当前按 2 实例 Multi-AZ 创建）
-
-说明：
-
- 当前东京 RDS 需要允许 `104.238.220.230` 从公网直连 `3306`，用于外部 MySQL 从库复制
- 因此本阶段 RDS 使用 `public subnet group + Publicly accessible = Yes`
- 访问面只通过 `sg-rds` 严格限制到业务 EC2 安全组和 `104.238.220.230/32`
-
-### Redis
-
- 部署位置：业务 EC2 本机
- 部署方式：Docker
- 版本：`redis:8.2.1`
- 监听：`0.0.0.0:6379`
- 应用连接：`127.0.0.1:6379`
- 安全组：仅对白名单备用节点 `104.238.220.230/32` 或同机应用开放
-
-## 3. 网络与安全组
-
-### 子网布局
-
- `public-a`, `public-c`: ALB / EC2
- `private-a`, `private-c`: RDS
-
-说明：
-
- 东京优先使用 `ap-northeast-1a` 和 `ap-northeast-1c`
- 如果账户映射不同，也可以用任意 2 个可用区，但公私网必须各 2 个子网
-
-### 安全组建议
-
-#### `sg-alb`
-
- Inbound
-  - `80/tcp` from `0.0.0.0/0`
-  - `443/tcp` from `0.0.0.0/0`
- Outbound
-  - `80/tcp` to `sg-ec2`
-
-#### `sg-ec2`
-
- Inbound
-  - `80/tcp` from `sg-alb`
-  - `22/tcp` from `你的固定运维 IP`
-  - `6379/tcp` from `104.238.220.230/32`
- Outbound
-  - all
-
-说明：
-
- 应用容器监听 `127.0.0.1:8080`
- EC2 对外只让 Nginx 监听 `80`
- Grafana / Prometheus / Tempo 仅监听 `127.0.0.1`
-
-#### `sg-rds`
-
- Inbound
-  - `3306/tcp` from `sg-ec2`
-  - `3306/tcp` from `104.238.220.230/32`
-
-## 4. ALB / Target Group / 健康检查
-
-### Target Group
-
- Type: `Instance`
- Protocol: `HTTP`
- Port: `80`
- Health check path: `/v1/common/heartbeat`
- Success code: `200`
-
-### ALB 监听器
-
- `80` -> redirect to `443`
- `443` -> forward 到 target group
-
-### ACM
-
- 在 `ap-northeast-1` 重新申请证书
- 先给平行环境域名，例如：
-  - `api-jp.hifast.biz`
-  - `logs-jp.hifast.biz`
-
-## 5. WAF 规则
-
-首版至少启用：
-
-1. `AWSManagedRulesCommonRuleSet`
-2. `AWSManagedRulesKnownBadInputsRuleSet`
-3. `AWSManagedRulesAmazonIpReputationList`
-4. 全站 rate-based rule
-5. 针对高风险路径的 rate-based rule
-
-建议的第一版限流：
-
- 全站：每 IP `2000 / 5 分钟`
- `/v1/public/user/subscribe`：每 IP `300 / 5 分钟`
- 登录 / 注册 / 验证码接口：每 IP `100 / 5 分钟`
-
-节点上报接口建议后续补：
-
- `/v1/server/status`
- `/v1/server/online`
- `/v1/server/traffic`
-
-## 6. EC2 文件落地
-
-在 EC2 上建议使用：
-
- 应用目录：`/opt/ppanel`
- Nginx 配置：`/etc/nginx/sites-available/ppanel-api.conf`
-
-需要上传这些文件 / 目录：
-
- `docker-compose.cloud.yml`
- `deploy/aws/ap-northeast-1/configs/ppanel.yaml.example` -> 重命名为 `configs/ppanel.yaml`
- `deploy/aws/ap-northeast-1/nginx/ppanel-api.conf`
- `grafana/`
- `loki/`
- `prometheus/`
- `tempo/`
- `.env.example` -> 重命名为 `.env`
-
-目标目录示例：
-
-```text
-/opt/ppanel/
-  docker-compose.cloud.yml
-  .env
-  configs/ppanel.yaml
-  grafana/
-  loki/
-  prometheus/
-  tempo/
-  logs/
-  cache/
-  tempo_data/
-```
-
-## 7. 应用配置
-
-基线模板见：
-
- [`configs/ppanel.yaml.example`](./configs/ppanel.yaml.example)
- [`nginx/ppanel-api.conf`](./nginx/ppanel-api.conf)
-
-关键值必须替换：
-
- `MySQL.Addr`
- `MySQL.Password`
- `Redis.Host`
- `Redis.Pass`
- `JwtAuth.AccessSecret`
- `Administrator.Email`
- `Administrator.Password`
- `AppSignature.AppSecrets.*`
- `device.security_secret`
- `Site.Host`
- `Site.SiteName`
-
-Redis 约定保持不变：
-
- 业务缓存：DB `0`
- Asynq：DB `5`
-
-## 8. 部署步骤
-
-### 8.0 创建东京基础设施
-
-如果本机或跳板机已经配置好 AWS CLI 凭据，可以先直接执行：
-
-```bash
-cp deploy/aws/ap-northeast-1/configs/aws-jp-infra.env.example /root/aws-jp-infra.env
-chmod 600 /root/aws-jp-infra.env
-vim /root/aws-jp-infra.env
-
-chmod +x deploy/scripts/aws_jp_create_base_infra.sh
-bash deploy/scripts/aws_jp_create_base_infra.sh /root/aws-jp-infra.env
-```
-
-执行后可用下面命令随时核对东京底座状态：
-
-```bash
-chmod +x deploy/scripts/aws_jp_describe_state.sh
-bash deploy/scripts/aws_jp_describe_state.sh /root/aws-jp-infra.env
-```
-
-### 8.1 初始化 EC2
-
-把脚本上传到东京 EC2 后执行：
-
-```bash
-chmod +x deploy/scripts/bootstrap_aws_ec2.sh
-sudo APP_DIR=/opt/ppanel APP_USER=ubuntu deploy/scripts/bootstrap_aws_ec2.sh
-```
-
-### 8.2 安装 Nginx 配置
-
-```bash
-sudo cp deploy/aws/ap-northeast-1/nginx/ppanel-api.conf /etc/nginx/sites-available/ppanel-api.conf
-sudo ln -sf /etc/nginx/sites-available/ppanel-api.conf /etc/nginx/sites-enabled/ppanel-api.conf
-sudo nginx -t
-sudo systemctl reload nginx
-```
-
-### 8.3 启动容器
-
-```bash
-cd /opt/ppanel
-docker compose -f docker-compose.cloud.yml up -d
-```
-
-### 8.4 预检
-
-```bash
-chmod +x deploy/scripts/preflight_aws_jp.sh
-APP_DIR=/opt/ppanel \
-RDS_HOST=<TOKYO_RDS_ENDPOINT> \
-REDIS_HOST=127.0.0.1 \
-deploy/scripts/preflight_aws_jp.sh
-```
-
-## 9. 数据迁移与切换
-
-正式迁移请按：
-
- [`ops/hifast-aws-jp-migration-runbook-zh.md`](/Users/Apple/code_vpn/vpn/ppanel-server/ops/hifast-aws-jp-migration-runbook-zh.md)
-
-执行。
-
-核心原则：
-
- 先搭平行环境
- 停机后再导出香港主数据
- 东京验收通过后再切正式域名
- 切换后再重挂 `104` 灾备
-
-## 10. 104 灾备节点常用模板
-
-如果迁移完成后要把 `104.238.220.230` 重挂为东京主站从库，可复用：
-
- [`deploy/scripts/hifast_mysql_seed_primary_and_replica.sh`](/Users/Apple/code_vpn/vpn/ppanel-server/deploy/scripts/hifast_mysql_seed_primary_and_replica.sh)
- [`deploy/scripts/hifast_mysql_attach_replica.sh`](/Users/Apple/code_vpn/vpn/ppanel-server/deploy/scripts/hifast_mysql_attach_replica.sh)
- [`deploy/scripts/hifast_redis_attach_replica.sh`](/Users/Apple/code_vpn/vpn/ppanel-server/deploy/scripts/hifast_redis_attach_replica.sh)
- [`deploy/scripts/hifast_data_sync_tool.sh`](/Users/Apple/code_vpn/vpn/ppanel-server/deploy/scripts/hifast_data_sync_tool.sh)
- [`configs/replica-ops.env.example`](./configs/replica-ops.env.example)
-
-## 11. 东京资源创建前置检查
-
-在 AWS 控制台里至少先确认：
-
- 东京区已启用
- `ap-northeast-1` 可创建 `t4g.large`
- `ap-northeast-1` RDS 可创建 `db.r7g.xlarge`
- ACM / ALB / WAF / S3 服务在东京区可正常使用
- Tokyo 对应配额满足：
-  - On-Demand Standard vCPU
-  - ALB 数量
-  - Elastic IP（如需）
-  - RDS 实例数
-
-## 12. 当前已知真实进度
-
-截至 `2026-05-20`，已知状态如下：
-
- 东京 VPC `ppanel-jp-prod` 已创建
- VPC ID: `vpc-0846b23b4a7d64eac`
- VPC CIDR: `10.20.0.0/16`
- 4 个子网在 AWS 控制台里曾填写完成，但提交时控制台 session 失效
- 因此：
-  - 子网是否真正创建成功，需要重新核实
-  - IGW / 路由表 / 安全组 / RDS / EC2 / ALB / WAF 都应按“未完成”处理，重新复核
-
-实时状态请以后续更新的 [`configs/resource-inventory.current.md`](./configs/resource-inventory.current.md) 为准。
@@ -1,55 +0,0 @@
-AWS_REGION=ap-northeast-1
-AWS_ACCOUNT_ID=200810848252
-
-VPC_NAME=ppanel-jp-prod
-VPC_ID=
-VPC_CIDR=10.20.0.0/16
-
-PUBLIC_SUBNET_A_NAME=ppanel-jp-public-a
-PUBLIC_SUBNET_A_AZ=ap-northeast-1a
-PUBLIC_SUBNET_A_CIDR=10.20.0.0/24
-
-PUBLIC_SUBNET_C_NAME=ppanel-jp-public-c
-PUBLIC_SUBNET_C_AZ=ap-northeast-1c
-PUBLIC_SUBNET_C_CIDR=10.20.1.0/24
-
-PRIVATE_SUBNET_A_NAME=ppanel-jp-private-a
-PRIVATE_SUBNET_A_AZ=ap-northeast-1a
-PRIVATE_SUBNET_A_CIDR=10.20.10.0/24
-
-PRIVATE_SUBNET_C_NAME=ppanel-jp-private-c
-PRIVATE_SUBNET_C_AZ=ap-northeast-1c
-PRIVATE_SUBNET_C_CIDR=10.20.11.0/24
-
-IGW_NAME=ppanel-jp-igw
-PUBLIC_ROUTE_TABLE_NAME=ppanel-jp-public-rt
-PRIVATE_ROUTE_TABLE_NAME=ppanel-jp-private-rt
-
-SG_ALB_NAME=ppanel-jp-sg-alb
-SG_EC2_NAME=ppanel-jp-sg-ec2
-SG_RDS_NAME=ppanel-jp-sg-rds
-
-OPS_SSH_CIDR=CHANGE_ME_TO_YOUR_FIXED_PUBLIC_IP_OR_CIDR
-DR_REPLICA_IP=104.238.220.230/32
-
-EC2_NAME=ppanel-app-jp-01
-EC2_AMI_FAMILY=ubuntu-24.04
-EC2_INSTANCE_TYPE=t4g.large
-EC2_DISK_GB=80
-EC2_KEY_PAIR=CHANGE_ME
-
-RDS_IDENTIFIER=ppanel-mysql-jp
-RDS_DB_NAME=hifast
-RDS_ADMIN_USER=admin
-RDS_INSTANCE_CLASS=db.r7g.xlarge
-RDS_STORAGE_GB=100
-
-ALB_NAME=ppanel-alb-jp
-TARGET_GROUP_NAME=ppanel-tg-jp
-WAF_NAME=ppanel-waf-jp
-
-PARALLEL_API_DOMAIN=api-jp.hifast.biz
-PARALLEL_LOGS_DOMAIN=logs-jp.hifast.biz
-PRODUCTION_API_DOMAIN=CHANGE_ME
-
-S3_BACKUP_BUCKET=hifast-prod-backups-200810848252-ap-northeast-1
@@ -1,19 +0,0 @@
-AWS_REGION=ap-northeast-1
-S3_BUCKET=hifast-prod-backups-200810848252-ap-northeast-1
-S3_PREFIX=mysql
-BACKUP_DIR=/var/backups/hifast
-HOST_TAG=104-standby-for-jp
-KEEP_LOCAL_DAYS=3
-CHECK_REPLICA=1
-
-MYSQL_HOST=127.0.0.1
-MYSQL_PORT=3306
-MYSQL_USER=backup_reader
-MYSQL_PASSWORD=CHANGE_ME
-MYSQL_SOCKET=
-MYSQL_DATABASE=hifast
-
-REDIS_HOST=127.0.0.1
-REDIS_PORT=6379
-REDIS_PASSWORD=CHANGE_ME
-
@@ -1,21 +0,0 @@
-PRIMARY_HOST=ppanel-mysql-jp.<CHANGE_ME>.ap-northeast-1.rds.amazonaws.com
-PRIMARY_PORT=3306
-PRIMARY_USER=admin
-PRIMARY_PASSWORD=CHANGE_ME
-PRIMARY_DB=hifast
-
-PRIMARY_REPL_USER=repl
-PRIMARY_REPL_PASSWORD=CHANGE_ME
-PRIMARY_REPL_HOST=104.238.220.230
-PRIMARY_BINLOG_RETENTION_HOURS=24
-
-REPLICA_HOST=127.0.0.1
-REPLICA_PORT=3306
-REPLICA_USER=root
-REPLICA_PASSWORD=
-REPLICA_SOCKET=/var/run/mysqld/mysqld.sock
-REPLICA_DB=hifast
-REPLICA_SOURCE_SSL=1
-
-DUMP_FILE=
-
@@ -1,112 +0,0 @@
-Host: 0.0.0.0
-Port: 8080
-Debug: false
-
-JwtAuth:
-  AccessSecret: CHANGE_ME_TO_A_LONG_RANDOM_SECRET
-  AccessExpire: 604800
-
-Logger:
-  ServiceName: PPanel
-  Mode: console
-  Encoding: plain
-  TimeFormat: "2006-01-02 15:04:05.000"
-  Path: logs
-  Level: info
-  MaxContentLength: 0
-  Compress: false
-  Stat: true
-  KeepDays: 7
-  StackCooldownMillis: 100
-  MaxBackups: 7
-  MaxSize: 100
-  Rotation: daily
-  FileTimeFormat: "2006-01-02T15:04:05.000Z07:00"
-
-MySQL:
-  Addr: YOUR_TOKYO_RDS_ENDPOINT:3306
-  Dbname: hifast
-  Username: admin
-  Password: CHANGE_ME_TO_TOKYO_RDS_PASSWORD
-  Config: charset=utf8mb4&parseTime=true&loc=Asia%2FTokyo
-  MaxIdleConns: 10
-  MaxOpenConns: 100
-  SlowThreshold: 1000
-
-Redis:
-  Host: 127.0.0.1:6379
-  Pass: CHANGE_ME_TO_TOKYO_REDIS_PASSWORD
-  DB: 0
-  PoolSize: 100
-  MinIdleConns: 10
-  MaxRetries: 3
-  PoolTimeout: 4
-  IdleTimeout: 300
-  MaxConnAge: 0
-  DialTimeout: 5
-  ReadTimeout: 3
-  WriteTimeout: 3
-
-Trace:
-  Name: ppanel-server
-  Endpoint: 127.0.0.1:4317
-  Sampler: 0.1
-  Batcher: otlpgrpc
-
-Site:
-  Host: api-jp.hifast.biz
-  SiteName: HiFastVPN
-
-Administrator:
-  Email: admin@example.com
-  Password: CHANGE_ME_TO_STRONG_ADMIN_PASSWORD
-
-Telegram:
-  Enable: false
-  BotID: 0
-  BotName: ""
-  BotToken: ""
-  GroupChatID: ""
-  EnableNotify: false
-  WebHookDomain: ""
-
-Kutt:
-  Enable: false
-  ApiURL: ""
-  ApiKey: ""
-  TargetURL: ""
-  Domain: ""
-
-OpenInstall:
-  Enable: false
-  AppKey: ""
-  ApiKey: ""
-
-Loki:
-  Enable: true
-  URL: "http://localhost:3100"
-
-AppSignature:
-  AppSecrets:
-    android-client: CHANGE_ME_ANDROID_SIGNATURE_SECRET
-    ios-client: CHANGE_ME_IOS_SIGNATURE_SECRET
-    web-client: CHANGE_ME_WEB_SIGNATURE_SECRET
-  ValidWindowSeconds: 300
-  SkipPrefixes:
-    - /v1/notify/
-    - /v1/iap/notifications
-    - /v1/telegram/webhook
-    - /v1/subscribe/config
-
-Signature:
-  EnableSignature: false
-
-device:
-  enable: true
-  security_secret: CHANGE_ME_DEVICE_SECURITY_SECRET
-
-Register:
-  EnableTrial: true
-  EnableTrialEmailWhitelist: true
-  TrialEmailDomainWhitelist: "gmail.com,outlook.com,icloud.com,qq.com,163.com"
-
@@ -1,23 +0,0 @@
-MYSQL_HOST=127.0.0.1
-MYSQL_PORT=3306
-MYSQL_USER=root
-MYSQL_PASSWORD=CHANGE_ME
-MYSQL_SOCKET=
-
-REPL_SOURCE_HOST=ppanel-mysql-jp.cpo0keikgh80.ap-northeast-1.rds.amazonaws.com
-REPL_SOURCE_PORT=3306
-REPL_SOURCE_USER=repl
-REPL_SOURCE_PASSWORD=XwWrQGVWtxmXJ3etHmkFvnRSD54MKYer
-REPL_SOURCE_SSL=1
-REPL_SOURCE_LOG_FILE=mysql-bin-changelog.000189
-REPL_SOURCE_LOG_POS=185053
-REPL_SOURCE_AUTO_POSITION=1
-
-REDIS_HOST=127.0.0.1
-REDIS_PORT=6379
-REDIS_PASSWORD=CHANGE_ME
-
-REDIS_SOURCE_HOST=3.114.29.208
-REDIS_SOURCE_PORT=6379
-REDIS_SOURCE_USER=
-REDIS_SOURCE_PASSWORD=hifast67yj
@@ -1,187 +0,0 @@
-# Tokyo Resource Inventory
-
-最后更新：`2026-05-21`
-
-这个文件记录当前东京迁移的真实实施状态，不是示例。
-
-## Region
-
- AWS account: `hifastvpn (200810848252)`
- Region: `ap-northeast-1`
-
-## Current Status
-
- 东京迁移方案已在仓库内落地为执行资产
- 东京 VPC 已创建
- 东京子网、IGW、路由表已在 AWS 控制台创建并复核
- 东京三层安全组已在 AWS 控制台创建并复核
- 东京 VPC DNS 开关已开启，可支持公网可访问 RDS
- 东京 S3 备份桶已在 AWS 控制台创建并复核
- 东京 ACM 证书请求已创建，等待 DNS 验证
- 东京 RDS MySQL 已创建完成并可用
- 东京业务 EC2 已创建完成并绑定固定 EIP
- 因当前本机没有可用 AWS CLI 凭据，云上资源状态仍需在 AWS 控制台或已登录环境中复查
-
-## Networking
-
- VPC
-  - Name: `ppanel-jp-prod`
-  - VPC ID: `vpc-0846b23b4a7d64eac`
-  - CIDR: `10.20.0.0/16`
-  - Status: `created`
- Public subnet A
-  - Name: `ppanel-jp-public-a`
-  - AZ: `ap-northeast-1a`
-  - CIDR: `10.20.0.0/24`
-  - Subnet ID: `subnet-091232bdb53e71490`
-  - Status: `created`
- Public subnet C
-  - Name: `ppanel-jp-public-c`
-  - AZ: `ap-northeast-1c`
-  - CIDR: `10.20.1.0/24`
-  - Subnet ID: `subnet-01ba0975c525ce8cf`
-  - Status: `created`
- Private subnet A
-  - Name: `ppanel-jp-private-a`
-  - AZ: `ap-northeast-1a`
-  - CIDR: `10.20.10.0/24`
-  - Subnet ID: `subnet-0bd13111c02f0edbe`
-  - Status: `created`
- Private subnet C
-  - Name: `ppanel-jp-private-c`
-  - AZ: `ap-northeast-1c`
-  - CIDR: `10.20.11.0/24`
-  - Subnet ID: `subnet-0d86c5c756dbc84b2`
-  - Status: `created`
- Internet Gateway
-  - Name: `ppanel-jp-igw`
-  - IGW ID: `igw-028041bcbf63b672c`
-  - Status: `created`
- Public route table
-  - Name: `ppanel-jp-public-rt`
-  - Route Table ID: `rtb-061b101080e4800e5`
-  - Default route: `0.0.0.0/0 -> igw-028041bcbf63b672c`
-  - Status: `created`
- Private route table
-  - Name: `ppanel-jp-private-rt`
-  - Route Table ID: `rtb-0d7a191a515031c45`
-  - Status: `created`
-
-## Security
-
- `sg-alb`
-  - Name: `ppanel-jp-sg-alb`
-  - Security Group ID: `sg-0b3a23c31041a5a5a`
-  - Inbound:
-    - `80/tcp <- 0.0.0.0/0`
-    - `443/tcp <- 0.0.0.0/0`
-  - Status: `created`
- `sg-ec2`
-  - Name: `ppanel-jp-sg-ec2`
-  - Security Group ID: `sg-01f2a5a81e7505c91`
-  - Inbound:
-    - `80/tcp <- sg-0b3a23c31041a5a5a`
-    - `22/tcp <- 64.118.144.142/32`
-    - `6379/tcp <- 104.238.220.230/32`
-  - Status: `created`
- `sg-rds`
-  - Name: `ppanel-jp-sg-rds`
-  - Security Group ID: `sg-0b71db1e2c18b57c0`
-  - Inbound:
-    - `3306/tcp <- sg-01f2a5a81e7505c91`
-    - `3306/tcp <- 104.238.220.230/32`
-  - Status: `created`
-
-## Compute / Database / Edge
-
- EC2 `ppanel-app-jp-01`:
-  - Instance ID: `i-07839130074cd7ed9`
-  - Type: `c7i.xlarge`
-  - Platform: `Ubuntu 26.04 / Linux`
-  - AZ: `ap-northeast-1c`
-  - VPC: `ppanel-jp-prod (vpc-0846b23b4a7d64eac)`
-  - Subnet: `ppanel-jp-public-c (subnet-01ba0975c525ce8cf)`
-  - Private IP: `10.20.1.168`
-  - Public IP / Elastic IP: `3.114.29.208`
-  - Public DNS: `ec2-3-114-29-208.ap-northeast-1.compute.amazonaws.com`
-  - Security group: `ppanel-jp-sg-ec2 (sg-01f2a5a81e7505c91)`
-  - Key pair: `ppanel-jp-key-20260521`
-  - Root volume: `gp3 100GiB`
-  - ENI: `eni-08accb427a470c9f7`
-  - EIP allocation ID: `eipalloc-038b32d5c0119accf`
-  - EIP association ID: `eipassoc-09184aa9161b6a4d9`
-  - Status: `running`
-  - SSH recovery private key: `deploy/aws/ap-northeast-1/keys/ppanel-jp-recovery`
-  - SSH recovery public key: `deploy/aws/ap-northeast-1/keys/ppanel-jp-recovery.pub`
- RDS subnet group:
-  - Name: `ppanel-jp-rds-subnet-group`
-  - VPC: `vpc-0846b23b4a7d64eac`
-  - Subnets:
-    - `subnet-0bd13111c02f0edbe` / `ppanel-jp-private-a`
-    - `subnet-0d86c5c756dbc84b2` / `ppanel-jp-private-c`
-  - Status: `created`
- RDS public subnet group:
-  - Name: `ppanel-jp-rds-public-subnet-group`
-  - VPC: `vpc-0846b23b4a7d64eac`
-  - Subnets:
-    - `subnet-091232bdb53e71490` / `ppanel-jp-public-a`
-    - `subnet-01ba0975c525ce8cf` / `ppanel-jp-public-c`
-  - Status: `created`
- RDS `ppanel-mysql-jp`:
-  - Engine: `MySQL Community 8.4.8`
-  - Class: `db.r7g.xlarge`
-  - Storage: `gp3 100GiB`
-  - Deployment: `Single instance (current actual state)`
-  - VPC: `ppanel-jp-prod (vpc-0846b23b4a7d64eac)`
-  - Subnet group: `ppanel-jp-rds-public-subnet-group`
-  - Security group: `ppanel-jp-sg-rds (sg-0b71db1e2c18b57c0)`
-  - Master username: `admin`
-  - Credential management: `self-managed`
-  - Secrets Manager managed password: `disabled`
-  - Current master password visibility: `not retrievable from AWS console; reset only`
-  - Public access: `enabled (set at creation time for external replication)`
-  - Status: `available`
-  - Endpoint: `ppanel-mysql-jp.cpo0keikgh80.ap-northeast-1.rds.amazonaws.com`
-  - Public IP (resolved via public DNS): `52.196.204.186`
-  - Connection test from Tokyo EC2:
-    - `mysql -h ppanel-mysql-jp.cpo0keikgh80.ap-northeast-1.rds.amazonaws.com -u admin -e "select 1"`
-    - Result: `ERROR 1045 (28000): Access denied for user 'admin'@'ip-10-20-1-168.ap-northeast-1.compute.internal' (using password: NO)`
-    - Meaning: `network path and security group are working; only the password is missing`
-  - Current admin password: `TkyRds20260521!N9mQ8sKe2vLp7Xa`
-  - External replica prep for `104.238.220.230`:
-    - binlog retention hours: `24`
-    - replication user: `repl@104.238.220.230`
-    - replication password: `XwWrQGVWtxmXJ3etHmkFvnRSD54MKYer`
-    - current binlog file: `mysql-bin-changelog.000189`
-    - current binlog position: `185053`
- ALB `ppanel-alb-jp`: `not created`
- WAF `ppanel-waf-jp`: `not created`
- ACM certificate in `ap-northeast-1`:
-  - Certificate ID: `29d0b9b6-ab37-44d9-ad9e-18fa7e9aae3a`
-  - Domains:
-    - `api-jp.hifast.biz`
-    - `logs-jp.hifast.biz`
-  - Status: `pending_validation`
-  - Route 53 hosted zone in current AWS account: `not found`
- S3 backup bucket `hifast-prod-backups-200810848252-ap-northeast-1`: `created`
-
-## Domains
-
- Parallel API domain: `api-jp.hifast.biz`
- Parallel logs domain: `logs-jp.hifast.biz`
- Production API domain: `pending user final confirmation`
- ACM DNS validation records pending external DNS add:
-  - `api-jp.hifast.biz`
-    - Name: `_0de5970dfbadaf46759447b2ea627a10.api-jp.hifast.biz.`
-    - Type: `CNAME`
-    - Value: `_6a632a5b85c5b3f304cc492090b741b3.jkddzztszm.acm-validations.aws.`
-  - `logs-jp.hifast.biz`
-    - Name: `_349a2b2bc4678d76c3ab341ccf73db61.logs-jp.hifast.biz.`
-    - Type: `CNAME`
-    - Value: `_74ced20dc96aa39070188605cf0ced18.jkddzztszm.acm-validations.aws.`
-
-## DR
-
- DR host: `104.238.220.230`
- Planned MySQL upstream after cutover: `Tokyo RDS`
- Planned Redis upstream after cutover: `Tokyo EC2 public IP`
@@ -1,69 +0,0 @@
-# Tokyo Resource Inventory Example
-
-Use this file as the single source of truth while building the Tokyo environment.
-
-## Region
-
- AWS account: `hifastvpn (200810848252)`
- Region: `ap-northeast-1`
-
-## DNS
-
- Production API domain: `CHANGE_ME`
- Parallel API domain: `api-jp.hifast.biz`
- Parallel logs domain: `logs-jp.hifast.biz`
-
-## Networking
-
- VPC name: `ppanel-jp-prod`
- VPC CIDR: `10.20.0.0/16`
- Public subnet A: `10.20.0.0/24`
- Public subnet C: `10.20.1.0/24`
- Private subnet A: `10.20.10.0/24`
- Private subnet C: `10.20.11.0/24`
- Ops CIDR for SSH: `CHANGE_ME`
-
-## Compute
-
- EC2 name: `ppanel-app-jp-01`
- EC2 type: `t4g.large`
- EC2 disk: `gp3 80GB`
- SSH key pair: `CHANGE_ME`
-
-## Database
-
- RDS identifier: `ppanel-mysql-jp`
- RDS engine: `MySQL 8.4`
- RDS class: `db.r7g.xlarge`
- RDS storage: `gp3 100GB`
- DB name: `hifast`
- DB admin user: `admin`
-
-## Cache
-
- Redis container: `hifast-redis`
- Redis port: `6379`
- Redis password: `CHANGE_ME`
-
-## Security / Secrets
-
- JWT secret: `CHANGE_ME`
- Admin email: `CHANGE_ME`
- Admin password: `CHANGE_ME`
- Android app signature secret: `CHANGE_ME`
- iOS app signature secret: `CHANGE_ME`
- Web app signature secret: `CHANGE_ME`
- Device security secret: `CHANGE_ME`
-
-## Backup
-
- S3 backup bucket: `hifast-prod-backups-200810848252-ap-northeast-1`
- Versioning: `Enabled`
-
-## DR
-
- DR host: `104.238.220.230`
- MySQL repl user: `repl`
- MySQL repl password: `CHANGE_ME`
- Redis source password: `CHANGE_ME`
-
@@ -1,7 +0,0 @@
-----BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACBsJxZDjKvaIdVjer3QMHRYw43wkVnzHurA2TQqHlr1YwAAAKBaQXT3WkF0
-9wAAAAtzc2gtZWQyNTUxOQAAACBsJxZDjKvaIdVjer3QMHRYw43wkVnzHurA2TQqHlr1Yw
-AAAEArWQWWwPoJp+za5JhSnrE0Pw1/TtqWRrdY5e8hULqYDGwnFkOMq9oh1WN6vdAwdFjD
-jfCRWfMe6sDZNCoeWvVjAAAAF0FwcGxlQE1hY0Jvb2stUHJvLmxvY2FsAQIDBAUG
-----END OPENSSH PRIVATE KEY-----
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGwnFkOMq9oh1WN6vdAwdFjDjfCRWfMe6sDZNCoeWvVj Apple@MacBook-Pro.local
@@ -1,34 +0,0 @@
-server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-    server_name _;
-
-    client_max_body_size 20m;
-
-    access_log /var/log/nginx/ppanel-access.log;
-    error_log /var/log/nginx/ppanel-error.log warn;
-
-    location / {
-        proxy_http_version 1.1;
-        proxy_pass http://127.0.0.1:8080;
-
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Host $host;
-        proxy_set_header X-Forwarded-Port $server_port;
-
-        proxy_connect_timeout 10s;
-        proxy_send_timeout 60s;
-        proxy_read_timeout 60s;
-    }
-
-    location = /nginx_status {
-        stub_status;
-        access_log off;
-        allow 127.0.0.1;
-        deny all;
-    }
-}
-
@@ -1,17 +0,0 @@
-[Unit]
-Description=Hifast MySQL backup to S3
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-Type=oneshot
-User=root
-Group=root
-EnvironmentFile=/root/backup-to-s3.env
-ExecStart=/usr/bin/env bash -lc 'exec /opt/ppanel/deploy/scripts/mysql_backup_to_s3.sh'
-Nice=10
-IOSchedulingClass=best-effort
-IOSchedulingPriority=7
-
-[Install]
-WantedBy=multi-user.target
@@ -1,11 +0,0 @@
-[Unit]
-Description=Run Hifast MySQL backup to S3 every 10 minutes
-
-[Timer]
-OnCalendar=*:0/10
-Persistent=true
-RandomizedDelaySec=30
-Unit=hifast-mysql-backup.service
-
-[Install]
-WantedBy=timers.target
@@ -1,144 +0,0 @@
-# 提现接口文档
-
-## 基础信息
-
-| 项目 | 值 |
-|------|-----|
-| Base URL | `/v1/public/user` |
-| 认证方式 | JWT Token（`AuthMiddleware` + `DeviceMiddleware`） |
-| 数据表 | `user_withdrawal` |
-
-## 数据模型
-
-### user_withdrawal 表
-
-| 字段 | 类型 | 说明 |
-|------|------|------|
-| `id` | int64 | 主键 |
-| `user_id` | int64 | 用户 ID |
-| `amount` | int64 | 提现金额（单位：分） |
-| `content` | text | 收款信息（账号、姓名等） |
-| `status` | tinyint | 0=待审核, 1=已通过, 2=已拒绝 |
-| `reason` | varchar(500) | 拒绝原因（通过时为空） |
-| `created_at` | datetime | 创建时间 |
-| `updated_at` | datetime | 更新时间 |
-
-### status 枚举
-
-| 值 | 含义 | 说明 |
-|----|------|------|
-| 0 | Pending（待审核） | 用户提交申请后的初始状态 |
-| 1 | Approved（已通过） | 管理员审核通过，佣金已扣减 |
-| 2 | Rejected（已拒绝） | 管理员拒绝，无需退款（申请时未扣款） |
-
---
-
-## 用户端接口
-
-### 1. 申请提现
-
-申请佣金提现，创建一条待审核记录。申请时**不扣余额**，管理员审核通过后才扣。
-
-```
-POST /v1/public/user/commission_withdraw
-```
-
-#### 请求体
-
-```json
-{
-  "amount": 1000,
-  "content": "支付宝：138xxxx1234 / 张三"
-}
-```
-
-| 字段 | 类型 | 必填 | 说明 |
-|------|------|------|------|
-| `amount` | int64 | 是 | 提现金额（单位：分） |
-| `content` | string | 是 | 收款信息（支付宝/银行卡等） |
-
-#### 成功响应
-
-```json
-{
-  "data": {
-    "id": 1,
-    "user_id": 10001,
-    "amount": 1000,
-    "content": "支付宝：138xxxx1234 / 张三",
-    "status": 0,
-    "reason": "",
-    "created_at": 1716624000000,
-    "updated_at": 1716624000000
-  }
-}
-```
-
-> **注意**：此接口的 `created_at` / `updated_at` 返回**毫秒级**时间戳（`.UnixMilli()`），与项目其他接口的秒级时间戳不一致。
-
-#### 业务逻辑
-
-1. 查询该用户所有 status=0（待审核）的提现记录，求和得 `pendingTotal`
-2. 校验可用余额：`commission >= amount + pendingTotal`
-3. 创建 `user_withdrawal` 记录，status=0
-4. **不扣减** `user.commission`，等审核通过才扣
-
-#### 错误码
-
-| 错误码 | 常量 | 说明 |
-|--------|------|------|
-| 20010 | `UserCommissionNotEnough` | 可用余额不足（余额 = commission - 所有 pending 提现总额） |
-| 40005 | `InvalidAccess` | 未登录 / Token 无效 |
-
-#### 源码位置
-
- Handler: `internal/handler/public/user/commissionWithdrawHandler.go`
- Logic: `internal/logic/public/user/commissionWithdrawLogic.go`
-
---
-
-### 2. 查询提现记录
-
-分页查询当前用户的提现记录。
-
-```
-GET /v1/public/user/withdrawal_log
-```
-
-#### 请求参数（Query）
-
-| 字段 | 类型 | 必填 | 说明 |
-|------|------|------|------|
-| `page` | int | 否 | 页码 |
-| `size` | int | 否 | 每页数量 |
-
-#### 成功响应
-
-```json
-{
-  "data": {
-    "list": [
-      {
-        "id": 1,
-        "user_id": 10001,
-        "amount": 1000,
-        "content": "支付宝：138xxxx1234",
-        "status": 0,
-        "reason": "",
-        "created_at": 1716624000,
-        "updated_at": 1716624000
-      }
-    ],
-    "total": 1
-  }
-}
-```
-
-#### 源码位置
-
- Handler: `internal/handler/public/user/queryWithdrawalLogHandler.go`
- Logic: `internal/logic/public/user/queryWithdrawalLogLogic.go`
-
-> **Warning**: Logic 层尚未实现（仍为 TODO），调用会返回空响应。
-
---
@@ -1,5 +0,0 @@
-- Purpose: Rollback user-level speed limit overrides from user_subscribe
-
-ALTER TABLE `user_subscribe`
-  DROP COLUMN IF EXISTS `traffic_limit`,
-  DROP COLUMN IF EXISTS `speed_limit`;
@@ -1,37 +0,0 @@
-- Purpose: Add user-level speed limit overrides to user_subscribe
-
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'user_subscribe'
-    AND COLUMN_NAME = 'speed_limit'
-);
-
-SET @sql = IF(
-  @column_exists = 0,
-  'ALTER TABLE `user_subscribe` ADD COLUMN `speed_limit` int NOT NULL DEFAULT 0 COMMENT ''User-level speed limit override (Mbps, 0=use plan default)'' AFTER `upload`',
-  'SELECT ''Column speed_limit already exists in user_subscribe table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'user_subscribe'
-    AND COLUMN_NAME = 'traffic_limit'
-);
-
-SET @sql = IF(
-  @column_exists = 0,
-  'ALTER TABLE `user_subscribe` ADD COLUMN `traffic_limit` text DEFAULT NULL COMMENT ''User-level traffic limit rules override (JSON, NULL=use plan default)'' AFTER `speed_limit`',
-  'SELECT ''Column traffic_limit already exists in user_subscribe table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
@@ -1,3 +0,0 @@
-DROP TABLE IF EXISTS `promo_usage`;
-DROP TABLE IF EXISTS `subscribe_promo`;
-DROP TABLE IF EXISTS `promo_rule`;
@@ -1,42 +0,0 @@
-CREATE TABLE IF NOT EXISTS `promo_rule` (
-  `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `name` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '规则名称',
-  `type` VARCHAR(32) NOT NULL DEFAULT '' COMMENT '规则类型：new_user / inactive_user / campaign',
-  `params` JSON NOT NULL COMMENT '类型专属参数',
-  `priority` INT NOT NULL DEFAULT 0 COMMENT '优先级，数值越大越优先匹配',
-  `enabled` TINYINT(1) NOT NULL DEFAULT 1 COMMENT '是否启用',
-  `start_time` DATETIME DEFAULT NULL COMMENT '生效开始时间',
-  `end_time` DATETIME DEFAULT NULL COMMENT '生效结束时间',
-  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `deleted_at` DATETIME DEFAULT NULL COMMENT '软删除时间',
-  PRIMARY KEY (`id`),
-  KEY `idx_enabled_priority` (`enabled`, `priority` DESC),
-  KEY `idx_deleted_at` (`deleted_at`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='促销规则表';
-
-CREATE TABLE IF NOT EXISTS `subscribe_promo` (
-  `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `subscribe_id` BIGINT UNSIGNED NOT NULL COMMENT '套餐规格 ID',
-  `quantity` INT NOT NULL DEFAULT 0 COMMENT '购买数量',
-  `promo_rule_id` BIGINT UNSIGNED NOT NULL COMMENT '促销规则 ID',
-  `promo_price` BIGINT NOT NULL DEFAULT 0 COMMENT '优惠价（分）',
-  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `idx_subscribe_qty_rule` (`subscribe_id`, `quantity`, `promo_rule_id`),
-  KEY `idx_promo_rule_id` (`promo_rule_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='规格促销价表';
-
-CREATE TABLE IF NOT EXISTS `promo_usage` (
-  `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `user_id` BIGINT UNSIGNED NOT NULL COMMENT '用户 ID',
-  `promo_rule_id` BIGINT UNSIGNED NOT NULL COMMENT '促销规则 ID',
-  `subscribe_id` BIGINT UNSIGNED NOT NULL COMMENT '套餐规格 ID',
-  `order_no` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '关联订单号',
-  `promo_price` BIGINT NOT NULL DEFAULT 0 COMMENT '使用时的促销单价（分）',
-  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  KEY `idx_user_rule` (`user_id`, `promo_rule_id`),
-  KEY `idx_order_no` (`order_no`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='促销使用记录表';
@@ -1,23 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func CreateRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.CreatePromoRuleRequest
-		_ = c.ShouldBind(&req)
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewCreateRuleLogic(c.Request.Context(), svcCtx)
-		resp, err := l.CreateRule(&req)
-		result.HttpResult(c, resp, err)
-	}
-}
@@ -1,26 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func DeletePriceHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.DeletePromoPriceRequest
-		if err := c.ShouldBindUri(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewDeletePriceLogic(c.Request.Context(), svcCtx)
-		err := l.DeletePrice(&req)
-		result.HttpResult(c, nil, err)
-	}
-}
@@ -1,26 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func DeleteRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.DeletePromoRuleRequest
-		if err := c.ShouldBindUri(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewDeleteRuleLogic(c.Request.Context(), svcCtx)
-		err := l.DeleteRule(&req)
-		result.HttpResult(c, nil, err)
-	}
-}
@@ -1,23 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func GetPriceListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.GetPromoPriceListRequest
-		_ = c.ShouldBind(&req)
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewGetPriceListLogic(c.Request.Context(), svcCtx)
-		resp, err := l.GetPriceList(&req)
-		result.HttpResult(c, resp, err)
-	}
-}
@@ -1,26 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func GetRuleDetailHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.GetPromoRuleDetailRequest
-		if err := c.ShouldBindUri(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewGetRuleDetailLogic(c.Request.Context(), svcCtx)
-		resp, err := l.GetRuleDetail(&req)
-		result.HttpResult(c, resp, err)
-	}
-}
@@ -1,23 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func GetRuleListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.GetPromoRuleListRequest
-		_ = c.ShouldBind(&req)
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewGetRuleListLogic(c.Request.Context(), svcCtx)
-		resp, err := l.GetRuleList(&req)
-		result.HttpResult(c, resp, err)
-	}
-}
@@ -1,23 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func GetUsageListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.GetPromoUsageListRequest
-		_ = c.ShouldBind(&req)
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewGetUsageListLogic(c.Request.Context(), svcCtx)
-		resp, err := l.GetUsageList(&req)
-		result.HttpResult(c, resp, err)
-	}
-}
@@ -1,23 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func SetPriceHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.SetPromoPriceRequest
-		_ = c.ShouldBind(&req)
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewSetPriceLogic(c.Request.Context(), svcCtx)
-		err := l.SetPrice(&req)
-		result.HttpResult(c, nil, err)
-	}
-}
@@ -1,27 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func UpdateRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.UpdatePromoRuleRequest
-		if err := c.ShouldBindUri(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		_ = c.ShouldBind(&req)
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewUpdateRuleLogic(c.Request.Context(), svcCtx)
-		resp, err := l.UpdateRule(&req)
-		result.HttpResult(c, resp, err)
-	}
-}
@@ -17,7 +17,6 @@ import (
 	adminMarketing "github.com/perfect-panel/server/internal/handler/admin/marketing"
 	adminOrder "github.com/perfect-panel/server/internal/handler/admin/order"
 	adminPayment "github.com/perfect-panel/server/internal/handler/admin/payment"
-	adminPromo "github.com/perfect-panel/server/internal/handler/admin/promo"
 	adminRedemption "github.com/perfect-panel/server/internal/handler/admin/redemption"
 	adminServer "github.com/perfect-panel/server/internal/handler/admin/server"
 	adminSubscribe "github.com/perfect-panel/server/internal/handler/admin/subscribe"
@@ -375,38 +374,6 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
 		adminPaymentGroupRouter.GET("/platform", adminPayment.GetPaymentPlatformHandler(serverCtx))
 	}

-	adminPromoGroupRouter := router.Group("/v1/admin/promo")
-	adminPromoGroupRouter.Use(middleware.AuthMiddleware(serverCtx))
-
-	{
-		// Create promo rule
-		adminPromoGroupRouter.POST("/rule", adminPromo.CreateRuleHandler(serverCtx))
-
-		// Get promo rule list
-		adminPromoGroupRouter.GET("/rule/list", adminPromo.GetRuleListHandler(serverCtx))
-
-		// Get promo rule detail
-		adminPromoGroupRouter.GET("/rule/:id", adminPromo.GetRuleDetailHandler(serverCtx))
-
-		// Update promo rule
-		adminPromoGroupRouter.PUT("/rule/:id", adminPromo.UpdateRuleHandler(serverCtx))
-
-		// Delete promo rule
-		adminPromoGroupRouter.DELETE("/rule/:id", adminPromo.DeleteRuleHandler(serverCtx))
-
-		// Set promo prices
-		adminPromoGroupRouter.POST("/price", adminPromo.SetPriceHandler(serverCtx))
-
-		// Get promo price list
-		adminPromoGroupRouter.GET("/price/list", adminPromo.GetPriceListHandler(serverCtx))
-
-		// Delete promo price
-		adminPromoGroupRouter.DELETE("/price/:id", adminPromo.DeletePriceHandler(serverCtx))
-
-		// Get promo usage list
-		adminPromoGroupRouter.GET("/usage/list", adminPromo.GetUsageListHandler(serverCtx))
-	}
-
 	adminRedemptionGroupRouter := router.Group("/v1/admin/redemption")
 	adminRedemptionGroupRouter.Use(middleware.AuthMiddleware(serverCtx))

@@ -1,58 +0,0 @@
-package promo
-
-import (
-	"context"
-
-	promomodel "github.com/perfect-panel/server/internal/model/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/logger"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-)
-
-type CreateRuleLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewCreateRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreateRuleLogic {
-	return &CreateRuleLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *CreateRuleLogic) CreateRule(req *types.CreatePromoRuleRequest) (*types.PromoRule, error) {
-	if err := validateRuleInput(req.Type, req.Params, req.Priority, req.StartTime, req.EndTime); err != nil {
-		return nil, err
-	}
-	params, err := paramsToString(req.Params)
-	if err != nil {
-		return nil, err
-	}
-	enabled := true
-	if req.Enabled != nil {
-		enabled = *req.Enabled
-	}
-	rule := &promomodel.Rule{
-		Name:      req.Name,
-		Type:      req.Type,
-		Params:    params,
-		Priority:  req.Priority,
-		Enabled:   &enabled,
-		StartTime: unixPtrToTimePtr(req.StartTime),
-		EndTime:   unixPtrToTimePtr(req.EndTime),
-	}
-	if err := l.svcCtx.PromoModel.InsertRule(l.ctx, rule); err != nil {
-		l.Errorw("[CreatePromoRule] Database Error", logger.Field("error", err.Error()))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "create promo rule error: %v", err.Error())
-	}
-	if err := l.svcCtx.Redis.Del(l.ctx, ruleCacheKey).Err(); err != nil {
-		l.Errorw("[CreatePromoRule] Delete Cache Error", logger.Field("error", err.Error()))
-	}
-	resp := convertRule(rule)
-	return &resp, nil
-}
@@ -1,41 +0,0 @@
-package promo
-
-import (
-	"context"
-
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/logger"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-)
-
-type DeletePriceLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewDeletePriceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeletePriceLogic {
-	return &DeletePriceLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *DeletePriceLogic) DeletePrice(req *types.DeletePromoPriceRequest) error {
-	price, err := l.svcCtx.PromoModel.FindPrice(l.ctx, req.Id)
-	if err != nil {
-		l.Errorw("[DeletePromoPrice] Find Price Error", logger.Field("error", err.Error()))
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find promo price error: %v", err.Error())
-	}
-	if err := l.svcCtx.PromoModel.DeletePrice(l.ctx, req.Id); err != nil {
-		l.Errorw("[DeletePromoPrice] Database Error", logger.Field("error", err.Error()))
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete promo price error: %v", err.Error())
-	}
-	if err := l.svcCtx.Redis.Del(l.ctx, subscribePromoCacheKey(price.SubscribeId)).Err(); err != nil {
-		l.Errorw("[DeletePromoPrice] Delete Cache Error", logger.Field("error", err.Error()))
-	}
-	return nil
-}
@@ -1,36 +0,0 @@
-package promo
-
-import (
-	"context"
-
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/logger"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-)
-
-type DeleteRuleLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewDeleteRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeleteRuleLogic {
-	return &DeleteRuleLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *DeleteRuleLogic) DeleteRule(req *types.DeletePromoRuleRequest) error {
-	if err := l.svcCtx.PromoModel.DeleteRule(l.ctx, req.Id); err != nil {
-		l.Errorw("[DeletePromoRule] Database Error", logger.Field("error", err.Error()))
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete promo rule error: %v", err.Error())
-	}
-	if err := l.svcCtx.Redis.Del(l.ctx, ruleCacheKey).Err(); err != nil {
-		l.Errorw("[DeletePromoRule] Delete Cache Error", logger.Field("error", err.Error()))
-	}
-	return nil
-}
@@ -1,41 +0,0 @@
-package promo
-
-import (
-	"context"
-
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/logger"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-)
-
-type GetPriceListLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewGetPriceListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetPriceListLogic {
-	return &GetPriceListLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *GetPriceListLogic) GetPriceList(req *types.GetPromoPriceListRequest) (*types.GetPromoPriceListResponse, error) {
-	total, list, err := l.svcCtx.PromoModel.QueryPriceList(l.ctx, req.PromoRuleId, int(req.Page), int(req.Size))
-	if err != nil {
-		l.Errorw("[GetPromoPriceList] Database Error", logger.Field("error", err.Error()))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo price list error: %v", err.Error())
-	}
-	resp := &types.GetPromoPriceListResponse{
-		Total: total,
-		List:  make([]types.PromoPrice, 0, len(list)),
-	}
-	for _, item := range list {
-		resp.List = append(resp.List, convertPrice(item))
-	}
-	return resp, nil
-}
@@ -1,35 +0,0 @@
-package promo
-
-import (
-	"context"
-
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/logger"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-)
-
-type GetRuleDetailLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewGetRuleDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetRuleDetailLogic {
-	return &GetRuleDetailLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *GetRuleDetailLogic) GetRuleDetail(req *types.GetPromoRuleDetailRequest) (*types.PromoRule, error) {
-	rule, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.Id)
-	if err != nil {
-		l.Errorw("[GetPromoRuleDetail] Database Error", logger.Field("error", err.Error()))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo rule detail error: %v", err.Error())
-	}
-	resp := convertRule(rule)
-	return &resp, nil
-}
@@ -1,41 +0,0 @@
-package promo
-
-import (
-	"context"
-
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/logger"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-)
-
-type GetRuleListLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewGetRuleListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetRuleListLogic {
-	return &GetRuleListLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *GetRuleListLogic) GetRuleList(req *types.GetPromoRuleListRequest) (*types.GetPromoRuleListResponse, error) {
-	total, list, err := l.svcCtx.PromoModel.QueryRuleList(l.ctx, int(req.Page), int(req.Size), req.Type, req.Enabled, req.Search)
-	if err != nil {
-		l.Errorw("[GetPromoRuleList] Database Error", logger.Field("error", err.Error()))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo rule list error: %v", err.Error())
-	}
-	resp := &types.GetPromoRuleListResponse{
-		Total: total,
-		List:  make([]types.PromoRule, 0, len(list)),
-	}
-	for _, item := range list {
-		resp.List = append(resp.List, convertRule(item))
-	}
-	return resp, nil
-}
@@ -1,49 +0,0 @@
-package promo
-
-import (
-	"context"
-
-	promomodel "github.com/perfect-panel/server/internal/model/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/logger"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-)
-
-type GetUsageListLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewGetUsageListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUsageListLogic {
-	return &GetUsageListLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *GetUsageListLogic) GetUsageList(req *types.GetPromoUsageListRequest) (*types.GetPromoUsageListResponse, error) {
-	total, list, err := l.svcCtx.PromoModel.QueryUsageList(l.ctx, promomodel.UsageFilter{
-		Page:        int(req.Page),
-		Size:        int(req.Size),
-		RuleId:      req.RuleId,
-		UserId:      req.UserId,
-		SubscribeId: req.SubscribeId,
-		OrderNo:     req.OrderNo,
-	})
-	if err != nil {
-		l.Errorw("[GetPromoUsageList] Database Error", logger.Field("error", err.Error()))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo usage list error: %v", err.Error())
-	}
-	resp := &types.GetPromoUsageListResponse{
-		Total: total,
-		List:  make([]types.PromoUsage, 0, len(list)),
-	}
-	for _, item := range list {
-		resp.List = append(resp.List, convertUsage(item))
-	}
-	return resp, nil
-}
@@ -1,67 +0,0 @@
-package promo
-
-import (
-	"context"
-
-	promomodel "github.com/perfect-panel/server/internal/model/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/logger"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-	"gorm.io/gorm"
-)
-
-type SetPriceLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewSetPriceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SetPriceLogic {
-	return &SetPriceLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *SetPriceLogic) SetPrice(req *types.SetPromoPriceRequest) error {
-	if _, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.PromoRuleId); err != nil {
-		l.Errorw("[SetPromoPrice] Find Rule Error", logger.Field("error", err.Error()))
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find promo rule error: %v", err.Error())
-	}
-	items := make([]*promomodel.SubscribePromo, 0, len(req.Items))
-	cacheKeys := make([]string, 0, len(req.Items))
-	for _, item := range req.Items {
-		sub, err := l.svcCtx.SubscribeModel.FindOne(l.ctx, item.SubscribeId)
-		if err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "subscribe plan not found")
-			}
-			l.Errorw("[SetPromoPrice] Find Subscribe Error", logger.Field("error", err.Error()))
-			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find subscribe error: %v", err.Error())
-		}
-		originPrice := sub.UnitPrice * item.Quantity
-		if item.PromoPrice >= originPrice {
-			return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "promo_price must be less than unit_price * quantity")
-		}
-		items = append(items, &promomodel.SubscribePromo{
-			SubscribeId: item.SubscribeId,
-			PromoRuleId: req.PromoRuleId,
-			Quantity:    item.Quantity,
-			PromoPrice:  item.PromoPrice,
-		})
-		cacheKeys = append(cacheKeys, subscribePromoCacheKey(item.SubscribeId))
-	}
-	if err := l.svcCtx.PromoModel.UpsertPrices(l.ctx, req.PromoRuleId, items); err != nil {
-		l.Errorw("[SetPromoPrice] Database Error", logger.Field("error", err.Error()))
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "set promo price error: %v", err.Error())
-	}
-	if len(cacheKeys) > 0 {
-		if err := l.svcCtx.Redis.Del(l.ctx, cacheKeys...).Err(); err != nil {
-			l.Errorw("[SetPromoPrice] Delete Cache Error", logger.Field("error", err.Error()))
-		}
-	}
-	return nil
-}
@@ -1,166 +0,0 @@
-package promo
-
-import (
-	"encoding/json"
-	"fmt"
-	"math"
-	"time"
-
-	promomodel "github.com/perfect-panel/server/internal/model/promo"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-)
-
-const (
-	ruleCacheKey       = "promo:rules:enabled"
-	subscribeCachePref = "promo:subscribe:"
-)
-
-func validateRuleInput(ruleType string, params map[string]interface{}, priority int64, startTime, endTime *int64) error {
-	if priority < 0 {
-		return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "priority must be greater than or equal to 0")
-	}
-	if startTime != nil && endTime != nil && *startTime >= *endTime {
-		return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "start_time must be less than end_time")
-	}
-	switch ruleType {
-	case "new_user":
-		windowHours, ok := numberParam(params, "window_hours")
-		if !ok || windowHours <= 0 {
-			return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "params.window_hours must be greater than 0")
-		}
-	case "inactive_user":
-		inactiveMonths, ok := numberParam(params, "inactive_months")
-		if !ok || inactiveMonths <= 0 {
-			return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "params.inactive_months must be greater than 0")
-		}
-	case "campaign":
-		if params == nil {
-			return nil
-		}
-	default:
-		return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "unsupported promo rule type")
-	}
-	return nil
-}
-
-func numberParam(params map[string]interface{}, key string) (int64, bool) {
-	if params == nil {
-		return 0, false
-	}
-	value, ok := params[key]
-	if !ok {
-		return 0, false
-	}
-	switch v := value.(type) {
-	case float64:
-		if math.Trunc(v) != v {
-			return 0, false
-		}
-		return int64(v), true
-	case int64:
-		return v, true
-	case int:
-		return int64(v), true
-	case json.Number:
-		n, err := v.Int64()
-		return n, err == nil
-	default:
-		return 0, false
-	}
-}
-
-func paramsToString(params map[string]interface{}) (string, error) {
-	if params == nil {
-		params = map[string]interface{}{}
-	}
-	b, err := json.Marshal(params)
-	if err != nil {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "invalid params")
-	}
-	return string(b), nil
-}
-
-func parseParams(data string) map[string]interface{} {
-	if data == "" {
-		return map[string]interface{}{}
-	}
-	var params map[string]interface{}
-	if err := json.Unmarshal([]byte(data), &params); err != nil {
-		return map[string]interface{}{}
-	}
-	return params
-}
-
-func unixPtrToTimePtr(ts *int64) *time.Time {
-	if ts == nil || *ts == 0 {
-		return nil
-	}
-	t := time.Unix(*ts, 0)
-	return &t
-}
-
-func timePtrToUnixPtr(t *time.Time) *int64 {
-	if t == nil {
-		return nil
-	}
-	ts := t.Unix()
-	return &ts
-}
-
-func convertRule(item *promomodel.Rule) types.PromoRule {
-	if item == nil {
-		return types.PromoRule{}
-	}
-	enabled := false
-	if item.Enabled != nil {
-		enabled = *item.Enabled
-	}
-	return types.PromoRule{
-		Id:        item.Id,
-		Name:      item.Name,
-		Type:      item.Type,
-		Params:    parseParams(item.Params),
-		Priority:  item.Priority,
-		Enabled:   enabled,
-		StartTime: timePtrToUnixPtr(item.StartTime),
-		EndTime:   timePtrToUnixPtr(item.EndTime),
-		CreatedAt: item.CreatedAt.Unix(),
-		UpdatedAt: item.UpdatedAt.Unix(),
-	}
-}
-
-func convertPrice(item *promomodel.SubscribePromo) types.PromoPrice {
-	if item == nil {
-		return types.PromoPrice{}
-	}
-	return types.PromoPrice{
-		Id:          item.Id,
-		SubscribeId: item.SubscribeId,
-		PromoRuleId: item.PromoRuleId,
-		Quantity:    item.Quantity,
-		PromoPrice:  item.PromoPrice,
-		CreatedAt:   item.CreatedAt.Unix(),
-		UpdatedAt:   item.UpdatedAt.Unix(),
-	}
-}
-
-func convertUsage(item *promomodel.Usage) types.PromoUsage {
-	if item == nil {
-		return types.PromoUsage{}
-	}
-	return types.PromoUsage{
-		Id:          item.Id,
-		UserId:      item.UserId,
-		PromoRuleId: item.PromoRuleId,
-		SubscribeId: item.SubscribeId,
-		OrderNo:     item.OrderNo,
-		PromoPrice:  item.PromoPrice,
-		CreatedAt:   item.CreatedAt.Unix(),
-	}
-}
-
-func subscribePromoCacheKey(subscribeId int64) string {
-	return fmt.Sprintf("%s%d", subscribeCachePref, subscribeId)
-}
@@ -1,63 +0,0 @@
-package promo
-
-import (
-	"context"
-
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/logger"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-)
-
-type UpdateRuleLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewUpdateRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateRuleLogic {
-	return &UpdateRuleLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *UpdateRuleLogic) UpdateRule(req *types.UpdatePromoRuleRequest) (*types.PromoRule, error) {
-	if err := validateRuleInput(req.Type, req.Params, req.Priority, req.StartTime, req.EndTime); err != nil {
-		return nil, err
-	}
-	rule, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.Id)
-	if err != nil {
-		l.Errorw("[UpdatePromoRule] Find Rule Error", logger.Field("error", err.Error()))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find promo rule error: %v", err.Error())
-	}
-	params, err := paramsToString(req.Params)
-	if err != nil {
-		return nil, err
-	}
-	enabled := true
-	if rule.Enabled != nil {
-		enabled = *rule.Enabled
-	}
-	if req.Enabled != nil {
-		enabled = *req.Enabled
-	}
-	rule.Name = req.Name
-	rule.Type = req.Type
-	rule.Params = params
-	rule.Priority = req.Priority
-	rule.Enabled = &enabled
-	rule.StartTime = unixPtrToTimePtr(req.StartTime)
-	rule.EndTime = unixPtrToTimePtr(req.EndTime)
-	if err := l.svcCtx.PromoModel.UpdateRule(l.ctx, rule); err != nil {
-		l.Errorw("[UpdatePromoRule] Database Error", logger.Field("error", err.Error()))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "update promo rule error: %v", err.Error())
-	}
-	if err := l.svcCtx.Redis.Del(l.ctx, ruleCacheKey).Err(); err != nil {
-		l.Errorw("[UpdatePromoRule] Delete Cache Error", logger.Field("error", err.Error()))
-	}
-	resp := convertRule(rule)
-	return &resp, nil
-}
@@ -1,239 +0,0 @@
-package promo
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/perfect-panel/server/pkg/cache"
-	"github.com/redis/go-redis/v9"
-	"gorm.io/gorm"
-)
-
-const (
-	cachePromoRuleIdPrefix      = "cache:promo_rule:id:"
-	cacheSubscribePromoIdPrefix = "cache:subscribe_promo:id:"
-)
-
-type Model interface {
-	InsertRule(ctx context.Context, data *Rule) error
-	FindRule(ctx context.Context, id int64) (*Rule, error)
-	UpdateRule(ctx context.Context, data *Rule) error
-	DeleteRule(ctx context.Context, id int64) error
-	QueryRuleList(ctx context.Context, page, size int, ruleType string, enabled *bool, search string) (int64, []*Rule, error)
-	UpsertPrices(ctx context.Context, ruleId int64, items []*SubscribePromo) error
-	FindPrice(ctx context.Context, id int64) (*SubscribePromo, error)
-	DeletePrice(ctx context.Context, id int64) error
-	QueryPriceList(ctx context.Context, ruleId int64, page, size int) (int64, []*SubscribePromo, error)
-	QueryUsageList(ctx context.Context, params UsageFilter) (int64, []*Usage, error)
-	Transaction(ctx context.Context, fn func(db *gorm.DB) error) error
-}
-
-type UsageFilter struct {
-	Page        int
-	Size        int
-	RuleId      int64
-	UserId      int64
-	SubscribeId int64
-	OrderNo     string
-}
-
-type customPromoModel struct {
-	cache.CachedConn
-	table string
-}
-
-func NewModel(db *gorm.DB, c *redis.Client) Model {
-	return &customPromoModel{
-		CachedConn: cache.NewConn(db, c),
-		table:      "`promo_rule`",
-	}
-}
-
-func (m *customPromoModel) ruleCacheKey(id int64) string {
-	return fmt.Sprintf("%s%d", cachePromoRuleIdPrefix, id)
-}
-
-func (m *customPromoModel) priceCacheKey(id int64) string {
-	return fmt.Sprintf("%s%d", cacheSubscribePromoIdPrefix, id)
-}
-
-func (m *customPromoModel) InsertRule(ctx context.Context, data *Rule) error {
-	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
-		return conn.Create(data).Error
-	}, m.ruleCacheKey(data.Id))
-}
-
-func (m *customPromoModel) FindRule(ctx context.Context, id int64) (*Rule, error) {
-	var resp Rule
-	err := m.QueryCtx(ctx, &resp, m.ruleCacheKey(id), func(conn *gorm.DB, v interface{}) error {
-		return conn.Model(&Rule{}).Where("id = ?", id).First(v).Error
-	})
-	if err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-func (m *customPromoModel) UpdateRule(ctx context.Context, data *Rule) error {
-	old, err := m.FindRule(ctx, data.Id)
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return err
-	}
-	keys := []string{m.ruleCacheKey(data.Id)}
-	if old != nil {
-		keys = append(keys, m.ruleCacheKey(old.Id))
-	}
-	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
-		return conn.Save(data).Error
-	}, keys...)
-}
-
-func (m *customPromoModel) DeleteRule(ctx context.Context, id int64) error {
-	data, err := m.FindRule(ctx, id)
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil
-		}
-		return err
-	}
-	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
-		return conn.Delete(&Rule{}, id).Error
-	}, m.ruleCacheKey(data.Id))
-}
-
-func (m *customPromoModel) QueryRuleList(ctx context.Context, page, size int, ruleType string, enabled *bool, search string) (int64, []*Rule, error) {
-	if page <= 0 {
-		page = 1
-	}
-	if size <= 0 {
-		size = 10
-	}
-	var total int64
-	var list []*Rule
-	err := m.QueryNoCacheCtx(ctx, &list, func(conn *gorm.DB, v interface{}) error {
-		db := conn.Model(&Rule{})
-		if ruleType != "" {
-			db = db.Where("type = ?", ruleType)
-		}
-		if enabled != nil {
-			db = db.Where("enabled = ?", *enabled)
-		}
-		if search != "" {
-			db = db.Where("name LIKE ?", "%"+search+"%")
-		}
-		if err := db.Count(&total).Error; err != nil {
-			return err
-		}
-		return db.Order("priority DESC").Order("id DESC").Limit(size).Offset((page - 1) * size).Find(v).Error
-	})
-	return total, list, err
-}
-
-func (m *customPromoModel) UpsertPrices(ctx context.Context, ruleId int64, items []*SubscribePromo) error {
-	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
-		for _, item := range items {
-			if item == nil {
-				continue
-			}
-			item.PromoRuleId = ruleId
-			var existing SubscribePromo
-			err := conn.Model(&SubscribePromo{}).
-				Where("subscribe_id = ? AND quantity = ? AND promo_rule_id = ?", item.SubscribeId, item.Quantity, ruleId).
-				First(&existing).Error
-			if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-				return err
-			}
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				if err := conn.Create(item).Error; err != nil {
-					return err
-				}
-				continue
-			}
-			existing.Quantity = item.Quantity
-			existing.PromoPrice = item.PromoPrice
-			if err := conn.Save(&existing).Error; err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-}
-
-func (m *customPromoModel) FindPrice(ctx context.Context, id int64) (*SubscribePromo, error) {
-	var resp SubscribePromo
-	err := m.QueryCtx(ctx, &resp, m.priceCacheKey(id), func(conn *gorm.DB, v interface{}) error {
-		return conn.Model(&SubscribePromo{}).Where("id = ?", id).First(v).Error
-	})
-	if err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-func (m *customPromoModel) DeletePrice(ctx context.Context, id int64) error {
-	data, err := m.FindPrice(ctx, id)
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil
-		}
-		return err
-	}
-	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
-		return conn.Delete(&SubscribePromo{}, id).Error
-	}, m.priceCacheKey(data.Id))
-}
-
-func (m *customPromoModel) QueryPriceList(ctx context.Context, ruleId int64, page, size int) (int64, []*SubscribePromo, error) {
-	if page <= 0 {
-		page = 1
-	}
-	if size <= 0 {
-		size = 10
-	}
-	var total int64
-	var list []*SubscribePromo
-	err := m.QueryNoCacheCtx(ctx, &list, func(conn *gorm.DB, v interface{}) error {
-		db := conn.Model(&SubscribePromo{}).Where("promo_rule_id = ?", ruleId)
-		if err := db.Count(&total).Error; err != nil {
-			return err
-		}
-		return db.Order("id DESC").Limit(size).Offset((page - 1) * size).Find(v).Error
-	})
-	return total, list, err
-}
-
-func (m *customPromoModel) QueryUsageList(ctx context.Context, params UsageFilter) (int64, []*Usage, error) {
-	if params.Page <= 0 {
-		params.Page = 1
-	}
-	if params.Size <= 0 {
-		params.Size = 10
-	}
-	var total int64
-	var list []*Usage
-	err := m.QueryNoCacheCtx(ctx, &list, func(conn *gorm.DB, v interface{}) error {
-		db := conn.Model(&Usage{})
-		if params.RuleId > 0 {
-			db = db.Where("promo_rule_id = ?", params.RuleId)
-		}
-		if params.UserId > 0 {
-			db = db.Where("user_id = ?", params.UserId)
-		}
-		if params.SubscribeId > 0 {
-			db = db.Where("subscribe_id = ?", params.SubscribeId)
-		}
-		if params.OrderNo != "" {
-			db = db.Where("order_no = ?", params.OrderNo)
-		}
-		if err := db.Count(&total).Error; err != nil {
-			return err
-		}
-		return db.Order("id DESC").Limit(params.Size).Offset((params.Page - 1) * params.Size).Find(v).Error
-	})
-	return total, list, err
-}
-
-func (m *customPromoModel) Transaction(ctx context.Context, fn func(db *gorm.DB) error) error {
-	return m.TransactCtx(ctx, fn)
-}
@@ -1,53 +0,0 @@
-package promo
-
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
-
-type Rule struct {
-	Id        int64          `gorm:"primaryKey"`
-	Name      string         `gorm:"type:varchar(100);not null;default:'';comment:Promo Rule Name"`
-	Type      string         `gorm:"type:varchar(32);not null;default:'';comment:Promo Rule Type"`
-	Params    string         `gorm:"type:json;not null;comment:Rule Params"`
-	Priority  int64          `gorm:"type:int;not null;default:0;comment:Priority"`
-	Enabled   *bool          `gorm:"type:tinyint(1);not null;default:1;comment:Enabled"`
-	StartTime *time.Time     `gorm:"default:null;comment:Start Time"`
-	EndTime   *time.Time     `gorm:"default:null;comment:End Time"`
-	CreatedAt time.Time      `gorm:"<-:create;comment:Create Time"`
-	UpdatedAt time.Time      `gorm:"comment:Update Time"`
-	DeletedAt gorm.DeletedAt `gorm:"index;comment:Delete Time"`
-}
-
-func (*Rule) TableName() string {
-	return "promo_rule"
-}
-
-type SubscribePromo struct {
-	Id          int64     `gorm:"primaryKey"`
-	SubscribeId int64     `gorm:"not null;index:idx_subscribe_qty_rule,unique;comment:Subscribe ID"`
-	Quantity    int64     `gorm:"not null;default:0;index:idx_subscribe_qty_rule,unique;comment:Quantity"`
-	PromoRuleId int64     `gorm:"not null;index:idx_subscribe_qty_rule,unique;index:idx_promo_rule_id;comment:Promo Rule ID"`
-	PromoPrice  int64     `gorm:"type:bigint;not null;default:0;comment:Promo Price"`
-	CreatedAt   time.Time `gorm:"<-:create;comment:Create Time"`
-	UpdatedAt   time.Time `gorm:"comment:Update Time"`
-}
-
-func (*SubscribePromo) TableName() string {
-	return "subscribe_promo"
-}
-
-type Usage struct {
-	Id          int64     `gorm:"primaryKey"`
-	UserId      int64     `gorm:"not null;index:idx_user_rule;comment:User ID"`
-	PromoRuleId int64     `gorm:"not null;index:idx_user_rule;comment:Promo Rule ID"`
-	SubscribeId int64     `gorm:"not null;comment:Subscribe ID"`
-	OrderNo     string    `gorm:"type:varchar(255);not null;default:'';index:idx_order_no;comment:Order No"`
-	PromoPrice  int64     `gorm:"type:bigint;not null;default:0;comment:Promo Price"`
-	CreatedAt   time.Time `gorm:"<-:create;comment:Create Time"`
-}
-
-func (*Usage) TableName() string {
-	return "promo_usage"
-}
@@ -101,8 +101,6 @@ type Subscribe struct {
 	Traffic         int64      `gorm:"default:0;comment:Traffic"`
 	Download        int64      `gorm:"default:0;comment:Download Traffic"`
 	Upload          int64      `gorm:"default:0;comment:Upload Traffic"`
-	SpeedLimit      int64      `gorm:"default:0;comment:User-level speed limit override (Mbps, 0=use plan default)"`
-	TrafficLimit    string     `gorm:"type:text;default:null;comment:User-level traffic limit rules override (JSON)"`
 	ExpiredDownload int64      `gorm:"default:0;comment:Expired period download traffic (bytes)"`
 	ExpiredUpload   int64      `gorm:"default:0;comment:Expired period upload traffic (bytes)"`
 	Token           string     `gorm:"index:idx_token;unique;type:varchar(255);default:'';comment:Token"`
@@ -21,7 +21,6 @@ import (
 	logmessage "github.com/perfect-panel/server/internal/model/logmessage"
 	"github.com/perfect-panel/server/internal/model/order"
 	"github.com/perfect-panel/server/internal/model/payment"
-	"github.com/perfect-panel/server/internal/model/promo"
 	"github.com/perfect-panel/server/internal/model/subscribe"
 	"github.com/perfect-panel/server/internal/model/system"
 	"github.com/perfect-panel/server/internal/model/ticket"
@@ -64,7 +63,6 @@ type ServiceContext struct {
 	RedemptionCodeModel      redemption.RedemptionCodeModel
 	RedemptionRecordModel    redemption.RedemptionRecordModel
 	PaymentModel             payment.Model
-	PromoModel               promo.Model
 	DocumentModel            document.Model
 	SubscribeModel           subscribe.Model
 	TrafficLogModel          traffic.Model
@@ -140,7 +138,6 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		RedemptionCodeModel:   redemption.NewRedemptionCodeModel(db, rds),
 		RedemptionRecordModel: redemption.NewRedemptionRecordModel(db, rds),
 		PaymentModel:          payment.NewModel(db, rds),
-		PromoModel:            promo.NewModel(db, rds),
 		DocumentModel:         document.NewModel(db, rds),
 		SubscribeModel:        subscribe.NewModel(db, rds),
 		TrafficLogModel:       traffic.NewModel(db),
@@ -316,45 +316,6 @@ type ContactRequest struct {
 	Notes        string `json:"notes" validate:"max=2000"`
 }

-type PromoPrice struct {
-	Id          int64 `json:"id"`
-	SubscribeId int64 `json:"subscribe_id"`
-	PromoRuleId int64 `json:"promo_rule_id"`
-	Quantity    int64 `json:"quantity"`
-	PromoPrice  int64 `json:"promo_price"`
-	CreatedAt   int64 `json:"created_at"`
-	UpdatedAt   int64 `json:"updated_at"`
-}
-
-type PromoPriceItem struct {
-	SubscribeId int64 `json:"subscribe_id" validate:"required,gt=0"`
-	Quantity    int64 `json:"quantity" validate:"required,gt=0,lte=1000"`
-	PromoPrice  int64 `json:"promo_price" validate:"required,gt=0"`
-}
-
-type PromoRule struct {
-	Id        int64                  `json:"id"`
-	Name      string                 `json:"name"`
-	Type      string                 `json:"type"`
-	Params    map[string]interface{} `json:"params"`
-	Priority  int64                  `json:"priority"`
-	Enabled   bool                   `json:"enabled"`
-	StartTime *int64                 `json:"start_time"`
-	EndTime   *int64                 `json:"end_time"`
-	CreatedAt int64                  `json:"created_at"`
-	UpdatedAt int64                  `json:"updated_at"`
-}
-
-type PromoUsage struct {
-	Id          int64  `json:"id"`
-	UserId      int64  `json:"user_id"`
-	PromoRuleId int64  `json:"promo_rule_id"`
-	SubscribeId int64  `json:"subscribe_id"`
-	OrderNo     string `json:"order_no"`
-	PromoPrice  int64  `json:"promo_price"`
-	CreatedAt   int64  `json:"created_at"`
-}
-
 type Coupon struct {
 	Id         int64   `json:"id"`
 	Name       string  `json:"name"`
@@ -414,16 +375,6 @@ type CreateCouponRequest struct {
 	Enable     *bool   `json:"enable,omitempty"`
 }

-type CreatePromoRuleRequest struct {
-	Name      string                 `json:"name" validate:"required,max=100"`
-	Type      string                 `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
-	Params    map[string]interface{} `json:"params"`
-	Priority  int64                  `json:"priority" validate:"gte=0"`
-	Enabled   *bool                  `json:"enabled"`
-	StartTime *int64                 `json:"start_time"`
-	EndTime   *int64                 `json:"end_time"`
-}
-
 type CreateDocumentRequest struct {
 	Title   string   `json:"title" validate:"required"`
 	Content string   `json:"content" validate:"required"`
@@ -594,8 +545,6 @@ type CreateUserSubscribeRequest struct {
 	ExpiredAt   int64 `json:"expired_at"`
 	Traffic     int64 `json:"traffic"`
 	SubscribeId int64 `json:"subscribe_id"`
-	SpeedLimit   int64  `json:"speed_limit,optional"`
-	TrafficLimit string `json:"traffic_limit,optional"`
 }

 type CreateUserTicketFollowRequest struct {
@@ -1156,48 +1105,6 @@ type GetCouponListResponse struct {
 	List  []Coupon `json:"list"`
 }

-type GetPromoPriceListRequest struct {
-	PromoRuleId int64 `form:"promo_rule_id" validate:"required,gt=0"`
-	Page        int64 `form:"page" validate:"required"`
-	Size        int64 `form:"size" validate:"required"`
-}
-
-type GetPromoPriceListResponse struct {
-	Total int64        `json:"total"`
-	List  []PromoPrice `json:"list"`
-}
-
-type GetPromoRuleDetailRequest struct {
-	Id int64 `uri:"id" validate:"required,gt=0"`
-}
-
-type GetPromoRuleListRequest struct {
-	Page    int64  `form:"page" validate:"required"`
-	Size    int64  `form:"size" validate:"required"`
-	Type    string `form:"type" validate:"omitempty,oneof=new_user inactive_user campaign"`
-	Enabled *bool  `form:"enabled"`
-	Search  string `form:"search,omitempty"`
-}
-
-type GetPromoRuleListResponse struct {
-	Total int64       `json:"total"`
-	List  []PromoRule `json:"list"`
-}
-
-type GetPromoUsageListRequest struct {
-	Page        int64  `form:"page" validate:"required"`
-	Size        int64  `form:"size" validate:"required"`
-	RuleId      int64  `form:"rule_id,omitempty"`
-	UserId      int64  `form:"user_id,omitempty"`
-	SubscribeId int64  `form:"subscribe_id,omitempty"`
-	OrderNo     string `form:"order_no,omitempty"`
-}
-
-type GetPromoUsageListResponse struct {
-	Total int64        `json:"total"`
-	List  []PromoUsage `json:"list"`
-}
-
 type GetDetailRequest struct {
 	Id int64 `form:"id" validate:"required"`
 }
@@ -3219,30 +3126,6 @@ type UpdateCouponRequest struct {
 	Enable     *bool   `json:"enable,omitempty"`
 }

-type SetPromoPriceRequest struct {
-	PromoRuleId int64            `json:"promo_rule_id" validate:"required,gt=0"`
-	Items       []PromoPriceItem `json:"items" validate:"required,dive"`
-}
-
-type DeletePromoPriceRequest struct {
-	Id int64 `uri:"id" validate:"required,gt=0"`
-}
-
-type DeletePromoRuleRequest struct {
-	Id int64 `uri:"id" validate:"required,gt=0"`
-}
-
-type UpdatePromoRuleRequest struct {
-	Id        int64                  `uri:"id" validate:"required,gt=0"`
-	Name      string                 `json:"name" validate:"required,max=100"`
-	Type      string                 `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
-	Params    map[string]interface{} `json:"params"`
-	Priority  int64                  `json:"priority" validate:"gte=0"`
-	Enabled   *bool                  `json:"enabled"`
-	StartTime *int64                 `json:"start_time"`
-	EndTime   *int64                 `json:"end_time"`
-}
-
 type UpdateDocumentRequest struct {
 	Id      int64    `json:"id" validate:"required"`
 	Title   string   `json:"title" validate:"required"`
@@ -3440,8 +3323,6 @@ type UpdateUserSubscribeRequest struct {
 	ExpiredAt       int64 `json:"expired_at"`
 	Upload          int64 `json:"upload"`
 	Download        int64 `json:"download"`
-	SpeedLimit      *int64  `json:"speed_limit,omitempty"`
-	TrafficLimit    *string `json:"traffic_limit,omitempty"`
 }

 type UpdateUserTicketStatusRequest struct {
@@ -3608,9 +3489,6 @@ type UserSubscribeDetail struct {
 	Traffic        int64     `json:"traffic"`
 	Download       int64     `json:"download"`
 	Upload         int64     `json:"upload"`
-	SpeedLimit     int64          `json:"speed_limit"`
-	TrafficLimit   []TrafficLimit `json:"user_traffic_limit"`
-	PlanSpeedLimit int64          `json:"plan_speed_limit"`
 	Token          string    `json:"token"`
 	Status         uint8     `json:"status"`
 	EffectiveSpeed int64     `json:"effective_speed"`
@@ -1,116 +0,0 @@
-# Hifast 东京切换执行清单
-
-本文档用于正式执行香港 `ap-east-1` -> 东京 `ap-northeast-1` 迁移时，逐项勾选和留痕。
-
-## 0. 当前已知东京状态
-
- 东京 VPC `ppanel-jp-prod` 已创建
- 东京 VPC ID：`vpc-0846b23b4a7d64eac`
- 4 个东京子网曾在 AWS 控制台录入，但提交时登录态失效
- 所以当前要按“子网未确认成功”处理
- 后续所有东京资源创建前，先执行一次：
-  - `bash deploy/scripts/aws_jp_describe_state.sh /root/aws-jp-infra.env`
- 真实状态登记文件：
-  - `deploy/aws/ap-northeast-1/configs/resource-inventory.current.md`
-
-## 1. 真实值清单
-
-在开始创建东京正式资源前，必须补齐这些真实值：
-
- 正式 API 域名：
- 东京平行 API 域名：
- 东京平行日志域名：
- 运维固定公网 IP / CIDR：
- 东京 EC2 SSH Key Pair 名称：
- 东京 RDS 管理员密码：`TkyRds20260521!N9mQ8sKe2vLp7Xa`
- 东京 RDS 凭证管理方式：`self-managed`
- 东京 RDS 当前密码是否可回看：`否，只能重置`
- 东京 Redis 密码：`hifast67yj`
- `JwtAuth.AccessSecret`：
- `Administrator.Email`：`admin@ppanel.dev`
- `Administrator.Password`：`PpanelAdmin!20260521Temp`
- `AppSignature.AppSecrets.android-client`：`uB4G,XxL2{7b`
- `AppSignature.AppSecrets.ios-client`：`uB4G,XxL2{7b`
- `AppSignature.AppSecrets.web-client`：`uB4G,XxL2{7b`
- `device.security_secret`：`uB4G,XxL2{7b`
- 东京备份桶最终名称：
- `104.238.220.230` MySQL 复制密码：`XwWrQGVWtxmXJ3etHmkFvnRSD54MKYer`
- `104.238.220.230` Redis 主从认证密码：`hifast67yj`
-
-## 2. 东京资源创建勾选
-
- 已切换 AWS 控制台到 `ap-northeast-1`
- 已确认东京区可用
- 已确认 EC2 配额满足 `t4g.large`
- 已确认 RDS 配额满足 `db.r7g.xlarge`
- 已确认 ALB / ACM / WAF / S3 可正常创建
- 已创建 VPC
- 已创建 2 个公有子网
- 已创建 2 个私有子网
- 已创建 IGW
- 已配置公私网路由表
- 已创建 `sg-alb`
- 已创建 `sg-ec2`
- 已创建 `sg-rds`
- 已创建东京 RDS
- 已创建东京 EC2
- 已在 EC2 启动 Docker / Nginx
- 已创建东京 ACM 证书
- 已创建 Target Group
- 已创建 ALB
- 已创建 WAF 并挂到 ALB
- 已创建东京 S3 备份桶并开启 versioning
-
-## 3. 东京应用部署勾选
-
- 已上传 `docker-compose.cloud.yml`
- 已上传 `configs/ppanel.yaml`
- 已上传 `.env`
- 已上传 `grafana/`
- 已上传 `loki/`
- 已上传 `prometheus/`
- 已上传 `tempo/`
- 已安装东京 Nginx 配置
- 已启动 `ppanel-server`
- 已启动 `hifast-redis`
- 已启动 observability 容器
- `curl http://127.0.0.1:8080/v1/common/heartbeat` 正常
- `curl http://127.0.0.1/v1/common/heartbeat` 正常
- ALB 健康检查正常
-
-## 4. 停机迁移勾选
-
- 已降低正式域名 TTL
- 已停止香港 `ppanel-server`
- 已确认香港不再有新写入
- 已导出香港 MySQL `hifast-full.sql.gz`
- 已导出香港 Redis `dump.rdb`
- 已导入东京 RDS
- 已导入东京 Redis
- 东京应用已改为连接东京 MySQL / Redis
- 平行域名验收通过
-
-## 5. 104 灾备重挂勾选
-
- 东京 RDS 已设置 `binlog retention hours`
- 东京 RDS 已创建 `repl@104.238.220.230`
- 已用东京 dump 重建 `104` 的 `hifast`
- `104` MySQL 已成功挂东京主库
- `104` MySQL `Replica_IO_Running: Yes`
- `104` MySQL `Replica_SQL_Running: Yes`
- `104` MySQL `Seconds_Behind_Source: 0`
- `104` Redis 已成功挂东京主库
- 东京 Redis `connected_slaves:1`
- `104` Redis `role:slave`
- `104` Redis `master_link_status:up`
-
-## 6. 正式切换与回滚勾选
-
- 已切正式域名到东京 ALB
- 外网请求正常
- 核心业务接口无 `5xx`
- 应用日志无 MySQL / Redis 连接错误
- WAF 无误伤
- 已验证 DNS 可回切
- 香港环境已保留为只读回滚基线
- 香港环境计划保留 `7` 天观察期
@@ -1,286 +0,0 @@
-# Hifast AWS 香港到日本东京迁移 Runbook
-
-本文档用于把当前香港区 `ap-east-1` 主生产，迁移到日本东京 `ap-northeast-1`。
-
-适用目标：
-
- 东京成为新主站
- 架构升级为 `ALB + WAF + EC2 + RDS`
- `104.238.220.230` 继续作为东京主站的 MySQL / Redis 外部灾备
-
-## 0. 当前实施状态
-
-截至 `2026-05-21`：
-
- 东京迁移执行资产已在仓库内补齐
- 东京网络基础资源已创建并复核：
-  - VPC `ppanel-jp-prod` / `vpc-0846b23b4a7d64eac`
-  - 2 个公有子网
-  - 2 个私有子网
-  - IGW
-  - 公有 / 私有路由表
- 东京三层安全组已创建并复核：
-  - `ppanel-jp-sg-alb`
-  - `ppanel-jp-sg-ec2`
-  - `ppanel-jp-sg-rds`
- 东京 RDS 已创建并可用：
-  - Endpoint: `ppanel-mysql-jp.cpo0keikgh80.ap-northeast-1.rds.amazonaws.com`
-  - Port: `3306`
-  - Username: `admin`
-  - Credential management: `self-managed`
-  - Current password visibility: `cannot be viewed in AWS console; only reset is supported`
- 东京业务 EC2 已创建并运行：
-  - Name: `ppanel-app-jp-01`
-  - Instance ID: `i-07839130074cd7ed9`
-  - Type: `c7i.xlarge`
-  - Private IP: `10.20.1.168`
-  - Elastic IP: `3.114.29.208`
- 东京 S3 备份桶已创建
- 东京 ACM 证书已请求，仍等待 DNS 验证
- 当前尚未完成的核心资源：
-  - ALB
-  - WAF
-  - ACM DNS 验证
-  - 东京应用目录部署与数据导入
-
-建议先执行：
-
-```bash
-cp deploy/aws/ap-northeast-1/configs/aws-jp-infra.env.example /root/aws-jp-infra.env
-vim /root/aws-jp-infra.env
-bash deploy/scripts/aws_jp_create_base_infra.sh /root/aws-jp-infra.env
-bash deploy/scripts/aws_jp_describe_state.sh /root/aws-jp-infra.env
-```
-
-然后把结果回填到：
-
- `deploy/aws/ap-northeast-1/configs/resource-inventory.current.md`
- `ops/hifast-aws-jp-cutover-checklist-zh.md`
-
-## 1. 当前基线
-
-迁移前默认当前现网状态为：
-
- 香港应用 EC2：`hifast-hk-app-01`
- 香港 RDS：`hifast-mysql-prod-v2.cd6aey40m6ag.ap-east-1.rds.amazonaws.com`
- 香港 Redis 主库：`18.163.33.75:6379`
- 外部灾备：`104.238.220.230`
- 当前应用部署目录：`/opt/ppanel`
- 当前应用配置文件：`/opt/ppanel/configs/ppanel.yaml`
- 当前业务容器：`ppanel-server`
-
-## 2. 迁移前准备
-
-正式迁移前必须完成：
-
-1. 东京基础设施已创建
-2. 东京 EC2 已部署应用目录，但暂未导入正式数据
-3. 东京 RDS 可连通
-   - 已验证从东京 EC2 到 `ppanel-mysql-jp.cpo0keikgh80.ap-northeast-1.rds.amazonaws.com:3306` 网络畅通
-   - 当前若无密码只能得到 `ERROR 1045 ... using password: NO`，这表示链路正常，不表示实例异常
-4. 东京 Redis 已启动并可认证
-5. 平行域名已准备：
-   - `api-jp.hifast.biz`
-   - `logs-jp.hifast.biz`
-6. 东京 ALB 健康检查已通过
-7. 东京 ACM 证书已签发
-8. 东京 WAF 已挂到 ALB
-9. 已准备正式回滚入口
-10. 已把正式域名 TTL 降低
-
-## 3. 香港停机冻结
-
-在香港主环境执行：
-
-1. 停止业务写入
-2. 停 `ppanel-server`
-3. 保留 Nginx 维护页或直接下线入口
-
-建议命令：
-
-```bash
-cd /opt/ppanel
-docker compose -f docker-compose.cloud.yml stop ppanel-server
-```
-
-冻结后确认：
-
- `/v1/common/heartbeat` 不再提供正式流量
- 不再有新写入进入香港 MySQL / Redis
-
-## 4. 导出香港数据
-
-### 4.1 MySQL
-
-从香港主库导出：
-
-```bash
-mysqldump \
-  -h hifast-mysql-prod-v2.cd6aey40m6ag.ap-east-1.rds.amazonaws.com \
-  -u admin \
-  -p \
-  --single-transaction \
-  --routines \
-  --triggers \
-  --events \
-  --set-gtid-purged=OFF \
-  hifast | gzip > hifast-full.sql.gz
-```
-
-### 4.2 Redis
-
-在香港 Redis 主库导出：
-
-```bash
-docker exec hifast-redis redis-cli -a '<REDIS_PASSWORD>' BGSAVE
-docker cp hifast-redis:/data/dump.rdb ./dump.rdb
-```
-
-## 5. 导入东京
-
-### 5.1 MySQL 导入东京 RDS
-
-```bash
-gunzip -c hifast-full.sql.gz | mysql -h <TOKYO_RDS_ENDPOINT> -u admin -p hifast
-```
-
-导入后确认：
-
-```bash
-mysql -h <TOKYO_RDS_ENDPOINT> -u admin -p -e "USE hifast; SHOW TABLES;"
-```
-
-### 5.2 Redis 导入东京
-
-1. 停止东京 Redis 容器
-2. 替换 `/data/dump.rdb`
-3. 启动东京 Redis 容器
-
-导入后确认：
-
-```bash
-docker exec hifast-redis redis-cli -a '<TOKYO_REDIS_PASSWORD>' PING
-```
-
-## 6. 启动东京应用
-
-更新东京：
-
- `/opt/ppanel/configs/ppanel.yaml`
- `/opt/ppanel/.env`
-
-关键值：
-
- `MySQL.Addr=<TOKYO_RDS_ENDPOINT>:3306`
- `MySQL.Username=admin`
- `MySQL.Password=<TOKYO_RDS_PASSWORD>`
- `Redis.Host=127.0.0.1:6379`
- `Redis.Pass=<TOKYO_REDIS_PASSWORD>`
- `Site.Host=api-jp.hifast.biz`
- `.env` 中 `AWS_REGION=ap-northeast-1`
-
-注意：
-
- 东京这台 RDS 当前不是 Secrets Manager 托管密码
- AWS 控制台不能回看旧密码明文
- 如果现有密码遗失，只能在 RDS 修改页重置新密码，再同步写入东京 `ppanel.yaml`
-
-当前东京已实际生效：
-
- `MySQL.Addr=ppanel-mysql-jp.cpo0keikgh80.ap-northeast-1.rds.amazonaws.com:3306`
- `MySQL.Username=admin`
- `MySQL.Password=TkyRds20260521!N9mQ8sKe2vLp7Xa`
- `Redis.Host=127.0.0.1:6379`
- `Redis.Pass=hifast67yj`
-
-启动：
-
-```bash
-cd /opt/ppanel
-docker compose -f docker-compose.cloud.yml up -d
-```
-
-## 7. 东京平行环境验收
-
-至少执行：
-
-```bash
-curl -sf http://127.0.0.1:8080/v1/common/heartbeat
-curl -sf http://127.0.0.1/v1/common/heartbeat
-docker compose -f /opt/ppanel/docker-compose.cloud.yml ps
-docker compose -f /opt/ppanel/docker-compose.cloud.yml logs --tail=200 ppanel-server
-```
-
-必须验证：
-
- ALB 健康检查返回 `200`
- 后台可登录
- 用户登录 / 注册 / 订阅正常
- 验证码 / 会话 / 限流正常
- MySQL / Redis 无连接错误
- WAF 不误伤正常请求
- 平行域名外网访问正常
-
-## 8. 正式域名切换
-
-仅在东京平行环境验收全部通过后执行：
-
-1. 将正式域名切到东京 `ALB`
-2. 观察 5xx、延迟、容器日志、RDS、Redis
-3. 保持香港不删，只做回滚保留
-
-## 9. 104 灾备重挂
-
-### 9.1 MySQL
-
-在东京 RDS 上：
-
-```sql
-CALL mysql.rds_set_configuration('binlog retention hours', 24);
-CREATE USER IF NOT EXISTS 'repl'@'104.238.220.230' IDENTIFIED BY '<REPL_PASSWORD>';
-GRANT REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'repl'@'104.238.220.230';
-FLUSH PRIVILEGES;
-SHOW BINARY LOG STATUS;
-```
-
-当前东京已准备完成：
-
- `repl@104.238.220.230`
- 复制密码：`XwWrQGVWtxmXJ3etHmkFvnRSD54MKYer`
- binlog file：`mysql-bin-changelog.000189`
- binlog pos：`185053`
-
-然后在 `104` 重建并挂从。
-
-### 9.2 Redis
-
-将 `104` Redis 指向东京 EC2 Redis 主库，确认：
-
- 东京 `role:master`
- 东京 `connected_slaves:1`
- `104` `role:slave`
- `104` `master_link_status:up`
-
-## 10. 回滚
-
-如果东京验收失败：
-
- 不切正式域名
- 继续保留香港主环境
-
-如果正式切换后发现严重问题：
-
-1. 立刻把 DNS 切回香港
-2. 恢复香港 `ppanel-server`
-3. 放弃本次东京接管
-
-## 11. 切换后观察期
-
-切换后至少保留香港环境 `7` 天：
-
- 香港 RDS 快照
- 香港 Redis RDB
- 香港 EC2 配置
- 香港 `ppanel.yaml` 备份
-
-观察期内不删除香港资源。
@@ -1,246 +0,0 @@
-# Hifast 当前架构文档（东京主站版）
-
-最后更新：`2026-05-21`
-
-这份文档只描述**当前真实生效**的架构，不描述理想目标，不混入已经下线或待迁移的香港旧链路。
-
-如果后续东京 `ALB / WAF / 正式域名` 上线，应继续更新这份文档，而不是回头参考旧香港架构文档。
-
-## 1. 当前结论
-
-当前已经实际跑起来的是：
-
-`用户 / 运维 -> 东京 EC2 -> ppanel-server + Redis + observability -> 东京 RDS MySQL`
-
-当前还**没有**实际生效的组件：
-
- `ALB`
- `WAF`
- 正式域名切流
- `104.238.220.230` 重挂东京 MySQL / Redis 从库
-
-也就是说，东京环境目前是：
-
- 一台业务 EC2 已可用
- 一台东京 RDS 已可用
- 本机 Redis 已可用
- `ppanel-server` 已成功启动并连通 MySQL / Redis
- 灾备链路参数已准备好，但 `104` 还没最终挂上去
-
-## 2. 当前真实拓扑
-
-```mermaid
-flowchart TB
-    USER["用户 / 运维"] --> EIP["东京 EC2 公网入口\n3.114.29.208"]
-    EIP --> NGINX["Nginx\nEC2 本机"]
-    NGINX --> APP["ppanel-server\nhost network\n127.0.0.1:8080"]
-    APP --> REDIS["Redis Docker\n127.0.0.1:6379"]
-    APP --> RDS["Tokyo RDS MySQL\nppanel-mysql-jp"]
-    APP --> OBS["Grafana / Loki / Tempo / Prometheus"]
-
-    RDS -. 预留复制 .-> DRMYSQL["104.238.220.230\nMySQL DR\n未最终接入"]
-    REDIS -. 预留复制 .-> DRREDIS["104.238.220.230\nRedis DR\n未最终接入"]
-```
-
-## 3. 云资源清单
-
-### 3.1 Region
-
- AWS account: `hifastvpn (200810848252)`
- Region: `ap-northeast-1`
-
-### 3.2 网络
-
- VPC: `ppanel-jp-prod`
- VPC ID: `vpc-0846b23b4a7d64eac`
- CIDR: `10.20.0.0/16`
-
-公有子网：
-
- `ppanel-jp-public-a` / `subnet-091232bdb53e71490` / `10.20.0.0/24`
- `ppanel-jp-public-c` / `subnet-01ba0975c525ce8cf` / `10.20.1.0/24`
-
-私有子网：
-
- `ppanel-jp-private-a` / `subnet-0bd13111c02f0edbe` / `10.20.10.0/24`
- `ppanel-jp-private-c` / `subnet-0d86c5c756dbc84b2` / `10.20.11.0/24`
-
-### 3.3 安全组
-
- `ppanel-jp-sg-alb`
-  - `80/tcp <- 0.0.0.0/0`
-  - `443/tcp <- 0.0.0.0/0`
- `ppanel-jp-sg-ec2`
-  - `80/tcp <- sg-0b3a23c31041a5a5a`
-  - `22/tcp <- 64.118.144.142/32`
-  - `6379/tcp <- 104.238.220.230/32`
- `ppanel-jp-sg-rds`
-  - `3306/tcp <- sg-01f2a5a81e7505c91`
-  - `3306/tcp <- 104.238.220.230/32`
-
-## 4. 计算与数据库
-
-### 4.1 业务 EC2
-
- Name: `ppanel-app-jp-01`
- Instance ID: `i-07839130074cd7ed9`
- Type: `c7i.xlarge`
- AZ: `ap-northeast-1c`
- Private IP: `10.20.1.168`
- Public IP / Elastic IP: `3.114.29.208`
- Public DNS: `ec2-3-114-29-208.ap-northeast-1.compute.amazonaws.com`
- Root volume: `gp3 100GiB`
- Status: `running`
-
-说明：
-
- 当前公网入口是这台 EC2 自己
- 这里绑定的是 `EIP`，不是依赖实例自动分配的临时公网 IP
- 绑定 EIP 的目的，是保证以后 Redis 主从、白名单、DNS、文档里的公网地址不因为实例变更而漂移
-
-### 4.2 Tokyo RDS
-
- Identifier: `ppanel-mysql-jp`
- Engine: `MySQL Community 8.4.8`
- Class: `db.r7g.xlarge`
- Storage: `gp3 100GiB`
- Master user: `admin`
- Endpoint: `ppanel-mysql-jp.cpo0keikgh80.ap-northeast-1.rds.amazonaws.com`
- Public access: `enabled`
- Credential management: `self-managed`
- Current status: `available`
-
-当前实际连接值：
-
- Host: `ppanel-mysql-jp.cpo0keikgh80.ap-northeast-1.rds.amazonaws.com`
- Port: `3306`
- User: `admin`
-
-### 4.3 Redis
-
- 部署位置：东京 EC2 本机
- 部署方式：Docker
- 容器名：`ppanel-redis`
- 当前角色：`master`
- 当前监听：`127.0.0.1:6379`（应用本机访问）
- 当前对灾备开放：`3.114.29.208:6379`
-
-### 4.4 应用与可观测
-
-业务容器：
-
- `ppanel-server`
-
-可观测容器：
-
- `ppanel-grafana`
- `ppanel-loki`
- `ppanel-promtail`
- `ppanel-prometheus`
- `ppanel-tempo`
- `ppanel-cadvisor`
- `ppanel-node-exporter`
- `ppanel-nginx-exporter`
-
-## 5. 当前部署方式
-
-部署目录：
-
- `/opt/ppanel`
-
-关键文件：
-
- `/opt/ppanel/docker-compose.cloud.yml`
- `/opt/ppanel/configs/ppanel.yaml`
- `/opt/ppanel/.env`
-
-业务启动方式：
-
- `ppanel-server` 使用 `docker compose`
- `network_mode: host`
-
-当前配置指向：
-
- MySQL -> 东京 RDS
- Redis -> 本机 Docker Redis
- Trace -> `127.0.0.1:4317`
-
-## 6. 当前已验证状态
-
-截至 `2026-05-21` 已确认：
-
- `docker exec ppanel-redis redis-cli -a 'hifast67yj' PING` 返回 `PONG`
- `MYSQL_PWD=... mysql -h ppanel-mysql-jp.cpo0keikgh80.ap-northeast-1.rds.amazonaws.com -u admin -e "select 1"` 返回正常
- `docker compose -f /opt/ppanel/docker-compose.cloud.yml up -d ppanel-server` 已成功
- `docker logs ppanel-server` 无 MySQL / Redis 连接报错
- `curl http://127.0.0.1:8080/v1/common/heartbeat` 返回成功
-
-可以认为当前东京单站已经具备：
-
- 服务启动能力
- 数据库连接能力
- Redis 连接能力
- 基础可观测能力
-
-## 7. 当前未落地项
-
-下面这些还属于“目标方案”，不是“当前实际架构”：
-
- `ALB`
- `WAF`
- ACM 证书完成 DNS 验证
- 正式域名切换到东京
- `104.238.220.230` 完整接成东京 DR
-
-所以现在请不要把当前架构理解成：
-
-`DNS -> ALB -> WAF -> EC2 -> RDS`
-
-当前真实架构更准确地说是：
-
-`EIP -> EC2(Nginx + ppanel-server + Redis + observability) -> RDS`
-
-## 8. 灾备准备状态
-
-### 8.1 MySQL DR
-
-已准备好：
-
- DR host: `104.238.220.230`
- 复制账号：`repl@104.238.220.230`
- binlog retention hours: `24`
- current binlog file: `mysql-bin-changelog.000189`
- current binlog position: `185053`
-
-当前状态：
-
- 东京侧已准备完成
- 但 `104` 侧还没有最终执行挂从
-
-### 8.2 Redis DR
-
-已准备好：
-
- 东京 Redis 主地址：`3.114.29.208:6379`
- 东京 Redis 当前角色：`role:master`
- 东京 Redis 当前状态：`connected_slaves:0`
-
-当前状态：
-
- 东京侧已可作为主库提供同步
- 但 `104` 侧还没有最终执行 `REPLICAOF`
-
-## 9. 权威文档入口
-
-与当前东京架构直接相关的文档，以这些为准：
-
- [当前架构文档](./hifast-current-architecture-zh.md)
- [东京资源清单](../deploy/aws/ap-northeast-1/configs/resource-inventory.current.md)
- [东京迁移 Runbook](./hifast-aws-jp-migration-runbook-zh.md)
- [东京切换清单](./hifast-aws-jp-cutover-checklist-zh.md)
-
-下面这些旧文档可以继续保留，但不要作为“当前实际架构”依据：
-
- 香港旧主站相关文档
- 仍以 `ap-east-1` 为主语的历史架构说明
-
@@ -214,42 +214,6 @@ S3_PREFIX=redis bash deploy/scripts/redis_rdb_backup_to_s3.sh
 - 本地临时文件默认只保留 `3` 天
 - 长期保留建议通过 S3 Lifecycle 管理，而不是靠本机 cron 删除

-### 9.3 MySQL 每 10 分钟执行一次
-
-如果你要在 `104` 上做高频逻辑备份，仓库里已经补了 `systemd timer` 安装脚本：
-
- 安装脚本：
-  - [`deploy/scripts/install_mysql_backup_timer.sh`](/Users/Apple/code_vpn/vpn/ppanel-server/deploy/scripts/install_mysql_backup_timer.sh)
- systemd service：
-  - [`deploy/systemd/hifast-mysql-backup.service`](/Users/Apple/code_vpn/vpn/ppanel-server/deploy/systemd/hifast-mysql-backup.service)
- systemd timer：
-  - [`deploy/systemd/hifast-mysql-backup.timer`](/Users/Apple/code_vpn/vpn/ppanel-server/deploy/systemd/hifast-mysql-backup.timer)
-
-安装方式：
-
-```bash
-cp deploy/aws/ap-northeast-1/configs/backup-to-s3.env.example /root/backup-to-s3.env
-chmod 600 /root/backup-to-s3.env
-vim /root/backup-to-s3.env
-
-bash deploy/scripts/install_mysql_backup_timer.sh /opt/ppanel /root/backup-to-s3.env
-```
-
-查看状态：
-
-```bash
-systemctl list-timers --all | grep hifast-mysql-backup
-systemctl status hifast-mysql-backup.timer --no-pager -l
-systemctl status hifast-mysql-backup.service --no-pager -l
-journalctl -u hifast-mysql-backup.service -n 50 --no-pager
-```
-
-补充说明：
-
- 定时表达式是 `OnCalendar=*:0/10`，即每 `10` 分钟执行一次
- 备份脚本已加 `flock` 锁，上一轮未结束时，下一轮会自动跳过，不会并发打包
- 高频逻辑备份会持续产生 `mysqldump` 开销，建议只在 `104` 这样的从库或备用库上执行，不要直接打主库
-
 ## 10. 恢复思路

 ### 10.1 MySQL
@@ -1,37 +0,0 @@
-server:
-  http_listen_port: 3200
-  grpc_listen_port: 9095
-
-distributor:
-  receivers:
-    otlp:
-      protocols:
-        grpc:
-          endpoint: 0.0.0.0:4317
-        http:
-          endpoint: 0.0.0.0:4318
-
-ingester:
-  max_block_duration: 5m
-
-compactor:
-  compaction:
-    block_retention: 168h
-
-storage:
-  trace:
-    backend: local
-    wal:
-      path: /var/tempo/wal
-    local:
-      path: /var/tempo/blocks
-
-metrics_generator:
-  registry:
-    external_labels:
-      source: tempo
-      cluster: ppanel
-  storage:
-    path: /var/tempo/generator/wal
-    remote_write:
-      - url: http://prometheus:9090/api/v1/write
				`@@ -1 +0,0 @@`
				`ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGwnFkOMq9oh1WN6vdAwdFjDjfCRWfMe6sDZNCoeWvVj Apple@MacBook-Pro.local`