From 8c6c7ee21fae8e329ffb29934bc3337cba9e898a Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Thu, 9 Feb 2023 11:25:19 +0800
Subject: [PATCH] errcode

---
 internal/rpc/group/group.go          | 5 +++--
 pkg/common/db/relation/init_mysql.go | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index fb19a3820..d04a44f9b 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -68,11 +68,12 @@ func NewGroupServer(port int) *groupServer {
 		panic(err.Error())
 	}
 	registerIP, err := network.GetRpcIP(config.Config.RpcRegisterIP)
-	err = zkClient.Register(config.Config.RpcRegisterName.OpenImGroupName, registerIP, port)
+	g.registerCenter = zkClient
+	err = g.registerCenter.Register(config.Config.RpcRegisterName.OpenImGroupName, registerIP, port)
 	if err != nil {
 		panic(err.Error())
 	}
-	g.registerCenter = zkClient
+
 	//conns, err := g.registerCenter.GetConns(config.Config.RpcRegisterName.OpenImConversationName)
 
 	g.GroupInterface = controller.NewGroupInterface(controller.NewGroupDatabase(mysql.GormConn(), redis.GetClient(), mongo.GetClient()))
diff --git a/pkg/common/db/relation/init_mysql.go b/pkg/common/db/relation/init_mysql.go
index 6d6ec61ee..986060b0a 100644
--- a/pkg/common/db/relation/init_mysql.go
+++ b/pkg/common/db/relation/init_mysql.go
@@ -63,6 +63,9 @@ func (m *Mysql) InitConn() *Mysql {
 	sqlDB.SetConnMaxLifetime(time.Second * time.Duration(config.Config.Mysql.DBMaxLifeTime))
 	sqlDB.SetMaxOpenConns(config.Config.Mysql.DBMaxOpenConns)
 	sqlDB.SetMaxIdleConns(config.Config.Mysql.DBMaxIdleConns)
+	if db == nil {
+		panic("db is nil")
+	}
 	m.SetGormConn(db)
 	return m
 }
@@ -89,8 +92,8 @@ func (w Writer) Printf(format string, args ...interface{}) {
 
 func getDBConn(db *gorm.DB, tx []any) *gorm.DB {
 	if len(tx) > 0 {
-		if txDb, ok := tx[0].(*gorm.DB); ok {
-			return txDb
+		if txDB, ok := tx[0].(*gorm.DB); ok {
+			return txDB
 		}
 	}
 	return db