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

# Conflicts:
#	pkg/common/db/model/group.go

pkg/common/db/cache/group.go

@@ -23,7 +23,7 @@ type GroupCache struct {
 
 func NewGroupCache(rdb redis.UniversalClient, db *mysql.Group, opts rockscache.Options) *GroupCache {
 	rcClient := &rockscache.Client{
-		Options: opts,
+		Options: rockscache.Options{},
 	}
 	redisClient := NewRedisClient(rdb)
 	return &GroupCache{rcClient: rcClient, expireTime: GroupExpireTime, db: db, redisClient: redisClient}

pkg/common/db/cache/rockscache.go

@@ -608,7 +608,7 @@ func DelConversationFromCache(ctx context.Context, ownerUserID, conversationID s
 	return utils.Wrap(db.DB.Rc.TagAsDeleted(conversationCache+ownerUserID+":"+conversationID), "DelConversationFromCache err")
 }
 
-func GetExtendMsg(ctx context.Context, sourceID string, sessionType int32, clientMsgID string, firstModifyTime int64) (extendMsg *mongo.ExtendMsg, err error) {
+func GetExtendMsg(ctx context.Context, sourceID string, sessionType int32, clientMsgID string, firstModifyTime int64) (extendMsg *mongoDB.ExtendMsg, err error) {
 	getExtendMsg := func() (string, error) {
 		extendMsg, err := db.DB.GetExtendMsg(sourceID, sessionType, clientMsgID, firstModifyTime)
 		if err != nil {
@@ -628,7 +628,7 @@ func GetExtendMsg(ctx context.Context, sourceID string, sessionType int32, clien
 	if err != nil {
 		return nil, utils.Wrap(err, "Fetch failed")
 	}
-	extendMsg = &mongo.ExtendMsg{}
+	extendMsg = &mongoDB.ExtendMsg{}
 	err = json.Unmarshal([]byte(extendMsgStr), extendMsg)
 	return extendMsg, utils.Wrap(err, "Unmarshal failed")
 }

pkg/common/db/model/group.go

@@ -2,13 +2,13 @@ package model
 
 import (
 	"Open_IM/pkg/common/db/cache"
-	"Open_IM/pkg/common/db/mongo"
+	"Open_IM/pkg/common/db/mongoDB"
 	"Open_IM/pkg/common/db/mysql"
-	"Open_IM/pkg/common/trace_log"
 	"Open_IM/pkg/utils"
 	"context"
-	"encoding/json"
 	"github.com/dtm-labs/rockscache"
+	"github.com/go-redis/redis/v8"
+	"go.mongodb.org/mongo-driver/mongo"
 	"gorm.io/gorm"
 	//"time"
 )
@@ -16,17 +16,17 @@ import (
 type GroupModel struct {
 	db    *mysql.Group
 	cache *cache.GroupCache
-	mongo *mongo.Client
+	mongo *mongoDB.Client
 }
 
-func NewGroupModel() *GroupModel {
+func NewGroupModel(db *mysql.Group, rdb redis.UniversalClient, mdb *mongo.Client) *GroupModel {
 	var groupModel GroupModel
-	groupModel.db = mysql.NewGroupDB()
-	groupModel.cache = cache.NewGroupCache(cache.InitRedis(), groupModel.db, rockscache.Options{
+	groupModel.db = db
+	groupModel.cache = cache.NewGroupCache(rdb, db, rockscache.Options{
 		DisableCacheRead:  false,
 		StrongConsistency: true,
 	})
-	groupModel.mongo = mongo.NewMongoClient()
+	groupModel.mongo = mongoDB.NewMongoClient(mdb)
 	return &groupModel
 }
 

pkg/common/db/mongo/office.go

@@ -1 +0,0 @@
-package mongo

pkg/common/db/mongoDB/batch_insert_chat.go

@@ -1,4 +1,4 @@
-package mongo
+package mongoDB
 
 import (
 	"Open_IM/pkg/common/config"

pkg/common/db/mongoDB/extend_msg_mongo_model.go

@@ -1,4 +1,4 @@
-package mongo
+package mongoDB
 
 import (
 	"Open_IM/pkg/common/config"

pkg/common/db/mongoDB/init_mongo.go

@@ -1,4 +1,4 @@
-package mongo
+package mongoDB
 
 import (
 	"Open_IM/pkg/common/config"
@@ -17,10 +17,8 @@ type Client struct {
 	mongo *mongo.Client
 }
 
-func NewMongoClient() *Client {
-	var client Client
-	client.mongo = initMongo()
-	return &client
+func NewMongoClient(mdb *mongo.Client) *Client {
+	return &Client{mongo: mdb}
 }
 
 func initMongo() *mongo.Client {

pkg/common/db/mongoDB/mongo_model.go

@@ -1,4 +1,4 @@
-package mongo
+package mongoDB
 
 import (
 	"Open_IM/pkg/common/config"

pkg/common/db/mongoDB/office.go

@@ -0,0 +1 @@
+package mongoDB