luoyangwei 1 год назад
Родитель
Сommit
04d5c8b919
1 измененных файлов с 8 добавлено и 8 удалено
  1. 8 8
      server/fcm.go

+ 8 - 8
server/fcm.go

@@ -16,8 +16,8 @@ import (
 )
 
 const (
-	firebaseServiceAccountID = "firebase-adminsdk-uycdi@sikey-watch.iam.gserviceaccount.com"
-	firebaseCredentials      = `{
+	iosFirebaseServiceAccountID = "firebase-adminsdk-uycdi@sikey-watch.iam.gserviceaccount.com"
+	iosFirebaseCredentials      = `{
 		"type": "service_account",
 		"project_id": "sikey-watch",
 		"private_key_id": "ab460af1d589188d0a8ab6c597f7daa283317838",
@@ -36,17 +36,17 @@ const DefaultQueueStatus = -1
 const DefaultRemainingRetries = 3
 
 type FirebaseMessageServer struct {
-	app    *firebase.App
-	client *messaging.Client
-	repos  *repositories.Repositories
+	iosApp    *firebase.App
+	iosClient *messaging.Client
+	repos     *repositories.Repositories
 }
 
 func NewFirebaseMessageServer(repos *repositories.Repositories) *FirebaseMessageServer {
 	ctx := context.Background()
-	conf := &firebase.Config{ServiceAccountID: firebaseServiceAccountID}
+	conf := &firebase.Config{ServiceAccountID: iosFirebaseServiceAccountID}
 	app, err := firebase.NewApp(ctx, conf,
 		// option.WithHTTPClient(&http.Client{Timeout: 5 * time.Second}),
-		option.WithCredentialsJSON([]byte(firebaseCredentials)))
+		option.WithCredentialsJSON([]byte(iosFirebaseCredentials)))
 	if err != nil {
 		log.Fatalln(err)
 	}
@@ -57,7 +57,7 @@ func NewFirebaseMessageServer(repos *repositories.Repositories) *FirebaseMessage
 		panic(eris.Wrap(err, "unable to create fcm client connect"))
 	}
 
-	firebaseMessageServer := &FirebaseMessageServer{app: app, client: client, repos: repos}
+	firebaseMessageServer := &FirebaseMessageServer{iosApp: app, iosClient: client, repos: repos}
 
 	c := cron.New()
 	//_ = cron.New()