fix: 修复订单 claim 机制状态冲突与 stuck 订单恢复

- 将 OrderStatusClaimed 从 4 改为 6，与 OrderStatusFailed(4) 区分 - releaseClaim 改为返回 error，失败时不再静默吞掉 - claimAndGetOrder 对 status=claimed 返回可重试错误而非静默跳过 - ProcessTask 区分 claimed stuck 错误（触发重试）和其他非 paid 状态（跳过） - finalizeCouponAndOrder 使用直接 DB 更新 claimed→finished，绕过 UpdateOrderStatus 的 status<target 守卫（6 > 5 无法通过该条件）并显式删除 Redis 缓存避免缓存脏读 - 新增 StuckOrderRecoveryLogic：每 10 分钟扫描超时 claimed 订单，重置为 paid 并重新入队激活任务 Co-authored-by: multica-agent <github@multica.ai>
2026-05-24 23:42:37 -07:00
73 changed files with 369 additions and 3586 deletions
@@ -7,8 +7,8 @@ MYSQL_ROOT_PASSWORD=CHANGE_ME_TO_STRONG_PASSWORD
 # Grafana 管理员密码
 GRAFANA_PASSWORD=CHANGE_ME_TO_STRONG_PASSWORD
-# PPanel Server 镜像标签（由 CI/CD 传入不可变 tag，如 git SHA）
+# PPanel Server 镜像标签（留空使用 latest）
-PPANEL_SERVER_TAG=CHANGE_ME_TO_GIT_SHA
+PPANEL_SERVER_TAG=latest
 # AWS 区域（香港）
 AWS_REGION=ap-east-1
@@ -21,8 +21,8 @@ env:
  # SSH私钥（Gitea Secret 名称：AWS）
  SSH_KEY: ${{ secrets.AWS }}
  # TG通知
-  TG_BOT_TOKEN: ${{ secrets.TG_BOT_TOKEN }}
+  TG_BOT_TOKEN: 8114337882:AAHkEx03HSu7RxN4IHBJJEnsK9aPPzNLIk0
-  TG_CHAT_ID: ${{ secrets.TG_CHAT_ID }}
+  TG_CHAT_ID: "-4940243803"
  # Go构建变量
  SERVICE: vpn
  SERVICE_STYLE: vpn
@@ -51,19 +51,16 @@ jobs:
            echo "DOCKER_TAG_SUFFIX=latest" >> $GITHUB_ENV
            echo "CONTAINER_NAME=ppanel-server" >> $GITHUB_ENV
            echo "DEPLOY_PATH=/opt/ppanel" >> $GITHUB_ENV
            echo "DEPLOY_ENV_LABEL=🚀 服务已成功部署到生产环境" >> $GITHUB_ENV
            echo "为 main 分支设置生产环境变量"
          elif [ "${{ github.ref_name }}" = "internal" ]; then
            echo "DOCKER_TAG_SUFFIX=internal" >> $GITHUB_ENV
            echo "CONTAINER_NAME=ppanel-server-internal" >> $GITHUB_ENV
            echo "DEPLOY_PATH=/root/bindbox" >> $GITHUB_ENV
            echo "DEPLOY_ENV_LABEL=🧪 服务已成功部署到测试环境" >> $GITHUB_ENV
            echo "为 internal 分支设置开发环境变量"
          else
            echo "DOCKER_TAG_SUFFIX=${{ github.ref_name }}" >> $GITHUB_ENV
            echo "CONTAINER_NAME=ppanel-server-${{ github.ref_name }}" >> $GITHUB_ENV
            echo "DEPLOY_PATH=/root/vpn_server_other" >> $GITHUB_ENV
            echo "DEPLOY_ENV_LABEL=🔧 服务已成功部署到其他环境" >> $GITHUB_ENV
            echo "为其他分支 (${{ github.ref_name }}) 设置环境变量"
          fi
@@ -115,37 +112,24 @@ jobs:
          docker version || true
          echo "客户端 API 版本:" $(docker version --format '{{.Client.APIVersion}}')
-      # 步骤4: 构建镜像
+      # 步骤4: 构建并发布到镜像仓库
-      - name: 🏗️ 构建镜像
+      - name: 📤 构建并发布到镜像仓库
        run: |
-          echo "开始构建镜像..."
+          echo "开始构建并推送镜像..."
          echo "仓库: ${{ env.REPO }}"
          echo "版本标签: ${{ env.VERSION }}"
          echo "分支标签: ${{ env.DOCKER_TAG_SUFFIX }}"
-          BUILD_TAG_ARGS="-t ${{ env.REPO }}:${{ env.VERSION }}"
+          # 构建镜像，同时打上版本和分支两个标签
          if [ "${{ github.event_name }}" = "push" ]; then
            BUILD_TAG_ARGS="$BUILD_TAG_ARGS -t ${{ env.REPO }}:${{ env.DOCKER_TAG_SUFFIX }}"
          else
            echo "PR事件仅构建版本标签，不推送镜像、不部署"
          fi
          docker build -f Dockerfile \
            --platform linux/amd64 \
            --build-arg TARGETARCH=amd64 \
            --build-arg VERSION=${{ env.VERSION }} \
            --build-arg BUILDTIME=${{ env.BUILDTIME }} \
-            $BUILD_TAG_ARGS \
+            -t ${{ env.REPO }}:${{ env.VERSION }} \
            -t ${{ env.REPO }}:${{ env.DOCKER_TAG_SUFFIX }} \
            .
          echo "镜像构建完成"
      # 步骤5: 发布到镜像仓库
      - name: 📤 发布到镜像仓库
        if: github.event_name == 'push'
        run: |
          echo "开始推送镜像..."
          echo "推送版本标签镜像: ${{ env.REPO }}:${{ env.VERSION }}"
          docker push ${{ env.REPO }}:${{ env.VERSION }}
@@ -154,9 +138,8 @@ jobs:
          echo "镜像推送完成"
-      # 步骤6: 调试 - 打印部署目标（不输出敏感信息）
+      # 调试: 打印部署目标（不输出敏感信息）
      - name: 🔍 调试 - 打印部署目标
        if: github.event_name == 'push'
        run: |
          echo "========== 部署目标调试 =========="
          echo "当前分支: ${{ github.ref_name }}"
@@ -167,9 +150,8 @@ jobs:
          echo "DEPLOY_PATH: ${{ env.DEPLOY_PATH }}"
          echo "====================================="
-      # 步骤7: 传输配置文件
+      # 步骤5: 传输配置文件
      - name: 📂 传输配置文件
        if: github.event_name == 'push'
        uses: appleboy/scp-action@v0.1.7
        with:
          host: ${{ env.SSH_HOST }}
@@ -179,9 +161,8 @@ jobs:
          source: "docker-compose.cloud.yml"
          target: "/tmp/ppanel-deploy/"
-      # 步骤8: 连接服务器更新、健康检查并按需回滚
+      # 步骤6: 连接服务器更新并启动
      - name: 🚀 连接服务器更新并启动
        if: github.event_name == 'push'
        uses: appleboy/ssh-action@v1.0.3
        with:
          host: ${{ env.SSH_HOST }}
@@ -191,114 +172,36 @@ jobs:
          timeout: 300s
          command_timeout: 600s
          script: |
            set -e
            echo "连接服务器成功，开始部署..."
            echo "部署目录: ${{ env.DEPLOY_PATH }}"
            echo "部署标签: ${{ env.DOCKER_TAG_SUFFIX }}"
            echo "登录用户: ${{ env.SSH_USER }}"
            HEALTHCHECK_URL="http://127.0.0.1:8080/v1/common/heartbeat"
            NEW_TAG="${{ env.DOCKER_TAG_SUFFIX }}"
            ROLLBACK_TAG="rollback-${{ env.VERSION }}"
            SUDO=""
            if [ "${{ github.ref_name }}" = "main" ]; then
              SUDO="sudo"
            fi
            docker_cmd() {
              if [ -n "$SUDO" ]; then
                sudo docker "$@"
              else
                docker "$@"
              fi
            }
            compose_with_tag() {
              tag="$1"
              shift
              if [ -n "$SUDO" ]; then
                sudo env PPANEL_SERVER_TAG="$tag" docker-compose -f docker-compose.cloud.yml "$@"
              else
                PPANEL_SERVER_TAG="$tag" docker-compose -f docker-compose.cloud.yml "$@"
              fi
            }
            write_previous_tag() {
              if [ -n "$SUDO" ]; then
                printf '%s\n' "${PREVIOUS_IMAGE_TAG:-}" | sudo tee .previous-ppanel-image-tag >/dev/null
              else
                printf '%s\n' "${PREVIOUS_IMAGE_TAG:-}" > .previous-ppanel-image-tag
              fi
            }
            health_check() {
              attempt=1
              while [ "$attempt" -le 3 ]; do
                if curl -sf "$HEALTHCHECK_URL"; then
                  echo
                  return 0
                fi
                echo "健康检查第 ${attempt}/3 次失败，10s 后重试..."
                attempt=$((attempt + 1))
                sleep 10
              done
              return 1
            }
            if [ "${{ github.ref_name }}" = "main" ]; then
              sudo mkdir -p ${{ env.DEPLOY_PATH }}
              sudo cp /tmp/ppanel-deploy/docker-compose.cloud.yml ${{ env.DEPLOY_PATH }}/docker-compose.cloud.yml
              cd ${{ env.DEPLOY_PATH }}
              echo "📥 拉取镜像..."
              sudo docker-compose -f docker-compose.cloud.yml pull ppanel-server
              echo "🚀 启动服务..."
              sudo docker-compose -f docker-compose.cloud.yml up -d ppanel-server
              sudo docker image prune -f || true
            else
              mkdir -p ${{ env.DEPLOY_PATH }}
              cp /tmp/ppanel-deploy/docker-compose.cloud.yml ${{ env.DEPLOY_PATH }}/docker-compose.cloud.yml
            fi
              cd ${{ env.DEPLOY_PATH }}
-
+              echo "📥 拉取镜像..."
-            PREVIOUS_IMAGE_TAG="$(docker_cmd inspect --format '{{.Config.Image}}' ppanel-server 2>/dev/null || true)"
+              docker-compose -f docker-compose.cloud.yml pull ppanel-server
            PREVIOUS_IMAGE_ID="$(docker_cmd inspect --format '{{.Image}}' ppanel-server 2>/dev/null || true)"
            echo "上一版本镜像tag: ${PREVIOUS_IMAGE_TAG:-未发现}"
            echo "上一版本镜像ID: ${PREVIOUS_IMAGE_ID:-未发现}"
            write_previous_tag
            echo "📥 拉取镜像: ${{ env.REPO }}:${NEW_TAG}"
            compose_with_tag "$NEW_TAG" pull ppanel-server
              echo "🚀 启动服务..."
-            compose_with_tag "$NEW_TAG" up -d ppanel-server
+              docker-compose -f docker-compose.cloud.yml up -d ppanel-server
              docker image prune -f || true
            fi
            echo "🩺 部署后健康检查: ${HEALTHCHECK_URL}"
            if health_check; then
              docker_cmd image prune -f || true
              echo "✅ 部署后健康检查通过"
            echo "✅ 部署命令执行完成"
              exit 0
            fi
-            echo "❌ 部署后健康检查连续 3 次失败，开始回滚..."
+      # 步骤6: TG通知 (成功)
            if [ -n "$PREVIOUS_IMAGE_ID" ]; then
              docker_cmd tag "$PREVIOUS_IMAGE_ID" "${{ env.REPO }}:${ROLLBACK_TAG}"
              echo "回滚镜像tag: ${{ env.REPO }}:${ROLLBACK_TAG}"
              compose_with_tag "$ROLLBACK_TAG" up -d ppanel-server
              echo "🩺 回滚后健康检查: ${HEALTHCHECK_URL}"
              if health_check; then
                echo "✅ 回滚后健康检查通过"
              else
                echo "❌ 回滚后健康检查仍失败"
              fi
            else
              echo "未找到上一版本镜像ID，无法自动回滚"
            fi
            docker_cmd image prune -f || true
            exit 1
      # 步骤9: TG通知 (成功)
      - name: 📱 发送成功通知到Telegram
-        if: success() && github.event_name == 'push'
+        if: success()
        uses: appleboy/telegram-action@master
        with:
          token: ${{ env.TG_BOT_TOKEN }}
@@ -312,13 +215,12 @@ jobs:
            👤 提交者: ${{ github.actor }}
            🕐 时间: ${{ github.event.head_commit.timestamp }}
-            ${{ env.DEPLOY_ENV_LABEL }}
+            🚀 服务已成功部署到生产环境
            🩺 健康检查: 通过 (http://127.0.0.1:8080/v1/common/heartbeat)
          parse_mode: Markdown
-      # 步骤10: TG通知 (失败)
+      # 步骤5: TG通知 (失败)
      - name: 📱 发送失败通知到Telegram
-        if: failure() && github.event_name == 'push'
+        if: failure()
        uses: appleboy/telegram-action@master
        with:
          token: ${{ env.TG_BOT_TOKEN }}
@@ -332,6 +234,6 @@ jobs:
            👤 提交者: ${{ github.actor }}
            🕐 时间: ${{ github.event.head_commit.timestamp }}
            🩺 健康检查: 失败或未完成；若新版本健康检查连续 3 次失败，已自动尝试回滚并重新检查
            ⚠️ 请检查构建日志获取详细信息
          parse_mode: Markdown
@@ -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;
    }
 }
@@ -149,35 +149,6 @@ type (
 		Total int64           `json:"total"`
 		List  []CommissionLog `json:"list"`
 	}
 	OrderRefundLog {
 		OrderId                int64  `json:"order_id"`
 		OrderNo                string `json:"order_no"`
 		OperatorUserId         int64  `json:"operator_user_id"`
 		OperatorAuthIdentifier string `json:"operator_auth_identifier,omitempty"`
 		TargetUserId           int64  `json:"target_user_id"`
 		UserSubscribeId        int64  `json:"user_subscribe_id"`
 		RefererUserId          int64  `json:"referer_user_id,omitempty"`
 		CommissionAmount       int64  `json:"commission_amount"`
 		Reason                 string `json:"reason,omitempty"`
 		OrderStatusBefore      uint8  `json:"order_status_before"`
 		OrderStatusAfter       uint8  `json:"order_status_after"`
 		SubscribeStatusBefore  uint8  `json:"subscribe_status_before"`
 		SubscribeStatusAfter   uint8  `json:"subscribe_status_after"`
 		SubscribeExpireBefore  int64  `json:"subscribe_expire_before"`
 		SubscribeExpireAfter   int64  `json:"subscribe_expire_after"`
 		CommissionBefore       int64  `json:"commission_before"`
 		CommissionAfter        int64  `json:"commission_after"`
 		Timestamp              int64  `json:"timestamp"`
 	}
 	FilterOrderRefundLogRequest {
 		FilterLogParams
 		OrderId int64 `form:"order_id,optional"`
 		UserId  int64 `form:"user_id,optional"`
 	}
 	FilterOrderRefundLogResponse {
 		Total int64            `json:"total"`
 		List  []OrderRefundLog `json:"list"`
 	}
 	GiftLog {
 		Type        uint16 `json:"type"`
 		userId      int64  `json:"user_id"`
@@ -268,30 +239,6 @@ type (
 		OccurredAt int64  `json:"occurred_at"`
 		CreatedAt  int64  `json:"created_at"`
 	}
 	GetLogMessageRawRequest {
 		Id int64 `form:"id" validate:"required"`
 	}
 	GetLogMessageRawResponse {
 		Id         int64       `json:"id"`
 		Platform   string      `json:"platform"`
 		AppVersion string      `json:"app_version"`
 		OsName     string      `json:"os_name"`
 		OsVersion  string      `json:"os_version"`
 		DeviceId   string      `json:"device_id"`
 		UserId     *int64      `json:"user_id"`
 		SessionId  string      `json:"session_id"`
 		Level      uint8       `json:"level"`
 		ErrorCode  string      `json:"error_code"`
 		Message    string      `json:"message"`
 		Stack      string      `json:"stack"`
 		Context    interface{} `json:"context"`
 		ClientIP   string      `json:"client_ip"`
 		UserAgent  string      `json:"user_agent"`
 		Locale     string      `json:"locale"`
 		Digest     string      `json:"digest"`
 		OccurredAt int64       `json:"occurred_at"`
 		CreatedAt  int64       `json:"created_at"`
 	}
 )
