From 9d73fc99323833131c3e2dde4f4531f98b7fa185 Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Thu, 15 Sep 2022 12:55:40 +0800
Subject: [PATCH] Remove duplicate messageVerification call in sendMsg

---
 internal/rpc/msg/send_msg.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/internal/rpc/msg/send_msg.go b/internal/rpc/msg/send_msg.go
index dbc1ec6eb..4be38cee7 100644
--- a/internal/rpc/msg/send_msg.go
+++ b/internal/rpc/msg/send_msg.go
@@ -245,11 +245,11 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 	if !flag {
 		return returnMsg(&replay, pb, errCode, errMsg, "", 0)
 	}
-	flag, errCode, errMsg, _ = messageVerification(pb)
-	log.Info(pb.OperationID, "messageVerification ", flag, " cost time: ", time.Since(t1))
-	if !flag {
-		return returnMsg(&replay, pb, errCode, errMsg, "", 0)
-	}
+	//flag, errCode, errMsg, _ = messageVerification(pb)
+	//log.Info(pb.OperationID, "messageVerification ", flag, " cost time: ", time.Since(t1))
+	//if !flag {
+	//	return returnMsg(&replay, pb, errCode, errMsg, "", 0)
+	//}
 	t1 = time.Now()
 	rpc.encapsulateMsgData(pb.MsgData)
 	log.Info(pb.OperationID, "encapsulateMsgData ", " cost time: ", time.Since(t1))
@@ -287,6 +287,11 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 			promePkg.PromeInc(promePkg.SingleChatMsgProcessFailedCounter)
 			return returnMsg(&replay, pb, int32(callbackResp.ErrCode), callbackResp.ErrMsg, "", 0)
 		}
+		flag, errCode, errMsg, _ = messageVerification(pb)
+		log.Info(pb.OperationID, "messageVerification ", flag, " cost time: ", time.Since(t1))
+		if !flag {
+			return returnMsg(&replay, pb, errCode, errMsg, "", 0)
+		}
 		t1 = time.Now()
 		isSend := modifyMessageByUserMessageReceiveOpt(pb.MsgData.RecvID, pb.MsgData.SendID, constant.SingleChatType, pb)
 		log.Info(pb.OperationID, "modifyMessageByUserMessageReceiveOpt ", " cost time: ", time.Since(t1))