Merge branch 'heshuo' into 'master'

Heshuo

See merge request !7

index.js

 var app = require('express')();
 var http = require('http').createServer(app);
+var https = require("https");
 var axios = require('axios');
 var io = require('socket.io')(http);
-
-//跨域CORS设置
-app.use((req, res, next) => {
-    res.header("Access-Control-Allow-Origin", "*");
-    res.header("Access-Control-Allow-Methods", "*");
-    res.header("Access-Control-Allow-Credentials", "true");
-    res.header("Access-Control-Allow-Headers", "Content-Type,Access-Token,adminid");
-    res.header("Access-Control-Expose-Headers", "*");
-    if (req.method == 'OPTIONS') {
-      res.send(200); /*让options请求快速返回*/
-    } else {
-      next();
-    }
-});
+let fs = require("fs");
 
 // var BaseUrl = "http://localhost/api/";
 var BaseUrl = "https://zhibo.xueyoubangedu.com/api/";
 // var BaseUrl = "https://live.xueyoubangedu.com/api/";
 
+
+const httpsOption = {
+    key : fs.readFileSync("/etc/letsencrypt/live/livesocket.xueyoubangedu.com/privkey.pem"),
+    cert: fs.readFileSync("/etc/letsencrypt/live/livesocket.xueyoubangedu.com/fullchain.pem")
+}
+
 app.get('/', function(req, res){
  res.send('<h1>Hello world</h1>');
 });
@@ -104,7 +98,10 @@ io.on('connection', function(socket){
 });
 
 
+// http.listen(3000, function(){
+//   console.log('http listening on *:3000');
+// });
 
-http.listen(3000, function(){
-  console.log('listening on *:3000');
+https.createServer(httpsOption, app).listen(3000, function(){
+  console.log('https listening on *:3000');
 });
\ No newline at end of file