Commit de1dfbad authored by 何硕's avatar 何硕

Merge branch 'heshuo' into 'master'

test wss

See merge request !8
parents dc08b1e6 b846ea5c
-----BEGIN CERTIFICATE-----
MIIFojCCBIqgAwIBAgIQC6Mi4gidwXXjr0WBqIvtjDANBgkqhkiG9w0BAQsFADBu
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
d3cuZGlnaWNlcnQuY29tMS0wKwYDVQQDEyRFbmNyeXB0aW9uIEV2ZXJ5d2hlcmUg
RFYgVExTIENBIC0gRzEwHhcNMTkwODEzMDAwMDAwWhcNMjAwODEyMTIwMDAwWjAn
MSUwIwYDVQQDExxsaXZlc29ja2V0Lnh1ZXlvdWJhbmdlZHUuY29tMIIBIjANBgkq
hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlSdnaE8HQfAqr7l9fM6qG1/dGa5eX7aQ
ZuuUOyXV39pf+00o+peHIVQGBl3sb9B27b+YJEdUwxiraXReerEaC9dfjns5QUHN
n7sj8KL6ohiOVwndhYzt2xCyHd436G2WGTZRwOyNoXPwlX3WN+a8OuCYLSAUWpfH
gZJGoZzUGCh5zl7inX7vDTBjGV/Fl4AoyyXCpwgnTQrEs7cY18Cz02FNN5bIPkaz
E2FSoPOsxCm7Y3c0BQiy0ilLqDOPoaHS4zi3JH44RuSr/6+SUfYHzfp+yqzbip/c
xVVfTRbZVAXIPpprXPVIW4Ogbvz/J+iY3QjqKnbOOd6KXDn4KO9cKQIDAQABo4IC
gTCCAn0wHwYDVR0jBBgwFoAUVXRPsnJP9WC6UNHX5lFcmgGHGtcwHQYDVR0OBBYE
FEWPst8QZFbFjdnehsH8MYgrE/CAMCcGA1UdEQQgMB6CHGxpdmVzb2NrZXQueHVl
eW91YmFuZ2VkdS5jb20wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
BwMBBggrBgEFBQcDAjBMBgNVHSAERTBDMDcGCWCGSAGG/WwBAjAqMCgGCCsGAQUF
BwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAgGBmeBDAECATCBgAYI
KwYBBQUHAQEEdDByMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j
b20wSgYIKwYBBQUHMAKGPmh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9FbmNy
eXB0aW9uRXZlcnl3aGVyZURWVExTQ0EtRzEuY3J0MAkGA1UdEwQCMAAwggEFBgor
BgEEAdZ5AgQCBIH2BIHzAPEAdwCkuQmQtBhYFIe7E6LMZ3AKPDWYBPkb37jjd80O
yA3cEAAAAWyKWx7AAAAEAwBIMEYCIQD5hCJ9NC3vfUeFvyp63QFOZczoD8lbKz5C
TdhOiJPpTgIhALbd667fxeEUcUcgHrIuVUVkk37IxKqihc3CSn2if3ILAHYAXqdz
+d9WwOe1Nkh90EngMnqRmgyEoRIShBh1loFxRVgAAAFsilseFgAABAMARzBFAiEA
ql9xJtO1a7RsykWaamS3qs+6Nf9VvavCHwbMQ5BVg0ACIAlpnss+TjRUsdf/EE4k
1XgWcwIZpAko9/XfdJmwGXvlMA0GCSqGSIb3DQEBCwUAA4IBAQCOGqtlvZvgZ/hV
fLRV9YhkRMC2L7jdx9OawvHJB0J0v9YhqjaEqgznrUDTIs0OF4I/NSw9j2jLQROG
kqU7674MQnpqIXDakciQoIX1A1IvEdLVfM+mWol47jtB6ZALqGeIqEzDG7KHAT7v
M1YPdScESRsfGVzhoRo2bWTC5i6e7VBnzf+AwEUYjAzagZNCV9hFWYMBZSdqZ8p+
i5hrFn+1H1wZ8n/CL+nzBShlXW9DlaC8mWonJ6mJuPWLiPBzHMj0uoT4/6AZQ2cs
NvKWqRalDHegxZBquQZVUAcFv8s7B+xF7t1+IZNXdLklm8Wd75yQXJmnuwLnsgsM
usWS/li8
-----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-----
-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAlSdnaE8HQfAqr7l9fM6qG1/dGa5eX7aQZuuUOyXV39pf+00o
+peHIVQGBl3sb9B27b+YJEdUwxiraXReerEaC9dfjns5QUHNn7sj8KL6ohiOVwnd
hYzt2xCyHd436G2WGTZRwOyNoXPwlX3WN+a8OuCYLSAUWpfHgZJGoZzUGCh5zl7i
nX7vDTBjGV/Fl4AoyyXCpwgnTQrEs7cY18Cz02FNN5bIPkazE2FSoPOsxCm7Y3c0
BQiy0ilLqDOPoaHS4zi3JH44RuSr/6+SUfYHzfp+yqzbip/cxVVfTRbZVAXIPppr
XPVIW4Ogbvz/J+iY3QjqKnbOOd6KXDn4KO9cKQIDAQABAoIBAGwIj3jZDQuwlmqT
cxYsZr/PLsmEJ+0xweQaLFKvM/uhI7ZVDCJ+EK2OO5LvAut2Vj4ccWmNlRJ+0uFe
HXTGxHPhOuBr1muy6uoQVZbdpaY1HRxkE+TA0CPFMw45P8uFXJvEYXDYpjlUTeUp
sTjqUlpfBTpiKvv3RdVPCwPSITmhK0/JnuJxVnL9uQcGLaCZ+TaHvZwLhiY62efn
92DZg0qXQ6pYQqv3bS3b77IHGYSFTdg38iB0d6WUogHCig+XGOCWzqtsvZlXpEGN
kztgGWkTMOBV9uFUW6iUDZv17Sb+SsUKa/3GTJ8UnYu6EQ0aniJ1w/I+y7X6659N
trM12QECgYEA/CHGW1iJrCgaCGuDT/9M2wXsCAKP5tKs94qD3mspFypGogH0O/dF
zHbG8AOodX0R857GkhE3L2tEkAmHTEYL6ReqqvBiMSH4riEDy9NhkOOQfioJrYh8
z6aaMzCjaxlOZaGpu9TK89/C7Br+K0p9DB2Qll52AG4Owmm7OO1JBaECgYEAl3Ex
PlmxYru7oLbDjm+Tv2iqcoBlMSWkedGlQvOVt9+AE8bAASBJZIU5TCykA5aBdD6E
0W4fdot2PPJzOlAhSYnkOI3lLPb/zAKydVzOppKXYR23zSYKzIzR4vdEypcXLUTn
Z3baLr8gSrW6tbu8vXI8zXv9GsLA3x6mr/+KuYkCgYEA+Tg5ZVli3DTXZrM/HPfx
9B0qbdB6hWKBbj4Qku3BtBApuUHNNOj6qVxO0DgNb/Sspe6vwPobXlfdcbK5df9X
DpRCMq1hocc+lIA1zGeo7RrDXLIY1tsu4+J+UVMmdVqST4s4x11TLzRi7BbSXeBH
Mo6WuMuuQEaJeEoiseZ6Y4ECgYAtKE18wBYK0Nvz4kuRr2epDba1id+itgzDXmYe
/q9IMtboDr22GECKPseFFVKa10gmt3W3VVUAbjmFlu4RF0+1s+5fhsAtlkFUPgGk
yVW9ibyl8syZ2ZwivmLfgMf8eO0qTH+L9H6+rbMdU+8mvaJcAzJqO2yPjD8iyOr/
U/2zsQKBgDeeCybCwV0/aekSWOgaS8tEvOtaAc6otAvqlg26zihk691AE64Vg/YS
LJ4SaJsmAKEm6/VEPEamPZOurgKq6Q8Uwq4z1Qox643+wobxpQKHx1o8YdZs6V+u
AbT74Unp9htHBDo0fdMv6ywT2/hxXnKlzid63wBakTFDbm6+o9qb
-----END RSA PRIVATE KEY-----
......@@ -11,8 +11,8 @@ var BaseUrl = "https://zhibo.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")
key : fs.readFileSync("./https/privkey.pem"),
cert: fs.readFileSync("./https/fullchain.pem")
}
app.get('/', function(req, res){
......
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