github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-18 14:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 任务开始邮件提醒错误的问题

Browse Source
This commit is contained in:
kuaifan 2022-05-13 15:57:28 +08:00
parent 8f58797256
commit 279f05fd11
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/UserEmailVerification.php
View File

@ -67,7 +67,7 @@ class UserEmailVerification extends AbstractModel
->subject($subject) ->subject($subject)
->html($content)) ->html($content))
->send(); ->send();
} catch (\Exception $e) { } catch (\Throwable $e) {
if (str_contains($e->getMessage(), "Timed Out")) { if (str_contains($e->getMessage(), "Timed Out")) {
throw new ApiException("language.TimedOut"); throw new ApiException("language.TimedOut");
} elseif ($e->getCode() === 550) { } elseif ($e->getCode() === 550) {

14
app/Tasks/EmailNoticeTask.php
View File

@ -33,8 +33,8 @@ class EmailNoticeTask extends AbstractTask
ProjectTask::whereNull("complete_at") ProjectTask::whereNull("complete_at")
->whereNull("archived_at") ->whereNull("archived_at")
->whereBetween("start_at", [ ->whereBetween("start_at", [
Carbon::now()->subMinutes($start * 60 + 10), Carbon::now()->subMinutes($start + 10),
Carbon::now()->subMinutes($start * 60) Carbon::now()->subMinutes($start)
])->chunkById(100, function ($tasks) { ])->chunkById(100, function ($tasks) {
/** @var ProjectTask $task */ /** @var ProjectTask $task */
foreach ($tasks as $task) { foreach ($tasks as $task) {
@ -146,7 +146,7 @@ class EmailNoticeTask extends AbstractTask
'user' => $user, 'user' => $user,
'task' => $task, 'task' => $task,
'setting' => $setting, 'setting' => $setting,
]); ])->render();
Factory::mailer() Factory::mailer()
->setDsn("smtp://{$setting['account']}:{$setting['password']}@{$setting['smtp_server']}:{$setting['port']}?verify_peer=0") ->setDsn("smtp://{$setting['account']}:{$setting['password']}@{$setting['smtp_server']}:{$setting['port']}?verify_peer=0")
->setMessage(EmailMessage::create() ->setMessage(EmailMessage::create()
@ -156,7 +156,7 @@ class EmailNoticeTask extends AbstractTask
->html($content)) ->html($content))
->send(); ->send();
$data['is_send'] = 1; $data['is_send'] = 1;
} catch (\Exception $e) { } catch (\Throwable $e) {
$data['send_error'] = $e->getMessage(); $data['send_error'] = $e->getMessage();
} }
$data['email'] = $user->email; $data['email'] = $user->email;
@ -192,7 +192,7 @@ class EmailNoticeTask extends AbstractTask
'nickname' => $user->nickname, 'nickname' => $user->nickname,
'msgType' => $msgType, 'msgType' => $msgType,
'count' => count($data), 'count' => count($data),
]); ])->render();
$lists = $data->groupBy('dialog_id'); $lists = $data->groupBy('dialog_id');
/** @var WebSocketDialogMsg[] $items */ /** @var WebSocketDialogMsg[] $items */
foreach ($lists as $items) { foreach ($lists as $items) {
@ -222,7 +222,7 @@ class EmailNoticeTask extends AbstractTask
'dialogName' => $dialogName, 'dialogName' => $dialogName,
'unread' => count($items), 'unread' => count($items),
'items' => $items, 'items' => $items,
]); ])->render();
} }
try { try {
Factory::mailer() Factory::mailer()
@ -233,7 +233,7 @@ class EmailNoticeTask extends AbstractTask
->subject($subject) ->subject($subject)
->html($content)) ->html($content))
->send(); ->send();
} catch (\Exception $e) { } catch (\Throwable $e) {
info("unreadMsgEmail: " . $e->getMessage()); info("unreadMsgEmail: " . $e->getMessage());
} }
} }