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(null); - // 打开时重置表单与人机验证状态 + // 打开时重置表单并内嵌渲染人机验证组件 useEffect(() => { if (!open) return undefined; captcha.reset(); + void captcha.embed(); const raf = requestAnimationFrame(() => phoneRef.current?.focus()); return () => cancelAnimationFrame(raf); }, [open]); // eslint-disable-line react-hooks/exhaustive-deps @@ -173,22 +174,32 @@ export default function AuthModal({ open, onClose }: AuthModalProps) {

)} - {/* 人机验证(TAC 滑块,通过后变绿) */} + {/* 人机验证(TAC 内嵌组件,常驻表单内;通过后显示通过状态条) */}
-
- -
+ {!captcha.enabled ? ( +
本地开发已跳过人机验证
+ ) : ( + <> +
+ {captcha.verified && ( +
+ + 人机验证通过 +
+ )} + + )}
{/* 提交 */} diff --git a/perler-lab/src/lib/useCaptcha.ts b/perler-lab/src/lib/useCaptcha.ts index fe1ee96..3cb41ba 100644 --- a/perler-lab/src/lib/useCaptcha.ts +++ b/perler-lab/src/lib/useCaptcha.ts @@ -2,13 +2,17 @@ * useCaptcha —— TAC(tianai-captcha 自托管)人机验证 React hook。 * * 链路(与 perler-lab-server 的 requireCaptcha 对应): - * 1. 用户点击验证按钮 → 滑块弹窗 → 平台 POST /tac/api/challenge/verify 签发 verifyToken - * 2. 登录/注册接口携带 captchaToken = verifyToken - * 3. 后端调平台 secondary-verify 一次性核销 + * 1. 弹窗打开 → 内嵌渲染验证组件(initTAC 内嵌模式,组件常驻表单内,无触发按钮) + * 2. 用户完成滑块/旋转 → 平台 POST /tac/api/challenge/verify 签发 verifyToken + * 3. 登录/注册接口携带 captchaToken = verifyToken + * 4. 后端调平台 secondary-verify 一次性核销 * - * 静态资源:/tac/load.min.js(public/tac/,来源 tianai-captcha-web-sdk dist) - * API 代理:/tac/api/** → prod1:18200/api/**(nginx 同源反代,无 CORS) - * 站点凭证:复用 tianai-captcha-platform 站点「HomeCentral」(平台不校验域名) + * 静态资源:/tac/load.min.js(public/tac/,来源 tianai-captcha-web-sdk dist, + * 同时导出 loadTAC 与 initTAC) + * API 代理:/tac/api/** → 验证码平台(nginx 同源反代,无 CORS) + * 测试环境 → 测试机本地平台(tianai-captcha:18200,TestEnv 站点) + * 生产环境 → prod1:18200(HomeCentral 站点) + * 站点凭证:VITE_CAPTCHA_SITE_KEY 构建时注入;缺省回退 HomeCentral 站点 siteKey * * 开关:VITE_CAPTCHA_ENABLED=false 时跳过验证直接置为已通过 * (本地开发注入,测试/生产构建不注入保持验证) @@ -44,8 +48,12 @@ declare global { } } -/** tianai-captcha-platform 站点「HomeCentral」的 siteKey(公开标识,可暴露) */ -const SITE_KEY = '6796bad8-4369-492f-a4d7-643a93bb07f3'; +/** 站点 siteKey:构建时注入(测试环境注入 TestEnv 站点);缺省回退 HomeCentral 站点(生产) */ +const RAW_SITE_KEY = import.meta.env.VITE_CAPTCHA_SITE_KEY; +const SITE_KEY = + typeof RAW_SITE_KEY === 'string' && RAW_SITE_KEY.length > 0 + ? RAW_SITE_KEY + : '6796bad8-4369-492f-a4d7-643a93bb07f3'; const TAC_BASE = '/tac/'; const GENERATE_URL = '/tac/api/challenge/generate'; const VERIFY_URL = '/tac/api/challenge/verify'; @@ -62,9 +70,14 @@ export function useCaptcha(scene: string = 'auth') { const tacInstanceRef = useRef(null); const instancePromiseRef = useRef | null>(null); - /** 打开验证弹窗(懒加载 TAC 脚本,首次点击才拉取) */ - const show = useCallback(async () => { - if (state === 'passed') return; + /** + * 内嵌渲染验证组件(弹窗打开 / 需要重新验证时调用)。 + * 组件直接渲染进 #captcha-box-{scene},常驻表单内;通过后由 validSuccess + * 销毁组件窗口并置为 passed,由调用方渲染通过状态条。 + */ + const embed = useCallback(async () => { + if (!CAPTCHA_ENABLED) return; + if (state === 'passed' || state === 'loading') return; if (!window.loadTAC) { console.error('[TAC] load.min.js 未加载,请检查 /tac/load.min.js 可访问性'); return; @@ -79,13 +92,13 @@ export function useCaptcha(scene: string = 'auth') { requestCaptchaDataUrl: GENERATE_URL, validCaptchaUrl: VERIFY_URL, requestHeaders: { 'X-Site-Key': SITE_KEY }, - // 滑块校验通过:平台已签发 verifyToken → 记录、关弹窗、按钮变绿 + // 校验通过:平台已签发 verifyToken → 记录、收起组件、显示通过状态 validSuccess: (res, _c, tac) => { verifyTokenRef.current = res?.data?.verifyToken ?? null; tac.destroyWindow(); setState('passed'); }, - // 校验失败:弹窗内自动刷新重试 + // 校验失败:组件内自动刷新重试 validFail: (_res, _c, tac) => { tac.reloadCaptcha(); }, @@ -101,11 +114,21 @@ export function useCaptcha(scene: string = 'auth') { } }, [containerId, state]); - /** 登录失败/切换模式后调用:verifyToken 已被消费,必须重新验证 */ + /** + * 登录失败/切换模式/重新打开弹窗后调用:verifyToken 已被消费,必须重新验证。 + * 容器节点常驻 DOM,init() 会重新填充验证组件。 + */ const reset = useCallback(() => { if (!CAPTCHA_ENABLED) return; verifyTokenRef.current = null; setState('idle'); + if (tacInstanceRef.current) { + try { + tacInstanceRef.current.init(); + } catch (err) { + console.error('[TAC] 重新初始化失败:', err); + } + } }, []); /** @@ -117,5 +140,13 @@ export function useCaptcha(scene: string = 'auth') { return verifyTokenRef.current; }, []); - return { state, verified: state === 'passed', containerId, show, reset, consumeToken }; + return { + state, + verified: state === 'passed', + enabled: CAPTCHA_ENABLED, + containerId, + embed, + reset, + consumeToken, + }; } diff --git a/perler-lab/src/styles.css b/perler-lab/src/styles.css index 203b975..14a7c13 100644 --- a/perler-lab/src/styles.css +++ b/perler-lab/src/styles.css @@ -1435,39 +1435,56 @@ a { } /* ── 人机验证按钮(TAC 滑块入口) ── */ -.captcha-btn { +/* ── 人机验证:内嵌组件容器(TAC widget 渲染进 .captcha-embed) ── */ +.captcha-embed { + min-height: 64px; + display: flex; + align-items: center; + justify-content: center; + border: 1.5px dashed var(--border-strong); + border-radius: var(--radius-md); + background: var(--bg-subtle); + overflow: hidden; +} + +/* 组件加载中(容器为空时显示占位文案) */ +.captcha-embed:empty::before { + content: '人机验证组件加载中...'; + color: var(--text-tertiary); + font-size: var(--text-sm); +} + +/* 已通过:SDK 组件已被销毁,隐藏空容器,仅显示通过状态条 */ +.captcha-embed--done { + display: none; +} + +/* 内嵌组件实际渲染尺寸略宽于容器时允许横向滚动 */ +.captcha-embed > #tianai-captcha-parent { + max-width: 100%; +} + +/* 通过状态条 */ +.captcha-passed { + display: flex; + align-items: center; + gap: 8px; width: 100%; min-height: var(--touch-min); - border: 1.5px solid var(--border-strong); + padding: 0 var(--space-4); + border: 1.5px solid var(--success); border-radius: var(--radius-md); - background: var(--bg-card); - color: var(--text-secondary); + background: rgba(47, 158, 119, 0.06); + color: var(--success); font-size: var(--text-sm); font-weight: var(--weight-medium); - transition: border-color var(--dur-fast) ease, color var(--dur-fast) ease, - transform var(--dur-fast) var(--ease-out); } -@media (hover: hover) { - .captcha-btn:hover:not(:disabled) { - border-color: var(--accent); - color: var(--accent-ink); - } -} - -.captcha-btn:active:not(:disabled) { - transform: scale(0.97); -} - -.captcha-btn:focus-visible { - outline: none; - box-shadow: var(--focus-ring); -} - -.captcha-btn--passed { - border-color: var(--success); - color: var(--success); - background: rgba(47, 158, 119, 0.06); +/* 本地开发跳过验证的占位条 */ +.captcha-passed--skipped { + border-color: var(--border-strong); + background: var(--bg-card); + color: var(--text-tertiary); } /* 表单字段(AuthModal 等使用,DESIGN.md §3.2) */