合并了远程分支 cb72262 的功能更新,同时保留了 ESLint 修复:
**冲突解决详情:**
1. AccountTableFilters.vue
- ✅ 保留 emit 模式修复(避免 vue/no-mutating-props 错误)
- ✅ 添加第三个筛选器 type(账户类型)
- ✅ 新增 antigravity 平台和 inactive 状态选项
2. UserBalanceModal.vue
- ✅ 保留 console.error 错误日志
- ✅ 添加输入验证(金额校验、余额不足检查)
- ✅ 使用 appStore.showError 向用户显示友好错误
3. AccountsView.vue
- ✅ 保留所有 console.error 错误日志(避免 no-empty 错误)
- ✅ 使用新 API:clearRateLimit 和 setSchedulable
4. UsageView.vue
- ✅ 添加 console.error 错误日志
- ✅ 添加图表功能(模型分布、使用趋势)
- ✅ 添加粒度选择(按天/按小时)
- ✅ 保留 XLSX 动态导入优化
**测试结果:**
- ✅ Go tests: PASS
- ✅ golangci-lint: 0 issues
- ✅ ESLint: 0 errors
- ✅ TypeScript: PASS
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
204 lines
7.9 KiB
YAML
204 lines
7.9 KiB
YAML
# =============================================================================
|
||
# Sub2API Docker Compose Configuration
|
||
# =============================================================================
|
||
# Quick Start:
|
||
# 1. Copy .env.example to .env and configure
|
||
# 2. docker-compose up -d
|
||
# 3. Check logs: docker-compose logs -f sub2api
|
||
# 4. Access: http://localhost:8080
|
||
#
|
||
# All configuration is done via environment variables.
|
||
# No Setup Wizard needed - the system auto-initializes on first run.
|
||
# =============================================================================
|
||
|
||
services:
|
||
# ===========================================================================
|
||
# Sub2API Application
|
||
# ===========================================================================
|
||
sub2api:
|
||
image: weishaw/sub2api:latest
|
||
container_name: sub2api
|
||
restart: unless-stopped
|
||
ulimits:
|
||
nofile:
|
||
soft: 100000
|
||
hard: 100000
|
||
ports:
|
||
- "${BIND_HOST:-0.0.0.0}:${SERVER_PORT:-8080}:8080"
|
||
volumes:
|
||
# Data persistence (config.yaml will be auto-generated here)
|
||
- sub2api_data:/app/data
|
||
# Optional: Mount custom config.yaml (uncomment and create the file first)
|
||
# Copy config.example.yaml to config.yaml, modify it, then uncomment:
|
||
# - ./config.yaml:/app/data/config.yaml:ro
|
||
environment:
|
||
# =======================================================================
|
||
# Auto Setup (REQUIRED for Docker deployment)
|
||
# =======================================================================
|
||
- AUTO_SETUP=true
|
||
|
||
# =======================================================================
|
||
# Server Configuration
|
||
# =======================================================================
|
||
- SERVER_HOST=0.0.0.0
|
||
- SERVER_PORT=8080
|
||
- SERVER_MODE=${SERVER_MODE:-release}
|
||
- RUN_MODE=${RUN_MODE:-standard}
|
||
|
||
# =======================================================================
|
||
# Database Configuration (PostgreSQL)
|
||
# =======================================================================
|
||
- DATABASE_HOST=postgres
|
||
- DATABASE_PORT=5432
|
||
- DATABASE_USER=${POSTGRES_USER:-sub2api}
|
||
- DATABASE_PASSWORD=${POSTGRES_PASSWORD:?POSTGRES_PASSWORD is required}
|
||
- DATABASE_DBNAME=${POSTGRES_DB:-sub2api}
|
||
- DATABASE_SSLMODE=disable
|
||
|
||
# =======================================================================
|
||
# Redis Configuration
|
||
# =======================================================================
|
||
- REDIS_HOST=redis
|
||
- REDIS_PORT=6379
|
||
- REDIS_PASSWORD=${REDIS_PASSWORD:-}
|
||
- REDIS_DB=${REDIS_DB:-0}
|
||
|
||
# =======================================================================
|
||
# Admin Account (auto-created on first run)
|
||
# =======================================================================
|
||
- ADMIN_EMAIL=${ADMIN_EMAIL:-admin@sub2api.local}
|
||
- ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
|
||
|
||
# =======================================================================
|
||
# JWT Configuration
|
||
# =======================================================================
|
||
# IMPORTANT: Set a fixed JWT_SECRET to prevent login sessions from being
|
||
# invalidated after container restarts. If left empty, a random secret
|
||
# will be generated on each startup.
|
||
# Generate a secure secret: openssl rand -hex 32
|
||
- JWT_SECRET=${JWT_SECRET:-}
|
||
- JWT_EXPIRE_HOUR=${JWT_EXPIRE_HOUR:-24}
|
||
|
||
# =======================================================================
|
||
# Timezone Configuration
|
||
# This affects ALL time operations in the application:
|
||
# - Database timestamps
|
||
# - Usage statistics "today" boundary
|
||
# - Subscription expiry times
|
||
# - Log timestamps
|
||
# Common values: Asia/Shanghai, America/New_York, Europe/London, UTC
|
||
# =======================================================================
|
||
- TZ=${TZ:-Asia/Shanghai}
|
||
|
||
# =======================================================================
|
||
# Gemini OAuth Configuration (for Gemini accounts)
|
||
# =======================================================================
|
||
- GEMINI_OAUTH_CLIENT_ID=${GEMINI_OAUTH_CLIENT_ID:-}
|
||
- GEMINI_OAUTH_CLIENT_SECRET=${GEMINI_OAUTH_CLIENT_SECRET:-}
|
||
- GEMINI_OAUTH_SCOPES=${GEMINI_OAUTH_SCOPES:-}
|
||
- GEMINI_QUOTA_POLICY=${GEMINI_QUOTA_POLICY:-}
|
||
|
||
# =======================================================================
|
||
# Security Configuration (URL Allowlist)
|
||
# =======================================================================
|
||
# Enable URL allowlist validation (false to skip allowlist checks)
|
||
- SECURITY_URL_ALLOWLIST_ENABLED=${SECURITY_URL_ALLOWLIST_ENABLED:-false}
|
||
# Allow insecure HTTP URLs when allowlist is disabled (default: false, requires https)
|
||
- SECURITY_URL_ALLOWLIST_ALLOW_INSECURE_HTTP=${SECURITY_URL_ALLOWLIST_ALLOW_INSECURE_HTTP:-false}
|
||
# Allow private IP addresses for upstream/pricing/CRS (for internal deployments)
|
||
- SECURITY_URL_ALLOWLIST_ALLOW_PRIVATE_HOSTS=${SECURITY_URL_ALLOWLIST_ALLOW_PRIVATE_HOSTS:-false}
|
||
# Upstream hosts whitelist (comma-separated, only used when enabled=true)
|
||
- SECURITY_URL_ALLOWLIST_UPSTREAM_HOSTS=${SECURITY_URL_ALLOWLIST_UPSTREAM_HOSTS:-}
|
||
depends_on:
|
||
postgres:
|
||
condition: service_healthy
|
||
redis:
|
||
condition: service_healthy
|
||
networks:
|
||
- sub2api-network
|
||
healthcheck:
|
||
test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
|
||
interval: 30s
|
||
timeout: 10s
|
||
retries: 3
|
||
start_period: 30s
|
||
|
||
# ===========================================================================
|
||
# PostgreSQL Database
|
||
# ===========================================================================
|
||
postgres:
|
||
image: postgres:18-alpine
|
||
container_name: sub2api-postgres
|
||
restart: unless-stopped
|
||
ulimits:
|
||
nofile:
|
||
soft: 100000
|
||
hard: 100000
|
||
volumes:
|
||
- postgres_data:/var/lib/postgresql/data
|
||
environment:
|
||
- POSTGRES_USER=${POSTGRES_USER:-sub2api}
|
||
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:?POSTGRES_PASSWORD is required}
|
||
- POSTGRES_DB=${POSTGRES_DB:-sub2api}
|
||
- TZ=${TZ:-Asia/Shanghai}
|
||
networks:
|
||
- sub2api-network
|
||
healthcheck:
|
||
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-sub2api} -d ${POSTGRES_DB:-sub2api}"]
|
||
interval: 10s
|
||
timeout: 5s
|
||
retries: 5
|
||
start_period: 10s
|
||
# 注意:不暴露端口到宿主机,应用通过内部网络连接
|
||
# 如需调试,可临时添加:ports: ["127.0.0.1:5433:5432"]
|
||
|
||
# ===========================================================================
|
||
# Redis Cache
|
||
# ===========================================================================
|
||
redis:
|
||
image: redis:8-alpine
|
||
container_name: sub2api-redis
|
||
restart: unless-stopped
|
||
ulimits:
|
||
nofile:
|
||
soft: 100000
|
||
hard: 100000
|
||
volumes:
|
||
- redis_data:/data
|
||
command: >
|
||
redis-server
|
||
--save 60 1
|
||
--appendonly yes
|
||
--appendfsync everysec
|
||
${REDIS_PASSWORD:+--requirepass ${REDIS_PASSWORD}}
|
||
environment:
|
||
- TZ=${TZ:-Asia/Shanghai}
|
||
# REDISCLI_AUTH is used by redis-cli for authentication (safer than -a flag)
|
||
- REDISCLI_AUTH=${REDIS_PASSWORD:-}
|
||
networks:
|
||
- sub2api-network
|
||
healthcheck:
|
||
test: ["CMD", "redis-cli", "ping"]
|
||
interval: 10s
|
||
timeout: 5s
|
||
retries: 5
|
||
start_period: 5s
|
||
|
||
# =============================================================================
|
||
# Volumes
|
||
# =============================================================================
|
||
volumes:
|
||
sub2api_data:
|
||
driver: local
|
||
postgres_data:
|
||
driver: local
|
||
redis_data:
|
||
driver: local
|
||
|
||
# =============================================================================
|
||
# Networks
|
||
# =============================================================================
|
||
networks:
|
||
sub2api-network:
|
||
driver: bridge
|