fix: 更新苹果账号

fix: 获取用户已有订阅，如果有就续费，否则使用新购
feat: 更新免费账号
2026-01-28 20:59:05 -08:00 · 2025-12-30 22:25:44 -08:00 · 2025-12-29 08:45:58 -08:00 · 2025-12-11 06:34:10 -08:00 · 2025-12-11 06:31:19 -08:00 · 2025-12-10 04:41:15 -08:00
28 changed files with 2273 additions and 153 deletions
@@ -1,146 +1,790 @@
-name: Publish Release Assets
-run-name: Build and publish web assets and Docker images
+name: CI

 on:
-  workflow_dispatch:
  push:
    branches:
      - main
-    paths:
-      - "apps/**"
-      - "packages/**"
-      - "package.json"
-      - "turbo.json"
-      - ".gitea/workflows/*.yml"
+      - dev
+      - cicd
  pull_request:
-    types: [opened, synchronize, reopened]
-    paths:
-      - "apps/**"
-      - "packages/**"
-      - "package.json"
-      - "turbo.json"
-      - ".gitea/workflows/*.yml"
-  release:
-    types: [published]
+    branches:
+      - main
+      - dev
+      - cicd

 env:
-  # Gitea
-  GIT_USERNAME: ${{ vars.GIT_USERNAME }}
-  GIT_PASSWORD: ${{ vars.GIT_PASSWORD }}
-  # Docker Hub
-  DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-  # Host SSH (用于上传构建产物)
-  SSH_HOST: ${{ vars.SSH_HOST }}
-  SSH_PORT: ${{ vars.SSH_PORT }}
-  SSH_USER: ${{ vars.SSH_USER }}
-  SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+  DOMAIN_URL: git.kxsw.us 
+  REPO: ${{ vars.REPO }}
+  TELEGRAM_BOT_TOKEN: 8114337882:AAHkEx03HSu7RxN4IHBJJEnsK9aPPzNLIk0
+  TELEGRAM_CHAT_ID: "-4940243803"
+  DOCKER_REGISTRY: registry.kxsw.us
+  DOCKER_BUILDKIT: 1
+  DOCKER_API_VERSION: "1.44"
+  # Host SSH - 根据分支动态选择
+  SSH_HOST: ${{ github.ref_name == 'main' && vars.PRO_SSH_HOST || (github.ref_name == 'dev' && vars.DEV_SSH_HOST || vars.PRO_SSH_HOST) }}
+  SSH_PORT: ${{ github.ref_name == 'main' && vars.PRO_SSH_PORT || (github.ref_name == 'dev' && vars.DEV_SSH_PORT || vars.PRO_SSH_PORT) }}
+  SSH_USER: ${{ github.ref_name == 'main' && vars.PRO_SSH_USER || (github.ref_name == 'dev' && vars.DEV_SSH_USER || vars.PRO_SSH_USER) }}
+  SSH_PASSWORD: ${{ github.ref_name == 'main' && vars.PRO_SSH_PASSWORD || (github.ref_name == 'dev' && vars.DEV_SSH_PASSWORD || vars.PRO_SSH_PASSWORD) }}

 jobs:
-  publish:
-    name: Publish Release Assets
-    runs-on: ubuntu-latest
+  build:
+    runs-on: ppanel-web02
+    container:
+      image: node:20
+    strategy:
+      matrix:
+        # 只有node支持版本号别名
+        node: ['20.15.1']
+
    steps:
-      - name: Checkout codebase
+      - name: Checkout code
        uses: actions/checkout@v4
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v1
        with:
-          bun-version: 'latest'
+          fetch-depth: 0

-      - name: Cache Bun dependencies
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.bun
-          key: ${{ runner.os }}-bun-cache-${{ hashFiles('**/bun.lockb') }}
-          restore-keys: |
-            ${{ runner.os }}-bun-cache-
-
-      - name: Install deps
-        run: bun install --cache
-
-      - name: Build
-        run: bun run build
-
-      - name: Run publish script
+      - name: 缓存服务健康检查
+        id: cache-health
+        continue-on-error: true
        run: |
-          chmod +x scripts/publish.sh
-          ./scripts/publish.sh
+          echo "检查缓存服务可用性..."
          
-      - name: Upload tar.gz file to release
-        if: ${{ gitea.event_name == 'release' }}
-        uses: softprops/action-gh-release@v2
-        with:
-          files: |
-            out/ppanel-admin-web.tar.gz
-            out/ppanel-user-web.tar.gz
-          token: ${{ secrets.GITEA_TOKEN }}
+          # 设置缓存可用性标志
+          CACHE_AVAILABLE=true
          
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+          # 测试GitHub Actions缓存API
+          if ! curl -s --connect-timeout 10 --max-time 30 "https://api.github.com/repos/${{ github.repository }}/actions/caches" > /dev/null 2>&1; then
+            echo "⚠️ GitHub Actions缓存服务不可用，将跳过缓存步骤"
+            CACHE_AVAILABLE=false
+          else
+            echo "✅ 缓存服务可用"
+          fi
+          
+          echo "CACHE_AVAILABLE=$CACHE_AVAILABLE" >> $GITHUB_ENV
+          echo "cache-available=$CACHE_AVAILABLE" >> $GITHUB_OUTPUT
+
+      - name: 缓存降级提示
+        if: env.CACHE_AVAILABLE == 'false'
+        run: |
+          echo "🔄 缓存服务不可用，构建将在无缓存模式下进行"
+          echo "⏱️ 这可能会增加构建时间，但不会影响构建结果"
+          echo "📦 所有依赖将重新下载和安装"
+
+      - name: Install system tools (jq, docker, curl)
+        run: |
+          set -e
+          export DEBIAN_FRONTEND=noninteractive
+          echo "Waiting for apt/dpkg locks (unattended-upgrades) to release..."
+          # Wait up to 300s for unattended-upgrades/apt/dpkg locks
+          end=$((SECONDS+300))
+          while true; do
+            LOCKS_BUSY=0
+            # If unattended-upgrades is running, mark busy
+            if pgrep -x unattended-upgrades >/dev/null 2>&1; then LOCKS_BUSY=1; fi
+            # If fuser exists, check common lock files
+            if command -v fuser >/dev/null 2>&1; then
+              if fuser /var/lib/dpkg/lock >/dev/null 2>&1 \
+                || fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1 \
+                || fuser /var/lib/apt/lists/lock >/dev/null 2>&1; then
+                LOCKS_BUSY=1
+              fi
+            fi
+            # Break if not busy
+            if [ "$LOCKS_BUSY" -eq 0 ]; then break; fi
+            # Timeout after ~5 minutes
+            if [ $SECONDS -ge $end ]; then
+              echo "Timeout waiting for apt/dpkg locks, proceeding with Dpkg::Lock::Timeout..."
+              break
+            fi
+            echo "Still waiting for locks..."; sleep 5
+          done
+          apt-get update -y -o Dpkg::Lock::Timeout=600
+          # 基础工具和GPG
+          apt-get install -y -o Dpkg::Lock::Timeout=600 jq curl ca-certificates gnupg
+          # 配置Docker官方源，安装新版CLI与Buildx插件（支持 API 1.44+）
+          install -m 0755 -d /etc/apt/keyrings
+          curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+          chmod a+r /etc/apt/keyrings/docker.gpg
+          echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian $(. /etc/os-release && echo $VERSION_CODENAME) stable" > /etc/apt/sources.list.d/docker.list
+          apt-get update -y -o Dpkg::Lock::Timeout=600
+          apt-get install -y -o Dpkg::Lock::Timeout=600 docker-ce-cli docker-buildx-plugin
+          docker --version
+          jq --version
+          curl --version

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        run: |
+          # Check if buildx is available
+          if docker buildx version >/dev/null 2>&1; then
+            echo "Docker Buildx is available"
+            # Create builder if it doesn't exist
+            if ! docker buildx ls | grep -q "builder"; then
+              docker buildx create --name builder --driver docker-container
+            fi
+            # Use the builder
+            docker buildx use builder
+            docker buildx inspect --bootstrap
+          else
+            echo "Docker Buildx not available, using regular docker build"
+          fi

+      - name: Install Bun
+        run: |
+          echo "=== Installing Bun ==="
+          echo "Current working directory: $(pwd)"
+          echo "Current user: $(whoami)"
+          echo "Home directory: $HOME"
          
-      - name: Install jq
-        run: sudo apt-get install -y jq
+          # 设置Bun安装路径
+          export BUN_INSTALL="$HOME/.bun"
+          echo "BUN_INSTALL=$BUN_INSTALL" >> $GITHUB_ENV
+          echo "PATH=$BUN_INSTALL/bin:${PATH}" >> $GITHUB_ENV
          
-      - name: Extract version from package.json
-        id: version
-        run: echo "PPANEL_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_ENV
+          # 检查缓存是否存在
+          if [ -d "$BUN_INSTALL" ]; then
+            echo "✅ Bun cache found at $BUN_INSTALL"
+            ls -la "$BUN_INSTALL" || true
+          else
+            echo "❌ No Bun cache found, will install fresh"
+          fi
          
-      - name: Build and push Docker image for ppanel-admin-web
-        uses: docker/build-push-action@v6
+          # 安装Bun
+          curl -fsSL https://bun.sh/install | bash
+          
+          # 验证安装
+          "$BUN_INSTALL/bin/bun" --version
+          echo "✅ Bun installed successfully"
+
+      - name: Configure npm registry (npmmirror) and canvas mirror
+        run: |
+          echo "registry=https://registry.npmmirror.com" >> .npmrc
+          echo "canvas_binary_host_mirror=https://registry.npmmirror.com/-/binary/canvas" >> .npmrc
+
+      - name: Install dependencies cache (Bun)
+        if: env.CACHE_AVAILABLE == 'true'
+        uses: actions/cache@v4
+        continue-on-error: true
        with:
-          context: .
-          file: ./docker/ppanel-admin-web/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            ${{ env.DOCKER_USERNAME }}/ppanel-admin-web:latest
-            ${{ env.DOCKER_USERNAME }}/ppanel-admin-web:${{ env.PPANEL_VERSION }}
+          path: ~/.bun
+          key: bun-${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('bun.lock') }}
+          restore-keys: |
+            bun-${{ runner.os }}-${{ matrix.node }}-
+            bun-${{ runner.os }}-

-      - name: Build and push Docker image for ppanel-user-web
-        uses: docker/build-push-action@v6
+      - name: Install dependencies cache (node_modules)
+        if: env.CACHE_AVAILABLE == 'true'
+        uses: actions/cache@v4
+        continue-on-error: true
        with:
-          context: .
-          file: ./docker/ppanel-user-web/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            ${{ env.DOCKER_USERNAME }}/ppanel-user-web:latest
-            ${{ env.DOCKER_USERNAME }}/ppanel-user-web:${{ env.PPANEL_VERSION }}
-
-      - name: Upload to SSH server (if configured)
-        if: ${{ env.SSH_HOST != '' }}
-        uses: appleboy/ssh-action@v1
-        with:
-          host: ${{ env.SSH_HOST }}
-          username: ${{ env.SSH_USER }}
-          key: ${{ env.SSH_PRIVATE_KEY }}
-          port: ${{ env.SSH_PORT }}
-          script: |
-            mkdir -p ~/releases/${{ gitea.ref_name || 'latest' }}
-            
-      - name: Upload files via SCP (if SSH configured)
-        if: ${{ env.SSH_HOST != '' }}
-        uses: appleboy/scp-action@v1
-        with:
-          host: ${{ env.SSH_HOST }}
-          username: ${{ env.SSH_USER }}
-          key: ${{ env.SSH_PRIVATE_KEY }}
-          port: ${{ env.SSH_PORT }}
-          source: "out/*.tar.gz"
-          target: "~/releases/${{ gitea.ref_name || 'latest' }}/"
-
-      - name: Upload artifacts to Gitea
-        uses: actions/upload-artifact@v3
-        with:
-          name: ppanel-web-assets
          path: |
-            out/ppanel-admin-web.tar.gz
-            out/ppanel-user-web.tar.gz
+            node_modules
+            apps/*/node_modules
+            packages/*/node_modules
+          key: node-modules-${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('bun.lock', 'package.json', 'apps/*/package.json', 'packages/*/package.json') }}
+          restore-keys: |
+            node-modules-${{ runner.os }}-${{ matrix.node }}-
+            node-modules-${{ runner.os }}-

