From eda58634dc4f436b735be0cb67ce5fc5f33b74a3 Mon Sep 17 00:00:00 2001 From: Easy Date: Sun, 9 Jan 2022 17:39:12 +0800 Subject: [PATCH] fix type & message --- .../Controllers/PushDeerMessageController.php | 17 +++++++++-------- api/app/Models/PushDeerMessage.php | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/api/app/Http/Controllers/PushDeerMessageController.php b/api/app/Http/Controllers/PushDeerMessageController.php index c5de9ed..1ac72a1 100644 --- a/api/app/Http/Controllers/PushDeerMessageController.php +++ b/api/app/Http/Controllers/PushDeerMessageController.php @@ -56,17 +56,18 @@ class PushDeerMessageController extends Controller $result = false; if ($key) { + $readkey = Str::random(32); + $the_message = []; + $the_message['uid'] = $key->uid; + $the_message['text'] = $validated['text']; + $the_message['desp'] = $validated['desp']; + $the_message['type'] = $validated['type']; + $the_message['readkey'] = $readkey; + $pd_message = Message::create($the_message); + $devices = PushDeerDevice::where('uid', $key->uid)->get(); foreach ($devices as $device) { - $readkey = Str::random(32); - $the_message = []; - $the_message['uid'] = $key->uid; - $the_message['text'] = $validated['text']; - $the_message['desp'] = $validated['desp']; - $the_message['readkey'] = $readkey; - $pd_message = Message::create($the_message); - if ($device) { $result[] = ios_send($device->is_clip, $device->device_id, $validated['text']); } diff --git a/api/app/Models/PushDeerMessage.php b/api/app/Models/PushDeerMessage.php index 4054ea8..f823ec4 100644 --- a/api/app/Models/PushDeerMessage.php +++ b/api/app/Models/PushDeerMessage.php @@ -15,5 +15,6 @@ class PushDeerMessage extends Model 'text', 'desp', 'uid', + 'type', ]; }