no message
This commit is contained in:
parent
71a710f0cc
commit
b2f4fd99bb
@ -56,6 +56,7 @@ use Carbon\Carbon;
|
|||||||
use App\Models\MailMust as ModelMailMust;
|
use App\Models\MailMust as ModelMailMust;
|
||||||
use App\Models\MailLog as ModelMailLog;
|
use App\Models\MailLog as ModelMailLog;
|
||||||
use App\Services\TomTool\Telegram\Slave as TeleSlave;
|
use App\Services\TomTool\Telegram\Slave as TeleSlave;
|
||||||
|
use App\Services\MailHub;
|
||||||
|
|
||||||
final class Cron
|
final class Cron
|
||||||
{
|
{
|
||||||
@ -907,12 +908,12 @@ final class Cron
|
|||||||
|
|
||||||
if (Tools::isEmail($email_queue['to_email'])) {
|
if (Tools::isEmail($email_queue['to_email'])) {
|
||||||
|
|
||||||
Mail::send(
|
MailHub::start()
|
||||||
$email_queue['to_email'],
|
->setScene($email_queue['scene'])
|
||||||
$email_queue['subject'],
|
->setTitle($email_queue['subject'])
|
||||||
$email_queue['template'],
|
->setView($email_queue['template'], json_decode($email_queue['array']))
|
||||||
json_decode($email_queue['array'])
|
->setTo($email_queue['to_email'])
|
||||||
);
|
->send();
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
echo $email_queue['to_email'] . ' 邮箱格式错误,已跳过' . PHP_EOL;
|
echo $email_queue['to_email'] . ' 邮箱格式错误,已跳过' . PHP_EOL;
|
||||||
@ -922,7 +923,7 @@ final class Cron
|
|||||||
|
|
||||||
} catch (Exception|ClientExceptionInterface $e) {
|
} catch (Exception|ClientExceptionInterface $e) {
|
||||||
echo $e->getMessage();
|
echo $e->getMessage();
|
||||||
DB::rollBack();
|
// DB::rollBack();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -982,14 +983,20 @@ final class Cron
|
|||||||
|
|
||||||
if (Tools::isEmail($email_queue['to_email'])) {
|
if (Tools::isEmail($email_queue['to_email'])) {
|
||||||
|
|
||||||
|
MailHub::start()
|
||||||
|
->setScene($email_queue['scene'])
|
||||||
|
->setTitle($email_queue['subject'])
|
||||||
|
->setView($email_queue['template'], json_decode($email_queue['array']))
|
||||||
|
->setTo($email_queue['to_email'])
|
||||||
|
->send();
|
||||||
|
|
||||||
Mail::send_bulk(
|
// Mail::send_bulk(
|
||||||
$email_queue['to_email'],
|
// $email_queue['to_email'],
|
||||||
$email_queue['subject'],
|
// $email_queue['subject'],
|
||||||
$email_queue['template'],
|
// $email_queue['template'],
|
||||||
json_decode($email_queue['array']),
|
// json_decode($email_queue['array']),
|
||||||
$oSmtp
|
// $oSmtp
|
||||||
);
|
// );
|
||||||
|
|
||||||
DB::update("UPDATE smtp_list SET `day_count` = `day_count` + 1 WHERE id = ".$oSmtp->id);
|
DB::update("UPDATE smtp_list SET `day_count` = `day_count` + 1 WHERE id = ".$oSmtp->id);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user