From 0b2854dddaf1908b65e02a1c77bb1ef5743f6ff4 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Sat, 28 Jan 2023 14:42:46 +0800 Subject: [PATCH] group update --- internal/rpc/group/group.go | 8 ++++---- pkg/common/db/unrelation/init_mongo.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index c4a06b9b4..c4181e28a 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -5,9 +5,10 @@ import ( chat "Open_IM/internal/rpc/msg" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" + "Open_IM/pkg/common/db/cache" "Open_IM/pkg/common/db/controller" - "Open_IM/pkg/common/db/model" - imdb "Open_IM/pkg/common/db/mysql" + imdb "Open_IM/pkg/common/db/relation" + "Open_IM/pkg/common/db/unrelation" "Open_IM/pkg/common/log" "Open_IM/pkg/common/middleware" promePkg "Open_IM/pkg/common/prometheus" @@ -67,8 +68,7 @@ func NewGroupServer(port int) *groupServer { } //redis //mongo - g.group = model.NewGroupController(groupModel) - + g.GroupInterface = controller.NewGroupController(groupModel.DB, cache.InitRedis(), unrelation.InitMongo()) return &g } diff --git a/pkg/common/db/unrelation/init_mongo.go b/pkg/common/db/unrelation/init_mongo.go index 4b9faf84f..18a525aea 100644 --- a/pkg/common/db/unrelation/init_mongo.go +++ b/pkg/common/db/unrelation/init_mongo.go @@ -21,7 +21,7 @@ func NewMongoClient(mdb *mongo.Client) *Client { return &Client{mongo: mdb} } -func initMongo() *mongo.Database { +func InitMongo() *mongo.Database { uri := "mongodb://sample.host:27017/?maxPoolSize=20&w=majority" if config.Config.Mongo.DBUri != "" { // example: mongodb://$user:$password@mongo1.mongo:27017,mongo2.mongo:27017,mongo3.mongo:27017/$DBDatabase/?replicaSet=rs0&readPreference=secondary&authSource=admin&maxPoolSize=$DBMaxPoolSize