From 0428fb1ff2a5eb7043d2cc5c10fec93a00b1a6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=A4=E4=BF=8A=E6=9D=B0?= Date: Wed, 5 Jan 2022 22:32:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0goPush=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/.env.example | 6 ++++++ api/config/services.php | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/api/.env.example b/api/.env.example index 6c80973..f4b4447 100644 --- a/api/.env.example +++ b/api/.env.example @@ -50,3 +50,9 @@ PUSHER_APP_CLUSTER=mt1 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" + +GO_PUSH_ADDRESS=127.0.0.1 +GO_PUSH_IOS_PORT=8888 +GO_PUSH_IOS_TOPIC=com.pushdeer.app.ios +GO_PUSH_IOS_CLIP_PORT=8889 +GO_PUSH_IOS_CLIP_TOPIC=com.pushdeer.app.ios.Clip diff --git a/api/config/services.php b/api/config/services.php index 2a1d616..755b56c 100644 --- a/api/config/services.php +++ b/api/config/services.php @@ -30,4 +30,12 @@ return [ 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], + 'go_push' => [ + 'address' => env('GO_PUSH_ADDRESS', '127.0.0.1'), + 'ios_port' => env('GO_PUSH_IOS_PORT', 8888), + 'ios_topic' => env('GO_PUSH_IOS_TOPIC', 'com.pushdeer.app.ios'), + 'ios_clip_port' => env('GO_PUSH_IOS_CLIP_PORT', 8889), + 'ios_clip_topic' => env('GO_PUSH_IOS_CLIP_TOPIC', 'com.pushdeer.app.ios.Clip') + ] + ]; From d96ae050616ee460108c2095ad4fa06114de6cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=A4=E4=BF=8A=E6=9D=B0?= Date: Wed, 5 Jan 2022 22:41:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0goPush=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/Http/Helpers.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/api/app/Http/Helpers.php b/api/app/Http/Helpers.php index 4458dae..bb84592 100644 --- a/api/app/Http/Helpers.php +++ b/api/app/Http/Helpers.php @@ -64,18 +64,17 @@ function ios_send($is_clip, $device_token, $text, $desp = '', $dev = true) $notification->production = true; } - $port = intval($is_clip) == 1 ? 8889 : 8888; - $topic = intval($is_clip) == 1 ? 'com.pushdeer.app.ios.Clip' : 'com.pushdeer.app.ios'; + $port = intval($is_clip) == 1 ? config('services.go_push.ios_clip_port') : config('services.go_push.ios_port'); + $topic = intval($is_clip) == 1 ? config('services.go_push.ios_clip_topic') : config('services.go_push.ios_topic'); $notification->topic = $topic; $notification->sound = ['volume'=>2.0]; $json = ['notifications'=>[$notification]]; $client = new GuzzleHttp\Client(); - $response = $client->post('http://127.0.0.1:'. $port .'/api/push', [ + $response = $client->post('http://'.config('services.go_push.address').':'. $port .'/api/push', [ GuzzleHttp\RequestOptions::JSON => $json ]); $ret = $response->getBody()->getContents(); error_log('push error'. $ret); return $ret; - ; }