blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-11-04 19:32:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor:change FCM config name

Browse Source
This commit is contained in:
icey-yu 2024-06-12 14:16:56 +08:00
parent 9ae653c32d
commit 2aed1fde47
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/openim-push.yml
View File

@ -24,7 +24,7 @@ geTui:
channelName: '' channelName: ''
fcm: fcm:
# Prioritize using file paths. If the file path is empty, use URL # Prioritize using file paths. If the file path is empty, use URL
serviceAccount: "" # File path is concatenated with the parameters passed in through - c and serviceAccount. filePath: "" # File path is concatenated with the parameters passed in through - c(`mage` default pass in `config/`) and serviceAccount.
authURL: "" # file URL. Protocol must be specified. authURL: "" # file URL. Protocol must be specified.
jpns: jpns:
appKey: '' appKey: ''

4
internal/push/offlinepush/fcm/push.go
View File

@ -44,9 +44,9 @@ type Fcm struct {
func NewClient(pushConf *config.Push, cache cache.ThirdCache, fcmConfigPath string) (*Fcm, error) { func NewClient(pushConf *config.Push, cache cache.ThirdCache, fcmConfigPath string) (*Fcm, error) {
var opt option.ClientOption var opt option.ClientOption
switch { switch {
case len(pushConf.FCM.ServiceAccount) != 0: case len(pushConf.FCM.FilePath) != 0:
// with file path // with file path
credentialsFilePath := filepath.Join(fcmConfigPath, pushConf.FCM.ServiceAccount) credentialsFilePath := filepath.Join(fcmConfigPath, pushConf.FCM.FilePath)
opt = option.WithCredentialsFile(credentialsFilePath) opt = option.WithCredentialsFile(credentialsFilePath)
case len(pushConf.FCM.AuthUrl) != 0: case len(pushConf.FCM.AuthUrl) != 0:
// with authentication URL // with authentication URL

4
pkg/common/config/config.go
View File

@ -202,8 +202,8 @@ type Push struct {
ChannelName string `mapstructure:"channelName"` ChannelName string `mapstructure:"channelName"`
} `mapstructure:"geTui"` } `mapstructure:"geTui"`
FCM struct { FCM struct {
ServiceAccount string `mapstructure:"serviceAccount"` FilePath string `mapstructure:"filePath"`
AuthUrl string `mapstructure:"authURL"` AuthUrl string `mapstructure:"authURL"`
} `mapstructure:"fcm"` } `mapstructure:"fcm"`
JPNS struct { JPNS struct {
AppKey string `mapstructure:"appKey"` AppKey string `mapstructure:"appKey"`