更改数据库数据格式
This commit is contained in:
+2
-5
@@ -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
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
+38
-13
@@ -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;
|
||||
Reference in New Issue
Block a user