push

internal/push/getui/push.go

@@ -9,6 +9,7 @@ import (
 	"Open_IM/pkg/common/tracelog"
 	"Open_IM/pkg/utils/splitter"
 	"github.com/go-redis/redis/v8"
+	"sync"
 
 	"Open_IM/pkg/utils"
 	"context"
@@ -64,13 +65,17 @@ func (g *Client) Push(ctx context.Context, userIDs []string, title, content stri
 		maxNum := 999
 		if len(userIDs) > maxNum {
 			s := splitter.NewSplitter(maxNum, userIDs)
+			wg := sync.WaitGroup{}
+			wg.Add(len(s.GetSplitResult()))
 			for i, v := range s.GetSplitResult() {
 				go func(index int, userIDs []string) {
+					defer wg.Done()
 					if err = g.batchPush(ctx, token, userIDs, pushReq); err != nil {
 						log.NewError(tracelog.GetOperationID(ctx), "batchPush failed", i, token, pushReq)
 					}
 				}(i, v.Item)
 			}
+			wg.Wait()
 		} else {
 			err = g.batchPush(ctx, token, userIDs, pushReq)
 		}

internal/push/init.go

@@ -25,9 +25,12 @@ type Push struct {
 	successCount  uint64
 }
 
-func (p *Push) Init(rpcPort int) {
-	var cacheInterface cache.Cache
-
+func (p *Push) Init(rpcPort int) error {
+	redisClient, err := cache.NewRedis()
+	if err != nil {
+		return err
+	}
+	var cacheInterface cache.Cache = redisClient
 	p.rpcServer.Init(rpcPort, cacheInterface)
 	p.pushCh.Init()
 	statistics.NewStatistics(&p.successCount, config.Config.ModuleName.PushName, fmt.Sprintf("%d second push to msg_gateway count", constant.StatisticsTimeInterval), constant.StatisticsTimeInterval)
@@ -40,6 +43,7 @@ func (p *Push) Init(rpcPort int) {
 	if config.Config.Push.Fcm.Enable {
 		p.offlinePusher = fcm.NewClient(cacheInterface)
 	}
+	return nil
 }
 
 func (p *Push) initPrometheus() {

internal/push/push_handler.go

@@ -11,15 +11,18 @@ import (
 	"Open_IM/pkg/common/constant"
 	kfk "Open_IM/pkg/common/kafka"
 	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/common/tracelog"
 	pbChat "Open_IM/pkg/proto/msg"
 	pbPush "Open_IM/pkg/proto/push"
 	"Open_IM/pkg/utils"
+	"context"
 	"github.com/Shopify/sarama"
 	"github.com/golang/protobuf/proto"
 )
 
 type ConsumerHandler struct {
 	pushConsumerGroup *kfk.MConsumerGroup
+	pusher            Pusher
 }
 
 func (c *ConsumerHandler) Init() {
@@ -27,6 +30,7 @@ func (c *ConsumerHandler) Init() {
 		OffsetsInitial: sarama.OffsetNewest, IsReturnErr: false}, []string{config.Config.Kafka.Ms2pschat.Topic}, config.Config.Kafka.Ms2pschat.Addr,
 		config.Config.Kafka.ConsumerGroupID.MsgToPush)
 }
+
 func (c *ConsumerHandler) handleMs2PsChat(msg []byte) {
 	log.NewDebug("", "msg come from kafka  And push!!!", "msg", string(msg))
 	msgFromMQ := pbChat.PushMsgDataToMQ{}
@@ -43,11 +47,17 @@ func (c *ConsumerHandler) handleMs2PsChat(msg []byte) {
 	if nowSec-sec > 10 {
 		return
 	}
+	ctx := context.Background()
+	tracelog.SetOperationID(ctx, "")
+	var err error
 	switch msgFromMQ.MsgData.SessionType {
 	case constant.SuperGroupChatType:
-		MsgToSuperGroupUser(pbData)
+		err = c.pusher.MsgToSuperGroupUser(ctx, pbData.SourceID, pbData.MsgData)
 	default:
-		MsgToUser(pbData)
+		err = c.pusher.MsgToUser(ctx, pbData.SourceID, pbData.MsgData)
+	}
+	if err != nil {
+		log.NewError("", "push failed", *pbData)
 	}
 }
 func (ConsumerHandler) Setup(_ sarama.ConsumerGroupSession) error   { return nil }

internal/push/push_rpc_server.go

@@ -21,16 +21,13 @@ import (
 type RPCServer struct {
 	rpcPort         int
 	rpcRegisterName string
-	etcdSchema      string
-	etcdAddr        []string
-	push            controller.PushInterface
+	pushInterface   controller.PushInterface
+	pusher          Pusher
 }
 
 func (r *RPCServer) Init(rpcPort int, cache cache.Cache) {
 	r.rpcPort = rpcPort
 	r.rpcRegisterName = config.Config.RpcRegisterName.OpenImPushName
-	r.etcdSchema = config.Config.Etcd.EtcdSchema
-	r.etcdAddr = config.Config.Etcd.EtcdAddr
 }
 
 func (r *RPCServer) run() {
@@ -84,13 +81,13 @@ func (r *RPCServer) run() {
 func (r *RPCServer) PushMsg(ctx context.Context, pbData *pbPush.PushMsgReq) (resp *pbPush.PushMsgResp, err error) {
 	switch pbData.MsgData.SessionType {
 	case constant.SuperGroupChatType:
-		MsgToSuperGroupUser(pbData)
+		err = r.pusher.MsgToSuperGroupUser(ctx, pbData.SourceID, pbData.MsgData)
 	default:
-		MsgToUser(pbData)
+		err = r.pusher.MsgToUser(ctx, pbData.SourceID, pbData.MsgData)
 	}
-	return &pbPush.PushMsgResp{}, nil
+	return &pbPush.PushMsgResp{}, err
 }
 
 func (r *RPCServer) DelUserPushToken(ctx context.Context, req *pbPush.DelUserPushTokenReq) (resp *pbPush.DelUserPushTokenResp, err error) {
-	return &pbPush.DelUserPushTokenResp{}, r.push.DelFcmToken(ctx, req.UserID, int(req.PlatformID))
+	return &pbPush.DelUserPushTokenResp{}, r.pushInterface.DelFcmToken(ctx, req.UserID, int(req.PlatformID))
 }

internal/push/push_to_client.go

@@ -79,7 +79,6 @@ func (p *Pusher) MsgToUser(ctx context.Context, userID string, msg *sdkws.MsgDat
 		}
 		err = p.OfflinePushMsg(ctx, userID, msg, userIDs)
 		if err != nil {
-			log.NewError(operationID, "OfflinePushMsg failed", userID)
 			return err
 		}
 	}

internal/push/tpns.go

@@ -1,31 +0,0 @@
-package push
-
-import (
-	"Open_IM/internal/push/sdk/tpns-server-sdk-go/go/auth"
-	"Open_IM/pkg/common/config"
-)
-
-var badgeType = -2
-var iosAcceptId = auth.Auther{AccessID: config.Config.Push.Tpns.Ios.AccessID, SecretKey: config.Config.Push.Tpns.Ios.SecretKey}
-
-func IOSAccountListPush(accounts []string, title, content, jsonCustomContent string) {
-	var iosMessage = tpns.Message{
-		Title:   title,
-		Content: content,
-		IOS: &tpns.IOSParams{
-			Aps: &tpns.Aps{
-				BadgeType: &badgeType,
-				Sound:     "default",
-				Category:  "INVITE_CATEGORY",
-			},
-			CustomContent: jsonCustomContent,
-			//CustomContent: `"{"key\":\"value\"}"`,
-		},
-	}
-	pushReq, reqBody, err := req.NewListAccountPush(accounts, iosMessage)
-	if err != nil {
-		return
-	}
-	iosAcceptId.Auth(pushReq, auth.UseSignAuthored, iosAcceptId, reqBody)
-	common.PushAndGetResult(pushReq)
-}