Skip to content

L
liveserver
Commit e5a07cd4 authored by 何硕's avatar 何硕
Browse files
Options

Merge branch 'heshuo' into 'master' 

更改中断的操作以及删除证书

See merge request !26
parents bb891e7b 6aa1792f
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 196 deletions
https/fullchain.pem deleted 100644 → 0
View file @ bb891e7b
-----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-----
https/privkey.pem deleted 100644 → 0
View file @ bb891e7b
-----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-----
https/zhibo.xueyoubangedu.com.key deleted 100644 → 0
View file @ bb891e7b
-----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 deleted 100644 → 0
View file @ bb891e7b
-----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
View file @ e5a07cd4
...@@ -22,18 +22,19 @@ io.on('connection', function(socket){ ...@@ -22,18 +22,19 @@ io.on('connection', function(socket){
var status = obj.status; //用户状态 var status = obj.status; //用户状态
socket.nickname = roomid+ '***' + userid; socket.nickname = roomid+ '***' + userid;
console.log("login------------------"+socket.nickname); console.log("login------------------"+socket.nickname);
socket.join(roomid); // 加入房间
axios.post(BaseUrl + 'websocket/login', { axios.post(BaseUrl + 'websocket/login', {
roomid: roomid, roomid: roomid,
userid: userid, userid: userid,
status: status status: status
}) })
.then(function (response) { .then(function (response) {
// console.log(response.data); console.log(response.data);
var str = socket.nickname.split("***"); var str = socket.nickname.split("***");
var userid = str[1]; var userid = str[1];
var roomid = str[0]; var roomid = str[0];
io.emit(roomid + 'Login', {userid: userid, roomid: roomid}); io.to(roomid).emit('Login', {userid: userid, roomid: roomid});
}) })
.catch(function (error) { .catch(function (error) {
console.log(error); console.log(error);
...@@ -44,29 +45,29 @@ io.on('connection', function(socket){ ...@@ -44,29 +45,29 @@ io.on('connection', function(socket){
socket.on('disconnect', function(obj){ socket.on('disconnect', function(obj){
console.log('user disconnected--------'+socket.nickname); console.log('user disconnected--------'+socket.nickname);
console.log(obj); console.log(obj);
//最后结束不走中断 if (socket.nickname) {
if (obj != 'client namespace disconnect') { axios.post(BaseUrl + 'websocket/disconnect', {
if (socket.nickname) { socketName: socket.nickname
axios.post(BaseUrl + 'websocket/disconnect', { })
socketName: socket.nickname .then(function (response) {
}) // console.log(response.data);
.then(function (response) { if (response.data.meta.code == 200) {
// console.log(response.data);
var str = socket.nickname.split("***"); var str = socket.nickname.split("***");
var userid = str[1]; var userid = str[1];
var roomid = str[0]; var roomid = str[0];
var user = response.data.data; var user = response.data.data;
io.emit(roomid + 'BREAKCLASS', {userid: userid, roomid: roomid, user: user}); io.to(roomid).emit('BREAKCLASS', {userid: userid, roomid: roomid, user: user});
}) }
.catch(function (error) { })
console.log(error.data); .catch(function (error) {
}); console.log(error.data);
} });
} }
}); });
//下课 //下课
socket.on('loginout', function(obj){ socket.on('loginout', function(obj){
console.log("loginout----"+socket.nickname); console.log("loginout----"+socket.nickname);
// 退出房间
if (socket.nickname) { if (socket.nickname) {
axios.post(BaseUrl + 'websocket/loginout', { axios.post(BaseUrl + 'websocket/loginout', {
socketName: socket.nickname socketName: socket.nickname
...@@ -77,18 +78,13 @@ io.on('connection', function(socket){ ...@@ -77,18 +78,13 @@ io.on('connection', function(socket){
var userid = str[1]; var userid = str[1];
var roomid = str[0]; var roomid = str[0];
var user = response.data.data; var user = response.data.data;
io.emit(roomid + 'ENDCLASS', {userid: userid, roomid: roomid, user: user}); io.to(roomid).emit('ENDCLASS', {userid: userid, roomid: roomid, user: user});
}) })
.catch(function (error) { .catch(function (error) {
console.log(error.data); console.log(error.data);
}); });
} }
}); });
//开课
// socket.on('STARTCLASS', function(obj){
// console.log("STARTCLASS----------------------------");
// io.emit('STARTCLASS', obj);
// });
}); });
......
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