From 4c8bda57b13473e4ce2f85ffabea64da2206a044 Mon Sep 17 00:00:00 2001 From: que01 Date: Wed, 23 Sep 2026 11:26:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=8B=86=E5=88=86=E4=BC=9A?= =?UTF-8?q?=E8=AF=9D=E6=8E=A7=E5=88=B6=E5=99=A8=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenant-architecture-epic/PROGRESS.md | 3 +- apps/api/src/main.ts | 36 +---------------- .../src/modules/session/session.controller.ts | 39 +++++++++++++++++++ 3 files changed, 43 insertions(+), 35 deletions(-) create mode 100644 apps/api/src/modules/session/session.controller.ts diff --git a/.codex-tasks/tenant-architecture-epic/PROGRESS.md b/.codex-tasks/tenant-architecture-epic/PROGRESS.md index afd79a2..c34ffd2 100644 --- a/.codex-tasks/tenant-architecture-epic/PROGRESS.md +++ b/.codex-tasks/tenant-architecture-epic/PROGRESS.md @@ -3,7 +3,7 @@ - 任务:多品牌后台与 API 架构收口 - 形态:epic - 进度:1/3 -- 当前:API Controller 拆分 +- 当前:API Controller 拆分(已完成 session 模块第一批迁移,继续拆分中) - 真相文件:`SUBTASKS.csv` ## 已完成 @@ -11,3 +11,4 @@ - 后台导航改为当前品牌工作区语义。 - Header 显示当前认证品牌名称。 - 保持 membership 授权和现有 API 契约不变。 +- `CustomerSessionController` 和 `AdminSessionController` 已迁移到 `modules/session/session.controller.ts`。 diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts index f821f5e..7feab10 100644 --- a/apps/api/src/main.ts +++ b/apps/api/src/main.ts @@ -33,12 +33,11 @@ import { UpdateTrustContentDto, } from "./admin.dto.js"; import { AdminAuthService } from "./admin-auth.service.js"; -import { AdminLoginDto, WechatLoginDto } from "./admin-auth.dto.js"; import type { FastifyRequest } from "fastify"; import { Transform } from "class-transformer"; import type { TransformFnParams } from "class-transformer"; import { IsBoolean, IsEnum, IsOptional, IsString } from "class-validator"; -import { readIdentity, signIdentity } from "./auth.js"; +import { readIdentity } from "./auth.js"; import { ApiExceptionFilter, RequestIdMiddleware } from "./http.js"; import { brandTemplates, @@ -52,6 +51,7 @@ import { AdminWorkspaceController } from "./admin-workspace.controller.js"; import { TemplateWorkspaceService } from "./template-workspace.service.js"; import { AdminAccessService } from "./admin-access.service.js"; import { AdminMembershipGuard } from "./admin-membership.guard.js"; +import { CustomerSessionController, AdminSessionController } from "./modules/session/session.controller.js"; import type { RuntimeInquiryField, RuntimeOffering, @@ -597,38 +597,6 @@ export class CustomerInquirySubmissionController { } } -@Controller("customer/session") -export class CustomerSessionController { - constructor( - private readonly wechatAuth: WechatAuthService, - private readonly prisma: PrismaService, - ) {} - - @Post("wechat") - async wechatLogin(@Body() body: WechatLoginDto): Promise<{ token: string }> { - const session = await this.wechatAuth.exchangeCode(body.code); - const brand = await this.prisma.brandProfile.findFirst({ select: { id: true } }); - if (!brand) throw new BadRequestException("品牌尚未初始化"); - await this.prisma.customerUser.upsert({ - where: { brandId_openid: { brandId: brand.id, openid: session.openid } }, - update: { lastLoginAt: new Date() }, - create: { brandId: brand.id, openid: session.openid }, - }); - return { - token: signIdentity({ subject: session.openid, brandId: brand.id, role: "customer" }), - }; - } -} - -@Controller("admin/session") -export class AdminSessionController { - constructor(private readonly auth: AdminAuthService) {} - @Post("login") - login(@Body() body: AdminLoginDto): Promise<{ token: string; displayName: string }> { - return this.auth.login(body.username, body.password); - } -} - class AdminBookingQueryDto { @IsOptional() @IsEnum(BookingStatus) diff --git a/apps/api/src/modules/session/session.controller.ts b/apps/api/src/modules/session/session.controller.ts new file mode 100644 index 0000000..639ddfa --- /dev/null +++ b/apps/api/src/modules/session/session.controller.ts @@ -0,0 +1,39 @@ +import { BadRequestException, Body, Controller, Post } from "@nestjs/common"; +import { PrismaService } from "../../prisma.service.js"; +import { WechatAuthService } from "../../wechat-auth.js"; +import { AdminAuthService } from "../../admin-auth.service.js"; +import { AdminLoginDto, WechatLoginDto } from "../../admin-auth.dto.js"; +import { signIdentity } from "../../auth.js"; + +@Controller("customer/session") +export class CustomerSessionController { + constructor( + private readonly wechatAuth: WechatAuthService, + private readonly prisma: PrismaService, + ) {} + + @Post("wechat") + async wechatLogin(@Body() body: WechatLoginDto): Promise<{ token: string }> { + const session = await this.wechatAuth.exchangeCode(body.code); + const brand = await this.prisma.brandProfile.findFirst({ select: { id: true } }); + if (!brand) throw new BadRequestException("品牌尚未初始化"); + await this.prisma.customerUser.upsert({ + where: { brandId_openid: { brandId: brand.id, openid: session.openid } }, + update: { lastLoginAt: new Date() }, + create: { brandId: brand.id, openid: session.openid }, + }); + return { + token: signIdentity({ subject: session.openid, brandId: brand.id, role: "customer" }), + }; + } +} + +@Controller("admin/session") +export class AdminSessionController { + constructor(private readonly auth: AdminAuthService) {} + + @Post("login") + login(@Body() body: AdminLoginDto): Promise<{ token: string; displayName: string }> { + return this.auth.login(body.username, body.password); + } +}