proto modify

internal/push/push_rpc_server.go

@@ -1,24 +1,47 @@
 package push
 
 import (
-	"OpenIM/pkg/common/config"
 	"OpenIM/pkg/common/constant"
 	"OpenIM/pkg/common/db/cache"
+	"OpenIM/pkg/common/db/controller"
+	"OpenIM/pkg/common/db/localcache"
+	"OpenIM/pkg/discoveryregistry"
 	pbPush "OpenIM/pkg/proto/push"
 	"context"
-	"github.com/OpenIMSDK/openKeeper"
 	"google.golang.org/grpc"
+	"sync"
 )
 
 type pushServer struct {
 	pusher *Pusher
 }
 
-func Start(client *openKeeper.ZkClient, server *grpc.Server) error {
+func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error {
+	rdb, err := cache.NewRedis()
+	if err != nil {
+		return err
+	}
+	cacheModel := cache.NewCacheModel(rdb)
 
-	pbPush.RegisterPushMsgServiceServer(server, &pushServer{
-		pusher: NewPusher(),
-	})
+	offlinePusher := NewOfflinePusher(cacheModel)
+	database := controller.NewPushDatabase(cacheModel)
+	pusher := NewPusher(client, offlinePusher, database, localcache.NewGroupLocalCache(client), localcache.NewConversationLocalCache(client))
+	var wg sync.WaitGroup
+	wg.Add(2)
+	go func() {
+		defer wg.Done()
+		pbPush.RegisterPushMsgServiceServer(server, &pushServer{
+			pusher: pusher,
+		})
+	}()
+	go func() {
+		defer wg.Done()
+		consumer := NewConsumer(pusher)
+		consumer.initPrometheus()
+		consumer.Start()
+	}()
+	wg.Wait()
+	return nil
 }
 
 func (r *pushServer) PushMsg(ctx context.Context, pbData *pbPush.PushMsgReq) (resp *pbPush.PushMsgResp, err error) {