From 55cb20946f6769847bf79689c2916f8d2b3f5fd7 Mon Sep 17 00:00:00 2001 From: callmeyan Date: Mon, 30 Sep 2019 23:43:55 +0800 Subject: [PATCH] hehe --- io/io.js | 13 ++++++++----- package.json | 2 +- public/js/client/client.js | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/io/io.js b/io/io.js index 5b81268..dbba9c4 100644 --- a/io/io.js +++ b/io/io.js @@ -33,7 +33,7 @@ function ioServer(io) { } }; - io.on('connection',async function (socket) { + io.on('connection', async function (socket) { console.log('有新的连接进来了:', socket.id); //用户与Socket进行绑定 @@ -63,11 +63,12 @@ function ioServer(io) { "type": 'online' }; // 添加客户到 对应的客服 - await sessoionModel.createOrUpdate({uid}, { + await sessoionModel.createOrUpdate({uid}, { uid, socket: socket.id, type: 'customer', kefu_id: gongHao, + status: 1, nickname: clientInfo.name, }) // 给管理员发送通知 @@ -75,7 +76,7 @@ function ioServer(io) { } } catch (e) { //TODO 失败重发机制 - console.log('给管理员发送通知失败',e); + console.log('给管理员发送通知失败', e); } } @@ -149,13 +150,15 @@ function ioServer(io) { socket.broadcast.emit("message", sendMsg); } else if (msg.type == msgType.messageType.private) { let uid = msg.uid; // 对方uid + console.log('find kefu data', msg) // 暂时不 await sessoionModel.find(uid).then(toUser => { + console.log('find kefu data', toUser) if (toUser && toUser.status == 1) { // 对方在线才发送消息哟 - io.to(toUser.socket()).emit('message', sendMsg); + io.to(toUser.socket).emit('message', sendMsg); } }).catch(e => { - + console.log('find kefu data exception', e) }); } diff --git a/package.json b/package.json index d5ab96c..78197dd 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "scripts": { - "start": "node ./bin/www" + "start": "nodemon ./bin/www" }, "dependencies": { "body-parser": "~1.17.1", diff --git a/public/js/client/client.js b/public/js/client/client.js index d9edf34..1113e0a 100644 --- a/public/js/client/client.js +++ b/public/js/client/client.js @@ -99,7 +99,7 @@ $(function(){ if(msg){ var msg_sender = { "type":'private', - "uid":'chat-admin-' + gongHao, + "uid":gongHao, "content":msg, "from_uid":uuid, "chat_type":'text'