Merge branch 'tuoyun'

# Conflicts:
#	cmd/open_im_api/main.go
#	config/config.yaml
#	go.sum
#	pkg/common/config/config.go
#	pkg/common/db/model.go

pkg/common/db/model.go

@@ -17,15 +17,14 @@ import (
 	//"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	//	"go.mongodb.org/mongo-driver/mongo/options"
-
 )
 
 var DB DataBases
 
 type DataBases struct {
-	MysqlDB    mysqlDB
-	mgoSession *mgo.Session
-	redisPool  *redis.Pool
+	MysqlDB     mysqlDB
+	mgoSession  *mgo.Session
+	redisPool   *redis.Pool
 	mongoClient *mongo.Client
 }