From 0788480ce3a7f81ba07827402aa45e1d84919d01 Mon Sep 17 00:00:00 2001 From: que01 Date: Mon, 19 Oct 2026 00:28:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=B6=E5=8F=A3=E5=AE=A1=E6=9F=A5?= =?UTF-8?q?=E5=8F=91=E7=8E=B0=E7=9A=84=20CI=20=E4=B8=8E=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E8=BE=B9=E7=95=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 admin identity helper 移到共享边界,清理跨 feature 导入;修复 CI 集成环境、浏览器数据库/Playwright 配置;增强 doctor source hash 对重命名文件的处理,并补充 logout API 文档。 --- .../raw/completion-evidence.json | 4 ++-- .github/workflows/ci.yml | 24 +++++++++++++++++-- .../workspace => }/admin-access.identity.ts | 2 +- .../modules/admin/admin-config.controller.ts | 2 +- .../src/modules/tenant/tenant.controller.ts | 2 +- .../workspace/admin-capability.controller.ts | 2 +- .../workspace/admin-inquiry.controller.ts | 2 +- .../workspace/admin-offering.controller.ts | 2 +- .../workspace/admin-template.controller.ts | 2 +- .../admin-workspace-preview.controller.ts | 2 +- apps/taro/playwright.config.ts | 4 +--- scripts/lib/template-doctor.mjs | 3 ++- 12 files changed, 35 insertions(+), 16 deletions(-) rename apps/api/src/{modules/workspace => }/admin-access.identity.ts (94%) diff --git a/.codex-tasks/template-audit-execution/raw/completion-evidence.json b/.codex-tasks/template-audit-execution/raw/completion-evidence.json index 0ae6be9..b688631 100644 --- a/.codex-tasks/template-audit-execution/raw/completion-evidence.json +++ b/.codex-tasks/template-audit-execution/raw/completion-evidence.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "scope": "模板完成证据登记,保留命令、日志与产物哈希", - "generatedAt": "2026-10-19T00:40:00+08:00", + "generatedAt": "2026-10-19T01:15:00+08:00", "templates": { "acheng-campus-food": { "real-manifest-interaction": { @@ -292,5 +292,5 @@ } } }, - "sourceTreeHash": "ff1ad5d31af376ed6c2aa019533b168805bdf5cfaf306418b8327fb432dbeee3" + "sourceTreeHash": "7c75d6c3fe05b9c09e1392deaa8114a18dedaa1074e0a9d9022e4ee757ae930e" } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8178f01..d5d98dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,6 +87,15 @@ jobs: node-version: 24 cache: pnpm - run: pnpm install --frozen-lockfile + - name: Prepare API test env + working-directory: apps/api + run: | + cat > .env < .env < /tmp/api.log 2>&1 & env: @@ -175,3 +193,5 @@ jobs: curl --retry 30 --retry-delay 1 --retry-connrefused -fsS http://localhost:3002 curl --retry 30 --retry-delay 1 --retry-connrefused -fsS http://localhost:3000 - run: pnpm --filter @personal-brand/taro exec playwright test --config=playwright.config.ts --reporter=line + env: + ADMIN_URL: http://localhost:3000 diff --git a/apps/api/src/modules/workspace/admin-access.identity.ts b/apps/api/src/admin-access.identity.ts similarity index 94% rename from apps/api/src/modules/workspace/admin-access.identity.ts rename to apps/api/src/admin-access.identity.ts index 571f91c..b15df0d 100644 --- a/apps/api/src/modules/workspace/admin-access.identity.ts +++ b/apps/api/src/admin-access.identity.ts @@ -1,6 +1,6 @@ import { ForbiddenException, UnauthorizedException } from "@nestjs/common"; import type { FastifyRequest } from "fastify"; -import { readIdentity } from "../../auth.js"; +import { readIdentity } from "./auth.js"; export type AdminIdentity = { subject: string; diff --git a/apps/api/src/modules/admin/admin-config.controller.ts b/apps/api/src/modules/admin/admin-config.controller.ts index 78c7135..f4dfcb7 100644 --- a/apps/api/src/modules/admin/admin-config.controller.ts +++ b/apps/api/src/modules/admin/admin-config.controller.ts @@ -7,7 +7,7 @@ import { UpdateTrustContentDto, } from "../../admin.dto.js"; import { TemplateWorkspaceService } from "../../template-workspace.service.js"; -import { requireAdminIdentity } from "../workspace/admin-access.identity.js"; +import { requireAdminIdentity } from "../../admin-access.identity.js"; import { AdminBrandConfigService } from "./admin-brand-config.service.js"; @Controller("admin/config") diff --git a/apps/api/src/modules/tenant/tenant.controller.ts b/apps/api/src/modules/tenant/tenant.controller.ts index 9b74a83..63cc846 100644 --- a/apps/api/src/modules/tenant/tenant.controller.ts +++ b/apps/api/src/modules/tenant/tenant.controller.ts @@ -1,7 +1,7 @@ import { Body, Controller, Get, Param, Patch, Post, Req } from "@nestjs/common"; import type { FastifyRequest } from "fastify"; import { AdminAccessService } from "../../admin-access.service.js"; -import { requireAdminIdentity } from "../workspace/admin-access.identity.js"; +import { requireAdminIdentity } from "../../admin-access.identity.js"; import { CreateBrandMemberDto, UpdateBrandMemberDto } from "../../admin.dto.js"; import { TenantService } from "./tenant.service.js"; diff --git a/apps/api/src/modules/workspace/admin-capability.controller.ts b/apps/api/src/modules/workspace/admin-capability.controller.ts index c63d305..fe4a003 100644 --- a/apps/api/src/modules/workspace/admin-capability.controller.ts +++ b/apps/api/src/modules/workspace/admin-capability.controller.ts @@ -5,7 +5,7 @@ import { PreviewTemplateSampleDto, UpdateCapabilityInstallationDto, } from "../../admin.dto.js"; -import { requireAdminIdentity } from "./admin-access.identity.js"; +import { requireAdminIdentity } from "../../admin-access.identity.js"; import { AdminSampleContentService } from "./admin-sample-content.service.js"; import { AdminWorkspaceCapabilitiesService } from "./admin-workspace-capabilities.service.js"; diff --git a/apps/api/src/modules/workspace/admin-inquiry.controller.ts b/apps/api/src/modules/workspace/admin-inquiry.controller.ts index bde180a..603c399 100644 --- a/apps/api/src/modules/workspace/admin-inquiry.controller.ts +++ b/apps/api/src/modules/workspace/admin-inquiry.controller.ts @@ -7,7 +7,7 @@ import { UpdateInquiryFormDto, UpdateInquirySubmissionDto, } from "../../admin.dto.js"; -import { requireAdminIdentity } from "./admin-access.identity.js"; +import { requireAdminIdentity } from "../../admin-access.identity.js"; import { AdminInquiryService } from "./admin-inquiry.service.js"; @Controller("admin/workspace") diff --git a/apps/api/src/modules/workspace/admin-offering.controller.ts b/apps/api/src/modules/workspace/admin-offering.controller.ts index 616c2da..f80af3d 100644 --- a/apps/api/src/modules/workspace/admin-offering.controller.ts +++ b/apps/api/src/modules/workspace/admin-offering.controller.ts @@ -1,7 +1,7 @@ import { Body, Controller, Delete, Get, Param, Patch, Post, Req } from "@nestjs/common"; import type { FastifyRequest } from "fastify"; import { CreateOfferingDto, UpdateOfferingDto } from "../../admin.dto.js"; -import { requireAdminIdentity } from "./admin-access.identity.js"; +import { requireAdminIdentity } from "../../admin-access.identity.js"; import { AdminOfferingService } from "./admin-offering.service.js"; @Controller("admin/workspace") diff --git a/apps/api/src/modules/workspace/admin-template.controller.ts b/apps/api/src/modules/workspace/admin-template.controller.ts index ce67fa9..01980f4 100644 --- a/apps/api/src/modules/workspace/admin-template.controller.ts +++ b/apps/api/src/modules/workspace/admin-template.controller.ts @@ -2,7 +2,7 @@ import { Body, Controller, Get, Post, Req } from "@nestjs/common"; import type { FastifyRequest } from "fastify"; import { RollbackTemplateDto, UpgradeTemplateDto } from "../../admin.dto.js"; import { TemplateWorkspaceService } from "../../template-workspace.service.js"; -import { requireAdminIdentity } from "./admin-access.identity.js"; +import { requireAdminIdentity } from "../../admin-access.identity.js"; @Controller("admin/workspace") class AdminTemplateController { diff --git a/apps/api/src/modules/workspace/admin-workspace-preview.controller.ts b/apps/api/src/modules/workspace/admin-workspace-preview.controller.ts index 8f62e5b..0e59c08 100644 --- a/apps/api/src/modules/workspace/admin-workspace-preview.controller.ts +++ b/apps/api/src/modules/workspace/admin-workspace-preview.controller.ts @@ -2,7 +2,7 @@ import { Controller, Get, Post, Body, Req } from "@nestjs/common"; import type { FastifyRequest } from "fastify"; import { InstallTemplateDto, SelectTemplateVersionDto } from "../../admin.dto.js"; import { TemplateWorkspaceService } from "../../template-workspace.service.js"; -import { requireAdminIdentity } from "./admin-access.identity.js"; +import { requireAdminIdentity } from "../../admin-access.identity.js"; import { AdminWorkspaceService } from "./admin-workspace.service.js"; @Controller("admin/workspace") diff --git a/apps/taro/playwright.config.ts b/apps/taro/playwright.config.ts index 34fd5b2..d6dcb23 100644 --- a/apps/taro/playwright.config.ts +++ b/apps/taro/playwright.config.ts @@ -7,9 +7,7 @@ export default defineConfig({ viewport: { width: 375, height: 812 }, screenshot: "only-on-failure", launchOptions: { - executablePath: - process.env.CHROMIUM_PATH || - "/home/que01/.cache/ms-playwright/chromium-1228/chrome-linux64/chrome", + ...(process.env.CHROMIUM_PATH ? { executablePath: process.env.CHROMIUM_PATH } : {}), args: ["--no-sandbox"], }, }, diff --git a/scripts/lib/template-doctor.mjs b/scripts/lib/template-doctor.mjs index e5211ac..4deeea5 100644 --- a/scripts/lib/template-doctor.mjs +++ b/scripts/lib/template-doctor.mjs @@ -444,7 +444,8 @@ export function sourceTreeHash(root) { .toString("utf8") .split("\0") .filter((file) => file && !file.startsWith(".codex-tasks/")) - .map((file) => path.join(rootPath, file)); + .map((file) => path.join(rootPath, file)) + .filter((file) => fs.existsSync(file) && fs.statSync(file).isFile()); } else { files = walkRepositoryFiles(rootPath).filter( (file) => !path.relative(rootPath, file).startsWith(".codex-tasks/"),