From afa5802ef2742f017c59548c68659a08451c153e Mon Sep 17 00:00:00 2001 From: xiongxiao Date: Mon, 23 Mar 2026 18:44:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=20ID=20=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98=E5=8C=96=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=20mark=20=E8=AF=A6=E6=83=85=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- pnpm-lock.yaml | 23 +++++++++++------------ src/route.ts | 8 ++++---- src/routes/mark/list.ts | 10 +++++----- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index e3daf01..e3d3f29 100644 --- a/package.json +++ b/package.json @@ -61,13 +61,13 @@ "@ai-sdk/openai-compatible": "^2.0.37", "@aws-sdk/client-s3": "^3.1014.0", "@kevisual/api": "^0.0.65", - "@kevisual/cnb": "^0.0.58", + "@kevisual/cnb": "^0.0.59", "@kevisual/context": "^0.0.8", "@kevisual/local-app-manager": "0.1.32", "@kevisual/logger": "^0.0.4", "@kevisual/oss": "0.0.20", "@kevisual/permission": "^0.0.4", - "@kevisual/router": "0.1.6", + "@kevisual/router": "0.2.2", "@kevisual/types": "^0.0.12", "@kevisual/use-config": "^1.0.30", "@types/archiver": "^7.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 066d616..83c1397 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -69,8 +69,8 @@ importers: specifier: ^0.0.65 version: 0.0.65(react-dom@19.2.4(react@19.2.4))(react@19.2.4) '@kevisual/cnb': - specifier: ^0.0.58 - version: 0.0.58(dotenv@17.3.1)(idb-keyval@6.2.2)(ioredis@5.10.0) + specifier: ^0.0.59 + version: 0.0.59(dotenv@17.3.1)(idb-keyval@6.2.2)(ioredis@5.10.0) '@kevisual/context': specifier: ^0.0.8 version: 0.0.8 @@ -87,8 +87,8 @@ importers: specifier: ^0.0.4 version: 0.0.4 '@kevisual/router': - specifier: 0.1.6 - version: 0.1.6 + specifier: 0.2.2 + version: 0.2.2 '@kevisual/types': specifier: ^0.0.12 version: 0.0.12 @@ -871,8 +871,8 @@ packages: '@kevisual/auth@2.0.3': resolution: {integrity: sha512-4xpijaIhlCTr/DlJaV/gmkCQeg45EO1yxWpRvUX+1jCdVbuxSR0wZrF0SD9oybnjmKWMKDNPLsXyduFjMGcItA==} - '@kevisual/cnb@0.0.58': - resolution: {integrity: sha512-F39NXOGsHE+Iy+ionDO/V5UdT/CtodBVKNVRq2AsvZ6UwhtmyP4HM76H00GezyvUUTlIjmMPt/Ri2w13md7Emg==} + '@kevisual/cnb@0.0.59': + resolution: {integrity: sha512-pz35KfZK7dSMEgasRBxxOHgNfd92DfJYKKYTRYwOEnW5LC58qmhl3b+ApC/pFNjGsuLmpaxxjqTgtvFzkSIc/A==} hasBin: true '@kevisual/context@0.0.8': @@ -905,8 +905,8 @@ packages: '@kevisual/router@0.1.4': resolution: {integrity: sha512-/Gz3N4KAyCRQmy+FgtK8OEhainYxBnck97LSKeazHLzQ5lOoQs46XCGDYR/AjrCuDTuUrmfD/l1u9pFe2rjN8Q==} - '@kevisual/router@0.1.6': - resolution: {integrity: sha512-uQYxDd4j0ZKuuPXduSMSvckjEKi99hVRp7vz5AUFVDVbEBmNQBgDGbwmz9+X/DR/Gjx++x3m8XvYcAwuEzPOKw==} + '@kevisual/router@0.2.2': + resolution: {integrity: sha512-5swwu/1CHcIwXra0ZbZEeCWkDf77jELf4N2931ZE8TjKes9QnMu6PmHdEnNicFNrrBp00Rs7FM1n4lm2Xs9vHg==} '@kevisual/types@0.0.12': resolution: {integrity: sha512-zJXH2dosir3jVrQ6QG4i0+iLQeT9gJ3H+cKXs8ReWboxBSYzUZO78XssVeVrFPsJ33iaAqo4q3DWbSS1dWGn7Q==} @@ -2259,7 +2259,6 @@ packages: prebuild-install@7.1.3: resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==} engines: {node: '>=10'} - deprecated: No longer maintained. Please contact the author of the relevant native addon; alternatives are available. hasBin: true prettier@3.8.1: @@ -3492,10 +3491,10 @@ snapshots: '@kevisual/auth@2.0.3': {} - '@kevisual/cnb@0.0.58(dotenv@17.3.1)(idb-keyval@6.2.2)(ioredis@5.10.0)': + '@kevisual/cnb@0.0.59(dotenv@17.3.1)(idb-keyval@6.2.2)(ioredis@5.10.0)': dependencies: '@kevisual/query': 0.0.53 - '@kevisual/router': 0.1.6 + '@kevisual/router': 0.1.4 '@kevisual/use-config': 1.0.30(dotenv@17.3.1) '@opencode-ai/sdk': 1.2.27 es-toolkit: 1.45.1 @@ -3556,7 +3555,7 @@ snapshots: es-toolkit: 1.45.1 zod: 4.3.6 - '@kevisual/router@0.1.6': + '@kevisual/router@0.2.2': dependencies: crypto-js: 4.2.0 es-toolkit: 1.45.1 diff --git a/src/route.ts b/src/route.ts index d969f67..b2e19c9 100644 --- a/src/route.ts +++ b/src/route.ts @@ -35,7 +35,7 @@ export const addAuth = (app: App) => { app .route({ path: 'auth', - id: 'auth', + rid: 'auth', description: '验证token，必须成功, 错误返回401，正确赋值到ctx.state.tokenUser', }) .define(async (ctx) => { @@ -71,7 +71,7 @@ export const addAuth = (app: App) => { .route({ path: 'auth', key: 'can', - id: 'auth-can', + rid: 'auth-can', description: '验证token，可以不成功，错误不返回401，正确赋值到ctx.state.tokenUser，失败赋值null', }) .define(async (ctx) => { @@ -107,7 +107,7 @@ app .route({ path: 'auth', key: 'admin', - id: 'auth-admin', + rid: 'auth-admin', isDebug: true, middleware: ['auth'], description: '验证token，必须是admin用户, 错误返回403，正确赋值到ctx.state.tokenAdmin', @@ -154,7 +154,7 @@ app .route({ path: 'auth-check', key: 'admin', - id: 'check-auth-admin', + rid: 'check-auth-admin', middleware: ['auth'], }) .define(async (ctx) => { diff --git a/src/routes/mark/list.ts b/src/routes/mark/list.ts index f5dbb65..ca1aa6a 100644 --- a/src/routes/mark/list.ts +++ b/src/routes/mark/list.ts @@ -73,7 +73,6 @@ app description: '获取mark详情', metadata: { args: { - id: z.string().describe('mark id'), } }, @@ -106,8 +105,8 @@ app isDebug: true, metadata: { args: { - id: z.string().describe('mark id'), data: z.object({ + id: z.string().describe('mark id'), title: z.string().default(''), tags: z.any().default([]), link: z.string().default(''), @@ -179,8 +178,9 @@ app .define(async (ctx) => { const tokenUser = ctx.state.tokenUser; const operate = ctx.query.operate || 'update'; + const markId = ctx.query.id; const { id, node } = ctx.query.data || {}; - const marks = await db.select().from(schema.microMark).where(eq(schema.microMark.id, id)).limit(1); + const marks = await db.select().from(schema.microMark).where(eq(schema.microMark.id, markId)).limit(1); const markModel = marks[0]; if (!markModel) { ctx.throw(404, 'mark not found'); @@ -210,7 +210,7 @@ app version, updatedAt: new Date().toISOString(), }) - .where(eq(schema.microMark.id, id)) + .where(eq(schema.microMark.id, markId)) .returning(); ctx.body = updated[0]; }) @@ -233,7 +233,7 @@ app }) .define(async (ctx) => { const tokenUser = ctx.state.tokenUser; - const { id, nodeOperateList } = ctx.query.data || {}; + const { id, nodeOperateList } = ctx.query || {}; const marks = await db.select().from(schema.microMark).where(eq(schema.microMark.id, id)).limit(1); const markModel = marks[0]; if (!markModel) {