From 92c5d052261591420ca423642ff8a7f9aa0e6147 Mon Sep 17 00:00:00 2001 From: Seven <1530011482@qq.com> Date: Wed, 16 Sep 2026 22:27:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routes/login.js | 7 ++----- routes/user.js | 51 ++++++++++++++++++++++++++++++++++++------------- 2 files changed, 40 insertions(+), 18 deletions(-) diff --git a/routes/login.js b/routes/login.js index 59bf1d8..fe799c3 100644 --- a/routes/login.js +++ b/routes/login.js @@ -34,8 +34,7 @@ router.post("/login", (req, res) => { if (results.length > 0) { // 生成 JWT token const token = jwt.createToken({ - userId: results[0].user_id, - username: results[0].username, + username: results[0].username }); res.json({ code: 200, @@ -77,9 +76,7 @@ router.post("/register", (req, res) => { res.json({ code: 200, message: "注册成功", - data: { - id: result.insertId, - }, + data: null }); }); }); diff --git a/routes/user.js b/routes/user.js index 856595d..16a0643 100644 --- a/routes/user.js +++ b/routes/user.js @@ -12,7 +12,6 @@ router.get( res.json({ code: 200, data: { - userId: req.user.userId, username: req.user.username } }); @@ -27,14 +26,13 @@ router.get( (req, res) => { const sql = ` SELECT - u.user_id, u.username FROM chat_mysql.contacts c JOIN chat_mysql.users u - ON c.contact_id = u.user_id - WHERE c.user_id = ?; + ON c.contact_name = u.username + WHERE c.user_name = ?; `; - db.query(sql, [req.user.userId], (error, results) => { + db.query(sql, [req.user.username], (error, results) => { if (error) { console.error("数据库查询失败:", error); @@ -49,7 +47,6 @@ router.get( message: "查询成功", data: { contacts: results.map(contact => ({ - contactId: contact.user_id, contactName: contact.username })) }, @@ -68,23 +65,24 @@ router.get( } ); +// 获取所有聊天消息 router.get( "/messagesInfo", authMiddleware, (req, res) => { - const currentUserId = req.user.userId; + const currentUserName = req.user.username; const sql = ` SELECT id, - sender_id, - receiver_id, + sender_name, + receiver_name, content, created_at FROM chat_mysql.messages - WHERE sender_id = ? OR receiver_id = ? + WHERE sender_name = ? OR receiver_name = ? ORDER BY created_at ASC; `; - db.query(sql, [currentUserId, currentUserId], (error, results) => { + db.query(sql, [currentUserName, currentUserName], (error, results) => { if (error) { console.error("数据库查询失败:", error); @@ -100,8 +98,8 @@ router.get( data: { messages: results.map(message => ({ messageId: message.id, - senderId: message.sender_id, - receiverId: message.receiver_id, + senderName: message.sender_name, + receiverName: message.receiver_name, content: message.content, createdAt: message.created_at })) @@ -121,5 +119,32 @@ router.get( } ); +// 写入聊天消息 +router.post("/sendMessage", (req, res) => { + const sql = ` + INSERT INTO users (username, password) + VALUES (?, ?) + `; + + db.query(sql, [username, password], (error, result) => { + if (error) { + console.error(error); + + return res.status(500).json({ + code: 500, + message: "注册失败", + }); + } + + res.json({ + code: 200, + message: "注册成功", + data: { + id: result.insertId, + }, + }); + }); +}); + module.exports = router; \ No newline at end of file