diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 3c0129f4e..c6526ad41 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -69,7 +69,7 @@ func NewGroupServer(port int) *groupServer { } mongo.InitMongo() mongo.CreateSuperGroupIndex() - g.GroupInterface = controller.NewGroupController(groupModel.DB, cache.InitRedis(), mongo.DB) + g.GroupInterface = controller.NewGroupController(groupModel.DB, cache.InitRedis(), mongo.GetClient()) return &g } diff --git a/pkg/common/db/unrelation/init_mongo.go b/pkg/common/db/unrelation/init_mongo.go index d5c1c9ef1..90e359c29 100644 --- a/pkg/common/db/unrelation/init_mongo.go +++ b/pkg/common/db/unrelation/init_mongo.go @@ -8,7 +8,6 @@ import ( "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" "go.mongodb.org/mongo-driver/x/bsonx" - "log" "strings" "time" ) @@ -45,7 +44,7 @@ func (m *Mongo) InitMongo() { config.Config.Mongo.DBMaxPoolSize) } } - log.Println(utils.GetFuncName(1), "start to init mongoDB:", uri) + fmt.Println(utils.GetFuncName(1), "start to init mongoDB:", uri) mongoClient, err := mongo.Connect(context.TODO(), options.Client().ApplyURI(uri)) if err != nil { time.Sleep(time.Duration(30) * time.Second) @@ -57,6 +56,10 @@ func (m *Mongo) InitMongo() { m.DB = mongoClient } +func (m *Mongo) GetClient() *mongo.Client { + return m.DB +} + func (m *Mongo) CreateTagIndex() { if err := m.createMongoIndex(cSendLog, false, "send_id", "-send_time"); err != nil { panic(err.Error() + " index create failed " + cSendLog + " send_id, -send_time") @@ -97,7 +100,7 @@ func (m *Mongo) CreateWorkMomentIndex() { } func (m *Mongo) createMongoIndex(collection string, isUnique bool, keys ...string) error { - db := m.DB.Collection(collection) + db := m.DB.Database(config.Config.Mongo.DBDatabase).Collection(collection) opts := options.CreateIndexes().SetMaxTime(10 * time.Second) indexView := db.Indexes() keysDoc := bsonx.Doc{}