Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

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
 }
 

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