+      - name: 缓存状态检查和设置
+        run: |
+          echo "=== 缓存状态检查 ==="
+          echo "检查缓存恢复状态..."
+          
+          # 检查各种缓存目录
+          echo "Bun缓存: $([ -d ~/.bun ] && echo '✅ 已发现' || echo '❌ 缺失')"
+          echo "node_modules: $([ -d node_modules ] && echo '✅ 已发现' || echo '❌ 缺失')"
+          echo "Turbo缓存: $([ -d .turbo ] && echo '✅ 已发现' || echo '❌ 缺失')"
+          
+          # 显示缓存大小
+          if [ -d ~/.bun ]; then
+            echo "Bun缓存大小: $(du -sh ~/.bun 2>/dev/null || echo '未知')"
+          fi
+          if [ -d node_modules ]; then
+            echo "node_modules大小: $(du -sh node_modules 2>/dev/null || echo '未知')"
+          fi
+          if [ -d .turbo ]; then
+            echo "Turbo缓存大小: $(du -sh .turbo 2>/dev/null || echo '未知')"
+          fi
+          
+          echo "=== 缓存设置 ==="
+          # 确保缓存目录存在且权限正确
+          mkdir -p ~/.bun ~/.cache .turbo
+          chmod -R 755 ~/.bun ~/.cache .turbo 2>/dev/null || true
+          
+          # 设置Bun环境变量
+          echo "BUN_INSTALL_CACHE_DIR=$HOME/.cache/bun" >> $GITHUB_ENV
+          echo "BUN_INSTALL_BIN_DIR=$HOME/.bun/bin" >> $GITHUB_ENV
+          
+          echo "✅ 缓存目录已准备完成"
+
+      - name: Turborepo cache (.turbo)
+        if: env.CACHE_AVAILABLE == 'true'
+        uses: actions/cache@v4
+        continue-on-error: true
+        with:
+          path: .turbo
+          key: turbo-${{ runner.os }}-${{ hashFiles('turbo.json') }}-${{ hashFiles('apps//package.json') }}-${{ hashFiles('packages//package.json') }}-${{ hashFiles('bun.lock') }}
+          restore-keys: |
+            turbo-${{ runner.os }}-${{ hashFiles('turbo.json') }}-${{ hashFiles('apps//package.json') }}-${{ hashFiles('packages//package.json') }}-
+            turbo-${{ runner.os }}-${{ hashFiles('turbo.json') }}-
+            turbo-${{ runner.os }}-
+
+      - name: 安装依赖 (bun)
+        run: |
+          echo "=== 依赖安装调试信息 ==="
+          echo "当前目录: $(pwd)"
+          echo "Bun版本: $(bun --version)"
+          
+          # 检查node_modules缓存状态
+          if [ -d "node_modules" ]; then
+            echo "✅ 发现node_modules缓存"
+            echo "node_modules大小: $(du -sh node_modules 2>/dev/null || echo '未知')"
+          else
+            echo "❌ 未发现node_modules缓存"
+          fi
+          
+          # 检查bun.lock文件
+          if [ -f "bun.lock" ]; then
+            echo "✅ 发现bun.lock文件"
+          else
+            echo "❌ 未发现bun.lock文件"
+          fi
+          
+          echo "=== 开始安装依赖 ==="
+          echo "安装开始时间: $(date)"
+          bun install --frozen-lockfile
+          echo "安装完成时间: $(date)"
+          
+          echo "=== 依赖安装完成 ==="
+          echo "最终node_modules大小: $(du -sh node_modules 2>/dev/null || echo '未知')"
+          
+          # 验证缓存效果
+          echo "=== 缓存效果验证 ==="
+          if [ -d "node_modules" ]; then
+            echo "✅ 依赖安装成功"
+            echo "包数量: $(ls node_modules | wc -l 2>/dev/null || echo '未知')"
+          else
+            echo "⚠️  依赖可能未完全安装"
+          fi
+
+
+      - name: Decide build target (admin/user/both)
+        run: |
+          set -e
+          COMMIT_MSG="${{ github.event.head_commit.message }}"
+          BUILD_TARGET="both"
+          if echo "$COMMIT_MSG" | grep -qi "\[admin-only\]"; then
+            BUILD_TARGET="admin"
+          elif echo "$COMMIT_MSG" | grep -qi "\[user-only\]"; then
+            BUILD_TARGET="user"
+          else
+            if git rev-parse HEAD^ >/dev/null 2>&1; then
+              RANGE="HEAD^..HEAD"
+            else
+              RANGE="$(git rev-list --max-parents=0 HEAD)..HEAD"
+            fi
+            CHANGED=$(git diff --name-only $RANGE || true)
+            ADMIN_MATCH=$(echo "$CHANGED" | grep -E '^(apps/admin/|docker/ppanel-admin-web/)' || true)
+            USER_MATCH=$(echo "$CHANGED" | grep -E '^(apps/user/|docker/ppanel-user-web/)' || true)
+            PACKAGE_MATCH=$(echo "$CHANGED" | grep -E '^(packages/|turbo.json|package.json|bun.lock)' || true)
+            if [ -n "$PACKAGE_MATCH" ]; then
+              BUILD_TARGET="both"
+            else
+              if [ -n "$ADMIN_MATCH" ] && [ -z "$USER_MATCH" ]; then BUILD_TARGET="admin"; fi
+              if [ -n "$USER_MATCH" ] && [ -z "$ADMIN_MATCH" ]; then BUILD_TARGET="user"; fi
+              if [ -n "$ADMIN_MATCH" ] && [ -n "$USER_MATCH" ]; then BUILD_TARGET="both"; fi
+            fi
+          fi
+          echo "BUILD_TARGET=$BUILD_TARGET" >> $GITHUB_ENV
+          echo "Decided BUILD_TARGET=$BUILD_TARGET"
+
+      - name: Read version from package.json
+        run: |
+          if [ "$BUILD_TARGET" = "admin" ]; then
+            VERSION=$(jq -r .version apps/admin/package.json)
+            echo "使用 admin 应用版本: $VERSION"
+          elif [ "$BUILD_TARGET" = "user" ]; then
+            VERSION=$(jq -r .version apps/user/package.json)
+            echo "使用 user 应用版本: $VERSION"
+          else
+            # both 或其他情况使用根目录版本
+            VERSION=$(jq -r .version package.json)
+            echo "使用根目录版本: $VERSION"
+          fi
+          if [ "$VERSION" = "null" ] || [ -z "$VERSION" ] || [ "$VERSION" = "undefined" ]; then
+            echo "检测到版本为空，回退到根目录版本"
+            VERSION=$(jq -r .version package.json)
+          fi
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+
+      - name: 根据分支动态设置API地址
+        run: |
+          if [ "${{ github.ref_name }}" = "main" ]; then
+            echo "NEXT_PUBLIC_API_URL=https://api.airoport.co" >> $GITHUB_ENV
+            echo "为main分支设置生产环境API地址"
+          elif [ "${{ github.ref_name }}" = "dev" ]; then
+            echo "NEXT_PUBLIC_API_URL=https://api.kxsw.us" >> $GITHUB_ENV
+            echo "为dev分支设置开发环境API地址"
+          else
+            echo "NEXT_PUBLIC_API_URL=https://api.airoport.co" >> $GITHUB_ENV
+            echo "为其他分支设置默认API地址"
+          fi
+          echo "BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
+
+      - name: Cache Next.js build artifacts (.next/cache)
+        if: env.CACHE_AVAILABLE == 'true'
+        uses: actions/cache@v4
+        continue-on-error: true
+        with:
+          path: |
+            apps/admin/.next/cache
+            apps/user/.next/cache
+          key: nextcache-${{ runner.os }}-${{ hashFiles('apps//package.json') }}-${{ hashFiles('packages//package.json') }}-${{ hashFiles('turbo.json') }}-${{ hashFiles('bun.lock') }}
+          restore-keys: |
+            nextcache-${{ runner.os }}-${{ hashFiles('apps//package.json') }}-${{ hashFiles('packages//package.json') }}-
+            nextcache-${{ runner.os }}-
+
+      - name: Cache build outputs
+        if: env.CACHE_AVAILABLE == 'true'
+        uses: actions/cache@v4
+        continue-on-error: true
+        with:
+          path: |
+            apps/admin/.next
+            apps/user/.next
+            apps/admin/dist
+            apps/user/dist
+          key: build-${{ runner.os }}-${{ hashFiles('apps//*.ts', 'apps//*.tsx', 'apps//*.js', 'apps//*.jsx') }}-${{ hashFiles('packages//*.ts', 'packages//*.tsx') }}-${{ hashFiles('bun.lock') }}
+          restore-keys: |
+            build-${{ runner.os }}-${{ hashFiles('apps//*.ts', 'apps//*.tsx', 'apps//*.js', 'apps//*.jsx') }}-
+            build-${{ runner.os }}-
+
+      - name: Cache ESLint
+        if: env.CACHE_AVAILABLE == 'true'
+        uses: actions/cache@v4
+        continue-on-error: true
+        with:
+          path: |
+            .eslintcache
+            apps/admin/.eslintcache
+            apps/user/.eslintcache
+          key: eslint-${{ runner.os }}-${{ hashFiles('.eslintrc*', 'apps//.eslintrc*', 'packages//.eslintrc*') }}-${{ hashFiles('bun.lock') }}
+          restore-keys: |
+            eslint-${{ runner.os }}-
+
+      - name: Cache TypeScript
+        if: env.CACHE_AVAILABLE == 'true'
+        uses: actions/cache@v4
+        continue-on-error: true
+        with:
+          path: |
+            .tsbuildinfo
+            apps/admin/.tsbuildinfo
+            apps/user/.tsbuildinfo
+            packages//.tsbuildinfo
+          key: typescript-${{ runner.os }}-${{ hashFiles('tsconfig*.json', 'apps//tsconfig*.json', 'packages//tsconfig*.json') }}-${{ hashFiles('bun.lock') }}
+          restore-keys: |
+            typescript-${{ runner.os }}-
+
+      - name: 构建管理面板
+        if: env.BUILD_TARGET == 'admin' || env.BUILD_TARGET == 'both'
+        run: bun run build --filter=ppanel-admin-web
+
+      - name: 构建用户面板
+        if: env.BUILD_TARGET == 'user' || env.BUILD_TARGET == 'both'
+        run: bun run build --filter=ppanel-user-web
+
+      - name: 构建并推送管理面板Docker镜像
+        if: env.BUILD_TARGET == 'admin' || env.BUILD_TARGET == 'both'
+        run: |
+          if docker buildx version >/dev/null 2>&1; then
+            echo "使用docker buildx进行优化构建"
+            docker buildx build \
+              --platform linux/amd64 \
+              --cache-from type=registry,ref=${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:cache \
+              --cache-to type=registry,ref=${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:cache,mode=max \
+              -f ./docker/ppanel-admin-web/Dockerfile \
+              -t ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }} \
+              --push .
+          else
+            echo "使用常规docker构建"
+            docker build -f ./docker/ppanel-admin-web/Dockerfile -t ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }} .
+            docker push ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }}
+          fi
+
+      - name: 构建并推送用户面板Docker镜像
+        if: env.BUILD_TARGET == 'user' || env.BUILD_TARGET == 'both'
+        run: |
+          if docker buildx version >/dev/null 2>&1; then
+            echo "使用docker buildx进行优化构建"
+            docker buildx build \
+              --platform linux/amd64 \
+              --cache-from type=registry,ref=${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:cache \
+              --cache-to type=registry,ref=${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:cache,mode=max \
+              -f ./docker/ppanel-user-web/Dockerfile \
+              -t ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }} \
+              --push .
+          else
+            echo "使用常规docker构建"
+            docker build -f ./docker/ppanel-user-web/Dockerfile -t ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }} .
+            docker push ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }}
+          fi
+
+      - name: SSH连接预检查
+        if: env.BUILD_TARGET == 'admin' || env.BUILD_TARGET == 'user' || env.BUILD_TARGET == 'both'
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ env.SSH_HOST }}
+          username: ${{ env.SSH_USER }}
+          password: ${{ env.SSH_PASSWORD }}
+          port: ${{ env.SSH_PORT }}
+          timeout: 300s
+          command_timeout: 600s
+          debug: true
+          script: |
+            echo "=== SSH连接测试 ==="
+            echo "连接时间: $(date)"
+            echo "服务器主机名: $(hostname)"
+            echo "当前用户: $(whoami)"
+            echo "系统信息: $(uname -a)"
+            echo "Docker版本: $(docker --version 2>/dev/null || echo 'Docker未安装')"
+            echo "✅ SSH连接成功"
+
+      - name: 部署管理面板到服务器
+        if: env.BUILD_TARGET == 'admin' || env.BUILD_TARGET == 'both'
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ env.SSH_HOST }}
+          username: ${{ env.SSH_USER }}
+          password: ${{ env.SSH_PASSWORD }}
+          port: ${{ env.SSH_PORT }}
+          timeout: 300s
+          command_timeout: 600s
+          script: |
+            echo "=== SSH变量调试信息 ==="
+            echo "DOCKER_REGISTRY: ${{ env.DOCKER_REGISTRY }}"
+            echo "VERSION: ${{ env.VERSION }}"
+            echo "NEXT_PUBLIC_API_URL: ${{ env.NEXT_PUBLIC_API_URL }}"
+            echo "BRANCH: ${{ env.BRANCH }}"
+            
+            echo "=== 部署管理面板 ==="
+            
+            # 网络连通性检查
+            echo "检查镜像服务器连通性..."
+            REGISTRY_HOST=$(echo "${{ env.DOCKER_REGISTRY }}" | sed 's|https\?://||' | cut -d'/' -f1)
+            echo "镜像仓库地址: $REGISTRY_HOST"
+            
+            if ping -c 3 "$REGISTRY_HOST" > /dev/null 2>&1; then
+              echo "✅ 镜像服务器连通性正常"
+            else
+              echo "⚠️ 镜像服务器ping失败，但继续尝试拉取镜像"
+            fi
+            
+            # 检查Docker登录状态
+            echo "检查Docker登录状态..."
+            if docker info > /dev/null 2>&1; then
+              echo "✅ Docker服务正常"
+            else
+              echo "❌ Docker服务异常"
+              exit 1
+            fi
+            
+            # 拉取镜像（带重试）
+            echo "拉取Docker镜像..."
+            for i in {1..3}; do
+              echo "尝试拉取镜像 ($i/3): ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }}"
+              if docker pull ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }}; then
+                echo "✅ 镜像拉取成功"
+                break
+              else
+                echo "❌ 镜像拉取失败，重试 $i/3"
+                echo "检查网络和镜像仓库状态..."
+                
+                # 显示详细错误信息
+                echo "--- 网络诊断信息 ---"
+                echo "DNS解析测试:"
+                nslookup "$REGISTRY_HOST" || echo "DNS解析失败"
+                echo "网络连通性测试:"
+                ping -c 2 "$REGISTRY_HOST" || echo "ping失败"
+                echo "Docker镜像仓库连接测试:"
+                curl -I "https://$REGISTRY_HOST/v2/" 2>/dev/null || echo "仓库API访问失败"
+                
+                sleep 5
+                if [ $i -eq 3 ]; then
+                  echo "❌ 镜像拉取失败，部署终止"
+                  echo "请检查:"
+                  echo "1. 网络连接是否正常"
+                  echo "2. 镜像仓库是否可访问"
+                  echo "3. 镜像标签是否存在"
+                  echo "4. Docker登录凭据是否正确"
+                  exit 1
+                fi
+              fi
+            done
+            
+            # 安全停止和移除容器
+            echo "检查现有容器状态..."
+            CONTAINER_NAME="ppanel-admin-web"
+            
+            # 检查容器是否存在
+            if docker ps -aq -f name=$CONTAINER_NAME | grep -q .; then
+              echo "发现现有容器，开始清理..."
+              
+              # 检查容器是否正在运行
+              if docker ps -q -f name=$CONTAINER_NAME | grep -q .; then
+                echo "停止运行中的容器..."
+                docker stop $CONTAINER_NAME --time=15 || true
+                sleep 5
+              fi
+              
+              # 检查容器是否正在被移除
+              echo "检查容器移除状态..."
+              for i in {1..15}; do
+                # 尝试获取容器状态
+                CONTAINER_STATUS=$(docker inspect $CONTAINER_NAME --format='{{.State.Status}}' 2>/dev/null || echo "not_found")
+                
+                if [ "$CONTAINER_STATUS" = "not_found" ]; then
+                  echo "✅ 容器已不存在"
+                  break
+                elif [ "$CONTAINER_STATUS" = "removing" ]; then
+                  echo "⏳ 容器正在移除中，等待完成... $i/15"
+                  sleep 3
+                else
+                  echo "尝试移除容器... $i/15"
+                  if docker rm -f $CONTAINER_NAME 2>/dev/null; then
+                    echo "✅ 容器移除成功"
+                    break
+                  else
+                    echo "⚠️ 容器移除失败，重试..."
+                    sleep 2
+                  fi
+                fi
+                
+                # 最后一次尝试强制清理
+                if [ $i -eq 15 ]; then
+                  echo "🔧 执行强制清理..."
+                  docker kill $CONTAINER_NAME 2>/dev/null || true
+                  sleep 2
+                  docker rm -f $CONTAINER_NAME 2>/dev/null || true
+                  sleep 2
+                fi
+              done
+            else
+              echo "✅ 未发现现有容器"
+            fi
+            
+            echo "启动新容器..."
+            docker run -d \
+              --add-host api.airoport.co:103.150.215.40 \
+              --name ppanel-admin-web \
+              --restart unless-stopped \
+              -p 3001:3000 \
+              -e NEXT_PUBLIC_API_URL=${{ env.NEXT_PUBLIC_API_URL }} \
+              ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-admin-web:${{ env.VERSION }}
+            
+            # 验证容器启动
+            echo "验证容器启动状态..."
+            for i in {1..10}; do
+              if docker ps -q -f name=ppanel-admin-web | grep -q .; then
+                echo "✅ 管理面板部署成功"
+                docker ps -f name=ppanel-admin-web --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}"
+                exit 0
+              else
+                echo "等待容器启动... $i/10"
+                sleep 3
+              fi
+            done
+            
+            echo "❌ 管理面板部署失败 - 容器未能正常启动"
+            docker logs ppanel-admin-web || true
+            exit 1
+
+      - name: 部署用户面板到服务器
+        if: env.BUILD_TARGET == 'user' || env.BUILD_TARGET == 'both'
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ env.SSH_HOST }}
+          username: ${{ env.SSH_USER }}
+          password: ${{ env.SSH_PASSWORD }}
+          port: ${{ env.SSH_PORT }}
+          timeout: 300s
+          command_timeout: 600s
+          debug: true
+          script: |
+            echo "=== SSH变量调试信息 ==="
+            echo "DOCKER_REGISTRY: ${{ env.DOCKER_REGISTRY }}"
+            echo "VERSION: ${{ env.VERSION }}"
+            echo "NEXT_PUBLIC_API_URL: ${{ env.NEXT_PUBLIC_API_URL }}"
+            echo "BRANCH: ${{ env.BRANCH }}"
+            
+            echo "=== 部署用户面板 ==="
+            
+            # 网络连通性检查
+            echo "检查镜像服务器连通性..."
+            REGISTRY_HOST=$(echo "${{ env.DOCKER_REGISTRY }}" | sed 's|https\?://||' | cut -d'/' -f1)
+            echo "镜像仓库地址: $REGISTRY_HOST"
+            
+            if ping -c 3 "$REGISTRY_HOST" > /dev/null 2>&1; then
+              echo "✅ 镜像服务器连通性正常"
+            else
+              echo "⚠️ 镜像服务器ping失败，但继续尝试拉取镜像"
+            fi
+            
+            # 检查Docker登录状态
+            echo "检查Docker登录状态..."
+            if docker info > /dev/null 2>&1; then
+              echo "✅ Docker服务正常"
+            else
+              echo "❌ Docker服务异常"
+              exit 1
+            fi
+            
+            # 拉取镜像（带重试）
+            echo "拉取Docker镜像..."
+            for i in {1..3}; do
+              echo "尝试拉取镜像 ($i/3): ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }}"
+              if docker pull ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }}; then
+                echo "✅ 镜像拉取成功"
+                break
+              else
+                echo "❌ 镜像拉取失败，重试 $i/3"
+                echo "检查网络和镜像仓库状态..."
+                
+                # 显示详细错误信息
+                echo "--- 网络诊断信息 ---"
+                echo "DNS解析测试:"
+                nslookup "$REGISTRY_HOST" || echo "DNS解析失败"
+                echo "网络连通性测试:"
+                ping -c 2 "$REGISTRY_HOST" || echo "ping失败"
+                echo "Docker镜像仓库连接测试:"
+                curl -I "https://$REGISTRY_HOST/v2/" 2>/dev/null || echo "仓库API访问失败"
+                
+                sleep 5
+                if [ $i -eq 3 ]; then
+                  echo "❌ 镜像拉取失败，部署终止"
+                  echo "请检查:"
+                  echo "1. 网络连接是否正常"
+                  echo "2. 镜像仓库是否可访问"
+                  echo "3. 镜像标签是否存在"
+                  echo "4. Docker登录凭据是否正确"
+                  exit 1
+                fi
+              fi
+            done
+            
+            # 安全停止和移除容器
+            echo "检查现有容器状态..."
+            CONTAINER_NAME="ppanel-user-web"
+            
+            # 检查容器是否存在
+            if docker ps -aq -f name=$CONTAINER_NAME | grep -q .; then
+              echo "发现现有容器，开始清理..."
+              
+              # 检查容器是否正在运行
+              if docker ps -q -f name=$CONTAINER_NAME | grep -q .; then
+                echo "停止运行中的容器..."
+                docker stop $CONTAINER_NAME --time=15 || true
+                sleep 5
+              fi
+              
+              # 检查容器是否正在被移除
+              echo "检查容器移除状态..."
+              for i in {1..15}; do
+                # 尝试获取容器状态
+                CONTAINER_STATUS=$(docker inspect $CONTAINER_NAME --format='{{.State.Status}}' 2>/dev/null || echo "not_found")
+                
+                if [ "$CONTAINER_STATUS" = "not_found" ]; then
+                  echo "✅ 容器已不存在"
+                  break
+                elif [ "$CONTAINER_STATUS" = "removing" ]; then
+                  echo "⏳ 容器正在移除中，等待完成... $i/15"
+                  sleep 3
+                else
+                  echo "尝试移除容器... $i/15"
+                  if docker rm -f $CONTAINER_NAME 2>/dev/null; then
+                    echo "✅ 容器移除成功"
+                    break
+                  else
+                    echo "⚠️ 容器移除失败，重试..."
+                    sleep 2
+                  fi
+                fi
+                
+                # 最后一次尝试强制清理
+                if [ $i -eq 15 ]; then
+                  echo "🔧 执行强制清理..."
+                  docker kill $CONTAINER_NAME 2>/dev/null || true
+                  sleep 2
+                  docker rm -f $CONTAINER_NAME 2>/dev/null || true
+                  sleep 2
+                fi
+              done
+            else
+              echo "✅ 未发现现有容器"
+            fi
+            
+            echo "启动新容器..."
+            docker run -d \
+              --add-host api.airoport.co:103.150.215.40 \
+              --name ppanel-user-web \
+              --restart unless-stopped \
+              -p 3002:3000 \
+              -e NEXT_PUBLIC_API_URL=${{ env.NEXT_PUBLIC_API_URL }} \
+              ${{ env.DOCKER_REGISTRY }}/ppanel/ppanel-user-web:${{ env.VERSION }}
+            
+            # 验证容器启动
+            echo "验证容器启动状态..."
+            for i in {1..10}; do
+              if docker ps -q -f name=ppanel-user-web | grep -q .; then
+                echo "✅ 用户面板部署成功"
+                docker ps -f name=ppanel-user-web --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}"
+                exit 0
+              else
+                echo "等待容器启动... $i/10"
+                sleep 3
+              fi
+            done
+            
+            echo "❌ 用户面板部署失败 - 容器未能正常启动"
+            docker logs ppanel-user-web || true
+            exit 1
+
+      # 步骤5: TG通知 (成功)
+      - name: 📱 发送成功通知到Telegram
+        if: success()
+        uses: appleboy/telegram-action@master
+        with:
+          token: ${{ env.TELEGRAM_BOT_TOKEN }}
+          to: ${{ env.TELEGRAM_CHAT_ID }}
+          message: |
+            ✅ 部署成功！
+            
+            📦 项目: ${{ github.repository }}
+            🌿 分支: ${{ github.ref_name }}
+            🔖 版本: ${{ env.VERSION }}
+            🎯 构建目标: ${{ env.BUILD_TARGET }}
+            🔗 API地址: ${{ env.NEXT_PUBLIC_API_URL }}
+            📝 提交: ${{ github.sha }}
+            👤 提交者: ${{ github.actor }}
+            🕐 时间: ${{ github.event.head_commit.timestamp }}
+            
+            🚀 服务已成功部署到生产环境
+
+      # 步骤5: TG通知 (失败)
+      - name: 📱 发送失败通知到Telegram
+        if: failure()
+        uses: appleboy/telegram-action@master
+        with:
+          token: ${{ env.TELEGRAM_BOT_TOKEN }}
+          to: ${{ env.TELEGRAM_CHAT_ID }}
+          message: |
+            ❌ 部署失败！
+            
+            📦 项目: ${{ github.repository }}
+            🌿 分支: ${{ github.ref_name }}
+            🔖 版本: ${{ env.VERSION }}
+            🎯 构建目标: ${{ env.BUILD_TARGET }}
+            📝 提交: ${{ github.sha }}
+            👤 提交者: ${{ github.actor }}
+            🕐 时间: ${{ github.event.head_commit.timestamp }}
+            
+            ⚠️ 请检查构建日志获取详细信息
@@ -0,0 +1,91 @@
+# Makefile for panel-web
+
+# Docker Registry
+REGISTRY_URL=registry.kxsw.us
+
+# Image names
+ADMIN_IMAGE_NAME=ppanel/ppanel-admin-web
+USER_IMAGE_NAME=ppanel/ppanel-user-web
+
+# Full image names with registry
+ADMIN_IMAGE=${REGISTRY_URL}/${ADMIN_IMAGE_NAME}
+USER_IMAGE=${REGISTRY_URL}/${USER_IMAGE_NAME}
+
+# Version from package.json. Requires jq to be installed.
+VERSION=$(shell jq -r .version package.json)
+
+.PHONY: all
+all: build ## Default target
+
+# ==============================================================================
+# Build Targets
+# ==============================================================================
+
+.PHONY: build
+build: build-admin build-user ## Build both admin and user docker images
+
+.PHONY: build-admin
+build-admin: ## Build the admin docker image
+	@echo "Building admin image with tags ${ADMIN_IMAGE}:${VERSION} and ${ADMIN_IMAGE}:latest..."
+	docker build -f ./docker/ppanel-admin-web/Dockerfile -t ${ADMIN_IMAGE}:${VERSION} -t ${ADMIN_IMAGE}:latest .
+	@echo "Successfully built admin image."
+
+.PHONY: build-user
+build-user: ## Build the user docker image
+	@echo "Building user image with tags ${USER_IMAGE}:${VERSION} and ${USER_IMAGE}:latest..."
+	docker build -f ./docker/ppanel-user-web/Dockerfile -t ${USER_IMAGE}:${VERSION} -t ${USER_IMAGE}:latest .
+	@echo "Successfully built user image."
+
+
+# ==============================================================================
+# Publish Targets
+# ==============================================================================
+
+.PHONY: push
+push: push-admin push-user ## Push both admin and user images to the registry
+
+.PHONY: push-admin
+push-admin: ## Push the admin image to the registry
+	@echo "Pushing admin image ${ADMIN_IMAGE}:${VERSION} and ${ADMIN_IMAGE}:latest..."
+	docker push ${ADMIN_IMAGE}:${VERSION}
+	docker push ${ADMIN_IMAGE}:latest
+	@echo "Successfully pushed admin image."
+
+.PHONY: push-user
+push-user: ## Push the user image to the registry
+	@echo "Pushing user image ${USER_IMAGE}:${VERSION} and ${USER_IMAGE}:latest..."
+	docker push ${USER_IMAGE}:${VERSION}
+	docker push ${USER_IMAGE}:latest
+	@echo "Successfully pushed user image."
+
+
+# ==============================================================================
+# Run Targets
+# ==============================================================================
+
+.PHONY: ensure-version
+ensure-version:
+	@if [ -z "${VERSION}" ] || [ "${VERSION}" = "null" ]; then \
+		echo "ERROR: 未检测到版本号。请安装 jq 并在 panel-web/package.json 中设置有效的 version 字段。"; \
+		echo "提示：可以运行 'make version' 查看当前版本值。"; \
+		exit 1; \
+	fi
+
+# ==============================================================================
+# Other Targets
+# ==============================================================================
+
+.PHONY: login
+login: ## Login to the Docker registry
+	docker login ${REGISTRY_URL}
+
+.PHONY: help
+help: ## Show this help message
+	@echo "Usage: make [target]"
+	@echo ""
+	@echo "Targets:"
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
+
+.PHONY: version
+version: ## Print project version from package.json
+	@echo "${VERSION}"
@@ -3,7 +3,7 @@ NEXT_PUBLIC_DEFAULT_LANGUAGE=zh-CN

 # Site URL and API URL
 NEXT_PUBLIC_SITE_URL=https://admin.ppanel.dev
