diff --git a/src/modules/ws/processor/cdr_connect.go b/src/modules/ws/processor/cdr_connect.go index efebdb86..607e26e6 100644 --- a/src/modules/ws/processor/cdr_connect.go +++ b/src/modules/ws/processor/cdr_connect.go @@ -22,7 +22,7 @@ func GetCDRConnect(requestID string, data any) ([]byte, error) { dataMap := neDataService.NewCDREventImpl.SelectPage(query) resultByte, err := json.Marshal(result.Ok(map[string]any{ - "requestID": requestID, + "requestId": requestID, "data": dataMap, })) return resultByte, err diff --git a/src/modules/ws/processor/net_connect.go b/src/modules/ws/processor/net_connect.go index 6d2ed20d..d38c3ca0 100644 --- a/src/modules/ws/processor/net_connect.go +++ b/src/modules/ws/processor/net_connect.go @@ -54,7 +54,7 @@ func GetNetConnections(requestID string, data any) ([]byte, error) { } resultByte, err := json.Marshal(result.Ok(map[string]any{ - "requestID": requestID, + "requestId": requestID, "data": dataArr, })) return resultByte, err diff --git a/src/modules/ws/processor/ps_process.go b/src/modules/ws/processor/ps_process.go index 55e509ee..03238c01 100644 --- a/src/modules/ws/processor/ps_process.go +++ b/src/modules/ws/processor/ps_process.go @@ -135,7 +135,7 @@ func GetProcessData(requestID string, data any) ([]byte, error) { }) resultByte, err := json.Marshal(result.Ok(map[string]any{ - "requestID": requestID, + "requestId": requestID, "data": dataArr, })) return resultByte, err diff --git a/src/modules/ws/processor/ue_connect.go b/src/modules/ws/processor/ue_connect.go index ee54c81f..e43ecc99 100644 --- a/src/modules/ws/processor/ue_connect.go +++ b/src/modules/ws/processor/ue_connect.go @@ -22,7 +22,7 @@ func GetUEConnect(requestID string, data any) ([]byte, error) { dataMap := neDataService.NewUEEventImpl.SelectPage(query) resultByte, err := json.Marshal(result.Ok(map[string]any{ - "requestID": requestID, + "requestId": requestID, "data": dataMap, })) return resultByte, err diff --git a/src/modules/ws/service/ws.impl.go b/src/modules/ws/service/ws.impl.go index 46fa2866..2d64fd30 100644 --- a/src/modules/ws/service/ws.impl.go +++ b/src/modules/ws/service/ws.impl.go @@ -135,27 +135,13 @@ func (s *WSImpl) clientRead(wsClient *model.WSClient) { // clientWrite 客户端写入消息 func (s *WSImpl) clientWrite(wsClient *model.WSClient) { - ticker := time.NewTicker(time.Second * 5) // 设置心跳间隔为 5 秒钟 - defer ticker.Stop() - for { - select { - case <-ticker.C: - wsClient.LastHeartbeat = time.Now().UnixMilli() - // 发送 Ping 消息 - err := wsClient.Conn.WriteMessage(websocket.PingMessage, []byte{}) - if err != nil { - logger.Warnf("ws PingMessage UID %s err: %s", wsClient.BindUid, err.Error()) - s.CloseClient(wsClient.ID) - return - } - case msg := <-wsClient.MsgChan: - // 发送消息 - err := wsClient.Conn.WriteMessage(websocket.TextMessage, msg) - if err != nil { - logger.Warnf("ws WriteMessage UID %s err: %s", wsClient.BindUid, err.Error()) - s.CloseClient(wsClient.ID) - return - } + for msg := range wsClient.MsgChan { + // 发送消息 + err := wsClient.Conn.WriteMessage(websocket.TextMessage, msg) + if err != nil { + logger.Warnf("ws WriteMessage UID %s err: %s", wsClient.BindUid, err.Error()) + s.CloseClient(wsClient.ID) + return } } }