Merge pull request #20 from wold9527/main

添加绑卡和实用功能

Author: dou-jiang

.env.example

@@ -17,3 +17,10 @@
 
 # 远程 PostgreSQL（优先）
 # APP_DATABASE_URL=postgresql://user:password@host:5432/dbname
+
+# ── 第三方自动绑卡（可选） ───────────────────────────────────
+# 第三方绑卡 API 地址（支持填 Workers 根域名，后端会自动补全路径）
+# BIND_CARD_API_URL=https://twilight-river-f148.482091502.workers.dev/
+
+# 第三方绑卡 API Key（可留空，后端会先尝试无鉴权）
+# BIND_CARD_API_KEY=your_api_key_here

.github/workflows/docker-image.yml

@@ -0,0 +1,61 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "master", "main" ]
+    tags: [ 'v*.*.*' ]
+  pull_request:
+    branches: [ "master", "main" ]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          # 修改这里：使用 GHCR_TOKEN 而不是 GITHUB_TOKEN
+          password: ${{ secrets.GHCR_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=latest
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+            
+
+
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

Dockerfile

@@ -10,6 +10,10 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
     # WebUI 默认配置
     WEBUI_HOST=0.0.0.0 \
     WEBUI_PORT=1455 \
+    DISPLAY=:99 \
+    ENABLE_VNC=1 \
+    VNC_PORT=5900 \
+    NOVNC_PORT=6080 \
     LOG_LEVEL=info \
     DEBUG=0
 
@@ -19,18 +23,29 @@ RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         gcc \
         python3-dev \
+        xvfb \
+        fluxbox \
+        x11vnc \
+        websockify \
+        novnc \
+        ca-certificates \
     && rm -rf /var/lib/apt/lists/*
 
 # 复制依赖文件并安装
 COPY requirements.txt .
 RUN pip install --no-cache-dir --upgrade pip \
-    && pip install --no-cache-dir -r requirements.txt
+    && pip install --no-cache-dir -r requirements.txt \
+    && python -m playwright install --with-deps chromium
 
 # 复制项目代码
 COPY . .
+COPY scripts/docker/start-webui.sh /app/scripts/docker/start-webui.sh
+RUN chmod +x /app/scripts/docker/start-webui.sh
 
 # 暴露端口
 EXPOSE 1455
+EXPOSE 6080
+EXPOSE 5900
 
 # 启动 WebUI
-CMD ["python", "webui.py"]
+CMD ["/app/scripts/docker/start-webui.sh"]

README.md

@@ -8,11 +8,8 @@
 [![Python](https://img.shields.io/badge/Python-3.10%2B-blue.svg)](https://www.python.org/)
 
 ## QQ群
-- 交流群:291638849
-- https://qm.qq.com/q/ZTCKxawxeo
 
-## Telegram交流频道
-- https://t.me/cysq2026
+- 交流群: https://qm.qq.com/q/ZTCKxawxeo
 
 ## 致谢
 
@@ -129,13 +126,21 @@ codex-console.exe --access-password mypassword
 docker-compose up -d
 ```
 
-你可以在 `docker-compose.yml` 中修改环境变量，比如端口和访问密码。
+你可以在 `docker-compose.yml` 中修改环境变量，比如端口和访问密码。  
+如果需要看“全自动绑卡”的可视化浏览器，打开：
+
+- noVNC: `http://127.0.0.1:6080`
 
 ### 使用 docker run
 
 ```bash
 docker run -d \
   -p 1455:1455 \
+  -p 6080:6080 \
+  -e DISPLAY=:99 \
+  -e ENABLE_VNC=1 \
+  -e VNC_PORT=5900 \
+  -e NOVNC_PORT=6080 \
   -e WEBUI_HOST=0.0.0.0 \
   -e WEBUI_PORT=1455 \
   -e WEBUI_ACCESS_PASSWORD=your_secure_password \

docker-compose.yml

@@ -3,11 +3,19 @@ version: '3.8'
 services:
   webui:
     build: .
+    shm_size: "1gb"
     ports:
       - "1455:1455"
+      - "6080:6080"
+      # 如需使用 VNC 客户端直连可打开：
+      # - "5900:5900"
     environment:
       - WEBUI_HOST=0.0.0.0
       - WEBUI_PORT=1455
+      - DISPLAY=:99
+      - ENABLE_VNC=1
+      - VNC_PORT=5900
+      - NOVNC_PORT=6080
       - DEBUG=0
       - LOG_LEVEL=info
       # 如果需要访问密码，可以在这里取消注释并设置
@@ -16,4 +24,4 @@ services:
       # 挂载数据目录以持久化数据库和日志
       - ./data:/app/data
       - ./logs:/app/logs
-    restart: unless-stopped
+    restart: unless-stopped

make-test-win.bat

@@ -0,0 +1,27 @@
+@echo off
+setlocal
+cd /d "%~dp0"
+
+set "PS_CMD="
+where powershell.exe >nul 2>nul
+if not errorlevel 1 set "PS_CMD=powershell.exe"
+if not defined PS_CMD (
+    where pwsh.exe >nul 2>nul
+    if not errorlevel 1 set "PS_CMD=pwsh.exe"
+)
+if not defined PS_CMD (
+    echo.
+    echo PowerShell not found. Install Windows PowerShell or PowerShell 7 first.
+    exit /b 1
+)
+
+%PS_CMD% -ExecutionPolicy Bypass -File ".\scripts\make_windows_test_bundle.ps1"
+if errorlevel 1 (
+    echo.
+    echo Failed to create test bundle.
+    exit /b 1
+)
+
+echo.
+echo Test bundle created successfully.
+echo You can run: ..\codex-console2-win-test\start-webui.bat

requirements.txt

@@ -11,5 +11,5 @@ python-multipart>=0.0.6
 sqlalchemy>=2.0.0
 aiosqlite>=0.19.0
 psycopg[binary]>=3.1.18
-# 可选：无痕打开支付页需要 playwright（pip install playwright && playwright install chromium）
-# playwright>=1.40.0
+# 自动绑卡（local_auto）依赖
+playwright>=1.40.0

scripts/docker/start-webui.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+export DISPLAY="${DISPLAY:-:99}"
+ENABLE_VNC="${ENABLE_VNC:-1}"
+VNC_PORT="${VNC_PORT:-5900}"
+NOVNC_PORT="${NOVNC_PORT:-6080}"
+
+if [[ "${ENABLE_VNC}" == "1" || "${ENABLE_VNC,,}" == "true" ]]; then
+  echo "[docker] starting Xvfb on ${DISPLAY}"
+  Xvfb "${DISPLAY}" -screen 0 1366x900x24 -ac +extension RANDR >/tmp/xvfb.log 2>&1 &
+
+  echo "[docker] starting fluxbox window manager"
+  fluxbox >/tmp/fluxbox.log 2>&1 &
+
+  echo "[docker] starting x11vnc on :${VNC_PORT}"
+  x11vnc \
+    -display "${DISPLAY}" \
+    -rfbport "${VNC_PORT}" \
+    -forever \
+    -shared \
+    -nopw \
+    >/tmp/x11vnc.log 2>&1 &
+
+  NOVNC_WEB_ROOT="/usr/share/novnc"
+  if [[ ! -d "${NOVNC_WEB_ROOT}" ]]; then
+    NOVNC_WEB_ROOT="/usr/share/novnc/"
+  fi
+  echo "[docker] starting noVNC on :${NOVNC_PORT} (web=${NOVNC_WEB_ROOT})"
+  websockify --web="${NOVNC_WEB_ROOT}" "${NOVNC_PORT}" "127.0.0.1:${VNC_PORT}" >/tmp/novnc.log 2>&1 &
+fi
+
+echo "[docker] starting webui..."
+exec python webui.py
+