From 34eaad2144dbd933e1c33827e0713b4d2f67a63b Mon Sep 17 00:00:00 2001 From: tangtaoit Date: Thu, 23 Nov 2023 15:33:24 +0800 Subject: [PATCH] reactor: remove fmt.println --- internal/server/api_channel.go | 3 --- internal/server/api_conversation.go | 1 - internal/server/api_monitor.go | 1 - internal/server/dispatch.go | 2 -- internal/server/processor.go | 8 -------- pkg/grpcpool/pool_test.go | 2 -- 6 files changed, 17 deletions(-) diff --git a/internal/server/api_channel.go b/internal/server/api_channel.go index 4e368dd..188a000 100644 --- a/internal/server/api_channel.go +++ b/internal/server/api_channel.go @@ -1,7 +1,6 @@ package server import ( - "fmt" "net/http" "strings" @@ -596,8 +595,6 @@ func (ch *ChannelAPI) syncMessages(c *wkhttp.Context) { fakeChannelID = GetFakeChannelIDWith(req.LoginUID, req.ChannelID) } - fmt.Println("fakeChannelID:", fakeChannelID, "req.ChannelType:", req.ChannelType, "req.StartMessageSeq:", req.StartMessageSeq, "req.EndMessageSeq:", req.EndMessageSeq, "limit:", limit) - if req.StartMessageSeq == 0 && req.EndMessageSeq == 0 { messages, err = ch.s.store.LoadLastMsgs(fakeChannelID, req.ChannelType, limit) } else if req.PullMode == PullModeUp { // 向上拉取 diff --git a/internal/server/api_conversation.go b/internal/server/api_conversation.go index 2c547a6..76eabe4 100644 --- a/internal/server/api_conversation.go +++ b/internal/server/api_conversation.go @@ -203,7 +203,6 @@ func (s *ConversationAPI) syncUserConversation(c *wkhttp.Context) { } conversations := s.s.conversationManager.GetConversations(req.UID, req.Version, req.Larges) - fmt.Println("conversations---->", len(conversations)) var newConversations = make([]*wkstore.Conversation, 0, len(conversations)+20) if conversations != nil { newConversations = append(newConversations, conversations...) diff --git a/internal/server/api_monitor.go b/internal/server/api_monitor.go index 9e9f661..965a092 100644 --- a/internal/server/api_monitor.go +++ b/internal/server/api_monitor.go @@ -288,7 +288,6 @@ func (m *MonitorAPI) channels(c *wkhttp.Context) { fromUID, toUID := GetFromUIDAndToUIDWith(channelID) fakeChannelID = GetFakeChannelIDWith(fromUID, toUID) } - fmt.Println("fakeChannelID--->", fakeChannelID) channelInfo, err := m.s.channelManager.GetChannel(fakeChannelID, channelType) if err != nil { m.Error("get channel error", zap.Error(err)) diff --git a/internal/server/dispatch.go b/internal/server/dispatch.go index 211f855..d0c9bb8 100644 --- a/internal/server/dispatch.go +++ b/internal/server/dispatch.go @@ -1,7 +1,6 @@ package server import ( - "fmt" "strings" "sync" "time" @@ -70,7 +69,6 @@ func (d *Dispatch) dataIn(conn wknet.Conn) error { return nil } if !conn.IsAuthed() { // conn is not authed must be connect packet - fmt.Println("conn is not authed must be connect packet------>") packet, _, err := d.s.opts.Proto.DecodeFrame(data, wkproto.LatestVersion) if err != nil { d.Warn("Failed to decode the message", zap.Error(err)) diff --git a/internal/server/processor.go b/internal/server/processor.go index 3e8f9fc..d78bd01 100644 --- a/internal/server/processor.go +++ b/internal/server/processor.go @@ -95,13 +95,11 @@ func (p *Processor) processAuth(conn wknet.Conn, connectPacket *wkproto.ConnectP devceLevelI uint8 token string ) - fmt.Println("processAuth-------------->", connectPacket.String()) if strings.TrimSpace(connectPacket.ClientKey) == "" { p.responseConnackAuthFail(conn) return } // -------------------- token verify -------------------- - fmt.Println("processAuth-------------->1") if connectPacket.UID == p.s.opts.ManagerUID { if p.s.opts.ManagerTokenOn && connectPacket.Token != p.s.opts.ManagerToken { p.Error("manager token verify fail", zap.String("uid", uid), zap.String("token", connectPacket.Token)) @@ -130,7 +128,6 @@ func (p *Processor) processAuth(conn wknet.Conn, connectPacket *wkproto.ConnectP } else { devceLevel = wkproto.DeviceLevelSlave // 默认都是slave设备 } - fmt.Println("processAuth-------------->2") // -------------------- ban -------------------- userChannelInfo, err := p.s.store.GetChannel(uid, wkproto.ChannelTypePerson) @@ -149,8 +146,6 @@ func (p *Processor) processAuth(conn wknet.Conn, connectPacket *wkproto.ConnectP return } - fmt.Println("processAuth-------------->3") - // -------------------- get message encrypt key -------------------- dhServerPrivKey, dhServerPublicKey := wkutil.GetCurve25519KeypPair() // 生成服务器的DH密钥对 aesKey, aesIV, err := p.getClientAesKeyAndIV(connectPacket.ClientKey, dhServerPrivKey) @@ -161,7 +156,6 @@ func (p *Processor) processAuth(conn wknet.Conn, connectPacket *wkproto.ConnectP } dhServerPublicKeyEnc := base64.StdEncoding.EncodeToString(dhServerPublicKey[:]) - fmt.Println("processAuth-------------->4") // -------------------- same master kicks each other -------------------- oldConns := p.s.connManager.GetConnsWith(uid, connectPacket.DeviceFlag) if len(oldConns) > 0 && devceLevel == wkproto.DeviceLevelMaster { @@ -184,7 +178,6 @@ func (p *Processor) processAuth(conn wknet.Conn, connectPacket *wkproto.ConnectP p.Debug("close old conn", zap.Any("oldConn", oldConn)) } } - fmt.Println("processAuth-------------->5") // -------------------- set conn info -------------------- timeDiff := time.Now().UnixNano()/1000/1000 - connectPacket.ClientTimestamp @@ -541,7 +534,6 @@ func (p *Processor) sendPacketIsVail(sendPacket *wkproto.SendPacket, c wknet.Con // #################### subscribe #################### func (p *Processor) processSubs(conn wknet.Conn, subPackets []*wkproto.SubPacket) { - fmt.Println("subPackets--->", len(subPackets)) for _, subPacket := range subPackets { p.processSub(conn, subPacket) } diff --git a/pkg/grpcpool/pool_test.go b/pkg/grpcpool/pool_test.go index 707c178..4e04524 100644 --- a/pkg/grpcpool/pool_test.go +++ b/pkg/grpcpool/pool_test.go @@ -2,7 +2,6 @@ package grpcpool import ( "context" - "fmt" "testing" "time" @@ -12,7 +11,6 @@ import ( func TestNew(t *testing.T) { p, err := New(func() (*grpc.ClientConn, error) { - fmt.Println("conn----->") return grpc.Dial("example.com", grpc.WithInsecure()) }, 1, 3, 0) if err != nil {