Merge branch 'heshuo' into 'master'

test wss

See merge request !22

https/zhibo.xueyoubangedu.com.key

+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAgN3VAb0Q/Ky+g35Va2pBmD/JUQwR6rBxfIHtUxXPYzPscJbT
+iXTXwFiNskGCEPD+89DFjyXWSrCCzKZWpL5zbngUm02OCgEZtAbQiSfENcFfX2b7
+YG9URj66ta3WfG79SOyWEo8r2kbZ1BkG/aOovzXt6l1QFkLfGnvBq+FcfKRiZk9N
+v3VbN+SVPpS4KEZS4DHvHTJiIqhjWJjKSZyYHiTIKwvF58Aip2D4RQoAGdBGYNKE
+VA2Y8vDKqdZ19waV7GJ/u4tXPa3HhWTO1E2gZOKWcIyjr9VAjUopzzgEu2Q8Jl6z
+t/mifg3L++vOCRvFaTTOFasnU+kFVM/zdlnTiwIDAQABAoIBAERQ1ZZZW8MH9OuS
+ssgCCYoj7p63rlvjdBZUbrMIMexeX28Ellodhi8jAuNIFSLUD+TDfag4n9TypDTH
+zdECYgFjSVFXmQA2uyCUKEM9wKfavqu91W+3NU8T/DlKUhWfZUkemyR1oALUYrAt
+IGagN1o+xcTj+QwEIXBRwUdUbopodNytelnsJMN5g6mf+knwjOb5fHYk1JVRR+e5
+cCEXd7698ebgZrNMrDS8ehB+hn15um9S8tcq6i1mVmWC9vHtcM9RovmthGh/R0Ol
+RP/RxMNrKu6bEfKqNVhvXFrjBV5WC3kxTIHNEwtfIzhTYAdjDCedlHHiOH1OK8dt
+rXKFbGECgYEA+Ix3MZJLtZIswAMzOl7J3elcUUT3RSpS3LF2F+Xg4iMTs3LEKj9C
+l5cAtnXxi1myyIKvSEKl95X8ZGtaQstJYHV/tmF5wl2VUtf2SnWhRgcVRCHnDmcC
+8FFMnpxNRMiEE6mUiftmAqveEnY9VosE08u9SJ7f58zEXYWBRTnQ+pECgYEAhLrX
+xVoKNz/iiCDKe/Pzjai/rXuspbgLvqFoY133fefd8mn3Wsn/xLf3C5eyFGqFucAQ
+fP1yFWIq7zGw40xdDaPYMiwX+gdOF5BM7z9nTKywQ+7jHq9OrVJkeW6PtD6+sTxV
+K4EaIqpnNE4+phlv1QN0aVP+2KOhw0ZVPUjxolsCgYEA0wmBk0einRL2iDqvXppp
+UND6H88tHT8oiFbt7LC1V41tBuslgLGh+1CtvD88zpNk6Dd+WR6uCSEC4sj8JMaz
+EQHzZIozdkM7rNHOP77NJsaQ2f7nTyVMK3z8T5hrS0HuUzuj8dzR6ua/cnGO91Km
+0Kanm2e6ufj1qmrXLk4/EOECgYBeXw6tdjCPSfACQ/ZUHYbM8O+gJLADgBFxsAet
+pxEiRysKggdqWPdu4jJX3rqyQ27jPEk85WMpCwxl15nictgyq407VxiRIIKIxIO/
+FACZhqspEgAQQCsbltpzcIXibT5ee/w+m2N+xFPu37cxmCJofTVW8m7fj7CjTC2t
+DmEnwwKBgAyxCdceXdUytwajEDj2sD6pnBfRhfK4nIVX8k1ULX2dfPiQANhJw1/H
+kFxp/a0x7SqnZlO//DYGqfQNPDocVCZtYIgn2jzLzQHatyr/PDkvAImU+L2Ra+Oj
+9n2xD49YJun+M4PC4D1Fe82qJLfAJoVr7ti8sID+sEQqvC6L/Tkp
+-----END RSA PRIVATE KEY-----

https/zhibo.xueyoubangedu.com.pem

