fix conflict

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
2026-04-28 06:19:20 +08:00 · 2023-07-13 17:04:10 +08:00
parent 02e6b7ec18
commit 25eabde3f6
6 changed files with 27 additions and 20 deletions
@@ -81,6 +81,9 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
 	groupRpcClient := rpcclient.NewGroupRpcClient(client)
 	friendRpcClient := rpcclient.NewFriendRpcClient(client)
 	mysql, err := relation.NewGormDB()
+	if err != nil {
+		return err
+	}
 	msgMysModel := relation.NewChatLogGorm(mysql)
 	msgDatabase := controller.NewCommonMsgDatabase(msgDocModel, cacheModel, msgMysModel)
 	s := &msgServer{