From 279f05fd11aae856aff932d263f0ac0d82bafe35 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 13 May 2022 15:57:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=8F=90=E9=86=92=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/UserEmailVerification.php |  2 +-
 app/Tasks/EmailNoticeTask.php        | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Models/UserEmailVerification.php b/app/Models/UserEmailVerification.php
index 5adfb80d8..ae2ac3fe2 100644
--- a/app/Models/UserEmailVerification.php
+++ b/app/Models/UserEmailVerification.php
@@ -67,7 +67,7 @@ class UserEmailVerification extends AbstractModel
                     ->subject($subject)
                     ->html($content))
                 ->send();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             if (str_contains($e->getMessage(), "Timed Out")) {
                 throw new ApiException("language.TimedOut");
             } elseif ($e->getCode() === 550) {
diff --git a/app/Tasks/EmailNoticeTask.php b/app/Tasks/EmailNoticeTask.php
index 07cfcbad2..582b4d4c8 100644
--- a/app/Tasks/EmailNoticeTask.php
+++ b/app/Tasks/EmailNoticeTask.php
@@ -33,8 +33,8 @@ class EmailNoticeTask extends AbstractTask
                 ProjectTask::whereNull("complete_at")
                     ->whereNull("archived_at")
                     ->whereBetween("start_at", [
-                        Carbon::now()->subMinutes($start * 60 + 10),
-                        Carbon::now()->subMinutes($start * 60)
+                        Carbon::now()->subMinutes($start + 10),
+                        Carbon::now()->subMinutes($start)
                     ])->chunkById(100, function ($tasks) {
                         /** @var ProjectTask $task */
                         foreach ($tasks as $task) {
@@ -146,7 +146,7 @@ class EmailNoticeTask extends AbstractTask
                     'user' => $user,
                     'task' => $task,
                     'setting' => $setting,
-                ]);
+                ])->render();
                 Factory::mailer()
                     ->setDsn("smtp://{$setting['account']}:{$setting['password']}@{$setting['smtp_server']}:{$setting['port']}?verify_peer=0")
                     ->setMessage(EmailMessage::create()
@@ -156,7 +156,7 @@ class EmailNoticeTask extends AbstractTask
                         ->html($content))
                     ->send();
                 $data['is_send'] = 1;
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 $data['send_error'] = $e->getMessage();
             }
             $data['email'] = $user->email;
@@ -192,7 +192,7 @@ class EmailNoticeTask extends AbstractTask
                 'nickname' => $user->nickname,
                 'msgType' => $msgType,
                 'count' => count($data),
-            ]);
+            ])->render();
             $lists = $data->groupBy('dialog_id');
             /** @var WebSocketDialogMsg[] $items */
             foreach ($lists as $items) {
@@ -222,7 +222,7 @@ class EmailNoticeTask extends AbstractTask
                     'dialogName' => $dialogName,
                     'unread' => count($items),
                     'items' => $items,
-                ]);
+                ])->render();
             }
             try {
                 Factory::mailer()
@@ -233,7 +233,7 @@ class EmailNoticeTask extends AbstractTask
                         ->subject($subject)
                         ->html($content))
                     ->send();
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 info("unreadMsgEmail: " . $e->getMessage());
             }
         }