Merge branch 'heshuo' into 'master'

login

See merge request !27

index.js

@@ -19,22 +19,21 @@ io.on('connection', function(socket){
     socket.on('login', function(obj){
       var userid = obj.userid;
       var roomid = obj.roomid;
-      var status = obj.status; //用户状态
       socket.nickname = roomid+ '***' + userid;
       console.log("login------------------"+socket.nickname);
       socket.join(roomid);    // 加入房间
 
       axios.post(BaseUrl + 'websocket/login', {
         roomid: roomid,
-        userid: userid,
-        status: status
+        userid: userid
       })
       .then(function (response) {
         console.log(response.data);
         var str = socket.nickname.split("***");
         var userid = str[1];
         var roomid = str[0];
-        io.to(roomid).emit('Login', {userid: userid, roomid: roomid});
+        console.log(response.data.meta.code);
+        io.to(roomid).emit('Login', {userid: userid, roomid: roomid, code: response.data.meta.code});
       })
       .catch(function (error) {
         console.log(error);