diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 369979cc3..c4a06b9b4 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -5,6 +5,7 @@ import ( chat "Open_IM/internal/rpc/msg" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" + "Open_IM/pkg/common/db/controller" "Open_IM/pkg/common/db/model" imdb "Open_IM/pkg/common/db/mysql" "Open_IM/pkg/common/log" @@ -41,17 +42,34 @@ type groupServer struct { rpcRegisterName string etcdSchema string etcdAddr []string - imdb.GroupInterface + controller.GroupInterface } func NewGroupServer(port int) *groupServer { log.NewPrivateLog(constant.LogFileName) - return &groupServer{ + g := groupServer{ rpcPort: port, rpcRegisterName: config.Config.RpcRegisterName.OpenImGroupName, etcdSchema: config.Config.Etcd.EtcdSchema, etcdAddr: config.Config.Etcd.EtcdAddr, } + //mysql init + var mysql imdb.Mysql + var groupModel imdb.Group + err := mysql.InitConn().AutoMigrateModel(&groupModel) + if err != nil { + panic("db init err:" + err.Error()) + } + if mysql.GormConn() != nil { + groupModel.DB = mysql.GormConn() + } else { + panic("db init err:" + "conn is nil") + } + //redis + //mongo + g.group = model.NewGroupController(groupModel) + + return &g } func (s *groupServer) Run() { @@ -69,6 +87,7 @@ func (s *groupServer) Run() { panic("listening err:" + err.Error() + s.rpcRegisterName) } log.NewInfo("", "listen network success, ", address, listener) + defer listener.Close() //grpc server recvSize := 1024 * 1024 * constant.GroupRPCRecvSize diff --git a/pkg/common/db/relation/init_mysql.go b/pkg/common/db/relation/init_mysql.go index 14713d2d6..d6b11ae28 100644 --- a/pkg/common/db/relation/init_mysql.go +++ b/pkg/common/db/relation/init_mysql.go @@ -10,7 +10,18 @@ import ( "gorm.io/gorm/logger" ) -func ConnectToDB() *gorm.DB { +type Mysql struct { + gormConn *gorm.DB +} + +func (m *Mysql) GormConn() *gorm.DB { + return m.gormConn +} + +func (m *Mysql) SetGormConn(gormConn *gorm.DB) { + m.gormConn = gormConn +} +func (m *Mysql) InitConn() *Mysql { dsn := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true&loc=Local", config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], "mysql") var db *gorm.DB @@ -51,18 +62,22 @@ func ConnectToDB() *gorm.DB { sqlDB.SetConnMaxLifetime(time.Second * time.Duration(config.Config.Mysql.DBMaxLifeTime)) sqlDB.SetMaxOpenConns(config.Config.Mysql.DBMaxOpenConns) sqlDB.SetMaxIdleConns(config.Config.Mysql.DBMaxIdleConns) - return db + m.SetGormConn(db) + return m } //models := []interface{}{&Friend{}, &FriendRequest{}, &Group{}, &GroupMember{}, &GroupRequest{}, // &User{}, &Black{}, &ChatLog{}, &Conversation{}, &AppVersion{}} -func initModel(db *gorm.DB, model interface{}) *gorm.DB { - db.AutoMigrate(model) - db.Set("gorm:table_options", "CHARSET=utf8") - db.Set("gorm:table_options", "collation=utf8_unicode_ci") - _ = db.Migrator().CreateTable(model) - return db.Model(model) +func (m *Mysql) AutoMigrateModel(model interface{}) error { + err := m.gormConn.AutoMigrate(model) + if err != nil { + return err + } + m.gormConn.Set("gorm:table_options", "CHARSET=utf8") + m.gormConn.Set("gorm:table_options", "collation=utf8_unicode_ci") + _ = m.gormConn.Migrator().CreateTable(model) + return nil } type Writer struct{}