From 1e4aa38b875179c2dc81420a83899732fb39891b Mon Sep 17 00:00:00 2001 From: zyh Date: Thu, 10 Apr 2025 08:19:37 +0000 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B6=88=E6=81=AFAPI?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=EF=BC=8C=E8=B0=83=E6=95=B4=E6=9C=AA=E8=AF=BB?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=95=B0=E9=87=8F=E7=9A=84=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=EF=BC=8C=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7=E5=92=8C?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/mobile/api.ts | 2 +- server/routes_messages.ts | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/client/mobile/api.ts b/client/mobile/api.ts index 8941630..c97b080 100644 --- a/client/mobile/api.ts +++ b/client/mobile/api.ts @@ -676,7 +676,7 @@ export const MessageAPI = { // 获取未读消息数量 getUnreadCount: async (): Promise => { try { - const response = await axios.get(`${API_BASE_URL}/messages/unread-count`); + const response = await axios.get(`${API_BASE_URL}/messages/count/unread`); return response.data; } catch (error) { throw error; diff --git a/server/routes_messages.ts b/server/routes_messages.ts index 9b2d9fe..58a95c3 100644 --- a/server/routes_messages.ts +++ b/server/routes_messages.ts @@ -62,9 +62,8 @@ export function createMessagesRoutes(withAuth: WithAuth) { const user = c.get('user') if (!user) return c.json({ error: '未授权访问' }, 401) - const query = apiClient.database.table('user_messages') + const query = apiClient.database.table('user_messages as um') .select('m.*', 'um.status as user_status', 'um.read_at', 'um.id as user_message_id') - .from('user_messages as um') .leftJoin('messages as m', 'um.message_id', 'm.id') .where('um.user_id', user.id) .where('um.is_deleted', 0) @@ -94,9 +93,8 @@ export function createMessagesRoutes(withAuth: WithAuth) { const user = c.get('user') if (!user) return c.json({ error: '未授权访问' }, 401) - const message = await apiClient.database.table('user_messages') + const message = await apiClient.database.table('user_messages as um') .select('m.*', 'um.status as user_status', 'um.read_at') - .from('user_messages as um') .leftJoin('messages as m', 'um.message_id', 'm.id') .where('um.user_id', user.id) .where('um.message_id', messageId) @@ -153,7 +151,7 @@ export function createMessagesRoutes(withAuth: WithAuth) { }) // 获取未读消息数量 - messagesRoutes.get('/unread-count', withAuth, async (c) => { + messagesRoutes.get('/count/unread', withAuth, async (c) => { try { const apiClient = c.get('apiClient') @@ -164,7 +162,6 @@ export function createMessagesRoutes(withAuth: WithAuth) { .where('user_id', user.id) .where('status', MessageStatus.UNREAD) .where('is_deleted', 0) - .clone() .count() return c.json({ count: Number(count) })