diff --git a/.gitea/workflows/deploy-test.yml b/.gitea/workflows/deploy-test.yml
index 39073ca..f8e227c 100644
--- a/.gitea/workflows/deploy-test.yml
+++ b/.gitea/workflows/deploy-test.yml
@@ -37,7 +37,7 @@ jobs:
- name: Build images
run: |
set -e
- docker build -t 156.233.226.46:5000/perler-lab-web:test ./perler-lab
+ docker build --build-arg VITE_CAPTCHA_SITE_KEY=6a062b70-c0b3-428e-8f1b-cca402e67ddd -t 156.233.226.46:5000/perler-lab-web:test ./perler-lab
docker build -t 156.233.226.46:5000/perler-lab-server:test ./perler-lab-server
docker images --format '{{.Repository}}:{{.Tag}} {{.Size}}' | grep perler-lab
@@ -88,23 +88,27 @@ jobs:
DATABASE_URL: postgres://perler:7c5608fe52a5223a6c6107b6@postgres:5432/perler_lab
JWT_SECRET: "4c695e86451281112d20aae50f1fbde5a30d10f77ce4f750c1873b2d25549c81"
TAC_ENABLED: "true"
- TAC_API_BASE: "http://38.76.218.110:18200"
- TAC_SITE_KEY: "6796bad8-4369-492f-a4d7-643a93bb07f3"
- TAC_SECRET_KEY: "dae2c135-4e61-4249-a5bb-a15081b1a2b6"
+ TAC_API_BASE: "http://tianai-captcha:18200"
+ TAC_SITE_KEY: "6a062b70-c0b3-428e-8f1b-cca402e67ddd"
+ TAC_SECRET_KEY: "ce3b098e-e903-442b-b085-39303b69a33b"
volumes:
- db-data:/app/data
- networks: [perler-net]
+ networks: [perler-net, mw]
frontend:
image: 156.233.226.46:5000/perler-lab-web:test
container_name: perler-lab-frontend
restart: unless-stopped
+ environment:
+ CAPTCHA_UPSTREAM: "tianai-captcha:18200"
ports:
- "80:80"
depends_on:
- server
- networks: [perler-net]
+ networks: [perler-net, mw]
networks:
perler-net: {}
+ mw:
+ external: true
volumes:
db-data: {}
pg-data: {}
@@ -116,6 +120,11 @@ jobs:
$SSH_CMD '
set -e
cd /opt/perler-lab
+ echo "===== 前置检查:本地验证码平台 ====="
+ docker network create mw 2>/dev/null || true
+ if ! docker ps --format "{{.Names}}" | grep -q "^tianai-captcha$"; then
+ echo "警告: tianai-captcha 容器未运行(本地验证码平台栈未启动),验证码链路检查将失败"
+ fi
echo "===== 拉取镜像 ====="
docker compose -f docker-compose.test.yml pull
echo "===== 拉起容器 ====="
@@ -157,6 +166,18 @@ jobs:
echo "最终首页验证失败 (code=$CODE)"; exit 1
fi
echo "首页 HTTP $CODE"
+
+ echo "===== 验证码链路检查(本地平台 TestEnv 站点) ====="
+ COK=0
+ for i in $(seq 1 6); do
+ CCODE=$(curl -s -m 8 -o /dev/null -w "%{http_code}" -X POST http://127.0.0.1/tac/api/challenge/generate -H 'X-Site-Key: 6a062b70-c0b3-428e-8f1b-cca402e67ddd' -H 'Content-Type: application/json' -d '{"captchaType":"ROTATE"}' || true)
+ [ "$CCODE" = "200" ] && COK=1 && break
+ sleep 3
+ done
+ if [ "$COK" != "1" ]; then
+ echo "验证码链路检查失败 (generate code=$CCODE)"; exit 1
+ fi
+ echo "验证码链路 OK (HTTP $CCODE)"
echo "===== 测试环境部署完成 ====="
'
diff --git a/docker-compose.tianai.yml b/docker-compose.tianai.yml
new file mode 100644
index 0000000..8ee3dbc
--- /dev/null
+++ b/docker-compose.tianai.yml
@@ -0,0 +1,56 @@
+# =============================================================================
+# TIANAI CAPTCHA —— 测试机(156.233.226.86)本地验证码平台栈
+# 作用:拼豆测试环境自包含的人机验证平台,不跨机依赖 prod1:18200
+# 部署:docker compose -f docker-compose.tianai.yml up -d
+# 前置:/opt/tianai/{web,config,pgdata} 目录已就位(bind mount 持久化)
+# 网络:mw 外部网络(deploy-test.yml 会自动创建;perler 前后端容器也加入 mw
+# 以便通过容器名 tianai-captcha:18200 访问平台)
+# 站点:TestEnv(siteKey 6a062b70-c0b3-428e-8f1b-cca402e67ddd,
+# secretKey 见 deploy-test.yml / 平台管理端)
+# =============================================================================
+services:
+ captcha-forge-pg:
+ image: postgres:18-alpine
+ container_name: captcha-forge-pg
+ restart: unless-stopped
+ environment:
+ POSTGRES_USER: pgsql
+ POSTGRES_PASSWORD: "b2ad1fb583c4255bd9d818fa"
+ POSTGRES_DB: captcha_forge
+ volumes:
+ - /opt/tianai/pgdata:/var/lib/postgresql
+ healthcheck:
+ test: ["CMD-SHELL", "pg_isready -U pgsql -d captcha_forge"]
+ interval: 5s
+ timeout: 3s
+ retries: 12
+ networks: [mw]
+
+ tianai-captcha:
+ image: 156.233.226.46:5000/tianai-captcha-platform:test
+ container_name: tianai-captcha
+ restart: unless-stopped
+ depends_on:
+ captcha-forge-pg:
+ condition: service_healthy
+ volumes:
+ - /opt/tianai/config:/app/config
+ ports:
+ # 仅绑定本机回环:secondary-verify 供本机/容器网络调用,不暴露公网
+ - "127.0.0.1:18200:18200"
+ networks: [mw]
+
+ tianai-web:
+ image: nginx:alpine
+ container_name: tianai-web
+ restart: unless-stopped
+ volumes:
+ - /opt/tianai/web:/usr/share/nginx/html:ro
+ - /opt/tianai/web/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+ ports:
+ - "8080:80"
+ networks: [mw]
+
+networks:
+ mw:
+ external: true
diff --git a/perler-lab/Dockerfile b/perler-lab/Dockerfile
index 273cbb5..72abd00 100644
--- a/perler-lab/Dockerfile
+++ b/perler-lab/Dockerfile
@@ -31,6 +31,11 @@ COPY public ./public
ARG VITE_API_BASE=
ENV VITE_API_BASE=$VITE_API_BASE
+# 人机验证站点 siteKey:测试环境构建注入 TestEnv 站点(本地平台);
+# 不传则回退到 src/lib/useCaptcha.ts 中的 HomeCentral 站点(生产)。
+ARG VITE_CAPTCHA_SITE_KEY=
+ENV VITE_CAPTCHA_SITE_KEY=$VITE_CAPTCHA_SITE_KEY
+
# 构建 React 应用 → dist/(与 package.json 的 build 脚本一致:vite build)
RUN npm run build
diff --git a/perler-lab/src/components/AuthModal.tsx b/perler-lab/src/components/AuthModal.tsx
index f5d28d3..b9596f8 100644
--- a/perler-lab/src/components/AuthModal.tsx
+++ b/perler-lab/src/components/AuthModal.tsx
@@ -32,10 +32,11 @@ export default function AuthModal({ open, onClose }: AuthModalProps) {
const captcha = useCaptcha('auth');
const phoneRef = useRef