diff --git a/server/api/ChatApi.ts b/server/api/ChatApi.ts index 698eb44..d35cd9e 100644 --- a/server/api/ChatApi.ts +++ b/server/api/ChatApi.ts @@ -62,17 +62,22 @@ export default class ChatApi extends BaseApi { const userInst = User.findById(id) userInst?.updateRecentChat(chat.bean.id, args.text as string) }) + const m = { + ...msg, + id, + chat_id: chat.bean.id, + } this.boardcastToUsers(users, 'Client.onMessage', { chat: chat.bean.id, - msg: { - ...msg, - id - } + msg: m }) return { code: 200, msg: "成功", + data: { + msg: m, + } } }) /** diff --git a/server/data/MessageBean.ts b/server/data/MessageBean.ts index 5426a56..931436d 100644 --- a/server/data/MessageBean.ts +++ b/server/data/MessageBean.ts @@ -2,6 +2,7 @@ export default class MessageBean { declare id: number declare text: string declare user_id?: string + declare chat_id?: string declare time: string [key: string]: unknown diff --git a/server/data/MessagesManager.ts b/server/data/MessagesManager.ts index ae01948..f22653d 100644 --- a/server/data/MessagesManager.ts +++ b/server/data/MessagesManager.ts @@ -60,7 +60,11 @@ export default class MessagesManager { }) } getMessages(limit: number = 15, offset: number = 0) { - return MessagesManager.database.prepare(`SELECT * FROM ${this.getTableName()} ORDER BY id DESC LIMIT ? OFFSET ?;`).all(limit, offset) as unknown as MessageBean[] + const ls = MessagesManager.database.prepare(`SELECT * FROM ${this.getTableName()} ORDER BY id DESC LIMIT ? OFFSET ?;`).all(limit, offset) as unknown as MessageBean[] + return ls.map((v) => ({ + ...v, + chat_id: this.chat.bean.id, + })) } getMessagesWithPage(limit: number = 15, page: number = 0) { return this.getMessages(limit, limit * page)