blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-11-05 21:02:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: all module update.

Browse Source
This commit is contained in:
Gordon 2024-04-10 10:12:33 +08:00
parent a7d43bb186
commit 92efb51206
2 changed files with 65 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
internal/tools/msg.go
View File

@ -17,27 +17,18 @@ package tools
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/openimsdk/tools/db/redisutil"
"math" "math"
"math/rand" "math/rand"
"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
"github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller"
"github.com/openimsdk/open-im-server/v3/pkg/common/db/mgo"
kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister"
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification"
"github.com/openimsdk/open-im-server/v3/pkg/util/conversationutil" "github.com/openimsdk/open-im-server/v3/pkg/util/conversationutil"
"github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/protocol/sdkws"
"github.com/openimsdk/tools/db/mongoutil"
"github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/errs"
"github.com/openimsdk/tools/log" "github.com/openimsdk/tools/log"
"github.com/openimsdk/tools/mcontext" "github.com/openimsdk/tools/mcontext"
"github.com/openimsdk/tools/mw"
"github.com/openimsdk/tools/utils/stringutil" "github.com/openimsdk/tools/utils/stringutil"
"github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
) )
type MsgTool struct { type MsgTool struct {
@ -64,60 +55,61 @@ func NewMsgTool(msgDatabase controller.CommonMsgDatabase, userDatabase controlle
} }
func InitMsgTool(ctx context.Context, config *CronTaskConfig) (*MsgTool, error) { func InitMsgTool(ctx context.Context, config *CronTaskConfig) (*MsgTool, error) {
mgocli, err := mongoutil.NewMongoDB(ctx, config.MongodbConfig.Build()) //mgocli, err := mongoutil.NewMongoDB(ctx, config.MongodbConfig.Build())
if err != nil { //if err != nil {
return nil, err // return nil, err
} //}
rdb, err := redisutil.NewRedisClient(ctx, config.RedisConfig.Build()) //rdb, err := redisutil.NewRedisClient(ctx, config.RedisConfig.Build())
if err != nil { //if err != nil {
return nil, err // return nil, err
} //}
discov, err := kdisc.NewDiscoveryRegister(&config.ZookeeperConfig, &config.Share) //discov, err := kdisc.NewDiscoveryRegister(&config.ZookeeperConfig, &config.Share)
if err != nil { //if err != nil {
return nil, err // return nil, err
} //}
discov.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, "round_robin"))) //discov.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, "round_robin")))
userDB, err := mgo.NewUserMongo(mgocli.GetDB()) //userDB, err := mgo.NewUserMongo(mgocli.GetDB())
if err != nil { //if err != nil {
return nil, err // return nil, err
} //}
msgDatabase, err := controller.InitCommonMsgDatabase(rdb, mgocli.GetDB(), config) ////msgDatabase, err := controller.InitCommonMsgDatabase(rdb, mgocli.GetDB(), config)
if err != nil { //if err != nil {
return nil, err // return nil, err
} //}
userMongoDB := mgo.NewUserMongoDriver(mgocli.GetDB()) //userMongoDB := mgo.NewUserMongoDriver(mgocli.GetDB())
userDatabase := controller.NewUserDatabase( //userDatabase := controller.NewUserDatabase(
userDB, // userDB,
cache.NewUserCacheRedis(rdb, userDB, cache.GetDefaultOpt()), // cache.NewUserCacheRedis(rdb, userDB, cache.GetDefaultOpt()),
mgocli.GetTx(), // mgocli.GetTx(),
userMongoDB, // userMongoDB,
) //)
groupDB, err := mgo.NewGroupMongo(mgocli.GetDB()) //groupDB, err := mgo.NewGroupMongo(mgocli.GetDB())
if err != nil { //if err != nil {
return nil, err // return nil, err
} //}
groupMemberDB, err := mgo.NewGroupMember(mgocli.GetDB()) //groupMemberDB, err := mgo.NewGroupMember(mgocli.GetDB())
if err != nil { //if err != nil {
return nil, err // return nil, err
} //}
groupRequestDB, err := mgo.NewGroupRequestMgo(mgocli.GetDB()) //groupRequestDB, err := mgo.NewGroupRequestMgo(mgocli.GetDB())
if err != nil { //if err != nil {
return nil, err // return nil, err
} //}
conversationDB, err := mgo.NewConversationMongo(mgocli.GetDB()) //conversationDB, err := mgo.NewConversationMongo(mgocli.GetDB())
if err != nil { //if err != nil {
return nil, err // return nil, err
} //}
groupDatabase := controller.NewGroupDatabase(rdb, groupDB, groupMemberDB, groupRequestDB, mgocli.GetTx(), nil) //groupDatabase := controller.NewGroupDatabase(rdb, groupDB, groupMemberDB, groupRequestDB, mgocli.GetTx(), nil)
conversationDatabase := controller.NewConversationDatabase( //conversationDatabase := controller.NewConversationDatabase(
conversationDB, // conversationDB,
cache.NewConversationRedis(rdb, cache.GetDefaultOpt(), conversationDB), // cache.NewConversationRedis(rdb, cache.GetDefaultOpt(), conversationDB),
mgocli.GetTx(), // mgocli.GetTx(),
) //)
msgRpcClient := rpcclient.NewMessageRpcClient(discov, config.Share.RpcRegisterName.Msg) //msgRpcClient := rpcclient.NewMessageRpcClient(discov, config.Share.RpcRegisterName.Msg)
msgNotificationSender := notification.NewMsgNotificationSender(config, rpcclient.WithRpcClient(&msgRpcClient)) //msgNotificationSender := notification.NewMsgNotificationSender(config, rpcclient.WithRpcClient(&msgRpcClient))
msgTool := NewMsgTool(msgDatabase, userDatabase, groupDatabase, conversationDatabase, msgNotificationSender, config) //msgTool := NewMsgTool(msgDatabase, userDatabase, groupDatabase, conversationDatabase, msgNotificationSender, config)
return msgTool, nil //return msgTool, nil
return nil, nil
} }
// func (c *MsgTool) AllConversationClearMsgAndFixSeq() { // func (c *MsgTool) AllConversationClearMsgAndFixSeq() {

