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

fix:err and name

Browse Source
This commit is contained in:
icey-yu 2024-06-12 11:30:44 +08:00
parent 7bf29e8e5a
commit cb47d57ccd
3 changed files with 7 additions and 7 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:
serviceAccount: "x.json" serviceAccount: "x.json"
verifyUrl: "" authUrl: ""
jpns: jpns:
appKey: '' appKey: ''
masterSecret: '' masterSecret: ''

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

@ -52,16 +52,16 @@ func NewClient(pushConf *config.Push, cache cache.ThirdCache, fcmConfigPath stri
// with file path // with file path
credentialsFilePath := filepath.Join(fcmConfigPath, pushConf.FCM.ServiceAccount) credentialsFilePath := filepath.Join(fcmConfigPath, pushConf.FCM.ServiceAccount)
opt = option.WithCredentialsFile(credentialsFilePath) opt = option.WithCredentialsFile(credentialsFilePath)
case len(pushConf.FCM.VerifyUrl) != 0: case len(pushConf.FCM.AuthUrl) != 0:
// with verify url // with authentication url
client := httputil.NewHTTPClient(httputil.NewClientConfig()) client := httputil.NewHTTPClient(httputil.NewClientConfig())
resp, err := client.Get(pushConf.FCM.VerifyUrl) resp, err := client.Get(pushConf.FCM.AuthUrl)
if err != nil { if err != nil {
return nil, errs.Wrap(err) return nil, err
} }
opt = option.WithCredentialsJSON(resp) opt = option.WithCredentialsJSON(resp)
default: default:
return nil, errs.New("no FCM config") return nil, errs.New("no FCM config").Wrap()
} }
fcmApp, err := firebase.NewApp(context.Background(), nil, opt) fcmApp, err := firebase.NewApp(context.Background(), nil, opt)

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

@ -203,7 +203,7 @@ type Push struct {
} `mapstructure:"geTui"` } `mapstructure:"geTui"`
FCM struct { FCM struct {
ServiceAccount string `mapstructure:"serviceAccount"` ServiceAccount string `mapstructure:"serviceAccount"`
VerifyUrl string `mapstructure:"verifyUrl"` AuthUrl string `mapstructure:"authUrl"`
} `mapstructure:"fcm"` } `mapstructure:"fcm"`
JPNS struct { JPNS struct {
AppKey string `mapstructure:"appKey"` AppKey string `mapstructure:"appKey"`