refactor:change FCM config name

openimsdk · Jun 12, 2024 · 2aed1fd · 2aed1fd
1 parent 9ae653c
commit 2aed1fd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/config/openim-push.yml b/config/openim-push.yml
@@ -24,7 +24,7 @@ geTui:
   channelName: ''
 fcm:
   # 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.
 jpns:
   appKey: ''

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

diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go
@@ -202,8 +202,8 @@ type Push struct {
 		ChannelName  string `mapstructure:"channelName"`
 	} `mapstructure:"geTui"`
 	FCM struct {
-		ServiceAccount string `mapstructure:"serviceAccount"`
-		AuthUrl        string `mapstructure:"authURL"`
+		FilePath string `mapstructure:"filePath"`
+		AuthUrl  string `mapstructure:"authURL"`
 	} `mapstructure:"fcm"`
 	JPNS struct {
 		AppKey       string `mapstructure:"appKey"`