ThePain/CasaOS
1
0
Fork 0
mirror of https://github.com/IceWhaleTech/CasaOS.git synced 2025-11-06 22:59:44 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
link 2023-03-06 05:48:51 +00:00
parent 672574ed01
commit 1ffff6ba11
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
route/v1/file.go
View File

@ -1018,13 +1018,6 @@ func ConnectWebSocket(c *gin.Context) {
} }
http.SetCookie(writer, &cookie) http.SetCookie(writer, &cookie)
pmsg := make(map[string]interface{})
pmsg["type"] = "peer-joined"
pmsg["peer"] = client
pby, err := json.Marshal(pmsg)
fmt.Println(err)
client.handler.broadcast <- pby
// 推给监控中心注册到用户集合中 // 推给监控中心注册到用户集合中
handler.register <- client handler.register <- client
if len(list) > 10 { if len(list) > 10 {
@ -1054,11 +1047,9 @@ func ConnectWebSocket(c *gin.Context) {
fmt.Println("解决完后依然有溢出", list) fmt.Println("解决完后依然有溢出", list)
} }
clients := []Client{} clients := []Client{}
for _, v := range list { for _, v := range client.handler.clients {
if _, ok := handler.clients[v.ID]; ok { if _, ok := handler.clients[v.ID]; ok {
clients = append(clients, *handler.clients[v.ID]) clients = append(clients, *handler.clients[v.ID])
} else {
clients = append(clients, Client{ID: v.ID, Name: service.GetNameByDB(v), IP: v.IP, Offline: true})
} }
} }
@ -1069,6 +1060,13 @@ func ConnectWebSocket(c *gin.Context) {
fmt.Println(err) fmt.Println(err)
client.handler.broadcast <- otherBy client.handler.broadcast <- otherBy
pmsg := make(map[string]interface{})
pmsg["type"] = "peer-joined"
pmsg["peer"] = client
pby, err := json.Marshal(pmsg)
fmt.Println(err)
client.handler.broadcast <- pby
data := make(map[string]string) data := make(map[string]string)
data["displayName"] = client.Name.DisplayName data["displayName"] = client.Name.DisplayName
data["deviceName"] = client.Name.DeviceName data["deviceName"] = client.Name.DeviceName
@ -1143,22 +1141,22 @@ func (c *Client) readPump() {
if t.String() == "disconnect" { if t.String() == "disconnect" {
c.handler.unregister <- c c.handler.unregister <- c
c.conn.Close() c.conn.Close()
clients := []Client{} // clients := []Client{}
list := service.MyService.Peer().GetPeers() // list := service.MyService.Peer().GetPeers()
for _, v := range list { // for _, v := range list {
if _, ok := handler.clients[v.ID]; ok { // if _, ok := handler.clients[v.ID]; ok {
clients = append(clients, *handler.clients[v.ID]) // clients = append(clients, *handler.clients[v.ID])
} else { // } else {
clients = append(clients, Client{ID: v.ID, Name: service.GetNameByDB(v), IP: v.IP, Offline: true}) // clients = append(clients, Client{ID: v.ID, Name: service.GetNameByDB(v), IP: v.IP, Offline: true})
} // }
} // }
other := make(map[string]interface{}) // other := make(map[string]interface{})
other["type"] = "peers" // other["type"] = "peers"
other["peers"] = clients // other["peers"] = clients
otherBy, err := json.Marshal(other) // otherBy, err := json.Marshal(other)
fmt.Println(err) // fmt.Println(err)
c.handler.broadcast <- []byte(`{"type":"peer-left","peerId":"` + c.ID + `"}`) c.handler.broadcast <- []byte(`{"type":"peer-left","peerId":"` + c.ID + `"}`)
c.handler.broadcast <- otherBy //c.handler.broadcast <- otherBy
break break
} else if t.String() == "pong" { } else if t.String() == "pong" {
c.LastBeat = time.Now() c.LastBeat = time.Now()