@server (
@@ -344,10 +291,6 @@ service ppanel {
 	@handler FilterCommissionLog
 	get /commission/list (FilterCommissionLogRequest) returns (FilterCommissionLogResponse)
 	@doc "Filter order refund log"
 	@handler FilterOrderRefundLog
 	get /order/refund/list (FilterOrderRefundLogRequest) returns (FilterOrderRefundLogResponse)
 	@doc "Filter gift log"
 	@handler FilterGiftLog
 	get /gift/list (FilterGiftLogRequest) returns (FilterGiftLogResponse)
@@ -371,9 +314,5 @@ service ppanel {
 	@doc "Get error log message detail"
 	@handler GetErrorLogMessageDetail
 	get /error_message/detail returns (GetErrorLogMessageDetailResponse)
 	@doc "Get log message raw detail (temporary)"
 	@handler GetLogMessageRaw
 	get /message/detail (GetLogMessageRawRequest) returns (GetLogMessageRawResponse)
 }
@@ -33,10 +33,6 @@ type (
 		PaymentId int64  `json:"payment_id,omitempty"`
 		TradeNo   string `json:"trade_no,omitempty"`
 	}
 	RefundOrderRequest {
 		Id     int64  `json:"id" validate:"required"`
 		Reason string `json:"reason,omitempty" validate:"omitempty,max=500"`
 	}
 	ActivateOrderRequest {
 		OrderNo string `json:"order_no" validate:"required"`
 	}
@@ -72,10 +68,6 @@ service ppanel {
 	@handler UpdateOrderStatus
 	put /status (UpdateOrderStatusRequest)
 	@doc "Refund order"
 	@handler RefundOrder
 	post /refund (RefundOrderRequest)
 	@doc "Manually activate order"
 	@handler ActivateOrder
 	post /activate (ActivateOrderRequest)
@@ -41,17 +41,17 @@ type (
 		UserId             int64  `json:"user_id" validate:"required"`
 		Password           string `json:"password"`
 		Avatar             string `json:"avatar"`
-		Balance            *int64  `json:"balance"`
+		Balance            int64  `json:"balance"`
-		Commission         *int64  `json:"commission"`
+		Commission         int64  `json:"commission"`
 		ReferralPercentage uint8  `json:"referral_percentage"`
 		OnlyFirstPurchase  *bool  `json:"only_first_purchase"`
-		GiftAmount         *int64  `json:"gift_amount"`
+		GiftAmount         int64  `json:"gift_amount"`
 		Telegram           int64  `json:"telegram"`
 		ReferCode          string `json:"refer_code"`
-		RefererId          *int64  `json:"referer_id"`
+		RefererId          int64  `json:"referer_id"`
 		Enable             *bool  `json:"enable"`
 		IsAdmin            *bool  `json:"is_admin"`
-		Remark             *string `json:"remark"`
+		Remark             string `json:"remark"`
 	}
 	UpdateUserNotifySettingRequest {
 		UserId                int64 `json:"user_id" validate:"required"`
@@ -235,7 +235,6 @@ type (
 		Size   int    `form:"size"`
 		UserId *int64 `form:"user_id,omitempty"`
 		Status *uint8 `form:"status,omitempty"`
 		Method *uint8 `form:"method,omitempty"`
 	}
 	GetWithdrawalListResponse {
 		List  []WithdrawalLog `json:"list"`
@@ -111,9 +111,6 @@ type (
 	CommissionWithdrawRequest {
 		Amount  int64  `json:"amount"`
 		Content string `json:"content"`
 		Method    uint8  `json:"method" validate:"oneof=0 1 2 3"`
 		Account   string `json:"account,omitempty"`
 		QrCodeUrl string `json:"qr_code_url,omitempty"`
 	}
 	WithdrawalLog {
 		Id        int64  `json:"id"`
@@ -122,15 +119,9 @@ type (
 		Content   string `json:"content"`
 		Status    uint8  `json:"status"`
 		Reason    string `json:"reason,omitempty"`
 		Method    uint8  `json:"method"`
 		Account   string `json:"account"`
 		QrCodeUrl string `json:"qr_code_url"`
 		CreatedAt int64  `json:"created_at"`
 		UpdatedAt int64  `json:"updated_at"`
 	}
 	CancelWithdrawalRequest {
 		WithdrawalId int64 `json:"withdrawal_id" validate:"required,gt=0"`
 	}
 	QueryWithdrawalLogListRequest {
 		Page int `form:"page"`
 		Size int `form:"size"`
@@ -361,10 +352,6 @@ service ppanel {
 	@handler CommissionWithdraw
 	post /commission_withdraw (CommissionWithdrawRequest) returns (WithdrawalLog)
 	@doc "Cancel pending withdrawal"
 	@handler CancelWithdrawal
 	post /withdrawal_cancel (CancelWithdrawalRequest) returns (WithdrawalLog)
 	@doc "Query Withdrawal Log"
 	@handler QueryWithdrawalLog
 	get /withdrawal_log (QueryWithdrawalLogListRequest) returns (QueryWithdrawalLogListResponse)
@@ -427,7 +427,6 @@ type (
 		FeeAmount      int64         `json:"fee_amount"`
 		TradeNo        string        `json:"trade_no"`
 		Status         uint8         `json:"status"`
 		StatusName     string        `json:"status_name,omitempty"`
 		SubscribeId    int64         `json:"subscribe_id"`
 		CreatedAt      int64         `json:"created_at"`
 		UpdatedAt      int64         `json:"updated_at"`
@@ -450,7 +449,6 @@ type (
 		FeeAmount      int64         `json:"fee_amount"`
 		TradeNo        string        `json:"trade_no"`
 		Status         uint8         `json:"status"`
 		StatusName     string        `json:"status_name,omitempty"`
 		SubscribeId    int64         `json:"subscribe_id"`
 		Subscribe      Subscribe     `json:"subscribe"`
 		CreatedAt      int64         `json:"created_at"`
@@ -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），调用会返回空响应。
 ---
@@ -19,10 +19,9 @@ services:
  # ----------------------------------------------------
  # 1. 业务后端 (PPanel Server)
  #    host 网络：可出外网，直接访问 AWS RDS/Redis；通过 127.0.0.1 访问 Tempo
  #    PPANEL_SERVER_TAG 由 CI/CD 传入不可变镜像标签（如 git SHA）
  # ----------------------------------------------------
  ppanel-server:
-    image: registry.kxsw.us/vpn-server:${PPANEL_SERVER_TAG:?please set PPANEL_SERVER_TAG to an immutable image tag}
+    image: registry.kxsw.us/vpn-server:${PPANEL_SERVER_TAG:-latest}
    container_name: ppanel-server
    restart: always
    volumes:
@@ -120,7 +119,7 @@ services:
  # 或配置 Nginx 反代（建议加认证）
  # ----------------------------------------------------
  grafana:
-    image: grafana/grafana:13.0.1
+    image: grafana/grafana:latest
    container_name: ppanel-grafana
    restart: always
    ports:
@@ -155,7 +154,7 @@ services:
  # 6. Prometheus (指标采集)
  # ----------------------------------------------------
  prometheus:
-    image: prom/prometheus:v3.11.3
+    image: prom/prometheus:latest
    container_name: ppanel-prometheus
    restart: always
    ports:
@@ -180,7 +179,7 @@ services:
  # 7. Nginx Exporter (监控宿主机 Nginx)
  # ----------------------------------------------------
  nginx-exporter:
-    image: nginx/nginx-prometheus-exporter:1.5.0
+    image: nginx/nginx-prometheus-exporter:latest
    container_name: ppanel-nginx-exporter
    restart: always
    command:
@@ -199,7 +198,7 @@ services:
  # 8. Node Exporter (宿主机监控)
  # ----------------------------------------------------
  node-exporter:
-    image: prom/node-exporter:v1.11.1
+    image: prom/node-exporter:latest
    container_name: ppanel-node-exporter
    restart: always
    volumes:
@@ -222,7 +221,7 @@ services:
  # 9. cAdvisor (容器监控)
  # ----------------------------------------------------
  cadvisor:
-    image: gcr.io/cadvisor/cadvisor:v0.55.1
+    image: gcr.io/cadvisor/cadvisor:latest
    container_name: ppanel-cadvisor
    restart: always
    volumes:
@@ -1,13 +0,0 @@
 -- Remove app_account_token column from order table if it exists
 SET @col_exists = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'order' AND COLUMN_NAME = 'app_account_token');
 SET @sql = IF(@col_exists = 1, 'ALTER TABLE `order` DROP COLUMN `app_account_token`', 'SELECT 1');
 PREPARE stmt FROM @sql;
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;
 -- Remove subscription_user_id column from order table if it exists
 SET @col_exists2 = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'order' AND COLUMN_NAME = 'subscription_user_id');
 SET @sql2 = IF(@col_exists2 = 1, 'ALTER TABLE `order` DROP COLUMN `subscription_user_id`', 'SELECT 1');
 PREPARE stmt2 FROM @sql2;
 EXECUTE stmt2;
 DEALLOCATE PREPARE stmt2;
@@ -1,19 +0,0 @@
 -- Rollback: re-deduct commission for users with pending (status=0) withdrawals.
 -- This re-applies the OLD behaviour where commission is deducted on application.
 -- Only run this if you are rolling back to the old code; do NOT run against
 -- the new code or commission will be double-deducted on approval.
 UPDATE `user` u
 JOIN (
    SELECT user_id, COALESCE(SUM(amount), 0) AS pending_total
    FROM withdrawals
    WHERE status = 0
    GROUP BY user_id
 ) p ON u.id = p.user_id
 SET u.commission = u.commission - p.pending_total
 WHERE p.pending_total > 0;
 -- Remove the migration log entries written by the up migration.
 DELETE FROM system_logs
 WHERE type = 33
  AND content LIKE '%migration: refund pending withdrawal commission (HIF-22)%';
@@ -1,65 +0,0 @@
 -- Migration: refund commission for existing pending (status=0) withdrawals
 --
 -- Under the old logic, commission was deducted when a withdrawal was submitted.
 -- Under the new logic, commission is only deducted on approval.
 -- This migration refunds the deducted amounts back to each user so that
 -- the system is in a consistent state before the new code is deployed.
 --
 -- Idempotency: the UPDATE only touches rows whose commission would need
 -- to increase, and each execution produces the same result because
 -- COALESCE(SUM(amount),0) is deterministic given the same pending set.
 -- Running this script multiple times is safe only if no new pending
 -- withdrawals are created between runs; deploy new code immediately after.
 -- Compatibility: some historical databases missed migration 02122, so the
 -- withdrawals table may not exist yet. Create it idempotently before the
 -- refund logic so this migration can self-heal older installations.
 CREATE TABLE IF NOT EXISTS `withdrawals` (
    `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'Primary Key',
    `user_id` BIGINT NOT NULL COMMENT 'User ID',
    `amount` BIGINT NOT NULL COMMENT 'Withdrawal Amount',
    `content` TEXT COMMENT 'Withdrawal Content',
    `status` TINYINT(1) NOT NULL DEFAULT 0 COMMENT 'Withdrawal Status',
    `reason` VARCHAR(500) NOT NULL DEFAULT '' COMMENT 'Rejection Reason',
    `created_at` DATETIME NOT NULL COMMENT 'Creation Time',
    `updated_at` DATETIME NOT NULL COMMENT 'Update Time',
    PRIMARY KEY (`id`),
    KEY `idx_user_id` (`user_id`)
    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 INSERT IGNORE INTO `system` (`category`, `key`, `value`, `type`, `desc`, `created_at`, `updated_at`)
 VALUES
    ('invite', 'WithdrawalMethod', '', 'string', 'withdrawal method', '2025-04-22 14:25:16.637', '2025-04-22 14:25:16.637');
 -- Step 1: refund commission for all users with pending withdrawals.
 UPDATE `user` u
 JOIN (
    SELECT user_id, COALESCE(SUM(amount), 0) AS pending_total
    FROM withdrawals
    WHERE status = 0
    GROUP BY user_id
 ) p ON u.id = p.user_id
 SET u.commission = u.commission + p.pending_total
 WHERE p.pending_total > 0;
 -- Step 2: write a migration log entry for each refunded user.
 INSERT INTO system_logs (type, date, object_id, content, created_at)
 SELECT
    33 AS type,
    DATE(NOW()) AS date,
    p.user_id AS object_id,
    JSON_OBJECT(
        'type', 99,
        'amount', p.pending_total,
        'order_no', '',
        'timestamp', UNIX_TIMESTAMP(NOW()) * 1000,
        'note', 'migration: refund pending withdrawal commission (HIF-22)'
    ) AS content,
    NOW() AS created_at
 FROM (
    SELECT user_id, COALESCE(SUM(amount), 0) AS pending_total
    FROM withdrawals
    WHERE status = 0
    GROUP BY user_id
    HAVING pending_total > 0
 ) p;
@@ -1,2 +0,0 @@
 -- Remove activation_context column from order table
 ALTER TABLE `order` DROP COLUMN IF EXISTS `activation_context`;
@@ -1,6 +0,0 @@
 -- Add activation_context column to order table for Redis fallback persistence (idempotent)
 SET @col_exists = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'order' AND COLUMN_NAME = 'activation_context');
 SET @sql = IF(@col_exists = 0, 'ALTER TABLE `order` ADD COLUMN `activation_context` TEXT DEFAULT NULL COMMENT ''Activation context JSON (guest/redemption info for DB fallback)'' AFTER `app_account_token`', 'SELECT 1');
 PREPARE stmt FROM @sql;
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;
@@ -1,4 +0,0 @@
 ALTER TABLE `withdrawals`
  DROP COLUMN `qr_code_url`,
  DROP COLUMN `account`,
  DROP COLUMN `method`;
@@ -1,4 +0,0 @@
 ALTER TABLE `withdrawals`
  ADD COLUMN `method`      TINYINT(1)   NOT NULL DEFAULT 0 COMMENT '收款方式 0:其他 1:支付宝 2:微信 3:银行卡' AFTER `content`,
  ADD COLUMN `account`     VARCHAR(255) NOT NULL DEFAULT '' COMMENT '收款账号' AFTER `method`,
  ADD COLUMN `qr_code_url` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '收款码图片URL' AFTER `account`;
@@ -1,25 +0,0 @@
 package log
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/perfect-panel/server/internal/logic/admin/log"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/result"
 )
 func FilterOrderRefundLogHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
 	return func(c *gin.Context) {
 		var req types.FilterOrderRefundLogRequest
 		_ = c.ShouldBind(&req)
 		validateErr := svcCtx.Validate(&req)
 		if validateErr != nil {
 			result.ParamErrorResult(c, validateErr)
 			return
 		}
 		l := log.NewFilterOrderRefundLogLogic(c.Request.Context(), svcCtx)
 		resp, err := l.FilterOrderRefundLog(&req)
 		result.HttpResult(c, resp, err)
 	}
 }
@@ -1,23 +0,0 @@
 package log
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/perfect-panel/server/internal/logic/admin/log"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/result"
 )
 func GetLogMessageRawHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
 	return func(c *gin.Context) {
 		var req types.GetLogMessageRawRequest
 		_ = c.ShouldBind(&req)
 		if err := svcCtx.Validate(&req); err != nil {
 			result.ParamErrorResult(c, err)
 			return
 		}
 		l := log.NewGetLogMessageRawLogic(c.Request.Context(), svcCtx)
 		resp, err := l.GetLogMessageRaw(&req)
 		result.HttpResult(c, resp, err)
 	}
 }
@@ -1,25 +0,0 @@
 package order
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/perfect-panel/server/internal/logic/admin/order"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/result"
 )
 func RefundOrderHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
 	return func(c *gin.Context) {
 		var req types.RefundOrderRequest
 		_ = c.ShouldBind(&req)
 		validateErr := svcCtx.Validate(&req)
 		if validateErr != nil {
 			result.ParamErrorResult(c, validateErr)
 			return
 		}
 		l := order.NewRefundOrderLogic(c.Request.Context(), svcCtx)
 		err := l.RefundOrder(&req)
 		result.HttpResult(c, nil, err)
 	}
 }
@@ -1,26 +0,0 @@
 package user
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/perfect-panel/server/internal/logic/public/user"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/result"
 )
 // Cancel Withdrawal
 func CancelWithdrawalHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
 	return func(c *gin.Context) {
 		var req types.CancelWithdrawalRequest
 		_ = c.ShouldBind(&req)
 		validateErr := svcCtx.Validate(&req)
 		if validateErr != nil {
 			result.ParamErrorResult(c, validateErr)
 			return
 		}
 		l := user.NewCancelWithdrawalLogic(c.Request.Context(), svcCtx)
 		resp, err := l.CancelWithdrawal(&req)
 		result.HttpResult(c, resp, err)
 	}
 }
@@ -250,18 +250,12 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
 		// Filter commission log
 		adminLogGroupRouter.GET("/commission/list", adminLog.FilterCommissionLogHandler(serverCtx))
 		// Filter order refund log
 		adminLogGroupRouter.GET("/order/refund/list", adminLog.FilterOrderRefundLogHandler(serverCtx))
 		// Filter email log
 		adminLogGroupRouter.GET("/email/list", adminLog.FilterEmailLogHandler(serverCtx))
 		// Get error log message detail
 		adminLogGroupRouter.GET("/error_message/detail", adminLog.GetErrorLogMessageDetailHandler(serverCtx))
 		// Get log message raw detail (temporary)
 		adminLogGroupRouter.GET("/message/detail", adminLog.GetLogMessageRawHandler(serverCtx))
 		// Get error log message list
 		adminLogGroupRouter.GET("/error_message/list", adminLog.GetErrorLogMessageListHandler(serverCtx))
@@ -347,9 +341,6 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
 		// Update order status
 		adminOrderGroupRouter.PUT("/status", adminOrder.UpdateOrderStatusHandler(serverCtx))
 		// Refund order
 		adminOrderGroupRouter.POST("/refund", adminOrder.RefundOrderHandler(serverCtx))
 		// Manually activate order
 		adminOrderGroupRouter.POST("/activate", adminOrder.ActivateOrderHandler(serverCtx))
 	}
@@ -1059,9 +1050,6 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
 		// Commission Withdraw
 		publicUserGroupRouter.POST("/commission_withdraw", publicUser.CommissionWithdrawHandler(serverCtx))
 		// Cancel Withdrawal
 		publicUserGroupRouter.POST("/withdrawal_cancel", publicUser.CancelWithdrawalHandler(serverCtx))
 		// Delete Current User Account
 		publicUserGroupRouter.DELETE("/current_user_account", publicUser.DeleteCurrentUserAccountHandler(serverCtx))
@@ -1,77 +0,0 @@
 package log
 import (
 	"context"
 	modellog "github.com/perfect-panel/server/internal/model/log"
 	"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 FilterOrderRefundLogLogic struct {
 	logger.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 func NewFilterOrderRefundLogLogic(ctx context.Context, svcCtx *svc.ServiceContext) *FilterOrderRefundLogLogic {
 	return &FilterOrderRefundLogLogic{
 		Logger: logger.WithContext(ctx),
 		ctx:    ctx,
 		svcCtx: svcCtx,
 	}
 }
 func (l *FilterOrderRefundLogLogic) FilterOrderRefundLog(req *types.FilterOrderRefundLogRequest) (resp *types.FilterOrderRefundLogResponse, err error) {
 	data, total, err := l.svcCtx.LogModel.FilterSystemLog(l.ctx, &modellog.FilterParams{
 		Page:     req.Page,
 		Size:     req.Size,
 		Data:     req.Date,
 		Search:   req.Search,
 		Type:     modellog.TypeOrderRefund.Uint8(),
 		ObjectID: req.OrderId,
 	})
 	if err != nil {
 		l.Errorw("Query order refund log failed", logger.Field("error", err.Error()))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Query order refund log failed")
 	}
 	var list []types.OrderRefundLog
 	for _, item := range data {
 		var content modellog.OrderRefund
 		if err := content.Unmarshal([]byte(item.Content)); err != nil {
 			l.Errorf("unmarshal order refund log content failed: %v", err.Error())
 			continue
 		}
 		if req.UserId > 0 && content.TargetUserId != req.UserId && content.RefererUserId != req.UserId && content.OperatorUserId != req.UserId {
 			continue
 		}
 		list = append(list, types.OrderRefundLog{
 			OrderId:                content.OrderId,
 			OrderNo:                content.OrderNo,
 			OperatorUserId:         content.OperatorUserId,
 			OperatorAuthIdentifier: content.OperatorAuthIdentifier,
 			TargetUserId:           content.TargetUserId,
 			UserSubscribeId:        content.UserSubscribeId,
 			RefererUserId:          content.RefererUserId,
 			CommissionAmount:       content.CommissionAmount,
 			Reason:                 content.Reason,
 			OrderStatusBefore:      content.OrderStatusBefore,
 			OrderStatusAfter:       content.OrderStatusAfter,
 			SubscribeStatusBefore:  content.SubscribeStatusBefore,
 			SubscribeStatusAfter:   content.SubscribeStatusAfter,
 			SubscribeExpireBefore:  content.SubscribeExpireBefore,
 			SubscribeExpireAfter:   content.SubscribeExpireAfter,
 			CommissionBefore:       content.CommissionBefore,
 			CommissionAfter:        content.CommissionAfter,
 			Timestamp:              content.Timestamp,
 		})
 	}
 	return &types.FilterOrderRefundLogResponse{
 		Total: total,
 		List:  list,
 	}, nil
 }
@@ -1,66 +0,0 @@
 package log
 import (
 	"context"
 	"encoding/json"
 	"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 GetLogMessageRawLogic struct {
 	logger.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 func NewGetLogMessageRawLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetLogMessageRawLogic {
 	return &GetLogMessageRawLogic{Logger: logger.WithContext(ctx), ctx: ctx, svcCtx: svcCtx}
 }
 func (l *GetLogMessageRawLogic) GetLogMessageRaw(req *types.GetLogMessageRawRequest) (resp *types.GetLogMessageRawResponse, err error) {
 	row, err := l.svcCtx.LogMessageModel.FindOne(l.ctx, req.Id)
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "FindOne log_message id=%d: %v", req.Id, err)
 	}
 	var contextJSON json.RawMessage
 	if row.Context != "" {
 		if json.Valid([]byte(row.Context)) {
 			contextJSON = json.RawMessage(row.Context)
 		} else {
 			b, _ := json.Marshal(row.Context)
 			contextJSON = b
 		}
 	}
 	var occurredAt int64
 	if row.OccurredAt != nil {
 		occurredAt = row.OccurredAt.UnixMilli()
 	}
 	return &types.GetLogMessageRawResponse{
 		Id:         row.Id,
 		Platform:   row.Platform,
 		AppVersion: row.AppVersion,
 		OsName:     row.OsName,
 		OsVersion:  row.OsVersion,
 		DeviceId:   row.DeviceId,
 		UserId:     row.UserId,
 		SessionId:  row.SessionId,
 		Level:      row.Level,
 		ErrorCode:  row.ErrorCode,
 		Message:    row.Message,
 		Stack:      row.Stack,
 		Context:    contextJSON,
 		ClientIP:   row.ClientIP,
 		UserAgent:  row.UserAgent,
 		Locale:     row.Locale,
 		Digest:     row.Digest,
 		OccurredAt: occurredAt,
 		CreatedAt:  row.CreatedAt.UnixMilli(),
 	}, nil
 }
@@ -35,28 +35,6 @@ func (l *GetOrderListLogic) GetOrderList(req *types.GetOrderListRequest) (resp *
 	resp = &types.GetOrderListResponse{}
 	resp.List = make([]types.Order, 0)
 	tool.DeepCopy(&resp.List, list)
 	for i := range resp.List {
 		resp.List[i].StatusName = orderStatusName(resp.List[i].Status)
 	}
 	resp.Total = total
 	return
 }
 func orderStatusName(status uint8) string {
 	switch status {
 	case 1:
 		return "pending"
 	case 2:
 		return "paid"
 	case 3:
 		return "closed"
 	case 4:
 		return "failed"
 	case 5:
 		return "finished"
 	case 6:
 		return "refunded"
 	default:
 		return "unknown"
 	}
 }
@@ -1,298 +0,0 @@
 package order
 import (
 	"context"
 	"fmt"
 	"strings"
 	"time"
 	"github.com/perfect-panel/server/internal/model/log"
 	modelorder "github.com/perfect-panel/server/internal/model/order"
 	modeluser "github.com/perfect-panel/server/internal/model/user"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/constant"
 	"github.com/perfect-panel/server/pkg/logger"
 	"github.com/perfect-panel/server/pkg/xerr"
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 )
 const (
 	orderStatusRefunded = 6
 )
 type RefundOrderLogic struct {
 	logger.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 func NewRefundOrderLogic(ctx context.Context, svcCtx *svc.ServiceContext) *RefundOrderLogic {
 	return &RefundOrderLogic{
 		Logger: logger.WithContext(ctx),
 		ctx:    ctx,
 		svcCtx: svcCtx,
 	}
 }
 func (l *RefundOrderLogic) RefundOrder(req *types.RefundOrderRequest) error {
 	operator, ok := l.ctx.Value(constant.CtxKeyUser).(*modeluser.User)
 	if !ok {
 		return errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
 	}
 	reason := strings.TrimSpace(req.Reason)
 	var cachesToClear []*modeluser.Subscribe
 	var planCacheIDs []int64
 	var userCacheTargets []*modeluser.User
 	err := l.svcCtx.DB.WithContext(l.ctx).Transaction(func(tx *gorm.DB) error {
 		var orderInfo modelorder.Order
 		if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).
 			Model(&modelorder.Order{}).
 			Where("id = ?", req.Id).
 			First(&orderInfo).Error; err != nil {
 			if errors.Is(err, gorm.ErrRecordNotFound) {
 				return errors.Wrapf(xerr.NewErrCode(xerr.OrderNotExist), "order %d not found", req.Id)
 			}
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query order failed: %v", err)
 		}
 		if orderInfo.Status == orderStatusRefunded {
 			return errors.Wrapf(xerr.NewErrCode(xerr.OrderAlreadyRefunded), "order %d already refunded", orderInfo.Id)
 		}
 		if orderInfo.Status != 2 && orderInfo.Status != 5 {
 			return errors.Wrapf(xerr.NewErrCode(xerr.OrderStatusError), "order %d status %d is not refundable", orderInfo.Id, orderInfo.Status)
 		}
 		userSub, err := l.lockRefundTargetSubscription(tx, &orderInfo)
 		if err != nil {
 			return err
 		}
 		orderStatusBefore := orderInfo.Status
 		subStatusBefore := userSub.Status
 		subExpireBefore := userSub.ExpireTime
 		now := time.Now()
 		referer, commissionAmount, err := l.lockCommissionSource(tx, orderInfo.OrderNo, orderInfo.Commission)
 		if err != nil {
 			return err
 		}
 		var commissionBefore int64
 		var commissionAfter int64
 		if referer != nil {
 			commissionBefore = referer.Commission
 			commissionAfter = referer.Commission - commissionAmount
 			if err := tx.Model(&modeluser.User{}).
 				Where("id = ?", referer.Id).
 				UpdateColumn("commission", gorm.Expr("commission - ?", commissionAmount)).Error; err != nil {
 				return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "refund commission failed: %v", err)
 			}
 			commissionLog := log.Commission{
 				Type:      log.CommissionTypeRefund,
 				Amount:    -commissionAmount,
 				OrderNo:   orderInfo.OrderNo,
 				Timestamp: now.UnixMilli(),
 			}
 			content, marshalErr := commissionLog.Marshal()
 			if marshalErr != nil {
 				return errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "marshal commission refund log failed: %v", marshalErr)
 			}
 			if err := tx.Model(&log.SystemLog{}).Create(&log.SystemLog{
 				Type:      log.TypeCommission.Uint8(),
 				Date:      now.Format(time.DateOnly),
 				ObjectID:  referer.Id,
 				Content:   string(content),
 				CreatedAt: now,
 			}).Error; err != nil {
 				return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "insert commission refund log failed: %v", err)
 			}
 			referer.Commission = commissionAfter
 			userCacheTargets = append(userCacheTargets, referer)
 		}
 		if err := tx.Model(&modelorder.Order{}).
 			Where("id = ? AND status IN ?", orderInfo.Id, []int{2, 5}).
 			Update("status", orderStatusRefunded).Error; err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "refund order status update failed: %v", err)
 		}
 		orderInfo.Status = orderStatusRefunded
 		userSub.Status = 3
 		userSub.ExpireTime = now.Add(-time.Second)
 		userSub.FinishedAt = &now
 		if err := tx.Model(&modeluser.Subscribe{}).
 			Where("id = ?", userSub.Id).
 			Updates(map[string]interface{}{
 				"status":      userSub.Status,
 				"expire_time": userSub.ExpireTime,
 				"finished_at": userSub.FinishedAt,
 			}).Error; err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "update subscription failed: %v", err)
 		}
 		refundLog, err := l.buildRefundAuditLog(operator, &orderInfo, userSub, referer, commissionAmount, reason, orderStatusBefore, subStatusBefore, subExpireBefore, commissionBefore, commissionAfter, now)
 		if err != nil {
 			return err
 		}
 		logContent, err := refundLog.Marshal()
 		if err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "marshal refund audit log failed: %v", err)
 		}
 		if err := tx.Model(&log.SystemLog{}).Create(&log.SystemLog{
 			Type:      log.TypeOrderRefund.Uint8(),
 			Date:      now.Format(time.DateOnly),
 			ObjectID:  orderInfo.Id,
 			Content:   string(logContent),
 			CreatedAt: now,
 		}).Error; err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "insert refund audit log failed: %v", err)
 		}
 		cachesToClear = append(cachesToClear, userSub)
 		if userSub.SubscribeId > 0 {
 			planCacheIDs = append(planCacheIDs, userSub.SubscribeId)
 		}
 		if orderInfo.UserId > 0 {
 			orderUser := &modeluser.User{Id: orderInfo.UserId}
 			userCacheTargets = append(userCacheTargets, orderUser)
 		}
 		return nil
 	})
 	if err != nil {
 		l.Errorw("[RefundOrder] refund failed", logger.Field("error", err.Error()), logger.Field("order_id", req.Id))
 		return err
 	}
 	if len(cachesToClear) > 0 {
 		if clearErr := l.svcCtx.UserModel.ClearSubscribeCache(l.ctx, cachesToClear...); clearErr != nil {
 			l.Errorw("[RefundOrder] clear subscribe cache failed", logger.Field("error", clearErr.Error()), logger.Field("order_id", req.Id))
 		}
 	}
 	for _, subscribeID := range planCacheIDs {
 		if clearErr := l.svcCtx.SubscribeModel.ClearCache(l.ctx, subscribeID); clearErr != nil {
 			l.Errorw("[RefundOrder] clear subscribe cache failed", logger.Field("error", clearErr.Error()), logger.Field("subscribe_id", subscribeID))
 		}
 	}
 	if len(userCacheTargets) > 0 {
 		if clearErr := l.svcCtx.UserModel.ClearUserCache(l.ctx, userCacheTargets...); clearErr != nil {
 			l.Errorw("[RefundOrder] clear user cache failed", logger.Field("error", clearErr.Error()))
 		}
 	}
 	return nil
 }
 func (l *RefundOrderLogic) lockRefundTargetSubscription(tx *gorm.DB, orderInfo *modelorder.Order) (*modeluser.Subscribe, error) {
 	var userSub modeluser.Subscribe
 	err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).
 		Model(&modeluser.Subscribe{}).
 		Where("order_id = ?", orderInfo.Id).
 		First(&userSub).Error
 	if err == nil {
 		return &userSub, nil
 	}
 	if !errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query refund subscription failed: %v", err)
 	}
 	if orderInfo.Type != 2 {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.OrderRefundNoSubscription), "order %d has no linked subscription", orderInfo.Id)
 	}
 	if orderInfo.ParentId == 0 {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.OrderRefundNoSubscription), "renewal order %d has no parent order", orderInfo.Id)
 	}
 	err = tx.Clauses(clause.Locking{Strength: "UPDATE"}).
 		Model(&modeluser.Subscribe{}).
 		Where("order_id = ?", orderInfo.ParentId).
 		First(&userSub).Error
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.OrderRefundNoSubscription), "renewal order %d parent subscription not found", orderInfo.Id)
 		}
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query renewal subscription failed: %v", err)
 	}
 	return &userSub, nil
 }
 func (l *RefundOrderLogic) lockCommissionSource(tx *gorm.DB, orderNo string, orderCommission int64) (*modeluser.User, int64, error) {
 	var commissionLogs []log.SystemLog
 	if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).
 		Model(&log.SystemLog{}).
 		Where("type = ? AND content LIKE ?", log.TypeCommission.Uint8(), fmt.Sprintf("%%\"order_no\":\"%s\"%%", orderNo)).
 		Order("id DESC").
 		Find(&commissionLogs).Error; err != nil {
 		return nil, 0, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query commission log failed: %v", err)
 	}
 	for _, item := range commissionLogs {
 		var content log.Commission
 		if err := content.Unmarshal([]byte(item.Content)); err != nil {
 			continue
 		}
 		if content.Type != log.CommissionTypePurchase && content.Type != log.CommissionTypeRenewal {
 			continue
 		}
 		var referer modeluser.User
 		if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).
 			Model(&modeluser.User{}).
 			Where("id = ?", item.ObjectID).
 			First(&referer).Error; err != nil {
 			return nil, 0, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query commission owner failed: %v", err)
 		}
 		return &referer, content.Amount, nil
 	}
 	if orderCommission > 0 {
 		return nil, 0, errors.Wrapf(xerr.NewErrCode(xerr.OrderRefundCommissionMismatch), "order %s commission owner not found", orderNo)
 	}
 	return nil, 0, nil
 }
 func (l *RefundOrderLogic) buildRefundAuditLog(
 	operator *modeluser.User,
 	orderInfo *modelorder.Order,
 	userSub *modeluser.Subscribe,
 	referer *modeluser.User,
 	commissionAmount int64,
 	reason string,
 	orderStatusBefore uint8,
 	subStatusBefore uint8,
 	subExpireBefore time.Time,
 	commissionBefore int64,
 	commissionAfter int64,
 	now time.Time,
 ) (*log.OrderRefund, error) {
 	refundLog := &log.OrderRefund{
 		OrderId:               orderInfo.Id,
 		OrderNo:               orderInfo.OrderNo,
 		OperatorUserId:        operator.Id,
 		TargetUserId:          userSub.UserId,
 		UserSubscribeId:       userSub.Id,
 		CommissionAmount:      commissionAmount,
 		Reason:                reason,
 		OrderStatusBefore:     orderStatusBefore,
 		OrderStatusAfter:      orderInfo.Status,
 		SubscribeStatusBefore: subStatusBefore,
 		SubscribeStatusAfter:  userSub.Status,
 		SubscribeExpireBefore: subExpireBefore.UnixMilli(),
 		SubscribeExpireAfter:  userSub.ExpireTime.UnixMilli(),
 		CommissionBefore:      commissionBefore,
 		CommissionAfter:       commissionAfter,
 		Timestamp:             now.UnixMilli(),
 	}
 	if referer != nil {
 		refundLog.RefererUserId = referer.Id
 	}
 	if len(operator.AuthMethods) > 0 {
 		refundLog.OperatorAuthIdentifier = operator.AuthMethods[0].AuthIdentifier
 	}
 	return refundLog, nil
 }
@@ -1,85 +0,0 @@
 package order
 import (
 	"testing"
 	"time"
 	modelorder "github.com/perfect-panel/server/internal/model/order"
 	modeluser "github.com/perfect-panel/server/internal/model/user"
 )
 func TestOrderStatusName(t *testing.T) {
 	tests := map[uint8]string{
 		1: "pending",
 		2: "paid",
 		3: "closed",
 		4: "failed",
 		5: "finished",
 		6: "refunded",
 		7: "unknown",
 	}
 	for input, want := range tests {
 		if got := orderStatusName(input); got != want {
 			t.Fatalf("status %d: got %q want %q", input, got, want)
 		}
 	}
 }
 func TestBuildRefundAuditLog(t *testing.T) {
 	logic := &RefundOrderLogic{}
 	now := time.Unix(1710000000, 0)
 	expireBefore := now.Add(24 * time.Hour)
 	expireAfter := now.Add(-time.Second)
 	operator := &modeluser.User{
 		Id: 100,
 		AuthMethods: []modeluser.AuthMethods{
 			{AuthIdentifier: "admin@example.com"},
 		},
 	}
 	orderInfo := &modelorder.Order{Id: 10, OrderNo: "ORD-1", Status: orderStatusRefunded}
 	userSub := &modeluser.Subscribe{Id: 20, UserId: 30, Status: 3, ExpireTime: expireAfter}
 	referer := &modeluser.User{Id: 40}
 	got, err := logic.buildRefundAuditLog(
 		operator,
 		orderInfo,
 		userSub,
 		referer,
 		500,
 		"manual refund",
 		5,
 		1,
 		expireBefore,
 		900,
 		400,
 		now,
 	)
 	if err != nil {
 		t.Fatalf("buildRefundAuditLog error: %v", err)
 	}
 	if got.OrderId != 10 || got.OrderNo != "ORD-1" {
 		t.Fatalf("unexpected order info: %+v", got)
 	}
 	if got.OperatorUserId != 100 || got.OperatorAuthIdentifier != "admin@example.com" {
 		t.Fatalf("unexpected operator info: %+v", got)
 	}
 	if got.TargetUserId != 30 || got.UserSubscribeId != 20 {
 		t.Fatalf("unexpected subscription info: %+v", got)
 	}
 	if got.RefererUserId != 40 || got.CommissionAmount != 500 {
 		t.Fatalf("unexpected commission info: %+v", got)
 	}
 	if got.OrderStatusBefore != 5 || got.OrderStatusAfter != orderStatusRefunded {
 		t.Fatalf("unexpected order status: %+v", got)
 	}
 	if got.SubscribeStatusBefore != 1 || got.SubscribeStatusAfter != 3 {
 		t.Fatalf("unexpected subscribe status: %+v", got)
 	}
 	if got.SubscribeExpireBefore != expireBefore.UnixMilli() || got.SubscribeExpireAfter != expireAfter.UnixMilli() {
 		t.Fatalf("unexpected expire transition: %+v", got)
 	}
 	if got.CommissionBefore != 900 || got.CommissionAfter != 400 {
 		t.Fatalf("unexpected commission transition: %+v", got)
 	}
 }
@@ -42,9 +42,6 @@ func (l *GetWithdrawalListLogic) GetWithdrawalList(req *types.GetWithdrawalListR
 	if req.Status != nil {
 		query = query.Where("status = ?", *req.Status)
 	}
 	if req.Method != nil {
 		query = query.Where("method = ?", *req.Method)
 	}
 	var total int64
 	if err := query.Count(&total).Error; err != nil {
@@ -65,9 +62,6 @@ func (l *GetWithdrawalListLogic) GetWithdrawalList(req *types.GetWithdrawalListR
 			Content:   row.Content,
 			Status:    row.Status,
 			Reason:    row.Reason,
 			Method:    row.Method,
 			Account:   row.Account,
 			QrCodeUrl: row.QrCodeUrl,
 			CreatedAt: row.CreatedAt.UnixMilli(),
 			UpdatedAt: row.UpdatedAt.UnixMilli(),
 		})
@@ -46,13 +46,13 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 	}
 	err = l.svcCtx.UserModel.Transaction(l.ctx, func(tx *gorm.DB) error {
-		if req.Balance != nil && userInfo.Balance != *req.Balance {
+		if userInfo.Balance != req.Balance {
-			change := *req.Balance - userInfo.Balance
+			change := req.Balance - userInfo.Balance
 			balanceLog := log.Balance{
 				Type:      log.BalanceTypeAdjust,
 				Amount:    change,
 				OrderNo:   "",
-				Balance:   *req.Balance,
+				Balance:   req.Balance,
 				Timestamp: time.Now().UnixMilli(),
 			}
 			content, _ := balanceLog.Marshal()
@@ -66,14 +66,14 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 			if err != nil {
 				return err
 			}
-			userInfo.Balance = *req.Balance
+			userInfo.Balance = req.Balance
 		}
-		if req.GiftAmount != nil && userInfo.GiftAmount != *req.GiftAmount {
+		if userInfo.GiftAmount != req.GiftAmount {
-			change := *req.GiftAmount - userInfo.GiftAmount
+			change := req.GiftAmount - userInfo.GiftAmount
 			if change != 0 {
 				var changeType uint16
-				if userInfo.GiftAmount < *req.GiftAmount {
+				if userInfo.GiftAmount < req.GiftAmount {
 					changeType = log.GiftTypeIncrease
 				} else {
 					changeType = log.GiftTypeReduce
@@ -81,7 +81,7 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 				giftLog := log.Gift{
 					Type:      changeType,
 					Amount:    change,
-					Balance:   *req.GiftAmount,
+					Balance:   req.GiftAmount,
 					Remark:    "Admin adjustment",
 					Timestamp: time.Now().UnixMilli(),
 				}
@@ -96,27 +96,23 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 				if err != nil {
 					return err
 				}
-				userInfo.GiftAmount = *req.GiftAmount
+				userInfo.GiftAmount = req.GiftAmount
 			}
 		}
-		if req.Commission != nil && *req.Commission != userInfo.Commission {
+		if req.Commission != userInfo.Commission {
-			remark := ""
+			if isWithdrawalScene(req.Remark) {
 			if req.Remark != nil {
 				remark = *req.Remark
 			}
 			if isWithdrawalScene(remark) {
 				logWithdrawalGuard(l.Logger, userInfo.Id)
 				return errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "commission overwrite is blocked in withdrawal scene")
 			}
-			change := *req.Commission - userInfo.Commission
+			change := req.Commission - userInfo.Commission
 			if err = l.svcCtx.UserModel.UpdateCommission(l.ctx, userInfo.Id, change, tx); err != nil {
 				return err
 			}
 			if err = logicCommon.WriteCommissionLog(tx, userInfo.Id, log.CommissionTypeAdjust, change, ""); err != nil {
 				return err
 			}
-			userInfo.Commission = *req.Commission
+			userInfo.Commission = req.Commission
 		}
 		if req.Avatar != "" {
 			userInfo.Avatar = req.Avatar
@@ -124,17 +120,15 @@ func (l *UpdateUserBasicInfoLogic) UpdateUserBasicInfo(req *types.UpdateUserBasi
 		if req.ReferCode != "" {
 			userInfo.ReferCode = req.ReferCode
 		}
-		if req.RefererId != nil {
+		userInfo.RefererId = req.RefererId
 			userInfo.RefererId = *req.RefererId
 		}
 		if req.Enable != nil {
 			userInfo.Enable = req.Enable
 		}
 		if req.IsAdmin != nil {
 			userInfo.IsAdmin = req.IsAdmin
 		}
-		if req.Remark != nil {
+		if req.Remark != "" {
-			userInfo.Remark = *req.Remark
+			userInfo.Remark = req.Remark
 		}
 		if req.OnlyFirstPurchase != nil {
 			userInfo.OnlyFirstPurchase = req.OnlyFirstPurchase
@@ -12,12 +12,10 @@ import (
 	"github.com/perfect-panel/server/pkg/xerr"
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 )
 func approveWithdrawal(ctx context.Context, svcCtx *svc.ServiceContext, withdrawalID int64) error {
-	var approvedUserID int64
+	return svcCtx.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 	err := svcCtx.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		withdrawal, err := logicCommon.LoadPendingWithdrawalForUpdate(ctx, tx, withdrawalID)
 		if err != nil {
 			if err.Error() == "withdrawal status invalid" {
@@ -26,50 +24,26 @@ func approveWithdrawal(ctx context.Context, svcCtx *svc.ServiceContext, withdraw
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "load withdrawal failed: %v", err)
 		}
 		// Lock user row and verify sufficient balance before deducting.
 		var u usermodel.User
 		if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).
 			Where("id = ?", withdrawal.UserId).First(&u).Error; err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "load user failed: %v", err)
 		}
 		if u.Commission < withdrawal.Amount {
 			return errors.Wrapf(xerr.NewErrCode(xerr.UserCommissionNotEnough), "user %d has insufficient commission balance", withdrawal.UserId)
 		}
 		if err := tx.Model(&usermodel.Withdrawal{}).
-			Where("id = ? AND status = ?", withdrawalID, usermodel.WithdrawalStatusPending).
+			Where("id = ? AND status = 0", withdrawalID).
 			Updates(map[string]interface{}{
-				"status": usermodel.WithdrawalStatusApproved,
+				"status": 1,
 				"reason": "",
 			}).Error; err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "approve withdrawal failed: %v", err)
 		}
 		// Deduct commission atomically inside the transaction.
 		if err := tx.Model(&usermodel.User{}).
 			Where("id = ?", withdrawal.UserId).
 			UpdateColumn("commission", gorm.Expr("commission - ?", withdrawal.Amount)).Error; err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "deduct commission failed: %v", err)
 		}
 		if err := logicCommon.WriteCommissionLog(tx, withdrawal.UserId, log.CommissionTypeWithdraw, withdrawal.Amount, ""); err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "write commission log failed: %v", err)
 		}
 		approvedUserID = withdrawal.UserId
 		return nil
 	})
 	if err == nil && approvedUserID > 0 {
 		_ = svcCtx.UserModel.ClearUserCache(ctx, &usermodel.User{Id: approvedUserID})
 	}
 	return err
 }
 func rejectWithdrawal(ctx context.Context, svcCtx *svc.ServiceContext, withdrawalID int64, reason string) error {
 	reason = strings.TrimSpace(reason)
 	return svcCtx.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		_, err := logicCommon.LoadPendingWithdrawalForUpdate(ctx, tx, withdrawalID)
+		withdrawal, err := logicCommon.LoadPendingWithdrawalForUpdate(ctx, tx, withdrawalID)
 		if err != nil {
 			if err.Error() == "withdrawal status invalid" {
 				return errors.Wrapf(xerr.NewErrCode(xerr.WithdrawalStatusInvalid), "withdrawal %d already processed", withdrawalID)
@@ -77,14 +51,23 @@ func rejectWithdrawal(ctx context.Context, svcCtx *svc.ServiceContext, withdrawa
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "load withdrawal failed: %v", err)
 		}
-		// Commission was NOT deducted at application time under the new logic,
+		if err := tx.Model(&usermodel.Withdrawal{}).
-		// so rejection requires no refund — only a status update.
+			Where("id = ? AND status = 0", withdrawalID).
 		return tx.Model(&usermodel.Withdrawal{}).
 			Where("id = ? AND status = ?", withdrawalID, usermodel.WithdrawalStatusPending).
 			Updates(map[string]interface{}{
-				"status": usermodel.WithdrawalStatusRejected,
+				"status": 2,
 				"reason": reason,
-			}).Error
+			}).Error; err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "reject withdrawal failed: %v", err)
 		}
 		if err := svcCtx.UserModel.UpdateCommission(ctx, withdrawal.UserId, withdrawal.Amount, tx); err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "refund commission failed: %v", err)
 		}
 		if err := logicCommon.WriteCommissionLog(tx, withdrawal.UserId, log.CommissionTypeWithdrawReject, withdrawal.Amount, ""); err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "write commission log failed: %v", err)
 		}
 		return nil
 	})
 }
@@ -41,7 +41,7 @@ func LoadPendingWithdrawalForUpdate(ctx context.Context, tx *gorm.DB, withdrawal
 		First(&withdrawal).Error; err != nil {
 		return nil, err
 	}
-	if withdrawal.Status != usermodel.WithdrawalStatusPending {
+	if withdrawal.Status != 0 {
 		return nil, errors.New("withdrawal status invalid")
 	}
 	return &withdrawal, nil
@@ -3,20 +3,17 @@ package notify
 import (
 	"context"
 	"encoding/json"
 	"fmt"
 	"strconv"
 	"strings"
 	commonLogic "github.com/perfect-panel/server/internal/logic/common"
 	iapmodel "github.com/perfect-panel/server/internal/model/iap/apple"
 	"github.com/perfect-panel/server/internal/model/order"
 	"github.com/perfect-panel/server/internal/model/subscribe"
 	"github.com/perfect-panel/server/internal/model/user"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
 	iapapple "github.com/perfect-panel/server/pkg/iap/apple"
 	"github.com/perfect-panel/server/pkg/logger"
 	"github.com/perfect-panel/server/pkg/tool"
 	"gorm.io/gorm"
 )
@@ -87,7 +84,6 @@ func (l *AppleIAPNotifyLogic) Handle(signedPayload string) error {
 				l.Errorw("iap notify insert transaction error", logger.Field("error", e.Error()), logger.Field("productId", txPayload.ProductId), logger.Field("originalTransactionId", txPayload.OriginalTransactionId))
 				return e
 			}
 			existing = rec
 		} else {
 			if txPayload.RevocationDate != nil {
 				// 撤销场景：更新 revocation_at
@@ -100,32 +96,6 @@ func (l *AppleIAPNotifyLogic) Handle(signedPayload string) error {
 				}
 			}
 		}
 		// Fix Bug 7: resolve userId when the IAP transaction record has no associated user.
 		// This can happen if the first notification for a subscription arrived before the
 		// in-app purchase flow created the order (race) or the order was made in a previous
 		// build that did not write user_id to the IAP transaction table.
 		if existing != nil && existing.UserId == 0 {
 			var origOrder order.Order
 			if lookupErr := db.Model(&order.Order{}).
 				Where("trade_no = ? AND method = ?", txPayload.OriginalTransactionId, "apple_iap").
 				Order("id ASC").
 				First(&origOrder).Error; lookupErr == nil && origOrder.UserId > 0 {
 				existing.UserId = origOrder.UserId
 				_ = db.Model(&iapmodel.Transaction{}).
 					Where("id = ?", existing.Id).
 					Update("user_id", origOrder.UserId).Error
 				l.Infow("iap notify resolved zero userId from original purchase order",
 					logger.Field("userId", origOrder.UserId),
 					logger.Field("originalTransactionId", txPayload.OriginalTransactionId),
 				)
 			} else {
 				l.Errorw("CRITICAL: iap notify UserId=0 and cannot resolve from order, notification dropped",
 					logger.Field("originalTransactionId", txPayload.OriginalTransactionId))
 				return fmt.Errorf("iap notify: UserId=0 and cannot resolve from order for original_transaction_id=%s", txPayload.OriginalTransactionId)
 			}
 		}
 		var days int64
 		{
 			pid := strings.ToLower(txPayload.ProductId)
@@ -199,12 +169,7 @@ func (l *AppleIAPNotifyLogic) Handle(signedPayload string) error {
 			}
 		}
 		if days == 0 {
-			// Both string-parse and DB fallback failed to map the product to days.
+			l.Errorw("iap notify product mapping missing", logger.Field("productId", txPayload.ProductId))
 			// Return an error so Apple retries the notification; silently ignoring
 			// this would cause the subscriber's renewal to be lost.
 			l.Errorw("CRITICAL: iap notify product mapping missing, returning error to trigger retry",
 				logger.Field("productId", txPayload.ProductId))
 			return fmt.Errorf("iap product id %s could not be mapped to subscription days", txPayload.ProductId)
 		}
 		token := "iap:" + txPayload.OriginalTransactionId
 		sub, e := l.svcCtx.UserModel.FindOneSubscribeByToken(l.ctx, token)
@@ -251,11 +216,6 @@ func (l *AppleIAPNotifyLogic) Handle(signedPayload string) error {
 							logger.Field("product_id", txPayload.ProductId),
 						)...,
 					)
 					// Create audit order record for renewal notifications (Bug 7)
 					if err := l.createIAPRenewalAuditOrder(db, ntype, txPayload.TransactionId, candidate.UserId, candidate.SubscribeId, candidate.Token); err != nil {
 						l.Errorw("iap notify fallback create renewal order error", logger.Field("error", err.Error()))
 						// Non-fatal: subscription already updated; order creation failure is logged only
 					}
 					break
 				}
 			}
@@ -288,52 +248,7 @@ func (l *AppleIAPNotifyLogic) Handle(signedPayload string) error {
 					logger.Field("product_id", txPayload.ProductId),
 				)...,
 			)
 			// Create audit order record for renewal notifications (Bug 7)
 			if err := l.createIAPRenewalAuditOrder(db, ntype, txPayload.TransactionId, sub.UserId, sub.SubscribeId, sub.Token); err != nil {
 				l.Errorw("iap notify create renewal order error", logger.Field("error", err.Error()))
 				// Non-fatal: subscription already updated; order creation failure is logged only
 			}
 		}
 		return nil
 	})
 }
 // createIAPRenewalAuditOrder creates a finished renewal order record for DID_RENEW and SUBSCRIBED
 // Apple SSNS notifications so that the order table has a complete financial audit trail.
 // The operation is idempotent: if an order with the same trade_no already exists it is skipped.
 func (l *AppleIAPNotifyLogic) createIAPRenewalAuditOrder(db *gorm.DB, ntype, transactionId string, userId, subscribeId int64, subscribeToken string) error {
 	if ntype != "DID_RENEW" && ntype != "SUBSCRIBED" {
 		return nil
 	}
 	// Idempotency check
 	var count int64
 	if err := db.Model(&order.Order{}).
 		Where("trade_no = ? AND method = ?", transactionId, "apple_iap").
 		Count(&count).Error; err != nil {
 		return fmt.Errorf("check existing iap renewal order: %w", err)
 	}
 	if count > 0 {
 		return nil
 	}
 	rec := &order.Order{
 		UserId:         userId,
 		OrderNo:        tool.GenerateTradeNo(),
 		Type:           2, // OrderTypeRenewal
 		Status:         5, // OrderStatusFinished
 		Method:         "apple_iap",
 		TradeNo:        transactionId,
 		SubscribeId:    subscribeId,
 		SubscribeToken: subscribeToken,
 		Quantity:       1,
 		IsNew:          false,
 	}
 	if err := db.Model(&order.Order{}).Create(rec).Error; err != nil {
 		return fmt.Errorf("create iap renewal audit order: %w", err)
 	}
 	l.Infow("iap notify created renewal audit order",
 		logger.Field("orderNo", rec.OrderNo),
 		logger.Field("transactionId", transactionId),
 		logger.Field("userId", userId),
 	)
 	return nil
 }
@@ -154,12 +154,9 @@ func (l *PurchaseLogic) Purchase(req *types.PortalPurchaseRequest) (resp *types.
 		}
 		content, _ := tempOrder.Marshal()
-		// Persist activation context to DB so the worker can recover if Redis TTL expires.
+		if _, err = l.svcCtx.Redis.Set(l.ctx, fmt.Sprintf(constant.TempOrderCacheKey, orderInfo.OrderNo), string(content), CloseOrderTimeMinutes*time.Minute).Result(); err != nil {
-		orderInfo.ActivationContext = string(content)
+			l.Errorw("[Purchase] Redis set error", logger.Field("error", err.Error()), logger.Field("order_no", orderInfo.OrderNo))
-
+			return err
 		// Write to Redis as a hot cache (best-effort; non-fatal on failure).
 		if _, redisErr := l.svcCtx.Redis.Set(l.ctx, fmt.Sprintf(constant.TempOrderCacheKey, orderInfo.OrderNo), string(content), CloseOrderTimeMinutes*time.Minute).Result(); redisErr != nil {
 			l.Infow("[Purchase] Redis set error (non-fatal, DB fallback available)", logger.Field("error", redisErr.Error()), logger.Field("order_no", orderInfo.OrderNo))
 		}
 		l.Infow("[Purchase] Guest order", logger.Field("order_no", orderInfo.OrderNo), logger.Field("identifier", req.Identifier))
@@ -172,7 +169,7 @@ func (l *PurchaseLogic) Purchase(req *types.PortalPurchaseRequest) (resp *types.
 			}
 		}
-		// save guest order (activation_context is included)
+		// save guest order
 		if err = l.svcCtx.OrderModel.Insert(l.ctx, orderInfo, tx); err != nil {
 			return err
 		}
@@ -151,19 +151,6 @@ func (l *RedeemCodeLogic) RedeemCode(req *types.RedeemCodeRequest) (resp *types.
 	}
 	// 创建Order记录
 	redemptionContext := struct {
 		Type             string `json:"type"`
 		RedemptionCodeId int64  `json:"redemption_code_id"`
 		UnitTime         string `json:"unit_time"`
 		Quantity         int64  `json:"quantity"`
 	}{
 		Type:             "redemption",
 		RedemptionCodeId: redemptionCode.Id,
 		UnitTime:         redemptionCode.UnitTime,
 		Quantity:         redemptionCode.Quantity,
 	}
 	activationContextJSON, _ := json.Marshal(redemptionContext)
 	orderInfo := &order.Order{
 		UserId:         u.Id,
 		OrderNo:        tool.GenerateTradeNo(),
@@ -182,17 +169,16 @@ func (l *RedeemCodeLogic) RedeemCode(req *types.RedeemCodeRequest) (resp *types.
 		Status:         2, // 直接设置为已支付
 		SubscribeId:    redemptionCode.SubscribePlan,
 		IsNew:          isNew,
 		ActivationContext: string(activationContextJSON),
 	}
-	// 保存Order到数据库（activation_context 同步写入，作为 Redis 的持久化兜底）
+	// 保存Order到数据库
 	err = l.svcCtx.OrderModel.Insert(l.ctx, orderInfo)
 	if err != nil {
 		l.Errorw("[RedeemCode] Create order failed", logger.Field("error", err.Error()))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "create order failed")
 	}
-	// 缓存兑换码信息到Redis（热缓存，供队列任务快速读取，非关键路径）
+	// 缓存兑换码信息到Redis（供队列任务使用）
 	cacheKey := fmt.Sprintf("redemption_order:%s", orderInfo.OrderNo)
 	cacheData := map[string]interface{}{
 		"redemption_code_id": redemptionCode.Id,
@@ -200,8 +186,16 @@ func (l *RedeemCodeLogic) RedeemCode(req *types.RedeemCodeRequest) (resp *types.
 		"quantity":           redemptionCode.Quantity,
 	}
 	jsonData, _ := json.Marshal(cacheData)
-	if redisErr := l.svcCtx.Redis.Set(l.ctx, cacheKey, jsonData, 2*time.Hour).Err(); redisErr != nil {
+	err = l.svcCtx.Redis.Set(l.ctx, cacheKey, jsonData, 2*time.Hour).Err()
-		l.Infow("[RedeemCode] Cache redemption data failed (non-fatal, DB fallback available)", logger.Field("error", redisErr.Error()))
+	if err != nil {
 		l.Errorw("[RedeemCode] Cache redemption data failed", logger.Field("error", err.Error()))
 		// 缓存失败，删除已创建的Order避免孤儿记录
 		if delErr := l.svcCtx.OrderModel.Delete(l.ctx, orderInfo.Id); delErr != nil {
 			l.Errorw("[RedeemCode] Delete order failed after cache error",
 				logger.Field("order_id", orderInfo.Id),
 				logger.Field("error", delErr.Error()))
 		}
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "cache redemption data failed")
 	}
 	// 触发队列任务
@@ -1,89 +0,0 @@
 package user
 import (
 	"context"
 	logicCommon "github.com/perfect-panel/server/internal/logic/common"
 	"github.com/perfect-panel/server/internal/model/log"
 	"github.com/perfect-panel/server/internal/model/user"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/constant"
 	"github.com/perfect-panel/server/pkg/logger"
 	"github.com/perfect-panel/server/pkg/xerr"
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
 )
 type CancelWithdrawalLogic struct {
 	logger.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 func NewCancelWithdrawalLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CancelWithdrawalLogic {
 	return &CancelWithdrawalLogic{
 		Logger: logger.WithContext(ctx),
 		ctx:    ctx,
 		svcCtx: svcCtx,
 	}
 }
 func (l *CancelWithdrawalLogic) CancelWithdrawal(req *types.CancelWithdrawalRequest) (resp *types.WithdrawalLog, err error) {
 	u, ok := l.ctx.Value(constant.CtxKeyUser).(*user.User)
 	if !ok {
 		l.Error("current user is not found in context")
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
 	}
 	var withdrawal *user.Withdrawal
 	err = l.svcCtx.DB.WithContext(l.ctx).Transaction(func(tx *gorm.DB) error {
 		var txErr error
 		withdrawal, txErr = logicCommon.LoadPendingWithdrawalForUpdate(l.ctx, tx, req.WithdrawalId)
 		if txErr != nil {
 			if txErr.Error() == "withdrawal status invalid" {
 				return errors.Wrapf(xerr.NewErrCode(xerr.WithdrawalStatusInvalid), "withdrawal %d is not in pending state", req.WithdrawalId)
 			}
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "load withdrawal failed: %v", txErr)
 		}
 		if withdrawal.UserId != u.Id {
 			return errors.Wrapf(xerr.NewErrCode(xerr.PermissionDenied), "user %d cannot cancel withdrawal belonging to user %d", u.Id, withdrawal.UserId)
 		}
 		if txErr = tx.Model(&user.Withdrawal{}).
 			Where("id = ? AND status = ?", req.WithdrawalId, user.WithdrawalStatusPending).
 			Update("status", user.WithdrawalStatusCancelled).Error; txErr != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "cancel withdrawal failed: %v", txErr)
 		}
 		if txErr = l.svcCtx.UserModel.UpdateCommission(l.ctx, withdrawal.UserId, withdrawal.Amount, tx); txErr != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "refund commission failed: %v", txErr)
 		}
 		if txErr = logicCommon.WriteCommissionLog(tx, withdrawal.UserId, log.CommissionTypeWithdrawCancel, withdrawal.Amount, ""); txErr != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "write commission log failed: %v", txErr)
 		}
 		return nil
 	})
 	if err != nil {
 		return nil, err
 	}
 	_ = l.svcCtx.UserModel.ClearUserCache(l.ctx, u)
 	return &types.WithdrawalLog{
 		Id:        withdrawal.Id,
 		UserId:    withdrawal.UserId,
 		Amount:    withdrawal.Amount,
 		Content:   withdrawal.Content,
 		Status:    user.WithdrawalStatusCancelled,
 		Reason:    "",
 		Method:    withdrawal.Method,
 		Account:   withdrawal.Account,
 		QrCodeUrl: withdrawal.QrCodeUrl,
 		CreatedAt: withdrawal.CreatedAt.UnixMilli(),
 		UpdatedAt: withdrawal.UpdatedAt.UnixMilli(),
 	}, nil
 }
@@ -2,7 +2,10 @@ package user
 import (
 	"context"
 	"time"
 	logicCommon "github.com/perfect-panel/server/internal/logic/common"
 	"github.com/perfect-panel/server/internal/model/log"
 	"github.com/perfect-panel/server/internal/model/user"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
@@ -35,70 +38,57 @@ func (l *CommissionWithdrawLogic) CommissionWithdraw(req *types.CommissionWithdr
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
 	}
-	// Validate payment method fields
+	if u.Commission < req.Amount {
-	switch req.Method {
+		logger.Errorf("User %d has insufficient commission balance: %.2f, requested: %.2f", u.Id, float64(u.Commission)/100, float64(req.Amount)/100)
 	case user.WithdrawalMethodAlipay, user.WithdrawalMethodWechat:
 		if req.QrCodeUrl == "" {
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "qr_code_url is required for method %d", req.Method)
 		}
 	case user.WithdrawalMethodBank:
 		if req.Account == "" {
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "account is required for bank transfer")
 		}
 	default: // WithdrawalMethodOther
 		if req.Account == "" && req.Content == "" {
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "account or content is required for other methods")
 		}
 	}
 	// Sum all pending (status=0) withdrawals to compute available balance.
 	// Available = commission - pendingTotal; commission is only deducted on approval.
 	var pendingTotal int64
 	if err = l.svcCtx.DB.WithContext(l.ctx).
 		Model(&user.Withdrawal{}).
 		Where("user_id = ? AND status = ?", u.Id, user.WithdrawalStatusPending).
 		Select("COALESCE(SUM(amount), 0)").
 		Scan(&pendingTotal).Error; err != nil {
 		l.Errorf("Failed to query pending withdrawals for user %d: %v", u.Id, err)
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Failed to query pending withdrawals for user %d", u.Id)
 	}
 	if u.Commission < req.Amount+pendingTotal {
 		logger.Errorf("User %d insufficient available commission: total=%d pending=%d requested=%d",
 			u.Id, u.Commission, pendingTotal, req.Amount)
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.UserCommissionNotEnough), "User %d has insufficient commission balance", u.Id)
 	}
-	var w user.Withdrawal
+	tx := l.svcCtx.DB.WithContext(l.ctx).Begin()
-	err = l.svcCtx.DB.WithContext(l.ctx).Transaction(func(tx *gorm.DB) error {
+	now := time.Now()
-		w = user.Withdrawal{
+
 	// Atomically deduct the requested amount so concurrent commission growth is preserved.
 	if err = l.svcCtx.DB.WithContext(l.ctx).
 		Model(&user.User{}).
 		Where("id = ? AND commission >= ?", u.Id, req.Amount).
 		UpdateColumn("commission", gorm.Expr("commission - ?", req.Amount)).Error; err != nil {
 		tx.Rollback()
 		l.Errorf("Failed to update user %d commission balance: %v", u.Id, err)
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "Failed to update user %d commission balance: %v", u.Id, err)
 	}
 	_ = l.svcCtx.UserModel.ClearUserCache(l.ctx, u)
 	// create withdrawal log
 	if err = logicCommon.WriteCommissionLog(tx, u.Id, log.CommissionTypeConvertBalance, req.Amount, ""); err != nil {
 		tx.Rollback()
 		l.Errorf("Failed to create commission log for user %d: %v", u.Id, err)
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "Failed to create commission log for user %d: %v", u.Id, err)
 	}
 	err = tx.Model(&user.Withdrawal{}).Create(&user.Withdrawal{
 		UserId:  u.Id,
 		Amount:  req.Amount,
 		Content: req.Content,
-			Status:    user.WithdrawalStatusPending,
+		Status:  0,
 		Reason:  "",
-			Method:    req.Method,
+	}).Error
-			Account:   req.Account,
+
 			QrCodeUrl: req.QrCodeUrl,
 		}
 		return tx.Create(&w).Error
 	})
 	if err != nil {
-		l.Errorf("Failed to create withdrawal for user %d: %v", u.Id, err)
+		tx.Rollback()
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "Failed to create withdrawal for user %d: %v", u.Id, err)
+		l.Errorf("Failed to create withdrawal log for user %d: %v", u.Id, err)
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "Failed to create withdrawal log for user %d: %v", u.Id, err)
 	}
 	if err = tx.Commit().Error; err != nil {
 		l.Errorf("Transaction commit failed for user %d withdrawal: %v", u.Id, err)
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.ERROR), "Transaction commit failed for user %d withdrawal: %v", u.Id, err)
 	}
 	return &types.WithdrawalLog{
 		Id:        w.Id,
 		UserId:    u.Id,
 		Amount:    req.Amount,
 		Content:   req.Content,
-		Status:    user.WithdrawalStatusPending,
+		Status:    0,
 		Reason:    "",
-		Method:    req.Method,
+		CreatedAt: now.UnixMilli(),
-		Account:   req.Account,
+		UpdatedAt: now.UnixMilli(),
 		QrCodeUrl: req.QrCodeUrl,
 		CreatedAt: w.CreatedAt.UnixMilli(),
 		UpdatedAt: w.UpdatedAt.UnixMilli(),
 	}, nil
 }
@@ -64,9 +64,6 @@ func (l *QueryWithdrawalLogLogic) QueryWithdrawalLog(req *types.QueryWithdrawalL
 			Content:   row.Content,
 			Status:    row.Status,
 			Reason:    row.Reason,
 			Method:    row.Method,
 			Account:   row.Account,
 			QrCodeUrl: row.QrCodeUrl,
 			CreatedAt: row.CreatedAt.UnixMilli(),
 			UpdatedAt: row.UpdatedAt.UnixMilli(),
 		})
@@ -23,7 +23,6 @@ const (
 	TypeSubscribeTraffic  Type = 21 // Subscription traffic log
 	TypeServerTraffic     Type = 22 // Server traffic log
 	TypeResetSubscribe    Type = 23 // Reset subscription log
 	TypeOrderRefund       Type = 24 // Admin order refund log
 	TypeLogin             Type = 30 // Login log
 	TypeRegister          Type = 31 // Registration log
 	TypeBalance           Type = 32 // Balance log
@@ -51,7 +50,6 @@ const (
 	CommissionTypeAdjust         uint16 = 335 // Admin Adjust
 	CommissionTypeConvertBalance uint16 = 336 // Convert to Balance
 	CommissionTypeWithdrawReject uint16 = 337 // Withdraw rejected refund
 	CommissionTypeWithdrawCancel uint16 = 338 // 用户取消提现退佣金
 	GiftTypeIncrease             uint16 = 341 // Increase
 	GiftTypeReduce               uint16 = 342 // Reduce
 )
@@ -280,42 +278,6 @@ func (c *Commission) Unmarshal(data []byte) error {
 	return json.Unmarshal(data, aux)
 }
 type OrderRefund struct {
 	OrderId                int64  `json:"order_id"`
 	OrderNo                string `json:"order_no"`
 	OperatorUserId         int64  `json:"operator_user_id"`
 	OperatorAuthIdentifier string `json:"operator_auth_identifier,omitempty"`
 	TargetUserId           int64  `json:"target_user_id"`
 	UserSubscribeId        int64  `json:"user_subscribe_id"`
 	RefererUserId          int64  `json:"referer_user_id,omitempty"`
 	CommissionAmount       int64  `json:"commission_amount"`
 	Reason                 string `json:"reason,omitempty"`
 	OrderStatusBefore      uint8  `json:"order_status_before"`
 	OrderStatusAfter       uint8  `json:"order_status_after"`
 	SubscribeStatusBefore  uint8  `json:"subscribe_status_before"`
 	SubscribeStatusAfter   uint8  `json:"subscribe_status_after"`
 	SubscribeExpireBefore  int64  `json:"subscribe_expire_before"`
 	SubscribeExpireAfter   int64  `json:"subscribe_expire_after"`
 	CommissionBefore       int64  `json:"commission_before"`
 	CommissionAfter        int64  `json:"commission_after"`
 	Timestamp              int64  `json:"timestamp"`
 }
 func (o *OrderRefund) Marshal() ([]byte, error) {
 	type Alias OrderRefund
 	return json.Marshal(&struct {
 		*Alias
 	}{
 		Alias: (*Alias)(o),
 	})
 }
 func (o *OrderRefund) Unmarshal(data []byte) error {
 	type Alias OrderRefund
 	aux := (*Alias)(o)
 	return json.Unmarshal(data, aux)
 }
 // Gift represents a gift log entry.
 type Gift struct {
 	Type        uint16 `json:"type"`
@@ -110,10 +110,6 @@ func (m *customOrderModel) UpdateOrderStatus(ctx context.Context, orderNo string
 	if err != nil {
 		return err
 	}
 	keys := m.getCacheKeys(orderInfo)
 	// Pre-delete: evict cache before the DB write so concurrent reads during the update
 	// window go to DB instead of getting a stale cached status (double-delete pattern).
 	_ = m.DelCacheCtx(ctx, keys...)
 	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
 		if len(tx) > 0 {
 			conn = tx[0]
@@ -127,7 +123,7 @@ func (m *customOrderModel) UpdateOrderStatus(ctx context.Context, orderNo string
 			return nil
 		}
 		return nil
-	}, keys...)
+	}, m.getCacheKeys(orderInfo)...)
 }
 // FindOneDetailsByOrderNo Find order details by order number
@@ -25,7 +25,6 @@ type Order struct {
 	SubscribeId    int64     `gorm:"type:bigint;not null;default:0;comment:Subscribe Id"`
 	SubscribeToken  string    `gorm:"type:varchar(255);default:null;comment:Renewal Subscribe Token"`
 	AppAccountToken string    `gorm:"type:varchar(36);default:null;comment:Apple IAP App Account Token (UUID)"`
 	ActivationContext string    `gorm:"type:text;default:null;comment:Activation context JSON (guest/redemption info for DB fallback)"`
 	IsNew           bool      `gorm:"type:tinyint(1);not null;default:0;comment:Is New Order"`
 	CreatedAt      time.Time `gorm:"<-:create;comment:Create Time"`
 	UpdatedAt      time.Time `gorm:"comment:Update Time"`
@@ -378,13 +378,13 @@ func (m *customUserModel) QueryDailyUserStatisticsList(ctx context.Context, date
 		// 子查询：统计每天的新用户订单数量
 		newOrderSub := conn.Model(&order.Order{}).
 			Select("DATE_FORMAT(created_at, '%Y-%m-%d') AS date, COUNT(DISTINCT user_id) AS new_order_users").
-			Where("type = 1 AND created_at BETWEEN ? AND ? AND status IN ? AND method != ?", firstDay, date, []int64{2, 5}, "balance").
+			Where("is_new = 1 AND created_at BETWEEN ? AND ? AND status IN ?", firstDay, date, []int64{2, 5}).
 			Group("DATE_FORMAT(created_at, '%Y-%m-%d')")
 		// 子查询：统计每天的续费订单数量
 		renewalOrderSub := conn.Model(&order.Order{}).
 			Select("DATE_FORMAT(created_at, '%Y-%m-%d') AS date, COUNT(DISTINCT user_id) AS renewal_order_users").
-			Where("type = 2 AND created_at BETWEEN ? AND ? AND status IN ? AND method != ?", firstDay, date, []int64{2, 5}, "balance").
+			Where("is_new = 0 AND created_at BETWEEN ? AND ? AND status IN ?", firstDay, date, []int64{2, 5}).
 			Group("DATE_FORMAT(created_at, '%Y-%m-%d')")
 		return conn.Model(&User{}).
@@ -416,13 +416,13 @@ func (m *customUserModel) QueryMonthlyUserStatisticsList(ctx context.Context, da
 		// 子查询：每月新订单用户数量
 		newOrderSub := conn.Model(&order.Order{}).
 			Select("DATE_FORMAT(created_at, '%Y-%m') AS date, COUNT(DISTINCT user_id) AS new_order_users").
-			Where("type = 1 AND created_at >= ? AND status IN ? AND method != ?", sixMonthsAgo, []int64{2, 5}, "balance").
+			Where("is_new = 1 AND created_at >= ? AND status IN ?", sixMonthsAgo, []int64{2, 5}).
 			Group("DATE_FORMAT(created_at, '%Y-%m')")
 		// 子查询：每月续费订单用户数量
 		renewalOrderSub := conn.Model(&order.Order{}).
 			Select("DATE_FORMAT(created_at, '%Y-%m') AS date, COUNT(DISTINCT user_id) AS renewal_order_users").
-			Where("type = 2 AND created_at >= ? AND status IN ? AND method != ?", sixMonthsAgo, []int64{2, 5}, "balance").
+			Where("is_new = 0 AND created_at >= ? AND status IN ?", sixMonthsAgo, []int64{2, 5}).
 			Group("DATE_FORMAT(created_at, '%Y-%m')")
 		return conn.Model(&User{}).
@@ -167,15 +167,12 @@ type Withdrawal struct {
 	UserId    int64     `gorm:"index:idx_user_id;not null;comment:User ID"`
 	Amount    int64     `gorm:"not null;comment:Withdrawal Amount"`
 	Content   string    `gorm:"type:text;comment:Withdrawal Content"`
-	Status    uint8     `gorm:"type:tinyint(1);default:0;comment:Withdrawal Status: 0: Pending 1: Approved 2: Rejected 3: Cancelled"`
+	Status    uint8     `gorm:"type:tinyint(1);default:0;comment:Withdrawal Status: 0: Pending 1: Approved 2: Rejected"`
 	Reason    string    `gorm:"type:varchar(500);default:'';comment:Rejection Reason"`
 	Method    uint8     `gorm:"type:tinyint(1);default:0;comment:收款方式 0:其他 1:支付宝 2:微信 3:银行卡"`
 	Account   string    `gorm:"type:varchar(255);default:'';comment:收款账号"`
 	QrCodeUrl string    `gorm:"type:varchar(500);default:'';comment:收款码图片URL"`
 	CreatedAt time.Time `gorm:"<-:create;comment:Creation Time"`
 	UpdatedAt time.Time `gorm:"comment:Update Time"`
 }
 func (*Withdrawal) TableName() string {
-	return "withdrawals"
+	return "user_withdrawal"
 }
@@ -1,15 +0,0 @@
 package user
 const (
 	WithdrawalStatusPending   uint8 = 0 // 待审核
 	WithdrawalStatusApproved  uint8 = 1 // 已通过
 	WithdrawalStatusRejected  uint8 = 2 // 已拒绝
 	WithdrawalStatusCancelled uint8 = 3 // 已取消（用户自行撤回）
 )
 const (
 	WithdrawalMethodOther  uint8 = 0 // 其他
 	WithdrawalMethodAlipay uint8 = 1 // 支付宝
 	WithdrawalMethodWechat uint8 = 2 // 微信
 	WithdrawalMethodBank   uint8 = 3 // 银行卡
 )
@@ -3,17 +3,10 @@
 package types
 import "encoding/json"
 type ActivateOrderRequest struct {
 	OrderNo string `json:"order_no" validate:"required"`
 }
 type RefundOrderRequest struct {
 	Id     int64  `json:"id" validate:"required"`
 	Reason string `json:"reason,omitempty" validate:"omitempty,max=500"`
 }
 type Ads struct {
 	Id          int    `json:"id"`
 	Title       string `json:"title"`
@@ -298,9 +291,6 @@ type CommissionLog struct {
 type CommissionWithdrawRequest struct {
 	Amount  int64  `json:"amount"`
 	Content string `json:"content"`
 	Method    uint8  `json:"method" validate:"oneof=0 1 2 3"`
 	Account   string `json:"account,omitempty"`
 	QrCodeUrl string `json:"qr_code_url,omitempty"`
 }
 type ConnectionRecords struct {
@@ -836,17 +826,6 @@ type FilterCommissionLogResponse struct {
 	List  []CommissionLog `json:"list"`
 }
 type FilterOrderRefundLogRequest struct {
 	FilterLogParams
 	OrderId int64 `form:"order_id,optional"`
 	UserId  int64 `form:"user_id,optional"`
 }
 type FilterOrderRefundLogResponse struct {
 	Total int64            `json:"total"`
 	List  []OrderRefundLog `json:"list"`
 }
 type FilterEmailLogResponse struct {
 	Total int64        `json:"total"`
 	List  []MessageLog `json:"list"`
@@ -1873,7 +1852,6 @@ type Order struct {
 	FeeAmount      int64         `json:"fee_amount"`
 	TradeNo        string        `json:"trade_no"`
 	Status         uint8         `json:"status"`
 	StatusName     string        `json:"status_name,omitempty"`
 	SubscribeId    int64         `json:"subscribe_id"`
 	CreatedAt      int64         `json:"created_at"`
 	UpdatedAt      int64         `json:"updated_at"`
@@ -1897,34 +1875,12 @@ type OrderDetail struct {
 	FeeAmount      int64         `json:"fee_amount"`
 	TradeNo        string        `json:"trade_no"`
 	Status         uint8         `json:"status"`
 	StatusName     string        `json:"status_name,omitempty"`
 	SubscribeId    int64         `json:"subscribe_id"`
 	Subscribe      Subscribe     `json:"subscribe"`
 	CreatedAt      int64         `json:"created_at"`
 	UpdatedAt      int64         `json:"updated_at"`
 }
 type OrderRefundLog struct {
 	OrderId                int64  `json:"order_id"`
 	OrderNo                string `json:"order_no"`
 	OperatorUserId         int64  `json:"operator_user_id"`
 	OperatorAuthIdentifier string `json:"operator_auth_identifier,omitempty"`
 	TargetUserId           int64  `json:"target_user_id"`
 	UserSubscribeId        int64  `json:"user_subscribe_id"`
 	RefererUserId          int64  `json:"referer_user_id,omitempty"`
 	CommissionAmount       int64  `json:"commission_amount"`
 	Reason                 string `json:"reason,omitempty"`
 	OrderStatusBefore      uint8  `json:"order_status_before"`
 	OrderStatusAfter       uint8  `json:"order_status_after"`
 	SubscribeStatusBefore  uint8  `json:"subscribe_status_before"`
 	SubscribeStatusAfter   uint8  `json:"subscribe_status_after"`
 	SubscribeExpireBefore  int64  `json:"subscribe_expire_before"`
 	SubscribeExpireAfter   int64  `json:"subscribe_expire_after"`
 	CommissionBefore       int64  `json:"commission_before"`
 	CommissionAfter        int64  `json:"commission_after"`
 	Timestamp              int64  `json:"timestamp"`
 }
 type OrdersStatistics struct {
 	Date               string             `json:"date,omitempty"`
 	AmountTotal        int64              `json:"amount_total"`
@@ -2318,10 +2274,6 @@ type QueryUserSubscribeNodeListResponse struct {
 	List []UserSubscribeInfo `json:"list"`
 }
 type CancelWithdrawalRequest struct {
 	WithdrawalId int64 `json:"withdrawal_id" validate:"required,gt=0"`
 }
 type QueryWithdrawalLogListRequest struct {
 	Page int `form:"page"`
 	Size int `form:"size"`
@@ -2337,7 +2289,6 @@ type GetWithdrawalListRequest struct {
 	Size   int    `form:"size"`
 	UserId *int64 `form:"user_id,omitempty"`
 	Status *uint8 `form:"status,omitempty"`
 	Method *uint8 `form:"method,omitempty"`
 }
 type GetWithdrawalListResponse struct {
@@ -3275,17 +3226,17 @@ type UpdateUserBasiceInfoRequest struct {
 	UserId             int64  `json:"user_id" validate:"required"`
 	Password           string `json:"password"`
 	Avatar             string `json:"avatar"`
-	Balance            *int64  `json:"balance"`
+	Balance            int64  `json:"balance"`
-	Commission         *int64  `json:"commission"`
+	Commission         int64  `json:"commission"`
 	ReferralPercentage uint8  `json:"referral_percentage"`
 	OnlyFirstPurchase  *bool  `json:"only_first_purchase"`
-	GiftAmount         *int64  `json:"gift_amount"`
+	GiftAmount         int64  `json:"gift_amount"`
 	Telegram           int64  `json:"telegram"`
 	ReferCode          string `json:"refer_code"`
-	RefererId          *int64  `json:"referer_id"`
+	RefererId          int64  `json:"referer_id"`
 	Enable             *bool  `json:"enable"`
 	IsAdmin            *bool  `json:"is_admin"`
-	Remark             *string `json:"remark"`
+	Remark             string `json:"remark"`
 }
 type UpdateUserNotifyRequest struct {
@@ -3656,9 +3607,6 @@ type WithdrawalLog struct {
 	Content   string `json:"content"`
 	Status    uint8  `json:"status"`
 	Reason    string `json:"reason,omitempty"`
 	Method    uint8  `json:"method"`
 	Account   string `json:"account"`
 	QrCodeUrl string `json:"qr_code_url"`
 	CreatedAt int64  `json:"created_at"`
 	UpdatedAt int64  `json:"updated_at"`
 }
@@ -3693,29 +3641,3 @@ type GetAdminUserInviteListResponse struct {
 	Total int64              `json:"total"`
 	List  []AdminInvitedUser `json:"list"`
 }
 type GetLogMessageRawRequest struct {
 	Id int64 `form:"id" validate:"required"`
 }
 type GetLogMessageRawResponse struct {
 	Id         int64           `json:"id"`
 	Platform   string          `json:"platform"`
 	AppVersion string          `json:"app_version"`
 	OsName     string          `json:"os_name"`
 	OsVersion  string          `json:"os_version"`
 	DeviceId   string          `json:"device_id"`
 	UserId     *int64          `json:"user_id"`
 	SessionId  string          `json:"session_id"`
 	Level      uint8           `json:"level"`
 	ErrorCode  string          `json:"error_code"`
 	Message    string          `json:"message"`
 	Stack      string          `json:"stack"`
 	Context    json.RawMessage `json:"context"`
 	ClientIP   string          `json:"client_ip"`
 	UserAgent  string          `json:"user_agent"`
 	Locale     string          `json:"locale"`
 	Digest     string          `json:"digest"`
 	OccurredAt int64           `json:"occurred_at"`
 	CreatedAt  int64           `json:"created_at"`
 }
@@ -1,35 +0,0 @@
 package types
 import (
 	"encoding/json"
 	"testing"
 )
 func TestUpdateUserBasicInfoRequestRemarkPresence(t *testing.T) {
 	var omitted UpdateUserBasiceInfoRequest
 	if err := json.Unmarshal([]byte(`{"user_id":1}`), &omitted); err != nil {
 		t.Fatalf("unmarshal omitted remark: %v", err)
 	}
 	if omitted.Remark != nil {
 		t.Fatalf("omitted remark = %q, want nil", *omitted.Remark)
 	}
 	var cleared UpdateUserBasiceInfoRequest
 	if err := json.Unmarshal([]byte(`{"user_id":1,"remark":""}`), &cleared); err != nil {
 		t.Fatalf("unmarshal empty remark: %v", err)
 	}
 	if cleared.Remark == nil {
 		t.Fatal("empty remark was decoded as nil, want explicit empty string")
 	}
 	if *cleared.Remark != "" {
 		t.Fatalf("empty remark = %q, want empty string", *cleared.Remark)
 	}
 	var updated UpdateUserBasiceInfoRequest
 	if err := json.Unmarshal([]byte(`{"user_id":1,"remark":"new note"}`), &updated); err != nil {
 		t.Fatalf("unmarshal non-empty remark: %v", err)
 	}
 	if updated.Remark == nil || *updated.Remark != "new note" {
 		t.Fatalf("non-empty remark = %#v, want %q", updated.Remark, "new note")
 	}
 }
@@ -1,33 +0,0 @@
 # Docker Image Version Pins
 This file records the infrastructure image versions pinned in `docker-compose.cloud.yml`.
 The versions below match the images observed on the test deployment on 2026-05-26.
 | Service | Image | Running version source |
 | --- | --- | --- |
 | grafana | `grafana/grafana:13.0.1` | `grafana version 13.0.1` |
 | prometheus | `prom/prometheus:v3.11.3` | `prometheus, version 3.11.3` |
 | nginx-exporter | `nginx/nginx-prometheus-exporter:1.5.0` | image label `org.opencontainers.image.version=1.5.0` |
 | node-exporter | `prom/node-exporter:v1.11.1` | `node_exporter, version 1.11.1` |
 | cadvisor | `gcr.io/cadvisor/cadvisor:v0.55.1` | `cAdvisor version v0.55.1` |
 The test deployment in `/root/bindbox/docker-compose.cloud.yml` also contains
 live-only exporter services that are not present in this repository's
 `docker-compose.cloud.yml`. They were pinned during staging validation:
 | Test-only service | Image | Running version source |
 | --- | --- | --- |
 | mysql-exporter | `prom/mysqld-exporter:v0.19.0` | `mysqld_exporter, version 0.19.0` |
 | redis-exporter | `oliver006/redis_exporter:v1.82.0` | image label `org.opencontainers.image.version=v1.82.0` |
 `ppanel-server` intentionally remains variable and requires `PPANEL_SERVER_TAG`
 from CI/CD so deployments use an immutable application image tag.
 ## Rollback
 Restore the previous compose file from git and redeploy:
 ```sh
 git checkout HEAD~1 -- docker-compose.cloud.yml .env.example ops/docker-image-version-pins.md
 docker compose -f docker-compose.cloud.yml up -d
 ```
@@ -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
@@ -146,7 +146,4 @@ const (
 	OrderStatusError      uint32 = 61003
 	InsufficientOfPeriod  uint32 = 61004
 	ExistAvailableTraffic uint32 = 61005
 	OrderAlreadyRefunded          uint32 = 61006
 	OrderRefundNoSubscription     uint32 = 61007
 	OrderRefundCommissionMismatch uint32 = 61008
 )
@@ -103,9 +103,6 @@ func init() {
 		PaymentMethodNotFound: "Payment method not found",
 		OrderStatusError:      "Order status error",
 		InsufficientOfPeriod:  "Insufficient number of period",
 		OrderAlreadyRefunded:          "Order already refunded",
 		OrderRefundNoSubscription:     "Refund target subscription not found",
 		OrderRefundCommissionMismatch: "Refund commission source not found",
 		// Permission error
 		PermissionDenied: "Permission denied",
@@ -49,6 +49,6 @@ func RegisterHandlers(mux *asynq.ServeMux, serverCtx *svc.ServiceContext) {
 	mux.Handle(types.SchedulerIAPReconcile, iapLogic.NewReconcileLogic(serverCtx))
 	mux.Handle(types.SchedulerIAPDailyReconcile, iapLogic.NewDailyReconcileLogic(serverCtx))
-	// Stuck order recovery
+	// Stuck order recovery: reset claimed orders that timed out back to paid
 	mux.Handle(types.SchedulerStuckOrderRecovery, orderLogic.NewStuckOrderRecoveryLogic(serverCtx))
 }
@@ -93,11 +93,12 @@ func (l *ActivateOrderLogic) ProcessTask(ctx context.Context, task *asynq.Task)
 	orderInfo, err := l.claimAndGetOrder(ctx, payload.OrderNo)
 	if err != nil {
 		// 如果订单不存在或状态不对，不重试
 		if errors.Is(err, ErrInvalidOrderStatus) {
 			if strings.Contains(err.Error(), "stuck in claimed") {
 				logger.WithContext(ctx).Error("[ActivateOrderLogic] 订单卡在 claimed，将重试",
 					logger.Field("order_no", payload.OrderNo))
-				return err // 返回错误触发 asynq 重试
+				return err
 			}
 			logger.WithContext(ctx).Info("[ActivateOrderLogic] 订单状态不是已支付，跳过",
 				logger.Field("order_no", payload.OrderNo))
@@ -191,7 +192,6 @@ func (l *ActivateOrderLogic) claimAndGetOrder(ctx context.Context, orderNo strin
 		return nil, nil
 	}
 	// Detect stuck claimed order — return retryable error so asynq re-tries
 	if orderInfo.Status == OrderStatusClaimed {
 		logger.WithContext(ctx).Error("Order stuck in claimed status",
 			logger.Field("order_no", orderInfo.OrderNo),
@@ -589,9 +589,8 @@ func (l *ActivateOrderLogic) finalizeCouponAndOrder(ctx context.Context, orderIn
 		}
 	}
-	// UpdateOrderStatus uses WHERE status < target, which blocks claimed(6)→finished(5).
+	// Direct update from claimed(6) → finished(5), bypassing the model's status<target guard.
-	// Use a direct update matching the exact claimed status, then update the full record
+	// UpdateOrderStatus uses WHERE status < ?, so status=6 > 5 would never match.
 	// via the model layer to properly invalidate the cache.
 	result := l.svc.DB.WithContext(ctx).
 		Model(&order.Order{}).
 		Where("order_no = ? AND status = ?", orderInfo.OrderNo, OrderStatusClaimed).
@@ -602,14 +601,18 @@ func (l *ActivateOrderLogic) finalizeCouponAndOrder(ctx context.Context, orderIn
 			logger.Field("order_no", orderInfo.OrderNo),
 		)
 	}
-	// Invalidate order cache regardless of whether the DB update succeeded
+	// Invalidate cache entries; key format matches order/default.go cacheOrderIdPrefix / cacheOrderNoPrefix.
-	orderInfo.Status = OrderStatusFinished
+	cacheKeys := []string{
-	if err := l.svc.OrderModel.Update(ctx, orderInfo); err != nil {
+		fmt.Sprintf("cache:order:id:%d", orderInfo.Id),
-		logger.WithContext(ctx).Error("Update order cache after finalization failed",
+		fmt.Sprintf("cache:order:no:%s", orderInfo.OrderNo),
-			logger.Field("error", err.Error()),
+	}
 	if delErr := l.svc.Redis.Del(ctx, cacheKeys...).Err(); delErr != nil {
 		logger.WithContext(ctx).Error("Failed to invalidate order cache after status update",
 			logger.Field("error", delErr.Error()),
 			logger.Field("order_no", orderInfo.OrderNo),
 		)
 	}
 	orderInfo.Status = OrderStatusFinished
 	commonLogic.SubscriptionTraceInfo(logger.WithContext(ctx), commonLogic.SubscriptionTraceFlowOrder, "order_status_finished",
 		"[SubscriptionFlow] order status updated to finished",
 		commonLogic.OrderTraceFields(orderInfo)...,
@@ -636,7 +639,7 @@ func (l *ActivateOrderLogic) NewPurchase(ctx context.Context, orderInfo *order.O
 		return err
 	}
-	if err = validateNewUserOnlyEligibilityAtActivation(ctx, l.svc.DB, l.svc.Redis, orderInfo, sub); err != nil {
+	if err = validateNewUserOnlyEligibilityAtActivation(ctx, l.svc.DB, orderInfo, sub); err != nil {
 		return err
 	}
@@ -714,23 +717,18 @@ func (l *ActivateOrderLogic) NewPurchase(ctx context.Context, orderInfo *order.O
 	// 兜底：创建新订阅前，查找用户是否已有同套餐的订阅记录（含过期/赠送），
 	// 有则复用旧记录续期，避免出现重复订阅。
 	// 需要同时检查 UserId 和 SubscriptionUserId，因为家庭组绑定前后 owner 可能不同。
 	// 使用 SELECT ... FOR UPDATE 防止并发下多个 worker 同时选中同一订阅并创建重复记录。
 	if userSub == nil {
 		candidateUserIds := []int64{orderInfo.UserId}
 		if orderInfo.SubscriptionUserId > 0 && orderInfo.SubscriptionUserId != orderInfo.UserId {
 			candidateUserIds = append(candidateUserIds, orderInfo.SubscriptionUserId)
 		}
 		var existingSub user.Subscribe
-		findErr := l.svc.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		if findErr := l.svc.DB.Model(&user.Subscribe{}).
 			return tx.Clauses(clause.Locking{Strength: "UPDATE"}).
 				Model(&user.Subscribe{}).
 			Where("user_id IN ? AND token != ''", candidateUserIds).
 			Order("expire_time DESC").
 			Order("updated_at DESC").
 			Order("id DESC").
-				First(&existingSub).Error
+			First(&existingSub).Error; findErr == nil {
 		})
 		if findErr == nil {
 			// 家庭组场景：订阅 owner 可能变更（如成员注册的试用 → 被家主收归），
 			// 续期前把 user_id 校正为当前订单的 SubscriptionUserId
 			effectiveOwner := orderInfo.UserId
@@ -868,52 +866,26 @@ func (l *ActivateOrderLogic) createGuestUser(ctx context.Context, orderInfo *ord
 	return userInfo, nil
 }
-// getTempOrderInfo retrieves temporary order information from Redis cache with DB fallback.
+// getTempOrderInfo retrieves temporary order information from Redis cache
 func (l *ActivateOrderLogic) getTempOrderInfo(ctx context.Context, orderNo string) (*constant.TemporaryOrderInfo, error) {
 	cacheKey := fmt.Sprintf(constant.TempOrderCacheKey, orderNo)
 	data, err := l.svc.Redis.Get(ctx, cacheKey).Result()
-	if err == nil {
+	if err != nil {
 		logger.WithContext(ctx).Error("Get temp order cache failed",
 			logger.Field("error", err.Error()),
 			logger.Field("cache_key", cacheKey),
 		)
 		return nil, err
 	}
 	var tempOrder constant.TemporaryOrderInfo
-		if unmarshalErr := tempOrder.Unmarshal([]byte(data)); unmarshalErr != nil {
+	if err = tempOrder.Unmarshal([]byte(data)); err != nil {
 		logger.WithContext(ctx).Error("Unmarshal temp order cache failed",
-				logger.Field("error", unmarshalErr.Error()),
+			logger.Field("error", err.Error()),
 			logger.Field("cache_key", cacheKey),
 			logger.Field("data", data),
 		)
-			return nil, unmarshalErr
+		return nil, err
 		}
 		return &tempOrder, nil
 	}
 	// Redis miss — fall back to DB activation_context field.
 	logger.WithContext(ctx).Infow("Redis cache miss for temp order, falling back to DB",
 		logger.Field("cache_key", cacheKey),
 		logger.Field("error", err.Error()),
 	)
 	orderInfo, dbErr := l.svc.OrderModel.FindOneByOrderNo(ctx, orderNo)
 	if dbErr != nil {
 		logger.WithContext(ctx).Error("DB fallback for temp order failed",
 			logger.Field("order_no", orderNo),
 			logger.Field("error", dbErr.Error()),
 		)
 		return nil, dbErr
 	}
 	if orderInfo.ActivationContext == "" {
 		logger.WithContext(ctx).Error("CRITICAL: activation_context missing in DB and Redis expired; cannot recover guest order",
 			logger.Field("order_no", orderNo),
 		)
 		return nil, errors.New("activation context not found: Redis expired and no DB fallback available")
 	}
 	var tempOrder constant.TemporaryOrderInfo
 	if unmarshalErr := tempOrder.Unmarshal([]byte(orderInfo.ActivationContext)); unmarshalErr != nil {
 		logger.WithContext(ctx).Error("Unmarshal DB activation_context failed",
 			logger.Field("order_no", orderNo),
 			logger.Field("error", unmarshalErr.Error()),
 		)
 		return nil, unmarshalErr
 	}
 	return &tempOrder, nil
@@ -1517,40 +1489,7 @@ func (l *ActivateOrderLogic) resolveRenewalActivationSubscription(ctx context.Co
 	}
 	userSub, err := l.getUserSubscription(ctx, orderInfo.SubscribeToken)
 	if err != nil {
-		// Fallback: token may have been lost (subscription deleted or owner changed).
+		return nil, err
 		// Locate the most recent subscription by user_id + subscribe_id with FOR UPDATE
 		// to prevent a concurrent worker from renewing the same record twice.
 		targetUserID := orderInfo.UserId
 		if orderInfo.SubscriptionUserId > 0 {
 			targetUserID = orderInfo.SubscriptionUserId
 		}
 		var fallbackSub user.Subscribe
 		txErr := l.svc.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 			return tx.Clauses(clause.Locking{Strength: "UPDATE"}).
 				Model(&user.Subscribe{}).
 				Where("user_id = ? AND subscribe_id = ?", targetUserID, orderInfo.SubscribeId).
 				Where("status IN ?", []int64{0, 1, 2, 3}).
 				Order("expire_time DESC").
 				Order("updated_at DESC").
 				Order("id DESC").
 				First(&fallbackSub).Error
 		})
 		if txErr != nil {
 			logger.WithContext(ctx).Error("CRITICAL: Renewal activation token and fallback lookup both failed",
 				logger.Field("token_error", err.Error()),
 				logger.Field("fallback_error", txErr.Error()),
 				logger.Field("order_no", orderInfo.OrderNo),
 				logger.Field("target_user_id", targetUserID),
 				logger.Field("subscribe_id", orderInfo.SubscribeId),
 			)
 			return nil, fmt.Errorf("renewal activation subscription not found by token or user_id+subscribe_id for order %s: %w", orderInfo.OrderNo, err)
 		}
 		logger.WithContext(ctx).Info("Renewal token lookup failed; found subscription via fallback user_id+subscribe_id",
 			logger.Field("order_no", orderInfo.OrderNo),
 			logger.Field("fallback_subscribe_id", fallbackSub.Id),
 			logger.Field("target_user_id", targetUserID),
 		)
 		userSub = &fallbackSub
 	}
 	if orderInfo.UserId <= 0 {
 		return userSub, nil
@@ -1846,51 +1785,26 @@ func (l *ActivateOrderLogic) RedemptionActivate(ctx context.Context, orderInfo *
 		return err
 	}
-	// 3. 从Redis获取兑换码信息，Redis缺失时回查DB
+	// 3. 从Redis获取兑换码信息
 	cacheKey := fmt.Sprintf("redemption_order:%s", orderInfo.OrderNo)
 	data, err := l.svc.Redis.Get(ctx, cacheKey).Result()
 	if err != nil {
 		logger.WithContext(ctx).Error("Get redemption cache failed",
 			logger.Field("error", err.Error()),
 			logger.Field("cache_key", cacheKey),
 		)
 		return err
 	}
 	var redemptionData struct {
 		RedemptionCodeId int64  `json:"redemption_code_id"`
 		UnitTime         string `json:"unit_time"`
 		Quantity         int64  `json:"quantity"`
 	}
 	cacheKey := fmt.Sprintf("redemption_order:%s", orderInfo.OrderNo)
 	data, redisErr := l.svc.Redis.Get(ctx, cacheKey).Result()
 	if redisErr == nil {
 	if err = json.Unmarshal([]byte(data), &redemptionData); err != nil {
 		logger.WithContext(ctx).Error("Unmarshal redemption cache failed", logger.Field("error", err.Error()))
 		return err
 	}
 	} else {
 		// Redis miss — fall back to DB activation_context field.
 		logger.WithContext(ctx).Infow("Redis cache miss for redemption order, falling back to DB",
 			logger.Field("cache_key", cacheKey),
 			logger.Field("error", redisErr.Error()),
 		)
 		if orderInfo.ActivationContext == "" {
 			logger.WithContext(ctx).Error("CRITICAL: activation_context missing in DB and Redis expired; cannot recover redemption order",
 				logger.Field("order_no", orderInfo.OrderNo),
 			)
 			return errors.New("activation context not found: Redis expired and no DB fallback available")
 		}
 		var fullContext struct {
 			Type             string `json:"type"`
 			RedemptionCodeId int64  `json:"redemption_code_id"`
 			UnitTime         string `json:"unit_time"`
 			Quantity         int64  `json:"quantity"`
 		}
 		if err = json.Unmarshal([]byte(orderInfo.ActivationContext), &fullContext); err != nil {
 			logger.WithContext(ctx).Error("Unmarshal DB activation_context failed",
 				logger.Field("order_no", orderInfo.OrderNo),
 				logger.Field("error", err.Error()),
 			)
 			return err
 		}
 		redemptionData.RedemptionCodeId = fullContext.RedemptionCodeId
 		redemptionData.UnitTime = fullContext.UnitTime
 		redemptionData.Quantity = fullContext.Quantity
 	}
 	// 4. 幂等性检查：查询是否已有兑换记录
 	existingRecords, err := l.svc.RedemptionRecordModel.FindByUserId(ctx, userInfo.Id)
@@ -10,14 +10,12 @@ import (
 	"github.com/perfect-panel/server/internal/model/order"
 	"github.com/perfect-panel/server/internal/model/subscribe"
 	internaltypes "github.com/perfect-panel/server/internal/types"
 	"github.com/redis/go-redis/v9"
 	"gorm.io/gorm"
 )
 func validateNewUserOnlyEligibilityAtActivation(
 	ctx context.Context,
 	db *gorm.DB,
 	rdb *redis.Client,
 	orderInfo *order.Order,
 	sub *subscribe.Subscribe,
 ) error {
@@ -33,20 +31,6 @@ func validateNewUserOnlyEligibilityAtActivation(
 		return nil
 	}
 	// Acquire a per-user distributed lock so concurrent new-user-only activations
 	// for the same account are serialised. Without this, two workers can both read
 	// historyCount=0 and both pass the check before either has written the order.
 	lockKey := fmt.Sprintf("new_user_only_activate:%d", orderInfo.UserId)
 	const lockTTL = 30 * time.Second
 	acquired, lockErr := rdb.SetNX(ctx, lockKey, orderInfo.OrderNo, lockTTL).Result()
 	if lockErr != nil {
 		return fmt.Errorf("new user only: acquire lock error: %w", lockErr)
 	}
 	if !acquired {
 		return fmt.Errorf("new user only: another activation is in progress for user %d", orderInfo.UserId)
 	}
 	defer rdb.Del(ctx, lockKey)
 	eligibility, err := commonLogic.ResolveNewUserEligibility(ctx, db, orderInfo.UserId)
 	if err != nil {
 		return err
@@ -12,7 +12,10 @@ import (
 	queueTypes "github.com/perfect-panel/server/queue/types"
 )
-// StuckOrderRecoveryLogic scans orders stuck in claimed status and re-queues them for processing.
+const stuckClaimTimeout = 10 * time.Minute
 // StuckOrderRecoveryLogic scans orders stuck in claimed(6) status and resets them to paid(2)
 // so that asynq retry can re-claim and process them.
 type StuckOrderRecoveryLogic struct {
 	svc *svc.ServiceContext
 }
@@ -21,11 +24,8 @@ func NewStuckOrderRecoveryLogic(svc *svc.ServiceContext) *StuckOrderRecoveryLogi
 	return &StuckOrderRecoveryLogic{svc: svc}
 }
 // ProcessTask scans for orders stuck in claimed status for over 10 minutes,
 // resets them to paid, and re-enqueues the activate task so they are retried
 // independently of asynq's original retry counter (which may be exhausted).
 func (l *StuckOrderRecoveryLogic) ProcessTask(ctx context.Context, _ *asynq.Task) error {
-	cutoff := time.Now().Add(-10 * time.Minute)
+	cutoff := time.Now().Add(-stuckClaimTimeout)
 	var stuckOrders []order.Order
 	if err := l.svc.DB.WithContext(ctx).
@@ -46,57 +46,39 @@ func (l *StuckOrderRecoveryLogic) ProcessTask(ctx context.Context, _ *asynq.Task
 	for i := range stuckOrders {
 		orderNos = append(orderNos, stuckOrders[i].OrderNo)
 	}
-	logger.WithContext(ctx).Error("[StuckOrderRecovery] Found stuck claimed orders, recovering",
+
 	logger.WithContext(ctx).Error("[StuckOrderRecovery] Found stuck claimed orders, resetting to paid",
 		logger.Field("count", len(stuckOrders)),
 		logger.Field("order_nos", orderNos),
 	)
 	for i := range stuckOrders {
 		o := &stuckOrders[i]
 	result := l.svc.DB.WithContext(ctx).
 		Model(&order.Order{}).
-			Where("order_no = ? AND status = ?", o.OrderNo, OrderStatusClaimed).
+		Where("status = ? AND updated_at < ?", OrderStatusClaimed, cutoff).
 		Update("status", OrderStatusPaid)
 	if result.Error != nil {
-			logger.WithContext(ctx).Error("[StuckOrderRecovery] Failed to reset order status",
+		logger.WithContext(ctx).Error("[StuckOrderRecovery] Failed to reset stuck orders",
 				logger.Field("order_no", o.OrderNo),
 			logger.Field("error", result.Error.Error()),
 		)
-			continue
+		return result.Error
 		}
 		if result.RowsAffected == 0 {
 			// Another process already handled this order
 			continue
 	}
-		// Invalidate order cache
+	for i := range stuckOrders {
-		o.Status = OrderStatusPaid
+		ord := &stuckOrders[i]
-		if err := l.svc.OrderModel.Update(ctx, o); err != nil {
+		payload, err := json.Marshal(queueTypes.ForthwithActivateOrderPayload{OrderNo: ord.OrderNo})
 			logger.WithContext(ctx).Error("[StuckOrderRecovery] Failed to update order cache",
 				logger.Field("order_no", o.OrderNo),
 				logger.Field("error", err.Error()),
 			)
 		}
 		// Re-enqueue activate task so the order gets processed regardless of asynq retry state
 		payload, err := json.Marshal(queueTypes.ForthwithActivateOrderPayload{OrderNo: o.OrderNo})
 		if err != nil {
-			logger.WithContext(ctx).Error("[StuckOrderRecovery] Failed to marshal task payload",
+			logger.WithContext(ctx).Error("[StuckOrderRecovery] Failed to marshal payload",
-				logger.Field("order_no", o.OrderNo),
+				logger.Field("order_no", ord.OrderNo),
 				logger.Field("error", err.Error()),
 			)
 			continue
 		}
-		if _, err = l.svc.Queue.EnqueueContext(ctx, asynq.NewTask(queueTypes.ForthwithActivateOrder, payload)); err != nil {
+		task := asynq.NewTask(queueTypes.ForthwithActivateOrder, payload, asynq.MaxRetry(5))
-			logger.WithContext(ctx).Error("[StuckOrderRecovery] Failed to re-enqueue activate task",
+		if _, err := l.svc.Queue.EnqueueContext(ctx, task); err != nil {
-				logger.Field("order_no", o.OrderNo),
+			logger.WithContext(ctx).Error("[StuckOrderRecovery] Failed to re-enqueue order",
 				logger.Field("order_no", ord.OrderNo),
 				logger.Field("error", err.Error()),
 			)
 		} else {
 			logger.WithContext(ctx).Info("[StuckOrderRecovery] Re-enqueued activate task",
 				logger.Field("order_no", o.OrderNo),
 			)
 		}
 	}
@@ -7,5 +7,5 @@ const (
 	SchedulerTrafficStat        = "scheduler:traffic:stat"
 	SchedulerIAPReconcile       = "scheduler:iap:reconcile"       // 第二层：每 5 分钟扫描待支付 IAP 订单
 	SchedulerIAPDailyReconcile  = "scheduler:iap:daily:reconcile" // 第三层：日终全量对账
-	SchedulerStuckOrderRecovery = "scheduler:stuck:order:recovery"  // 扫描并恢复超时 claimed 订单
+	SchedulerStuckOrderRecovery = "scheduler:stuck:order:recovery" // 定时恢复卡在 claimed 状态的订单
 )
@@ -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`
		`@@ -1,2 +0,0 @@`
			`-- Remove activation_context column from order table`
			ALTER TABLE `order` DROP COLUMN IF EXISTS `activation_context`;