From 1eda0ebea7f1d47febd2634852e4278bfd80b722 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 28 Jul 2022 18:58:57 +0800 Subject: [PATCH] fcm push modify --- internal/push/fcm/push.go | 9 +++------ internal/push/logic/init.go | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/internal/push/fcm/push.go b/internal/push/fcm/push.go index 7878f11f3..3f0552d62 100644 --- a/internal/push/fcm/push.go +++ b/internal/push/fcm/push.go @@ -1,4 +1,4 @@ -package push +package fcm import ( "Open_IM/internal/push" @@ -17,12 +17,9 @@ type Fcm struct { FcmMsgCli *messaging.Client } -var FcmClient *Fcm - -func init() { - FcmClient = newFcmClient() +func NewFcm() *Fcm { + return newFcmClient() } - func newFcmClient() *Fcm { opt := option.WithCredentialsFile(filepath.Join(config.Root, "config", config.Config.Push.Fcm.ServiceAccount)) fcmApp, err := firebase.NewApp(context.Background(), nil, opt) diff --git a/internal/push/logic/init.go b/internal/push/logic/init.go index 0b540af6a..6d6229dca 100644 --- a/internal/push/logic/init.go +++ b/internal/push/logic/init.go @@ -44,7 +44,7 @@ func init() { } if config.Config.Push.Fcm.Enable { - offlinePusher = fcm.FcmClient + offlinePusher = fcm.NewFcm() } }