From afb0880d8eb9dabc8822ef09ac3f295345790422 Mon Sep 17 00:00:00 2001 From: imbytecat Date: Thu, 22 Jan 2026 16:52:16 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E5=91=BD=E5=90=8D=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E5=B9=B6=E4=BC=98=E5=8C=96=E5=8D=95=E4=BE=8B=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统一使用DB类型别名替换Database类型定义 - 将 db 中间件中获取数据库实例的函数名从 getDb 改为 getDB 以保持命名一致性。 - 重命名数据库相关函数和类型以使用一致的命名规范,并确保单例模式正确返回数据库实例。 --- apps/server/src/server/api/context.ts | 4 ++-- .../src/server/api/middlewares/db.middleware.ts | 4 ++-- apps/server/src/server/db/index.ts | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/server/src/server/api/context.ts b/apps/server/src/server/api/context.ts index b7f63e2..9d4772f 100644 --- a/apps/server/src/server/api/context.ts +++ b/apps/server/src/server/api/context.ts @@ -1,4 +1,4 @@ -import type { Database } from '@/server/db' +import type { DB } from '@/server/db' /** * 基础 Context - 所有请求都包含的上下文 @@ -11,7 +11,7 @@ export interface BaseContext { * 数据库 Context - 通过 db middleware 扩展 */ export interface DBContext extends BaseContext { - db: Database + db: DB } /** diff --git a/apps/server/src/server/api/middlewares/db.middleware.ts b/apps/server/src/server/api/middlewares/db.middleware.ts index 373089e..24f6bfc 100644 --- a/apps/server/src/server/api/middlewares/db.middleware.ts +++ b/apps/server/src/server/api/middlewares/db.middleware.ts @@ -1,11 +1,11 @@ import { os } from '@orpc/server' -import { getDb } from '@/server/db' +import { getDB } from '@/server/db' export const db = os.middleware(async ({ context, next }) => { return next({ context: { ...context, - db: getDb(), + db: getDB(), }, }) }) diff --git a/apps/server/src/server/db/index.ts b/apps/server/src/server/db/index.ts index 4646b5c..fee948f 100644 --- a/apps/server/src/server/db/index.ts +++ b/apps/server/src/server/db/index.ts @@ -2,7 +2,7 @@ import { drizzle } from 'drizzle-orm/postgres-js' import { env } from '@/env' import * as schema from '@/server/db/schema' -export const createDb = () => +export const createDB = () => drizzle({ connection: { url: env.DATABASE_URL, @@ -11,17 +11,17 @@ export const createDb = () => schema, }) -export type Database = ReturnType +export type DB = ReturnType -export const getDb = (() => { - let db: Database | null = null +export const getDB = (() => { + let db: DB | null = null - return (singleton = true): Database => { + return (singleton = true): DB => { if (!singleton) { - return createDb() + return createDB() } - db ??= createDb() + db ??= createDB() return db } })()