Commit 9502ee19 authored by 何硕's avatar 何硕

Merge branch 'heshuo' into 'master'

提交正式

See merge request !28
parents 4bf6dc80 c5b3709e
......@@ -5,8 +5,8 @@ var axios = require('axios');
var io = require('socket.io')(http);
// var BaseUrl = "http://localhost/api/";
var BaseUrl = "https://zhibo.xueyoubangedu.com/api/";
// var BaseUrl = "https://live.xueyoubangedu.com/api/";
// var BaseUrl = "https://zhibo.xueyoubangedu.com/api/";
var BaseUrl = "https://live.xueyoubangedu.com/api/";
app.get('/', function(req, res){
......@@ -80,7 +80,7 @@ io.on('connection', function(socket){
io.to(roomid).emit('ENDCLASS', {userid: userid, roomid: roomid, user: user});
})
.catch(function (error) {
console.log(error.data);
console.log(error);
});
}
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment