Merge branch 'heshuo' into 'master'

测试跨域

See merge request !6

index.js

@@ -48,7 +48,7 @@ io.on('connection', function(socket){
         io.emit(roomid + 'Login', {userid: userid, roomid: roomid});
       })
       .catch(function (error) {
-        console.log(error.data);
+        console.log(error);
       });
     });