Merge branch 'heshuo' into 'master'

test wss

See merge request !20

index.js

 var app = require('express')();
-var http = require('http').createServer(app);
-var https = require("https");
+var server = app.listen(3001, function(){
+  console.log('http listening on *:3001');
+});
+// var http = require('http').createServer(app);
+// var https = require("https");
 var axios = require('axios');
+var io = require('socket.io').listen(server);
 // var io = require('socket.io')(http);
-let fs = require("fs");
+// let fs = require("fs");
 
 
 // app.all('*', function(req, res, next) {
@@ -42,11 +46,8 @@ app.get('/', function(req, res){
  res.send('<h1>Hello world</h1>');
 });
 
-http.listen(3001, function(){
-  console.log('http listening on *:3001');
-});
 
-var io = require('socket.io').listen(http);
+// var io = require('socket.io').listen(http);
 
 io.on('connection', function(socket){
     console.log("connection");
@@ -127,6 +128,9 @@ io.on('connection', function(socket){
 });
 
 
+// http.listen(3001, function(){
+//   console.log('http listening on *:3001');
+// });
 
 
 // https.createServer(httpsOption, app).listen(3000, function(){