From b2f4fd99bb94f0cb8f0b2d020f777d9db73fc6fd Mon Sep 17 00:00:00 2001
From: hellcat <hellcat@hellcatdeMacBook-Pro.local>
Date: Fri, 8 May 2026 16:48:53 +0800
Subject: [PATCH] no message

---
 src/Services/Cron.php | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/Services/Cron.php b/src/Services/Cron.php
index 93e8896ec..f46cee777 100755
--- a/src/Services/Cron.php
+++ b/src/Services/Cron.php
@@ -56,6 +56,7 @@ use Carbon\Carbon;
 use App\Models\MailMust as ModelMailMust;
 use App\Models\MailLog as ModelMailLog;
 use App\Services\TomTool\Telegram\Slave as TeleSlave;
+use App\Services\MailHub;
 
 final class Cron
 {
@@ -907,13 +908,13 @@ final class Cron
 
                     if (Tools::isEmail($email_queue['to_email'])) {
                         
-                            Mail::send(
-                                $email_queue['to_email'],
-                                $email_queue['subject'],
-                                $email_queue['template'],
-                                json_decode($email_queue['array'])
-                            );
-                            
+                        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();
+                        
                     } else {
                         echo $email_queue['to_email'] . ' 邮箱格式错误，已跳过' . PHP_EOL;
                     }
@@ -922,7 +923,7 @@ final class Cron
                     
                 } catch (Exception|ClientExceptionInterface $e) {
                     echo $e->getMessage();
-                    DB::rollBack();
+//                    DB::rollBack();
                 }
                 
             }
@@ -982,14 +983,20 @@ final class Cron
 
                     if (Tools::isEmail($email_queue['to_email'])) {
                         
-                            
-                                Mail::send_bulk(
-                                    $email_queue['to_email'],
-                                    $email_queue['subject'],
-                                    $email_queue['template'],
-                                    json_decode($email_queue['array']),
-                                    $oSmtp
-                                );
+                        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(
+//                                    $email_queue['to_email'],
+//                                    $email_queue['subject'],
+//                                    $email_queue['template'],
+//                                    json_decode($email_queue['array']),
+//                                    $oSmtp
+//                                );
                             
                             DB::update("UPDATE smtp_list SET `day_count` = `day_count` + 1 WHERE id = ".$oSmtp->id);