+-----BEGIN CERTIFICATE-----
+MIIFlzCCBH+gAwIBAgIQCmH3rSS/W1zWfgBLO/aCQjANBgkqhkiG9w0BAQsFADBu
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMS0wKwYDVQQDEyRFbmNyeXB0aW9uIEV2ZXJ5d2hlcmUg
+RFYgVExTIENBIC0gRzEwHhcNMTkwNzA1MDAwMDAwWhcNMjAwNzA0MTIwMDAwWjAi
+MSAwHgYDVQQDExd6aGliby54dWV5b3ViYW5nZWR1LmNvbTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAIDd1QG9EPysvoN+VWtqQZg/yVEMEeqwcXyB7VMV
+z2Mz7HCW04l018BYjbJBghDw/vPQxY8l1kqwgsymVqS+c254FJtNjgoBGbQG0Ikn
+xDXBX19m+2BvVEY+urWt1nxu/UjslhKPK9pG2dQZBv2jqL817epdUBZC3xp7wavh
+XHykYmZPTb91WzfklT6UuChGUuAx7x0yYiKoY1iYykmcmB4kyCsLxefAIqdg+EUK
+ABnQRmDShFQNmPLwyqnWdfcGlexif7uLVz2tx4VkztRNoGTilnCMo6/VQI1KKc84
+BLtkPCZes7f5on4Ny/vrzgkbxWk0zhWrJ1PpBVTP83ZZ04sCAwEAAaOCAnswggJ3
+MB8GA1UdIwQYMBaAFFV0T7JyT/VgulDR1+ZRXJoBhxrXMB0GA1UdDgQWBBRuAgbG
+UTHW6grUhd1Kq8hPOjvTjzAiBgNVHREEGzAZghd6aGliby54dWV5b3ViYW5nZWR1
+LmNvbTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMEwGA1UdIARFMEMwNwYJYIZIAYb9bAECMCowKAYIKwYBBQUHAgEWHGh0dHBz
+Oi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQIBMIGABggrBgEFBQcBAQR0
+MHIwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBKBggrBgEF
+BQcwAoY+aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0VuY3J5cHRpb25FdmVy
+eXdoZXJlRFZUTFNDQS1HMS5jcnQwCQYDVR0TBAIwADCCAQQGCisGAQQB1nkCBAIE
+gfUEgfIA8AB2ALvZ37wfinG1k5Qjl6qSe0c4V5UKq1LoGpCWZDaOHtGFAAABa7/n
+6wEAAAQDAEcwRQIhAKFCj3nYM29dPBV4PIZsodTsomVzBvlYZx88SpI+udaxAiAF
+HevF5ksqO6f//oSQuqzOLK2xltEWoe6W/AkhW3R8ggB2AF6nc/nfVsDntTZIfdBJ
+4DJ6kZoMhKESEoQYdZaBcUVYAAABa7/n6lMAAAQDAEcwRQIgKxBsvvP5HEqXGx9f
+ZSm6ZzYrD+84vs66iTh3u95zIKUCIQD8rvUEnBJqCD4GUZY1NQVa1rFTdA7vznit
+6feflXXgzTANBgkqhkiG9w0BAQsFAAOCAQEAkp3/3qRAtrC7KoH37dcRQoIGjVuz
+3v5GTkycnAITNkc1qjZMiDHgplsuOGcd4tc4PI3H7y3WhHJubIIg8vpmQs/BKQy6
+fRVjA4qqnJ6BPYOwCaNllLxbtNj8M267B0AA4im8OoFLls4xwMGDD8WRrZkqk06V
+NsS7mzMJMqSRfJm9V2wO9kq0Hva4ERbeQafCi0ezH97C5ZJEFaBaOUI5qkkYaSK+
+dbT9mgSoifvvv6TD1W8cFVjhoH0rT4y/fAaDPodFdpDpVRtcQS6hbFgCUB28fTMv
+Wl5JIcGChQCcdZns9wscV5DTJBHI3fMJMWDmkPDopYF/lLfDpsALVTfLSg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIQAnmsRYvBskWr+YBTzSybsTANBgkqhkiG9w0BAQsFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0xNzExMjcxMjQ2MTBaFw0yNzExMjcxMjQ2MTBaMG4xCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBH
+MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALPeP6wkab41dyQh6mKc
+oHqt3jRIxW5MDvf9QyiOR7VfFwK656es0UFiIb74N9pRntzF1UgYzDGu3ppZVMdo
+lbxhm6dWS9OK/lFehKNT0OYI9aqk6F+U7cA6jxSC+iDBPXwdF4rs3KRyp3aQn6pj
+pp1yr7IB6Y4zv72Ee/PlZ/6rK6InC6WpK0nPVOYR7n9iDuPe1E4IxUMBH/T33+3h
+yuH3dvfgiWUOUkjdpMbyxX+XNle5uEIiyBsi4IvbcTCh8ruifCIi5mDXkZrnMT8n
+wfYCV6v6kDdXkbgGRLKsR4pucbJtbKqIkUGxuZI2t7pfewKRc5nWecvDBZf3+p1M
+pA8CAwEAAaOCAU8wggFLMB0GA1UdDgQWBBRVdE+yck/1YLpQ0dfmUVyaAYca1zAf
+BgNVHSMEGDAWgBQD3lA1VtFMu2bwo+IbG8OXsj3RVTAOBgNVHQ8BAf8EBAMCAYYw
+HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8C
+AQAwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp
+Y2VydC5jb20wQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQu
+Y29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG
+/WwBAjAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
+MAgGBmeBDAECATANBgkqhkiG9w0BAQsFAAOCAQEAK3Gp6/aGq7aBZsxf/oQ+TD/B
+SwW3AU4ETK+GQf2kFzYZkby5SFrHdPomunx2HBzViUchGoofGgg7gHW0W3MlQAXW
+M0r5LUvStcr82QDWYNPaUy4taCQmyaJ+VB+6wxHstSigOlSNF2a6vg4rgexixeiV
+4YSB03Yqp2t3TeZHM9ESfkus74nQyW7pRGezj+TC44xCagCQQOzzNmzEAP2SnCrJ
+sNE2DpRVMnL8J6xBRdjmOsC3N6cQuKuRXbzByVBjCqAA8t1L0I+9wXJerLPyErjy
+rMKWaBFLmfK/AHNF4ZihwPGOc7w6UHczBZXH5RFzJNnww+WnKuTPI0HfnVH8lg==
+-----END CERTIFICATE-----