22
pkg/common/db/controller/msg.go
View File

@ -17,13 +17,11 @@ package controller
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"github.com/openimsdk/open-im-server/v3/internal/tools"
"time" "time"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/convert" "github.com/openimsdk/open-im-server/v3/pkg/common/convert"
"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
"github.com/openimsdk/open-im-server/v3/pkg/common/db/mgo"
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
"github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/constant"
@ -133,16 +131,16 @@ func NewCommonMsgDatabase(msgDocModel relation.MsgDocModelInterface, msg cache.M
}, nil }, nil
} }
func InitCommonMsgDatabase(rdb redis.UniversalClient, database *mongo.Database, config *tools.CronTaskConfig) (CommonMsgDatabase, error) { //func InitCommonMsgDatabase(rdb redis.UniversalClient, database *mongo.Database, config *tools.CronTaskConfig) (CommonMsgDatabase, error) {
msgDocModel, err := mgo.NewMsgMongo(database) // msgDocModel, err := mgo.NewMsgMongo(database)
if err != nil { // if err != nil {
return nil, err // return nil, err
} // }
//todo MsgCacheTimeout // //todo MsgCacheTimeout
msg := cache.NewMsgCache(rdb, 86400, config.RedisConfig.EnablePipeline) // msg := cache.NewMsgCache(rdb, 86400, config.RedisConfig.EnablePipeline)
seq := cache.NewSeqCache(rdb) // seq := cache.NewSeqCache(rdb)
return NewCommonMsgDatabase(msgDocModel, msg, seq, &config.KafkaConfig) // return NewCommonMsgDatabase(msgDocModel, msg, seq, &config.KafkaConfig)
} //}
type commonMsgDatabase struct { type commonMsgDatabase struct {
msgDocDatabase relation.MsgDocModelInterface msgDocDatabase relation.MsgDocModelInterface