@@ -6,15 +6,18 @@ var openBrowsers = require('open-browsers');
66
77// log
88const log4js = require ( 'log4js' ) ;
9- log4js . addLayout ( 'json' , config => function ( logEvent ) {
10- logEvent . data = logEvent . data [ 0 ] ;
11- return JSON . stringify ( logEvent ) + config . separator ;
12- } ) ;
9+ log4js . addLayout (
10+ 'json' ,
11+ ( config ) =>
12+ function ( logEvent ) {
13+ logEvent . data = logEvent . data [ 0 ] ;
14+ return JSON . stringify ( logEvent ) + config . separator ;
15+ }
16+ ) ;
1317const logConf = require ( './conf/log.conf' ) ;
1418log4js . configure ( logConf ) ;
1519const logger = log4js . getLogger ( 'chatLog' ) ;
1620
17-
1821// 开发模式热更新
1922if ( process . env . NODE_ENV !== 'production' ) {
2023 var webpack = require ( 'webpack' ) ;
@@ -59,21 +62,21 @@ io.on('connection', function(socket) {
5962 socket . id = obj . uid ;
6063
6164 // 如果没有这个用户,那么在线人数+1,将其添加进在线用户
62- if ( ! onlineUsers . hasOwnProperty ( obj . uid ) ) {
65+ if ( ! onlineUsers [ obj . uid ] ) {
6366 onlineUsers [ obj . uid ] = obj . username ;
6467 onlineCount ++ ;
6568 }
6669
6770 // 向客户端发送登陆事件,同时发送在线用户、在线人数以及登陆用户
6871 io . emit ( 'login' , { onlineUsers : onlineUsers , onlineCount : onlineCount , user : obj } ) ;
69- logger . info ( { socketId : socket . id , ip : socket . request . connection . remoteAddress , user : obj . username , event : 'in' , message : obj . username + '加入了群聊' } ) ;
72+ logger . info ( { socketId : socket . id , ip : socket . request . connection . remoteAddress , user : obj . username , event : 'in' , message : obj . username + '加入了群聊' } ) ;
7073 console . log ( obj . username + '加入了群聊' ) ;
7174 } ) ;
7275
7376 // 监听客户端的断开连接
7477 socket . on ( 'disconnect' , function ( ) {
7578 // 如果有这个用户
76- if ( onlineUsers . hasOwnProperty ( socket . id ) ) {
79+ if ( onlineUsers [ socket . id ] ) {
7780 var obj = { uid : socket . id , username : onlineUsers [ socket . id ] } ;
7881
7982 // 删掉这个用户,在线人数-1
@@ -82,15 +85,15 @@ io.on('connection', function(socket) {
8285
8386 // 向客户端发送登出事件,同时发送在线用户、在线人数以及登出用户
8487 io . emit ( 'logout' , { onlineUsers : onlineUsers , onlineCount : onlineCount , user : obj } ) ;
85- logger . info ( { socketId : socket . id , ip : socket . request . connection . remoteAddress , user : obj . username , event : 'out' , message : obj . username + '退出了群聊' } ) ;
88+ logger . info ( { socketId : socket . id , ip : socket . request . connection . remoteAddress , user : obj . username , event : 'out' , message : obj . username + '退出了群聊' } ) ;
8689 console . log ( obj . username + '退出了群聊' ) ;
8790 }
8891 } ) ;
8992
9093 // 监听客户端发送的信息
9194 socket . on ( 'message' , function ( obj ) {
9295 io . emit ( 'message' , obj ) ;
93- logger . info ( { socketId : socket . id , ip : socket . request . connection . remoteAddress , user : obj . username , event : 'chat' , message : obj . username + '说:' + obj . message } ) ;
96+ logger . info ( { socketId : socket . id , ip : socket . request . connection . remoteAddress , user : obj . username , event : 'chat' , message : obj . username + '说:' + obj . message } ) ;
9497 console . log ( obj . username + '说:' + obj . message ) ;
9598 } ) ;
9699} ) ;
0 commit comments