index.js

 var express = require('express');
 var app = express();
-app.use(express.static('public'));
-var server = app.listen(3001, function(){
-  console.log('http listening on *:3001');
-});
-// var http = require('http').createServer(app);
-// var https = require("https");
+// app.use(express.static('public'));
+// 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");
-
+// var io = require('socket.io').listen(server);
+var io = require('socket.io')(http);
+let fs = require("fs");
 
 // app.all('*', function(req, res, next) {
 //     res.header("Access-Control-Allow-Origin", "*");
@@ -20,19 +19,6 @@ var io = require('socket.io').listen(server);
 //     res.header("Content-Type", "application/json;charset=utf-8");
 //     next();
 // });
-//allow custom header and CORS
-// app.all('*',function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin','https://zhibo.xueyoubangedu.com https://livesocket.xueyoubangedu.com');
-//   res.header('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild');
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET, DELETE, OPTIONS');
-
-//   if (req.method == 'OPTIONS') {
-//     res.send(200); 
-//   }
-//   else {
-//     next();
-//   }
-// });
 
 // var BaseUrl = "http://localhost/api/";
 var BaseUrl = "https://zhibo.xueyoubangedu.com/api/";
@@ -44,6 +30,11 @@ var BaseUrl = "https://zhibo.xueyoubangedu.com/api/";
 //     cert: fs.readFileSync("./https/fullchain.pem")
 // }
 
+const httpsOption = {
+    key : fs.readFileSync("./https/zhibo.xueyoubangedu.com.key"),
+    cert: fs.readFileSync("./https/zhibo.xueyoubangedu.com.pem")
+}
+
 app.get('/', function(req, res){
  res.send('<h1>Hello world</h1>');
 });
@@ -127,11 +118,11 @@ io.on('connection', function(socket){
 });
 
 
-// http.listen(3001, function(){
-//   console.log('http listening on *:3001');
-// });
+http.listen(3001, function(){
+  console.log('http listening on *:3001');
+});
 
 
-// https.createServer(httpsOption, app).listen(3000, function(){
-//   console.log('https listening on *:3000');
-// });
+https.createServer(httpsOption, app).listen(3000, function(){
+  console.log('https listening on *:3000');
+});
\ No newline at end of file