Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

constants/websocket.go

@@ -9,6 +9,9 @@ const (
 	WEBSOCKET_CONNECT_SUCCESS Websocket = "WEBSOCKET_CONNECT_SUCCESS" //ws连接成功 （1级消息，单向通信）
 )
 
+// 心跳
+const WEBSOCKET_HEARTBEAT Websocket = "WEBSOCKET_HEARTBEAT"
+
 // websocket消息类型(通用通知类别)
 const (
 	WEBSOCKET_COMMON_NOTIFY Websocket = "WEBSOCKET_COMMON_NOTIFY" //通用回调通知（1级消息，单向通信）

server/websocket/internal/logic/datatransferlogic.go

@@ -322,7 +322,14 @@ func (w *wsConnectItem) heartbeat() {
 				w.debug = nil
 			}
 			//发送心跳信息
-			if err := w.conn.WriteMessage(websocket.PongMessage, nil); err != nil {
+			var d interface{}
+			if w.debug != nil {
+				d = websocket_data.HeartBeatMsg{
+					WsCount:      currentWebsocketConnectCount,
+					CombineCount: currentRequestCombineApiCount,
+				}
+			}
+			if err := w.conn.WriteMessage(websocket.PongMessage, w.respondDataFormat(constants.WEBSOCKET_HEARTBEAT, d)); err != nil {
 				logx.Error("发送心跳信息异常，关闭连接:", w.uniqueId, err)
 				w.close()
 				return

server/websocket/internal/logic/ws_render_image.go

@@ -111,11 +111,11 @@ func (w *wsConnectItem) consumeRenderImageData() {
 			}
 			limitChan <- struct{}{}
 			go func(d websocket_data.RenderImageReqMsg) {
-				defer func() {
+				/*	defer func() {
 					if err := recover(); err != nil {
 						logx.Error("func renderImage main panic:", err)
 					}
-				}()
+				}()*/
 				//临时chan用select io多路复用去判断携程退出
 				tmpChan := make(chan struct{}, 1)
 				defer close(tmpChan)

utils/websocket_data/base_data.go

@@ -23,3 +23,9 @@ type ConnectErrMsg struct {
 type ConnectUnAuth struct {
 	Message string `json:"message"`
 }
+
+// 心跳数据
+type HeartBeatMsg struct {
+	WsCount      int `json:"ws_count"`
+	CombineCount int `json:"combine_count"`
+}