Error code standardization

internal/rpc/msg/send_msg.go

@@ -351,19 +351,10 @@ func GetMsgID(sendID string) string {
 	return utils.Md5(t + "-" + sendID + "-" + strconv.Itoa(rand.Int()))
 }
 
-func returnMsg(replay *pbChat.SendMsgResp, pb *pbChat.SendMsgReq, errCode int32, errMsg, serverMsgID string, sendTime int64) (*pbChat.SendMsgResp, error) {
-	replay.ErrCode = errCode
-	replay.ErrMsg = errMsg
-	replay.ServerMsgID = serverMsgID
-	replay.ClientMsgID = pb.MsgData.ClientMsgID
-	replay.SendTime = sendTime
-	return replay, nil
-}
-
 func modifyMessageByUserMessageReceiveOpt(userID, sourceID string, sessionType int, pb *msg.SendMsgReq) (bool, error) {
 	opt, err := db.DB.GetUserGlobalMsgRecvOpt(userID)
 	if err != nil {
-		log.NewError(pb.OperationID, "GetUserGlobalMsgRecvOpt from redis err", userID, pb.String(), err.Error())
+		return false, err
 	}
 	switch opt {
 	case constant.ReceiveMessage:

internal/rpc/msg/send_pull.go

@@ -138,7 +138,6 @@ func (m *msgServer) sendMsgGroupChat(ctx context.Context, req *msg.SendMsgReq) (
 
 	//split  parallel send
 	var wg sync.WaitGroup
-	var sendTag bool
 	var split = 20
 	msgToMQSingle := msg.MsgDataToMQ{MsgData: req.MsgData}
 	mErr := make([]error, 0)
@@ -148,7 +147,7 @@ func (m *msgServer) sendMsgGroupChat(ctx context.Context, req *msg.SendMsgReq) (
 		wg.Add(1)
 		tmp := valueCopy(req)
 		go func() {
-			err := m.sendMsgToGroupOptimization(ctx, memberUserIDList[i*split:(i+1)*split], tmp, &sendTag, &wg)
+			err := m.sendMsgToGroupOptimization(ctx, memberUserIDList[i*split:(i+1)*split], tmp, &wg)
 			if err != nil {
 				mutex.Lock()
 				mErr = append(mErr, err)
@@ -160,7 +159,7 @@ func (m *msgServer) sendMsgGroupChat(ctx context.Context, req *msg.SendMsgReq) (
 	if remain > 0 {
 		wg.Add(1)
 		tmp := valueCopy(req)
-		go m.sendMsgToGroupOptimization(ctx, memberUserIDList[split*(len(memberUserIDList)/split):], tmp, &sendTag, &wg)
+		go m.sendMsgToGroupOptimization(ctx, memberUserIDList[split*(len(memberUserIDList)/split):], tmp, &wg)
 	}
 
 	wg.Wait()