-NEXT_PUBLIC_API_URL=https://api.kxsw.us
+NEXT_PUBLIC_API_URL=https://api.airoport.co

 # Default Login User
 NEXT_PUBLIC_DEFAULT_USER_EMAIL=
@@ -8,7 +8,7 @@

 This is a PPanel admin web powered by PPanel

-English
+English ##
 ·
 [Chinese](./README.zh-CN.md)
 ·
@@ -134,7 +134,9 @@ export function UserDetail({ id }: { id: number }) {
      <HoverCardTrigger asChild>
        <Button variant='link' className='p-0' asChild>
          <Link href={`/dashboard/user/${id}`}>
-            {data?.auth_methods[0]?.auth_identifier || t('loading')}
+            {data?.auth_methods[0]?.auth_identifier
+              ? `${data?.auth_methods[0]?.auth_identifier} (${data?.remark})`
+              : t('loading')}
          </Link>
        </Button>
      </HoverCardTrigger>
@@ -18,7 +18,7 @@
    "axios": "^1.7.9",
    "js-yaml": "^4.1.0",
    "nanoid": "^5.0.9",
-    "next": "^15.1.4",
+    "next": "15.3.6",
    "next-intl": "^3.26.3",
    "next-runtime-env": "^3.2.2",
    "next-themes": "^0.4.4",
@@ -3,7 +3,7 @@ NEXT_PUBLIC_DEFAULT_LANGUAGE=zh-CN

 # Site URL and API URL
 NEXT_PUBLIC_SITE_URL=https://user.ppanel.dev
-NEXT_PUBLIC_API_URL=https://api.kxsw.us
+NEXT_PUBLIC_API_URL=https://api.airoport.co
 NEXT_PUBLIC_CDN_URL=https://cdn.jsdelivr.net

 # Home Page Settings
@@ -3,7 +3,7 @@ NEXT_PUBLIC_DEFAULT_LANGUAGE=en-US

 # Site URL and API URL
 NEXT_PUBLIC_SITE_URL=https://user.ppanel.dev
-NEXT_PUBLIC_API_URL=https://api.kxsw.us
+NEXT_PUBLIC_API_URL=https://airoport.co
 NEXT_PUBLIC_CDN_URL=https://cdn.jsdelivr.net

 # Home Page Settings
@@ -179,7 +179,7 @@ export default function Content() {
              variant={'primary'}
              onClick={() => {
                openPopupWindow({
-                  download: 'https://aunlock.laomaos.com/share/DEXVzMSP',
+                  download: 'https://getsapp.net/StKNQY',
                  title: 'Shadowrocket',
                });
              }}
@@ -0,0 +1,10 @@
+'use client';
+import EmailAuthForm1 from '@/app/auth/email2/auth-form';
+
+export default function RegisterPage() {
+  return (
+    <div className='container w-full py-8 sm:w-[496px]'>
+      <EmailAuthForm1 isRedirect={true} />
+    </div>
+  );
+}
@@ -0,0 +1,45 @@
+/*import { GlobalMap } from '@/components/main/global-map';
+import { Hero } from '@/components/main/hero';
+import { ProductShowcase } from '@/components/main/product-showcase/index';
+import { Stats } from '@/components/main/stats';*/
+import Header from '@/components/Header/Header';
+import { queryUserInfo } from '@/services/user/user';
+import { cookies } from 'next/headers';
+
+import EmailAuthForm2 from '@/app/auth/email2/auth-form';
+import { LoginDialogProvider } from '@/app/auth/LoginDialogContext';
+import FooterCopyright from '@/components/main/FooterCopyright';
+import FullScreenVideoBackground from '@/components/main/FullScreenVideoBackground';
+
+export default async function Home() {
+  const Authorization = (await cookies()).get('Authorization')?.value;
+
+  if (Authorization) {
+    let user = null;
+    try {
+      user = await queryUserInfo({
+        skipErrorHandler: true,
+        Authorization,
+      }).then((res) => res.data.data);
+    } catch (error) {
+      console.log('Token validation failed:', error);
+    }
+
+    if (user) {
+      // redirect('/dashboard');
+    }
+  }
+
+  return (
+    <LoginDialogProvider>
+      <FullScreenVideoBackground />
+      <Header />
+      <main className='fixed inset-0 z-40 flex items-center justify-center'>
+        <div className={'w-[80%] pt-8 sm:w-[496px]'}>
+          <EmailAuthForm2 isRedirect={true} />
+        </div>
+      </main>
+      <FooterCopyright />
+    </LoginDialogProvider>
+  );
+}
@@ -0,0 +1,111 @@
+'use client';
+
+import { resetPassword, userLogin, userRegister } from '@/services/common/auth';
+import { useTranslations } from 'next-intl';
+import { useRouter } from 'next/navigation';
+import { ReactNode, useState, useTransition } from 'react';
+import { toast } from 'sonner';
+
+import {
+  NEXT_PUBLIC_DEFAULT_USER_EMAIL,
+  NEXT_PUBLIC_DEFAULT_USER_PASSWORD,
+} from '@/config/constants';
+import useGlobalStore from '@/config/use-global';
+import { getRedirectUrl, setAuthorization } from '@/utils/common';
+import LoginForm from './login-form';
+import RegisterForm from './register-form';
+import ResetForm from './reset-form';
+
+export default function EmailAuthForm(props: { isRedirect: boolean }) {
+  const t = useTranslations('auth');
+  const router = useRouter();
+  const [type, setType] = useState<'login' | 'register' | 'reset'>('register');
+  const [loading, startTransition] = useTransition();
+  const [initialValues, setInitialValues] = useState<{
+    email?: string;
+    password?: string;
+  }>({
+    email: NEXT_PUBLIC_DEFAULT_USER_EMAIL,
+    password: NEXT_PUBLIC_DEFAULT_USER_PASSWORD,
+  });
+  const { getUserInfo } = useGlobalStore();
+  const handleFormSubmit = async (params: any) => {
+    const onLogin = async (token?: string) => {
+      if (!token) return;
+      setAuthorization(token);
+      console.log('props.isRedirect', token);
+      console.log('props.isRedirect', props.isRedirect);
+      console.log('props.isRedirect ', getRedirectUrl());
+      if (props.isRedirect) {
+        router.replace(getRedirectUrl());
+        router.refresh();
+      } else {
+        await getUserInfo();
+      }
+    };
+    startTransition(async () => {
+      try {
+        switch (type) {
+          case 'login': {
+            const login = await userLogin(params);
+            toast.success(t('login.success'));
+            onLogin(login.data.data?.token);
+            break;
+          }
+          case 'register': {
+            const create = await userRegister(params);
+            toast.success(t('register.success'));
+            onLogin(create.data.data?.token);
+            break;
+          }
+          case 'reset':
+            await resetPassword(params);
+            toast.success(t('reset.success'));
+            setType('login');
+            break;
+        }
+      } catch (error) {
+        /* empty */
+      }
+    });
+  };
+
+  let UserForm: ReactNode = null;
+  switch (type) {
+    case 'login':
+      UserForm = (
+        <LoginForm
+          loading={loading}
+          onSubmit={handleFormSubmit}
+          initialValues={initialValues}
+          setInitialValues={setInitialValues}
+          onSwitchForm={setType}
+        />
+      );
+      break;
+    case 'register':
+      UserForm = (
+        <RegisterForm
+          loading={loading}
+          onSubmit={handleFormSubmit}
+          initialValues={initialValues}
+          setInitialValues={setInitialValues}
+          onSwitchForm={setType}
+        />
+      );
+      break;
+    case 'reset':
+      UserForm = (
+        <ResetForm
+          loading={loading}
+          onSubmit={handleFormSubmit}
+          initialValues={initialValues}
+          setInitialValues={setInitialValues}
+          onSwitchForm={setType}
+        />
+      );
+      break;
+  }
+
+  return UserForm;
+}
@@ -0,0 +1,147 @@
+import useGlobalStore from '@/config/use-global';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { AiroButton } from '@workspace/airo-ui/components/AiroButton';
+import { Button } from '@workspace/airo-ui/components/button';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormMessage,
+} from '@workspace/airo-ui/components/form';
+import { Input } from '@workspace/airo-ui/components/input';
+import { Icon } from '@workspace/airo-ui/custom-components/icon';
+import { useTranslations } from 'next-intl';
+import { Dispatch, SetStateAction, useRef } from 'react';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+import CloudFlareTurnstile, { TurnstileRef } from '../turnstile';
+
+export default function LoginForm({
+  loading,
+  onSubmit,
+  initialValues,
+  setInitialValues,
+  onSwitchForm,
+}: {
+  loading?: boolean;
+  onSubmit: (data: any) => void;
+  initialValues: any;
+  setInitialValues: Dispatch<SetStateAction<any>>;
+  onSwitchForm: Dispatch<SetStateAction<'register' | 'reset' | 'login'>>;
+}) {
+  const t = useTranslations('auth.login');
+  const { common } = useGlobalStore();
+  const { verify } = common;
+
+  const formSchema = z.object({
+    email: z.string().email(t('email')),
+    password: z.string(),
+    cf_token:
+      verify.enable_login_verify && verify.turnstile_site_key ? z.string() : z.string().optional(),
+  });
+  const form = useForm<z.infer<typeof formSchema>>({
+    resolver: zodResolver(formSchema),
+    defaultValues: initialValues,
+  });
+
+  const turnstile = useRef<TurnstileRef>(null);
+  const handleSubmit = form.handleSubmit((data) => {
+    try {
+      onSubmit(data);
+    } catch (error) {
+      turnstile.current?.reset();
+    }
+  });
+
+  return (
+    <>
+      <div className={'h-[84px] text-2xl font-bold leading-[84px]'}>账户验证</div>
+      <Form {...form}>
+        <form onSubmit={handleSubmit} className=''>
+          <FormField
+            control={form.control}
+            name='email'
+            render={({ field }) => (
+              <FormItem className={'mb-5'}>
+                <FormControl>
+                  <Input
+                    className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                    placeholder='Email'
+                    type='email'
+                    {...field}
+                  />
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='password'
+            render={({ field }) => (
+              <FormItem className={'mb-2'}>
+                <FormControl>
+                  <Input
+                    className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                    placeholder='Password'
+                    type='password'
+                    {...field}
+                  />
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+          {verify.enable_login_verify && (
+            <FormField
+              control={form.control}
+              name='cf_token'
+              render={({ field }) => (
+                <FormItem className={'last:mb-0'}>
+                  <FormControl>
+                    <CloudFlareTurnstile id='login' {...field} ref={turnstile} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          )}
+          <div className='flex w-full justify-between text-sm'>
+            <Button
+              variant='link'
+              type='button'
+              className='p-0 text-[#225BA9]'
+              onClick={() => onSwitchForm('reset')}
+            >
+              {t('forgotPassword')}
+            </Button>
+            <Button
+              variant='link'
+              type='button'
+              className='p-0 text-[#225BA9]'
+              onClick={() => {
+                setInitialValues(undefined);
+                onSwitchForm('register');
+              }}
+            >
+              {t('registerAccount')}
+            </Button>
+          </div>
+
+          <div className='mt-6 flex justify-center'>
+            <AiroButton
+              type='submit'
+              variant='default'
+              disabled={loading}
+              className='h-auto min-w-[157px] py-2 text-lg font-medium'
+            >
+              {loading && <Icon icon='mdi:loading' className='animate-spin' />}
+              {t('title')}
+            </AiroButton>
+          </div>
+        </form>
+      </Form>
+    </>
+  );
+}
@@ -0,0 +1,218 @@
+'use client';
+import useGlobalStore from '@/config/use-global';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { AiroButton } from '@workspace/airo-ui/components/AiroButton';
+import { Button } from '@workspace/airo-ui/components/button';
+
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormMessage,
+} from '@workspace/airo-ui/components/form';
+import { Input } from '@workspace/airo-ui/components/input';
+import { Icon } from '@workspace/airo-ui/custom-components/icon';
+import { useRouter } from 'next/navigation';
+import { Dispatch, SetStateAction, useEffect, useRef, useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+import SendCode from '../send-code';
+import { TurnstileRef } from '../turnstile';
+
+export default function RegisterForm({
+  loading,
+  onSubmit,
+  initialValues,
+  setInitialValues,
+  onSwitchForm,
+}: {
+  loading?: boolean;
+  onSubmit: (data: any) => void;
+  initialValues: any;
+  setInitialValues: Dispatch<SetStateAction<any>>;
+  onSwitchForm: Dispatch<SetStateAction<'register' | 'reset' | 'login'>>;
+}) {
+  const { common } = useGlobalStore();
+  const router = useRouter();
+
+  const formSchema = z
+    .object({
+      email: z.string().email('请输入有效的电子邮件地址。'),
+      password: z.string().min(1, '请输入密码'), // 必填提示
+      repeat_password: z.string().min(1, '请重复输入密码'), // 必填
+      code: z.string().min(1, '请输入验证码'), // 必填,
+      invite: z.string().nullish(),
+    })
+    .superRefine(({ password, repeat_password }, ctx) => {
+      if (password !== repeat_password) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: '两次密码输入不一致',
+          path: ['repeat_password'],
+        });
+      }
+    });
+
+  const [inviteDefault, setInviteDefault] = useState('');
+
+  useEffect(() => {
+    const invite = localStorage.getItem('invite') || '';
+    setInviteDefault(invite);
+  }, []);
+
+  const form = useForm<z.infer<typeof formSchema>>({
+    resolver: zodResolver(formSchema),
+    defaultValues: {
+      ...initialValues,
+      invite: inviteDefault,
+    },
+  });
+
+  const turnstile = useRef<TurnstileRef>(null);
+  const handleSubmit = form.handleSubmit((data) => {
+    try {
+      onSubmit(data);
+    } catch (error) {
+      turnstile.current?.reset();
+    }
+  });
+
+  return (
+    <>
+      <div className={'h-[84px] text-2xl font-bold leading-[84px]'}>线路优化</div>
+
+      <Form {...form}>
+        <form onSubmit={handleSubmit}>
+          <div className='grid gap-5'>
+            <FormField
+              control={form.control}
+              name='email'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                      placeholder='电子邮箱'
+                      type='email'
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name='password'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                      placeholder='设置密码'
+                      type='password'
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name='repeat_password'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                      disabled={loading}
+                      placeholder='再次输入密码'
+                      type='password'
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            {
+              <FormField
+                control={form.control}
+                name='code'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormControl>
+                      <div className='flex items-center gap-8'>
+                        <Input
+                          disabled={loading}
+                          className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                          placeholder='邮箱验证码'
+                          type='text'
+                          {...field}
+                          value={field.value as string}
+                        />
+                        <SendCode
+                          type='email'
+                          form={form}
+                          params={{
+                            ...form.getValues(),
+                            type: 1,
+                          }}
+                        />
+                      </div>
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            }
+            <FormField
+              control={form.control}
+              name='invite'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                      disabled={loading || !!inviteDefault}
+                      placeholder={'邀请码（非必填）'}
+                      {...field}
+                      value={field.value || ''}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </div>
+
+          <div className='text-right text-sm'>
+            已有账户？&nbsp;
+            <Button
+              variant='link'
+              type='button'
+              className='p-0 text-[#225BA9]'
+              onClick={() => {
+                router.replace('/');
+              }}
+            >
+              登录
+            </Button>
+          </div>
+          <div className='mt-6 flex justify-center'>
+            <AiroButton
+              type='submit'
+              disabled={loading}
+              className='h-auto min-w-[157px] py-2 text-lg font-medium'
+            >
+              {loading && <Icon icon='mdi:loading' className='animate-spin' />}
+              注册
+            </AiroButton>
+          </div>
+        </form>
+      </Form>
+    </>
+  );
+}
@@ -0,0 +1,174 @@
+import useGlobalStore from '@/config/use-global';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { AiroButton } from '@workspace/airo-ui/components/AiroButton';
+import { Button } from '@workspace/airo-ui/components/button';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormMessage,
+} from '@workspace/airo-ui/components/form';
+import { Input } from '@workspace/airo-ui/components/input';
+import { Icon } from '@workspace/airo-ui/custom-components/icon';
+import { useTranslations } from 'next-intl';
+import { Dispatch, SetStateAction, useRef } from 'react';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+import SendCode from '../send-code';
+import CloudFlareTurnstile, { TurnstileRef } from '../turnstile';
+
+export default function ResetForm({
+  loading,
+  onSubmit,
+  initialValues,
+  setInitialValues,
+  onSwitchForm,
+}: {
+  loading?: boolean;
+  onSubmit: (data: any) => void;
+  initialValues: any;
+  setInitialValues: Dispatch<SetStateAction<any>>;
+  onSwitchForm: Dispatch<SetStateAction<'register' | 'reset' | 'login'>>;
+}) {
+  const t = useTranslations('auth.reset');
+
+  const { common } = useGlobalStore();
+  const { verify, auth } = common;
+
+  const formSchema = z.object({
+    email: z.string().email(t('email')),
+    password: z.string(),
+    code: auth?.email?.enable_verify ? z.string() : z.string().nullish(),
+    cf_token:
+      verify.enable_register_verify && verify.turnstile_site_key
+        ? z.string()
+        : z.string().nullish(),
+  });
+  const form = useForm<z.infer<typeof formSchema>>({
+    resolver: zodResolver(formSchema),
+    defaultValues: initialValues,
+  });
+
+  const turnstile = useRef<TurnstileRef>(null);
+  const handleSubmit = form.handleSubmit((data) => {
+    try {
+      onSubmit(data);
+    } catch (error) {
+      turnstile.current?.reset();
+    }
+  });
+
+  return (
+    <>
+      <div className={'h-[84px] text-2xl font-bold leading-[84px]'}>找回账户</div>
+      <Form {...form}>
+        <form onSubmit={handleSubmit}>
+          <div className='grid gap-5'>
+            <FormField
+              control={form.control}
+              name='email'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                      placeholder='Enter your email...'
+                      type='email'
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name='code'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <div className='flex items-center gap-8'>
+                      <Input
+                        className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                        disabled={loading}
+                        placeholder='Enter code...'
+                        type='text'
+                        {...field}
+                        value={field.value as string}
+                      />
+                      <SendCode
+                        type='email'
+                        form={form}
+                        params={{
+                          ...form.getValues(),
+                          type: 2,
+                        }}
+                      />
+                    </div>
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name='password'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                      placeholder='Enter your new password...'
+                      type='password'
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            {verify.enable_reset_password_verify && (
+              <FormField
+                control={form.control}
+                name='cf_token'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormControl>
+                      <CloudFlareTurnstile id='reset' {...field} ref={turnstile} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            )}
+          </div>
+          <div className='text-right text-sm'>
+            {t('existingAccount')}&nbsp;
+            <Button
+              variant='link'
+              type='button'
+              className='p-0 text-[#225BA9]'
+              onClick={() => {
+                setInitialValues(undefined);
+                onSwitchForm('login');
+              }}
+            >
+              {t('switchToLogin')}
+            </Button>
+          </div>
+          <div className='mt-6 flex justify-center'>
+            <AiroButton
+              type='submit'
+              disabled={loading}
+              className='h-auto min-w-[157px] py-2 text-lg font-medium'
+            >
+              {loading && <Icon icon='mdi:loading' className='animate-spin' />}
+              {t('title')}
+            </AiroButton>
+          </div>
+        </form>
+      </Form>
+    </>
+  );
+}
@@ -0,0 +1,111 @@
+'use client';
+
+import { resetPassword, userLogin, userRegister } from '@/services/common/auth';
+import { useTranslations } from 'next-intl';
+import { useRouter } from 'next/navigation';
+import { ReactNode, useState, useTransition } from 'react';
+import { toast } from 'sonner';
+
+import {
+  NEXT_PUBLIC_DEFAULT_USER_EMAIL,
+  NEXT_PUBLIC_DEFAULT_USER_PASSWORD,
+} from '@/config/constants';
+import useGlobalStore from '@/config/use-global';
+import { getRedirectUrl, setAuthorization } from '@/utils/common';
+import LoginForm from './login-form';
+import RegisterForm from './register-form';
+import ResetForm from './reset-form';
+
+export default function EmailAuthForm(props: { isRedirect: boolean }) {
+  const t = useTranslations('auth');
+  const router = useRouter();
+  const [type, setType] = useState<'login' | 'register' | 'reset'>('register');
+  const [loading, startTransition] = useTransition();
+  const [initialValues, setInitialValues] = useState<{
+    email?: string;
+    password?: string;
+  }>({
+    email: NEXT_PUBLIC_DEFAULT_USER_EMAIL,
+    password: NEXT_PUBLIC_DEFAULT_USER_PASSWORD,
+  });
+  const { getUserInfo } = useGlobalStore();
+  const handleFormSubmit = async (params: any) => {
+    const onLogin = async (token?: string) => {
+      if (!token) return;
+      setAuthorization(token);
+      console.log('props.isRedirect', token);
+      console.log('props.isRedirect', props.isRedirect);
+      console.log('props.isRedirect ', getRedirectUrl());
+      if (props.isRedirect) {
+        router.replace(getRedirectUrl());
+        router.refresh();
+      } else {
+        await getUserInfo();
+      }
+    };
+    startTransition(async () => {
+      try {
+        switch (type) {
+          case 'login': {
+            const login = await userLogin(params);
+            toast.success(t('login.success'));
+            onLogin(login.data.data?.token);
+            break;
+          }
+          case 'register': {
+            const create = await userRegister(params);
+            toast.success(t('register.success'));
+            onLogin(create.data.data?.token);
+            break;
+          }
+          case 'reset':
+            await resetPassword(params);
+            toast.success(t('reset.success'));
+            setType('login');
+            break;
+        }
+      } catch (error) {
+        /* empty */
+      }
+    });
+  };
+
+  let UserForm: ReactNode = null;
+  switch (type) {
+    case 'login':
+      UserForm = (
+        <LoginForm
+          loading={loading}
+          onSubmit={handleFormSubmit}
+          initialValues={initialValues}
+          setInitialValues={setInitialValues}
+          onSwitchForm={setType}
+        />
+      );
+      break;
+    case 'register':
+      UserForm = (
+        <RegisterForm
+          loading={loading}
+          onSubmit={handleFormSubmit}
+          initialValues={initialValues}
+          setInitialValues={setInitialValues}
+          onSwitchForm={setType}
+        />
+      );
+      break;
+    case 'reset':
+      UserForm = (
+        <ResetForm
+          loading={loading}
+          onSubmit={handleFormSubmit}
+          initialValues={initialValues}
+          setInitialValues={setInitialValues}
+          onSwitchForm={setType}
+        />
+      );
+      break;
+  }
+
+  return UserForm;
+}
@@ -0,0 +1,147 @@
+import useGlobalStore from '@/config/use-global';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { AiroButton } from '@workspace/airo-ui/components/AiroButton';
+import { Button } from '@workspace/airo-ui/components/button';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormMessage,
+} from '@workspace/airo-ui/components/form';
+import { Input } from '@workspace/airo-ui/components/input';
+import { Icon } from '@workspace/airo-ui/custom-components/icon';
+import { useTranslations } from 'next-intl';
+import { Dispatch, SetStateAction, useRef } from 'react';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+import CloudFlareTurnstile, { TurnstileRef } from '../turnstile';
+
+export default function LoginForm({
+  loading,
+  onSubmit,
+  initialValues,
+  setInitialValues,
+  onSwitchForm,
+}: {
+  loading?: boolean;
+  onSubmit: (data: any) => void;
+  initialValues: any;
+  setInitialValues: Dispatch<SetStateAction<any>>;
+  onSwitchForm: Dispatch<SetStateAction<'register' | 'reset' | 'login'>>;
+}) {
+  const t = useTranslations('auth.login');
+  const { common } = useGlobalStore();
+  const { verify } = common;
+
+  const formSchema = z.object({
+    email: z.string().email(t('email')),
+    password: z.string(),
+    cf_token:
+      verify.enable_login_verify && verify.turnstile_site_key ? z.string() : z.string().optional(),
+  });
+  const form = useForm<z.infer<typeof formSchema>>({
+    resolver: zodResolver(formSchema),
+    defaultValues: initialValues,
+  });
+
+  const turnstile = useRef<TurnstileRef>(null);
+  const handleSubmit = form.handleSubmit((data) => {
+    try {
+      onSubmit(data);
+    } catch (error) {
+      turnstile.current?.reset();
+    }
+  });
+
+  return (
+    <>
+      <div className={'h-[84px] text-2xl font-bold leading-[84px]'}>账户验证</div>
+      <Form {...form}>
+        <form onSubmit={handleSubmit} className=''>
+          <FormField
+            control={form.control}
+            name='email'
+            render={({ field }) => (
+              <FormItem className={'mb-5'}>
+                <FormControl>
+                  <Input
+                    className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                    placeholder='Email'
+                    type='email'
+                    {...field}
+                  />
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='password'
+            render={({ field }) => (
+              <FormItem className={'mb-2'}>
+                <FormControl>
+                  <Input
+                    className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                    placeholder='Password'
+                    type='password'
+                    {...field}
+                  />
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+          {verify.enable_login_verify && (
+            <FormField
+              control={form.control}
+              name='cf_token'
+              render={({ field }) => (
+                <FormItem className={'last:mb-0'}>
+                  <FormControl>
+                    <CloudFlareTurnstile id='login' {...field} ref={turnstile} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          )}
+          <div className='flex w-full justify-between text-sm'>
+            <Button
+              variant='link'
+              type='button'
+              className='p-0 text-[#225BA9]'
+              onClick={() => onSwitchForm('reset')}
+            >
+              {t('forgotPassword')}
+            </Button>
+            <Button
+              variant='link'
+              type='button'
+              className='p-0 text-[#225BA9]'
+              onClick={() => {
+                setInitialValues(undefined);
+                onSwitchForm('register');
+              }}
+            >
+              {t('registerAccount')}
+            </Button>
+          </div>
+
+          <div className='mt-6 flex justify-center'>
+            <AiroButton
+              type='submit'
+              variant='default'
+              disabled={loading}
+              className='h-auto min-w-[157px] py-2 text-lg font-medium'
+            >
+              {loading && <Icon icon='mdi:loading' className='animate-spin' />}
+              {t('title')}
+            </AiroButton>
+          </div>
+        </form>
+      </Form>
+    </>
+  );
+}
@@ -0,0 +1,231 @@
+'use client';
+import useGlobalStore from '@/config/use-global';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { AiroButton } from '@workspace/airo-ui/components/AiroButton';
+import { Button } from '@workspace/airo-ui/components/button';
+
+import { useLoginDialog } from '@/app/auth/LoginDialogContext';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormMessage,
+} from '@workspace/airo-ui/components/form';
+import { Input } from '@workspace/airo-ui/components/input';
+import { Icon } from '@workspace/airo-ui/custom-components/icon';
+import { useRouter } from 'next/navigation';
+import { Dispatch, SetStateAction, useEffect, useRef, useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+import SendCode from '../send-code';
+import { TurnstileRef } from '../turnstile';
+
+export default function RegisterForm({
+  loading,
+  onSubmit,
+  initialValues,
+  setInitialValues,
+  onSwitchForm,
+}: {
+  loading?: boolean;
+  onSubmit: (data: any) => void;
+  initialValues: any;
+  setInitialValues: Dispatch<SetStateAction<any>>;
+  onSwitchForm: Dispatch<SetStateAction<'register' | 'reset' | 'login'>>;
+}) {
+  const { common } = useGlobalStore();
+  const router = useRouter();
+
+  const formSchema = z
+    .object({
+      email: z.string().email('请输入有效的电子邮件地址。'),
+      password: z.string().min(1, '请输入密码'), // 必填提示
+      repeat_password: z.string().min(1, '请重复输入密码'), // 必填
+      code: z.string().min(1, '请输入验证码'), // 必填,
+      invite: z.string().nullish(),
+    })
+    .superRefine(({ password, repeat_password }, ctx) => {
+      if (password !== repeat_password) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: '两次密码输入不一致',
+          path: ['repeat_password'],
+        });
+      }
+    });
+
+  const [inviteDefault, setInviteDefault] = useState('');
+  const { openLoginDialog } = useLoginDialog();
+
+  useEffect(() => {
+    const invite = localStorage.getItem('invite') || '';
+    setInviteDefault(invite);
+  }, []);
+
+  const form = useForm<z.infer<typeof formSchema>>({
+    resolver: zodResolver(formSchema),
+    defaultValues: {
+      ...initialValues,
+      invite: inviteDefault,
+    },
+  });
+
+  const turnstile = useRef<TurnstileRef>(null);
+  const handleSubmit = form.handleSubmit((data) => {
+    try {
+      onSubmit(data);
+    } catch (error) {
+      turnstile.current?.reset();
+    }
+  });
+
+  return (
+    <>
+      <div className={'h-[84px] text-2xl font-bold leading-[84px] text-white'}>线路优化</div>
+
+      <Form {...form}>
+        <form onSubmit={handleSubmit}>
+          <div className='grid gap-5'>
+            <FormField
+              control={form.control}
+              name='email'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      className={
+                        'h-[46px] rounded-full bg-white shadow-[inset_0_0_7.6px_0_#00000040]'
+                      }
+                      placeholder='电子邮箱'
+                      type='email'
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name='password'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      className={
+                        'h-[46px] rounded-full bg-white shadow-[inset_0_0_7.6px_0_#00000040]'
+                      }
+                      placeholder='设置密码'
+                      type='password'
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name='repeat_password'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      className={
+                        'h-[46px] rounded-full bg-white shadow-[inset_0_0_7.6px_0_#00000040]'
+                      }
+                      disabled={loading}
+                      placeholder='再次输入密码'
+                      type='password'
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            {
+              <FormField
+                control={form.control}
+                name='code'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormControl>
+                      <div className='flex items-center gap-8'>
+                        <Input
+                          disabled={loading}
+                          className={
+                            'h-[46px] rounded-full bg-white shadow-[inset_0_0_7.6px_0_#00000040]'
+                          }
+                          placeholder='邮箱验证码'
+                          type='text'
+                          {...field}
+                          value={field.value as string}
+                        />
+                        <SendCode
+                          type='email'
+                          form={form}
+                          params={{
+                            ...form.getValues(),
+                            type: 1,
+                          }}
+                        />
+                      </div>
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            }
+            <FormField
+              control={form.control}
+              name='invite'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      className={
+                        'h-[46px] rounded-full bg-white shadow-[inset_0_0_7.6px_0_#00000040]'
+                      }
+                      disabled={loading || !!inviteDefault}
+                      placeholder={'邀请码（非必填）'}
+                      {...field}
+                      value={field.value || ''}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </div>
+
+          <div className='text-right text-sm'>
+            已有账户？&nbsp;
+            <Button
+              variant='link'
+              type='button'
+              className='p-0 text-[#225BA9]'
+              onClick={() => {
+                openLoginDialog();
+              }}
+            >
+              登录
+            </Button>
+          </div>
+          <div className='mt-6 flex justify-center'>
+            <AiroButton
+              type='submit'
+              variant={'default'}
+              disabled={loading}
+              className='h-auto min-w-[157px] border-[3px] border-white bg-white/10 py-2 text-lg font-medium text-white transition hover:bg-white/25'
+            >
+              {loading && <Icon icon='mdi:loading' className='animate-spin' />}
+              注册
+            </AiroButton>
+          </div>
+        </form>
+      </Form>
+    </>
+  );
+}
@@ -0,0 +1,174 @@
+import useGlobalStore from '@/config/use-global';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { AiroButton } from '@workspace/airo-ui/components/AiroButton';
+import { Button } from '@workspace/airo-ui/components/button';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormMessage,
+} from '@workspace/airo-ui/components/form';
+import { Input } from '@workspace/airo-ui/components/input';
+import { Icon } from '@workspace/airo-ui/custom-components/icon';
+import { useTranslations } from 'next-intl';
+import { Dispatch, SetStateAction, useRef } from 'react';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+import SendCode from '../send-code';
+import CloudFlareTurnstile, { TurnstileRef } from '../turnstile';
+
+export default function ResetForm({
+  loading,
+  onSubmit,
+  initialValues,
+  setInitialValues,
+  onSwitchForm,
+}: {
+  loading?: boolean;
+  onSubmit: (data: any) => void;
+  initialValues: any;
+  setInitialValues: Dispatch<SetStateAction<any>>;
+  onSwitchForm: Dispatch<SetStateAction<'register' | 'reset' | 'login'>>;
+}) {
+  const t = useTranslations('auth.reset');
+
+  const { common } = useGlobalStore();
+  const { verify, auth } = common;
+
+  const formSchema = z.object({
+    email: z.string().email(t('email')),
+    password: z.string(),
+    code: auth?.email?.enable_verify ? z.string() : z.string().nullish(),
+    cf_token:
+      verify.enable_register_verify && verify.turnstile_site_key
+        ? z.string()
+        : z.string().nullish(),
+  });
+  const form = useForm<z.infer<typeof formSchema>>({
+    resolver: zodResolver(formSchema),
+    defaultValues: initialValues,
+  });
+
+  const turnstile = useRef<TurnstileRef>(null);
+  const handleSubmit = form.handleSubmit((data) => {
+    try {
+      onSubmit(data);
+    } catch (error) {
+      turnstile.current?.reset();
+    }
+  });
+
+  return (
+    <>
+      <div className={'h-[84px] text-2xl font-bold leading-[84px]'}>找回账户</div>
+      <Form {...form}>
+        <form onSubmit={handleSubmit}>
+          <div className='grid gap-5'>
+            <FormField
+              control={form.control}
+              name='email'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                      placeholder='Enter your email...'
+                      type='email'
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name='code'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <div className='flex items-center gap-8'>
+                      <Input
+                        className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                        disabled={loading}
+                        placeholder='Enter code...'
+                        type='text'
+                        {...field}
+                        value={field.value as string}
+                      />
+                      <SendCode
+                        type='email'
+                        form={form}
+                        params={{
+                          ...form.getValues(),
+                          type: 2,
+                        }}
+                      />
+                    </div>
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name='password'
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      className={'h-[46px] rounded-full shadow-[inset_0_0_7.6px_0_#00000040]'}
+                      placeholder='Enter your new password...'
+                      type='password'
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            {verify.enable_reset_password_verify && (
+              <FormField
+                control={form.control}
+                name='cf_token'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormControl>
+                      <CloudFlareTurnstile id='reset' {...field} ref={turnstile} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            )}
+          </div>
+          <div className='text-right text-sm'>
+            {t('existingAccount')}&nbsp;
+            <Button
+              variant='link'
+              type='button'
+              className='p-0 text-[#225BA9]'
+              onClick={() => {
+                setInitialValues(undefined);
+                onSwitchForm('login');
+              }}
+            >
+              {t('switchToLogin')}
+            </Button>
+          </div>
+          <div className='mt-6 flex justify-center'>
+            <AiroButton
+              type='submit'
+              disabled={loading}
+              className='h-auto min-w-[157px] py-2 text-lg font-medium'
+            >
+              {loading && <Icon icon='mdi:loading' className='animate-spin' />}
+              {t('title')}
+            </AiroButton>
+          </div>
+        </form>
+      </Form>
+    </>
+  );
+}
@@ -84,16 +84,14 @@ export default function SendCode({ type, params, form }: SendCodeProps) {
      await getPhoneCode();
    }
  };
-  const disabled =
-    seconds > 0 ||
-    (type === 'email' ? !params.email : !params.telephone || !params.telephone_area_code);
+  const disabled = seconds > 0;

  return (
    <div>
      <AiroButton
        type='button'
        variant={'primary'}
-        className={'h-[30px] w-[109px]'}
+        className={'h-[46px] w-[109px]'}
        onClick={handleSendCode}
        disabled={disabled}
      >
@@ -33,7 +33,7 @@ export default function Providers({

  const { setCommon, setUser } = useGlobalStore();
  const pathname = usePathname();
-  const whiteList = ['/'];
+  const whiteList = ['/', '/register', '/register2'];
  const isWhite = whiteList.includes(pathname);

  useEffect(() => {
@@ -3,7 +3,8 @@
 import PaymentMethods from '@/components/subscribe/payment-methods';
 import PlanTabs, { TabValueType } from '@/components/SubscribePlan/PlanTabs/PlanTabs';
 import useGlobalStore from '@/config/use-global';
-import { preCreateOrder, purchase } from '@/services/user/order';
+import { preCreateOrder, purchase, renewal } from '@/services/user/order';
+import { queryUserSubscribe } from '@/services/user/user';
 import { useQuery } from '@tanstack/react-query';
 import { AiroButton } from '@workspace/airo-ui/components/AiroButton';
 import {
@@ -104,7 +105,23 @@ const Purchase = forwardRef<PurchaseDialogRef, PurchaseProps>((props, ref) => {
  const handleSubmit = useCallback(async () => {
    startTransition(async () => {
      try {
-        const response = await purchase(params as API.PurchaseOrderRequest);
+        const { data } = await queryUserSubscribe({ params: { includeExpired: 'all' } });
+        const activeList = data.data?.list || [];
+        const existingUser = activeList.find(
+          (item: any) => item.subscribe_id === params.subscribe_id,
+        );
+        let response;
+        // 3. 根据判断结果调用不同接口
+        if (existingUser) {
+          // 已有记录，走续费逻辑
+          response = await renewal({
+            user_subscribe_id: existingUser.id,
+            ...params,
+          } as API.RenewalOrderRequest);
+        } else {
+          // 无记录，走新购逻辑
+          response = await purchase(params as API.PurchaseOrderRequest);
+        }
        const orderNo = response.data.data?.order_no;
        if (orderNo) {
          await getUserInfo();
@@ -32,7 +32,7 @@
    "framer-motion": "^11.16.1",
    "gray-matter": "^4.0.3",
    "lucide-react": "^0.469.0",
-    "next": "^15.1.4",
+    "next": "15.3.6",
    "next-intl": "^3.26.3",
    "next-runtime-env": "^3.2.2",
    "next-themes": "^0.4.4",
@@ -53,7 +53,7 @@ export function Logout() {
  Crisp.session.reset(); // 2. Unbind the current session
  const pathname = location.pathname;
  if (
-    !['', '/', '/auth', '/tos', '/privacy-policy'].includes(pathname) &&
+    !['', '/', '/auth', '/tos', '/privacy-policy', '/register', '/register2'].includes(pathname) &&
    !pathname.startsWith('/purchasing') &&
    !pathname.startsWith('/oauth/')
  ) {
@@ -29,7 +29,7 @@
        "axios": "^1.7.9",
        "js-yaml": "^4.1.0",
        "nanoid": "^5.0.9",
-        "next": "^15.1.4",
+        "next": "15.3.6",
        "next-intl": "^3.26.3",
        "next-runtime-env": "^3.2.2",
        "next-themes": "^0.4.4",
@@ -70,7 +70,7 @@
        "framer-motion": "^11.16.1",
        "gray-matter": "^4.0.3",
        "lucide-react": "^0.469.0",
-        "next": "^15.1.4",
+        "next": "15.3.6",
        "next-intl": "^3.26.3",
        "next-runtime-env": "^3.2.2",
        "next-themes": "^0.4.4",
@@ -716,27 +716,27 @@

    "@netlify/plugin-nextjs": ["@netlify/plugin-nextjs@5.12.1", "", {}, "sha512-b2Ic9NkNnnh0lKC/YWDZ2+HdLd/uYdBzLvLKYOkPyFt8KEszoC+Je3GRcwBeOLxaNtK8lji7YPIjtGz8K2sLVQ=="],

-    "@next/env": ["@next/env@15.5.2", "", {}, "sha512-Qe06ew4zt12LeO6N7j8/nULSOe3fMXE4dM6xgpBQNvdzyK1sv5y4oAP3bq4LamrvGCZtmRYnW8URFCeX5nFgGg=="],
+    "@next/env": ["@next/env@15.3.6", "", {}, "sha512-/cK+QPcfRbDZxmI/uckT4lu9pHCfRIPBLqy88MhE+7Vg5hKrEYc333Ae76dn/cw2FBP2bR/GoK/4DU+U7by/Nw=="],

    "@next/eslint-plugin-next": ["@next/eslint-plugin-next@15.5.2", "", { "dependencies": { "fast-glob": "3.3.1" } }, "sha512-lkLrRVxcftuOsJNhWatf1P2hNVfh98k/omQHrCEPPriUypR6RcS13IvLdIrEvkm9AH2Nu2YpR5vLqBuy6twH3Q=="],

-    "@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@15.5.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-8bGt577BXGSd4iqFygmzIfTYizHb0LGWqH+qgIF/2EDxS5JsSdERJKA8WgwDyNBZgTIIA4D8qUtoQHmxIIquoQ=="],
+    "@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@15.3.5", "", { "os": "darwin", "cpu": "arm64" }, "sha512-lM/8tilIsqBq+2nq9kbTW19vfwFve0NR7MxfkuSUbRSgXlMQoJYg+31+++XwKVSXk4uT23G2eF/7BRIKdn8t8w=="],

-    "@next/swc-darwin-x64": ["@next/swc-darwin-x64@15.5.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-2DjnmR6JHK4X+dgTXt5/sOCu/7yPtqpYt8s8hLkHFK3MGkka2snTv3yRMdHvuRtJVkPwCGsvBSwmoQCHatauFQ=="],
+    "@next/swc-darwin-x64": ["@next/swc-darwin-x64@15.3.5", "", { "os": "darwin", "cpu": "x64" }, "sha512-WhwegPQJ5IfoUNZUVsI9TRAlKpjGVK0tpJTL6KeiC4cux9774NYE9Wu/iCfIkL/5J8rPAkqZpG7n+EfiAfidXA=="],

-    "@next/swc-linux-arm64-gnu": ["@next/swc-linux-arm64-gnu@15.5.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-3j7SWDBS2Wov/L9q0mFJtEvQ5miIqfO4l7d2m9Mo06ddsgUK8gWfHGgbjdFlCp2Ek7MmMQZSxpGFqcC8zGh2AA=="],
+    "@next/swc-linux-arm64-gnu": ["@next/swc-linux-arm64-gnu@15.3.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-LVD6uMOZ7XePg3KWYdGuzuvVboxujGjbcuP2jsPAN3MnLdLoZUXKRc6ixxfs03RH7qBdEHCZjyLP/jBdCJVRJQ=="],

-    "@next/swc-linux-arm64-musl": ["@next/swc-linux-arm64-musl@15.5.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-s6N8k8dF9YGc5T01UPQ08yxsK6fUow5gG1/axWc1HVVBYQBgOjca4oUZF7s4p+kwhkB1bDSGR8QznWrFZ/Rt5g=="],
+    "@next/swc-linux-arm64-musl": ["@next/swc-linux-arm64-musl@15.3.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-k8aVScYZ++BnS2P69ClK7v4nOu702jcF9AIHKu6llhHEtBSmM2zkPGl9yoqbSU/657IIIb0QHpdxEr0iW9z53A=="],

-    "@next/swc-linux-x64-gnu": ["@next/swc-linux-x64-gnu@15.5.2", "", { "os": "linux", "cpu": "x64" }, "sha512-o1RV/KOODQh6dM6ZRJGZbc+MOAHww33Vbs5JC9Mp1gDk8cpEO+cYC/l7rweiEalkSm5/1WGa4zY7xrNwObN4+Q=="],
+    "@next/swc-linux-x64-gnu": ["@next/swc-linux-x64-gnu@15.3.5", "", { "os": "linux", "cpu": "x64" }, "sha512-2xYU0DI9DGN/bAHzVwADid22ba5d/xrbrQlr2U+/Q5WkFUzeL0TDR963BdrtLS/4bMmKZGptLeg6282H/S2i8A=="],

-    "@next/swc-linux-x64-musl": ["@next/swc-linux-x64-musl@15.5.2", "", { "os": "linux", "cpu": "x64" }, "sha512-/VUnh7w8RElYZ0IV83nUcP/J4KJ6LLYliiBIri3p3aW2giF+PAVgZb6mk8jbQSB3WlTai8gEmCAr7kptFa1H6g=="],
+    "@next/swc-linux-x64-musl": ["@next/swc-linux-x64-musl@15.3.5", "", { "os": "linux", "cpu": "x64" }, "sha512-TRYIqAGf1KCbuAB0gjhdn5Ytd8fV+wJSM2Nh2is/xEqR8PZHxfQuaiNhoF50XfY90sNpaRMaGhF6E+qjV1b9Tg=="],

-    "@next/swc-win32-arm64-msvc": ["@next/swc-win32-arm64-msvc@15.5.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-sMPyTvRcNKXseNQ/7qRfVRLa0VhR0esmQ29DD6pqvG71+JdVnESJaHPA8t7bc67KD5spP3+DOCNLhqlEI2ZgQg=="],
+    "@next/swc-win32-arm64-msvc": ["@next/swc-win32-arm64-msvc@15.3.5", "", { "os": "win32", "cpu": "arm64" }, "sha512-h04/7iMEUSMY6fDGCvdanKqlO1qYvzNxntZlCzfE8i5P0uqzVQWQquU1TIhlz0VqGQGXLrFDuTJVONpqGqjGKQ=="],

    "@next/swc-win32-ia32-msvc": ["@next/swc-win32-ia32-msvc@14.2.32", "", { "os": "win32", "cpu": "ia32" }, "sha512-jHUeDPVHrgFltqoAqDB6g6OStNnFxnc7Aks3p0KE0FbwAvRg6qWKYF5mSTdCTxA3axoSAUwxYdILzXJfUwlHhA=="],

-    "@next/swc-win32-x64-msvc": ["@next/swc-win32-x64-msvc@15.5.2", "", { "os": "win32", "cpu": "x64" }, "sha512-W5VvyZHnxG/2ukhZF/9Ikdra5fdNftxI6ybeVKYvBPDtyx7x4jPPSNduUkfH5fo3zG0JQ0bPxgy41af2JX5D4Q=="],
+    "@next/swc-win32-x64-msvc": ["@next/swc-win32-x64-msvc@15.3.5", "", { "os": "win32", "cpu": "x64" }, "sha512-5fhH6fccXxnX2KhllnGhkYMndhOiLOLEiVGYjP2nizqeGWkN10sA9taATlXwake2E2XMvYZjjz0Uj7T0y+z1yw=="],

    "@nodelib/fs.scandir": ["@nodelib/fs.scandir@2.1.5", "", { "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" } }, "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="],

@@ -2440,7 +2440,7 @@

    "netmask": ["netmask@2.0.2", "", {}, "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="],

-    "next": ["next@15.5.2", "", { "dependencies": { "@next/env": "15.5.2", "@swc/helpers": "0.5.15", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "15.5.2", "@next/swc-darwin-x64": "15.5.2", "@next/swc-linux-arm64-gnu": "15.5.2", "@next/swc-linux-arm64-musl": "15.5.2", "@next/swc-linux-x64-gnu": "15.5.2", "@next/swc-linux-x64-musl": "15.5.2", "@next/swc-win32-arm64-msvc": "15.5.2", "@next/swc-win32-x64-msvc": "15.5.2", "sharp": "^0.34.3" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.51.1", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-H8Otr7abj1glFhbGnvUt3gz++0AF1+QoCXEBmd/6aKbfdFwrn0LpA836Ed5+00va/7HQSDD+mOoVhn3tNy3e/Q=="],
+    "next": ["next@15.3.6", "", { "dependencies": { "@next/env": "15.3.6", "@swc/counter": "0.1.3", "@swc/helpers": "0.5.15", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "15.3.5", "@next/swc-darwin-x64": "15.3.5", "@next/swc-linux-arm64-gnu": "15.3.5", "@next/swc-linux-arm64-musl": "15.3.5", "@next/swc-linux-x64-gnu": "15.3.5", "@next/swc-linux-x64-musl": "15.3.5", "@next/swc-win32-arm64-msvc": "15.3.5", "@next/swc-win32-x64-msvc": "15.3.5", "sharp": "^0.34.1" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.41.2", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-oI6D1zbbsh6JzzZFDCSHnnx6Qpvd1fSkVJu/5d8uluqnxzuoqtodVZjYvNovooznUq8udSAiKp7MbwlfZ8Gm6w=="],

    "next-intl": ["next-intl@3.26.5", "", { "dependencies": { "@formatjs/intl-localematcher": "^0.5.4", "negotiator": "^1.0.0", "use-intl": "^3.26.5" }, "peerDependencies": { "next": "^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 || ^19.0.0" } }, "sha512-EQlCIfY0jOhRldiFxwSXG+ImwkQtDEfQeSOEQp6ieAGSLWGlgjdb/Ck/O7wMfC430ZHGeUKVKax8KGusTPKCgg=="],

@@ -5,8 +5,8 @@ FROM oven/bun:latest AS base
 WORKDIR /app

 # Create a non-root user for running the production application
-RUN addgroup --system --gid 1001 nodejs \
-    && adduser --system --uid 1001 nextjs
+RUN groupadd -r -g 1001 nodejs && \
+    useradd -r -u 1001 -g nodejs -d /home/nextjs -m nextjs

 # Change to non-root user
 USER nextjs
@@ -5,8 +5,8 @@ FROM oven/bun:latest AS base
 WORKDIR /app

 # Create non-root user and set permissions
-RUN addgroup --system --gid 1001 nodejs \
-    && adduser --system --uid 1001 nextjs
+RUN groupadd -r -g 1001 nodejs && \
+    useradd -r -u 1001 -g nodejs -d /home/nextjs -m nextjs

 # Copy build output and static files
 COPY ./apps/user/.next/standalone ./
@@ -1,6 +1,6 @@
 {
  "name": "ppanel-web",
-  "version": "1.3.0",
+  "version": "1.3.2",
  "private": true,
  "homepage": "https://github.com/perfect-panel/ppanel-web",
  "bugs": {
Author	SHA1	Message	Date
sepakeloudest	e6526b77aa	fix: 更新苹果账号 CI / build (20.15.1) (push) Successful in 25m29s Details	2026-01-28 20:59:05 -08:00
sepakeloudest	780dbe075b	fix: 获取用户已有订阅，如果有就续费，否则使用新购 CI / build (20.15.1) (push) Successful in 17m33s Details	2025-12-30 22:25:44 -08:00
sepakeloudest	edf961eb7b	feat: 更新免费账号 CI / build (20.15.1) (push) Successful in 18m29s Details	2025-12-29 08:45:58 -08:00
sepakeloudest	285f4d07bc	feat: 增加register2页面 CI / build (20.15.1) (push) Successful in 21m30s Details	2025-12-11 06:34:10 -08:00
sepakeloudest	f7fa3a46d2	feat: 增加register2页面 CI / build (20.15.1) (push) Has been cancelled Details	2025-12-11 06:31:19 -08:00
sepakeloudest	b0c8cfb024	feat: 去除配置项等待 CI / build (20.15.1) (push) Failing after 55s Details	2025-12-10 04:41:15 -08:00
sepakeloudest	f86e3b4725	feat: 增加线路优化注册功能 CI / build (20.15.1) (push) Successful in 21m1s Details	2025-12-09 21:53:52 -08:00
shanshanzhong147	c6a825c284	chore: 更新版本号至1.3.2 CI / build (20.15.1) (push) Has been cancelled Details	2025-12-09 21:45:12 -08:00
sepakeloudest	c79de38d54	feat: 增加线路优化注册功能 CI / build (20.15.1) (push) Successful in 21m47s Details	2025-12-09 21:10:05 -08:00
shanshanzhong147	a5b4302ab7	fix(docker): 移除Dockerfile中的hosts配置并添加到docker run命令 CI / build (20.15.1) (push) Failing after 23m22s Details 将hosts配置从Dockerfile中移除，改为在docker run命令中使用--add-host参数添加	2025-12-07 09:11:56 -08:00
shanshanzhong147	162f8fe040	fix(docker): 添加api.airoport.co的主机映射到容器hosts文件 CI / build (20.15.1) (push) Failing after 22m40s Details	2025-12-07 08:28:37 -08:00
shanshanzhong147	2e4540095b	fix(ci): 修复版本检测为空时未回退到根目录版本的问题 CI / build (20.15.1) (push) Failing after 24m4s Details 当检测到版本为空时，回退到根目录的package.json中获取版本号	2025-12-07 06:18:56 -08:00
shanshanzhong147	42cf06c373	fix(docker): 修正Dockerfile中groupadd命令的语法错误 CI / build (20.15.1) (push) Failing after 15m38s Details 修复addgroup命令错误使用的问题，改用正确的groupadd命令	2025-12-07 05:41:36 -08:00
shanshanzhong147	97187806e1	refactor(docker): 优化Dockerfile中的用户和组创建命令 CI / build (20.15.1) (push) Failing after 23m15s Details 使用更简洁的useradd和addgroup命令替代原有写法，保持功能不变但提高可读性	2025-12-07 04:34:21 -08:00
sepakeloudest	d92202b6ab	fix: 升级安全版本并锁定15.3.6，修复指南 https://react.dev/blog/2025/12/03/critical-security-vulnerability-in-react-server-components CI / build (20.15.1) (push) Failing after 21m0s Details	2025-12-06 19:37:14 -08:00
shanshanzhong147	4ae7ed783f	ci(docker): 更新Docker配置和安装流程 CI / build (20.15.1) (push) Failing after 26m3s Details - 移除apps中package.json的version字段 - 添加DOCKER_API_VERSION环境变量 - 改进Docker安装流程，使用官方源安装新版CLI和Buildx插件	2025-11-13 19:14:39 -08:00
sepakeloudest	72bf4fee7c	fix: admin提交样式 CI / build (20.15.1) (push) Failing after 21m15s Details	2025-10-07 00:51:16 -07:00
shanshanzhong147	daacab613a	ci(docker): 更新版本号并改进版本读取逻辑 CI / build (20.15.1) (push) Failing after 24m23s Details 更新admin和user应用的package.json版本号为1.3.1 改进docker.yml工作流，根据BUILD_TARGET动态读取对应应用的版本号	2025-10-06 00:21:58 -07:00
shanshanzhong147	52b62694c3	merge: 合并 main 分支到 dev，保留动态 SSH 配置 CI / build (20.15.1) (push) Has been cancelled Details	2025-10-06 00:12:56 -07:00
shanshanzhong147	36419f9bf2	feat: 根据分支动态选择SSH参数	2025-10-06 00:10:54 -07:00
sepakeloudest	5576135726	fix: admin提交样式 CI / build (20.15.1) (push) Failing after 3s Details	2025-10-05 08:36:26 -07:00
sepakeloudest	02da429358	fix: 提交样式 CI / build (20.15.1) (push) Failing after 4s Details	2025-10-05 08:23:07 -07:00
shanshanzhong147	71d768bd9e	更新用户面板界面 [user-only] CI / build (20.15.1) (push) Successful in 21m27s Details	2025-09-28 20:31:17 -07:00
shanshanzhong147	3b7c8bbcb2	更新管理面板界面 [admin-only] CI / build (20.15.1) (push) Has been cancelled Details	2025-09-28 20:15:38 -07:00
shanshanzhong147	ccfd5be59f	tg CI / build (20.15.1) (push) Has been cancelled Details	2025-09-28 19:48:57 -07:00
shanshanzhong147	96aa507f77	cicd CI / build (20.15.1) (push) Failing after 25m32s Details	2025-09-28 18:06:33 -07:00
shanshanzhong147	95f614a51e	x CI / build (20.15.1) (push) Failing after 28m55s Details	2025-09-27 10:52:48 -07:00
shanshanzhong147	bd4091524e	in1 CI / build (20.15.1) (push) Failing after 24m12s Details	2025-09-26 18:50:38 -07:00
shanshanzhong147	5b7f778551	in1 CI / build (20.15.1) (push) Successful in 30m33s Details	2025-09-26 17:33:59 -07:00
shanshanzhong147	38f64f770d	in1 CI / build (20.15.1) (push) Failing after 23m2s Details	2025-09-26 09:48:00 -07:00
shanshanzhong147	2ee249f6f7	in1 CI / build (20.15.1) (push) Failing after 24m30s Details	2025-09-26 07:22:05 -07:00
shanshanzhong147	e3698a8a60	in1	2025-09-26 07:21:51 -07:00
shanshanzhong147	618ac0bf8c	in1 CI / build (20.15.1) (push) Failing after 1m6s Details	2025-09-26 07:14:26 -07:00
shanshanzhong147	0f58c4ef7c	in1 CI / build (20.15.1) (push) Failing after 23m22s Details	2025-09-26 06:47:11 -07:00
shanshanzhong147	92e298ee4e	in1 CI / build (20.15.1) (push) Failing after 23m4s Details	2025-09-26 05:45:09 -07:00
shanshanzhong147	3df33ae4ce	inini CI / build (20.15.1) (push) Failing after 4m31s Details	2025-09-26 05:03:18 -07:00
shanshanzhong147	fd711a22c8	tg CI / build (20.15.1) (push) Has been cancelled Details	2025-09-26 04:58:24 -07:00
shanshanzhong147	d81cdfe789	tg CI / build (20.15.1) (push) Failing after 23m29s Details	2025-09-26 03:33:53 -07:00
shanshanzhong147	fd8b07b0d8	tg CI / build (20.15.1) (push) Failing after 1m42s Details	2025-09-26 02:37:06 -07:00
shanshanzhong147	394727ccdb	tg CI / build (20.15.1) (push) Failing after 21m21s Details	2025-09-26 02:14:40 -07:00
shanshanzhong147	993c6d8870	tg	2025-09-26 02:14:33 -07:00
shanshanzhong147	f35eb48480	ci11 CI / build (20.15.1) (push) Failing after 21m52s Details	2025-09-26 01:49:44 -07:00
shanshanzhong147	8b25de05dc	ci11 CI / build (20.15.1) (push) Failing after 33s Details	2025-09-26 01:38:57 -07:00
shanshanzhong147	afba56c177	i9 CI / build (20.15.1) (push) Failing after 1m56s Details	2025-09-25 11:44:51 -07:00
shanshanzhong147	d37e2abf0d	i9	2025-09-25 11:43:59 -07:00
shanshanzhong147	71dbb921ff	i9	2025-09-25 11:28:51 -07:00
shanshanzhong147	a38bb5d38a	i8 CI / build (20.15.1) (push) Failing after 18m20s Details	2025-09-25 11:24:18 -07:00
shanshanzhong147	94c515b2de	i7 CI / build (20.15.1) (push) Has been cancelled Details	2025-09-25 11:17:05 -07:00
shanshanzhong147	61b299ed15	i7 CI / build (20.15.1) (push) Has been cancelled Details	2025-09-25 11:15:12 -07:00
shanshanzhong147	94004069cb	i5 CI / build (20.15.1) (push) Has been cancelled Details	2025-09-25 11:01:23 -07:00
shanshanzhong147	1c85a4abef	i5 CI / build (20.15.1) (push) Failing after 18m47s Details	2025-09-25 10:19:47 -07:00
shanshanzhong147	7d39166ed5	i4 CI / build (20.15.1) (push) Has been cancelled Details	2025-09-25 10:18:59 -07:00
shanshanzhong147	ff9401c24e	i3 CI / build (20.15.1) (push) Failing after 17m29s Details	2025-09-25 10:01:17 -07:00
shanshanzhong147	4181e4bd71	i2 CI / build (20.15.1) (push) Failing after 2m17s Details	2025-09-25 09:54:43 -07:00
shanshanzhong147	5be2e91d0a	i1 CI / build (20.15.1) (push) Has been cancelled Details	2025-09-25 09:53:01 -07:00
shanshanzhong147	4745f230b2	init CI / build (20.15.1) (push) Failing after 17m48s Details	2025-09-25 09:35:56 -07:00
shanshanzhong147	bad2843bfb	init	2025-09-25 09:34:46 -07:00
shanshanzhong147	cc2f715e77	init	2025-09-25 09:32:47 -07:00
shanshanzhong147	6df5f6a8db	init	2025-09-25 09:30:17 -07:00
shanshanzhong147	6524911c31	init	2025-09-25 09:29:54 -07:00
shanshanzhong147	fcac29b7b0	oo2	2025-09-25 09:28:58 -07:00
shanshanzhong147	2b24a66dbc	oo1	2025-09-25 09:27:18 -07:00
shanshanzhong147	92487eac92	11	2025-09-25 09:16:23 -07:00
shanshanzhong147	c1ab737894	c	2025-09-25 09:13:54 -07:00
shanshanzhong147	3fdd504d01	i1	2025-09-25 09:11:44 -07:00
shanshanzhong147	98a9fc041f	init02	2025-09-25 09:10:04 -07:00
shanshanzhong147	006886751f	ci(build:admin)	2025-09-25 09:06:10 -07:00
shanshanzhong147	832e55363b	ci(build:admin)	2025-09-25 09:02:08 -07:00
shanshanzhong147	ea16dbb91d	tg	2025-09-25 08:58:54 -07:00
shanshanzhong147	fcfd2a9a9f	init01	2025-09-25 08:55:12 -07:00
shanshanzhong147	02fc54df21	init01	2025-09-25 08:36:23 -07:00
shanshanzhong147	f3113d787d	init01	2025-09-25 08:31:59 -07:00
shanshanzhong147	a607748df0	init01	2025-09-25 08:21:38 -07:00
shanshanzhong147	731d64b26d	init01	2025-09-25 08:16:56 -07:00
shanshanzhong147	b6a2c13f72	init01	2025-09-25 08:14:59 -07:00
shanshanzhong147	3dcd4b0581	init01	2025-09-25 08:07:36 -07:00
shanshanzhong147	8ec2f9f097	init	2025-09-25 06:04:01 -07:00
shanshanzhong147	bbf27538b2	init	2025-09-25 05:53:33 -07:00
shanshanzhong147	56cf0e1de0	ini	2025-09-25 05:13:29 -07:00
shanshanzhong147	83476efe63	ini	2025-09-25 05:11:03 -07:00
shanshanzhong147	49359845c0	main	2025-09-25 04:57:54 -07:00
shanshanzhong147	170c42cb52	main	2025-09-25 04:47:45 -07:00
shanshanzhong147	67a427af49	main	2025-09-25 04:43:02 -07:00
shanshanzhong147	e65a2ded46	main	2025-09-25 04:36:19 -07:00
shanshanzhong147	de8761846a	main	2025-09-25 04:24:47 -07:00
shanshanzhong147	b0ecc0a514	main	2025-09-25 04:20:43 -07:00
shanshanzhong147	3d404dc6ab	main	2025-09-25 04:17:57 -07:00
shanshanzhong147	f22be971a5	init	2025-09-25 04:12:01 -07:00
shanshanzhong147	e5da524504	init	2025-09-25 04:05:52 -07:00
shanshanzhong147	2bc3fd541a	init	2025-09-25 04:05:09 -07:00
shanshanzhong147	82aec50e7a	init	2025-09-25 04:03:29 -07:00
shanshanzhong147	314406cd41	ci	2025-09-25 03:47:46 -07:00
shanshanzhong147	13635b2d9d	ci: 移除pnpm action setup的注释链接	2025-09-25 03:35:44 -07:00
shanshanzhong147	3eb4d5ff80	ci	2025-09-25 03:34:55 -07:00
shanshanzhong147	601425c783	ci	2025-09-25 03:34:09 -07:00
shanshanzhong147	cb705c0150	ci	2025-09-25 03:24:17 -07:00
shanshanzhong147	419b3c8625	ci	2025-09-25 03:18:40 -07:00
shanshanzhong147	b5a460e440	ci	2025-09-25 03:16:43 -07:00
shanshanzhong147	109e5ec119	ci	2025-09-25 03:12:23 -07:00
shanshanzhong147	22f5197417	ci	2025-09-25 03:03:46 -07:00
shanshanzhong147	854273f6a4	ci	2025-09-25 02:59:51 -07:00
shanshanzhong147	fad0450fd1	ci	2025-09-25 02:58:43 -07:00
shanshanzhong147	3ce7e7cee0	ci	2025-09-25 02:54:28 -07:00
shanshanzhong147	5637b002a5	ci	2025-09-25 02:50:29 -07:00
shanshanzhong147	eed624e491	ci	2025-09-25 02:49:29 -07:00
shanshanzhong147	ed9cbde7be	ci	2025-09-25 02:43:52 -07:00
shanshanzhong147	0db0f40ce3	ci	2025-09-25 02:37:59 -07:00
shanshanzhong147	dabe5fbb2c	ci	2025-09-25 02:29:14 -07:00
shanshanzhong147	61fa7be47d	ci	2025-09-25 02:19:18 -07:00
shanshanzhong147	849a7219df	ci	2025-09-25 02:17:57 -07:00
shanshanzhong147	c6f47e0e10	ci	2025-09-25 02:12:56 -07:00
shanshanzhong147	dbaee3d858	ci	2025-09-25 01:59:37 -07:00
shanshanzhong147	8ed24ed44b	ci	2025-09-25 01:52:12 -07:00
shanshanzhong147	3d7e13cbc2	ci	2025-09-25 01:44:24 -07:00
shanshanzhong147	db0cd8167d	ci	2025-09-25 01:42:01 -07:00
shanshanzhong147	611602cfef	ci	2025-09-24 23:42:11 -07:00
shanshanzhong147	67eec9ebb4	ci	2025-09-24 21:32:19 -07:00
shanshanzhong147	6c1953a831	ci	2025-09-24 21:28:07 -07:00
shanshanzhong147	df01c08734	ci	2025-09-24 21:18:09 -07:00
shanshanzhong147	23385ce3ac	ci	2025-09-24 19:44:46 -07:00
shanshanzhong147	a65c46cb46	ci	2025-09-24 19:32:34 -07:00
shanshanzhong147	9f716728fa	ci	2025-09-24 19:30:52 -07:00
shanshanzhong147	0fba9eac06	ci	2025-09-24 19:20:14 -07:00
shanshanzhong147	b0b58333a4	ci	2025-09-24 19:16:26 -07:00
shanshanzhong147	df79d6f74e	ci	2025-09-24 19:13:51 -07:00
shanshanzhong147	cf66053337	ci	2025-09-24 19:09:07 -07:00
shanshanzhong147	7cedf4fba3	ci	2025-09-24 19:08:19 -07:00