Merge remote-tracking branch 'origin/errcode' into errcode

# Conflicts:
#	internal/rpc/msg/delete.go
#	pkg/common/db/controller/msg.go
#	pkg/common/db/table/unrelation/extend_msg_set.go
This commit is contained in:
wangchuxiao
2023-02-23 19:17:23 +08:00
12 changed files with 652 additions and 217 deletions
+2 -2
View File
@@ -19,10 +19,10 @@ var Terminal = []int{constant.IOSPlatformID, constant.AndroidPlatformID, constan
type Fcm struct {
fcmMsgCli *messaging.Client
cache cache.Cache
cache cache.MsgCache
}
func NewClient(cache cache.Cache) *Fcm {
func NewClient(cache cache.MsgCache) *Fcm {
opt := option.WithCredentialsFile(filepath.Join(config.Root, "config", config.Config.Push.Fcm.ServiceAccount))
fcmApp, err := firebase.NewApp(context.Background(), nil, opt)
if err != nil {