Merge remote-tracking branch 'origin/errcode' into errcode

docker-compose.yaml

@@ -54,7 +54,7 @@ services:
 
 
   zookeeper:
-    image: wurstmeister/zookeeper:latest
+    image: zookeeper
     ports:
       - 2181:2181
     container_name: zookeeper

internal/msggateway/n_ws_server.go

@@ -1,14 +1,14 @@
 package msggateway
 
 import (
-	context2 "context"
 	"errors"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"net/http"
 	"sync"
 	"sync/atomic"
 	"time"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
@@ -198,7 +198,7 @@ func (ws *WsServer) wsHandler(w http.ResponseWriter, r *http.Request) {
 		httpError(context, errs.ErrConnArgsErr)
 		return
 	}
-	log.ZDebug(context2.Background(), "conn", "platformID", platformID)
+	// log.ZDebug(context2.Background(), "conn", "platformID", platformID)
 	err := tokenverify.WsVerifyToken(token, userID, platformID)
 	if err != nil {
 		httpError(context, err)

pkg/common/log/zk_logger.go

@@ -8,5 +8,5 @@ import (
 type ZkLogger struct{}
 
 func (l *ZkLogger) Printf(format string, a ...interface{}) {
-	ZInfo(context.Background(), fmt.Sprintf(format, a...))
+	ZInfo(context.Background(), "zookeeper output", "msg", fmt.Sprintf(format, a...))
 }