Compare commits
No commits in common. "6c6995d2dd902fc083a04c2651f9d657df3dfb72" and "622cd80380ec6b2c7e662d148b8a4082e17e1972" have entirely different histories.
6c6995d2dd
...
622cd80380
|
|
@ -36,7 +36,4 @@ config.local.yaml
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
# 需求文件
|
# 需求文件
|
||||||
todo.txt
|
todo.txt
|
||||||
|
|
||||||
# 测试文件
|
|
||||||
test/
|
|
||||||
|
|
@ -118,22 +118,14 @@ func (c *WSClient) closeConn() {
|
||||||
c.isConnected = false
|
c.isConnected = false
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *WSClient) connect() error {
|
func (c *WSClient) connect() any {
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
|
||||||
conn, _, err := websocket.DefaultDialer.Dial(c.config.ServerURL, nil)
|
conn, _, err := websocket.DefaultDialer.Dial(c.config.ServerURL, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
c.mu.Lock()
|
|
||||||
defer c.mu.Unlock()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-c.stopChan:
|
|
||||||
conn.Close()
|
|
||||||
return nil
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
|
|
||||||
c.conn = conn
|
c.conn = conn
|
||||||
c.isConnected = true
|
c.isConnected = true
|
||||||
log.Printf("[网络] 成功连接到服务器: %s", c.config.ServerURL)
|
log.Printf("[网络] 成功连接到服务器: %s", c.config.ServerURL)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user