1

@@ -10,6 +10,7 @@ use Model\bodySql;
 use Model\emailSql;
 use Model\emailSql;
 use Model\folderSql;
 use Model\folderSql;
 use Model\listsSql;
 use Model\listsSql;
+use Model\sendJobsSql;
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\SMTP;
 use PHPMailer\PHPMailer\SMTP;
 
 
@@ -228,9 +229,19 @@ class Home extends Base {
         $sendData['priority'] = $formData['priority']??3;// 是否紧急邮件
         $sendData['priority'] = $formData['priority']??3;// 是否紧急邮件
         $sendData['subject'] = $formData['subject'];// //Content 主题，标题
         $sendData['subject'] = $formData['subject'];// //Content 主题，标题
         $sendData['body'] = $formData['body'];
         $sendData['body'] = $formData['body'];
+        // 不重要的信息
+        $sendData['jobName'] = $formData['jobName']??'';//任务标题
+        $sendData['massSuit'] = $formData['massSuit']??0;// 是否是群发单显
 
 
         // 定时发送时间
         // 定时发送时间
-        $timer = strtotime(app()->request('timerValue','2023-04-10'));
+        $timer = app()->request('timerValue',0);
+        if(is_numeric($timer) && $timer){
+            $timer = time()+$timer;
+        }else if (is_string($timer)){
+            $timer = strtotime($timer);
+        }else{
+            $timer = 0;
+        }
         // 是否存草稿
         // 是否存草稿
         if(app()->request('saveType')=='draft'){
         if(app()->request('saveType')=='draft'){
             // 保存
             // 保存
@@ -242,15 +253,37 @@ class Home extends Base {
            app()->e('save_draft_error');
            app()->e('save_draft_error');
 
 
         }
         }
-        // 定时发送
-        else if(app()->request('timer') &&  $timer > time()){
+        // 定时发送 或者是单条发送
+        else if((app()->request('timer') &&  $timer > time()) || $sendData['massSuit']){
 
 
-        }else{
-            // 发送
-//            $result = MailFun::sendEmail($sendData,$email);
-//            if($result[0]){
-//                app()->_json(['messageId'   => $result[1]]);
-//            }
+            if($sendData['massSuit']){
+                // 每次发送间隔的时间
+                $sendData['masssuit_interval_send']  = app()->request('masssuit_interval_send');
+                $sendData['masssuit_interval_send']['start'] = intval($sendData['masssuit_interval_send']['start']??0);
+                $sendData['masssuit_interval_send']['end'] = intval($sendData['masssuit_interval_send']['end']??1);
+            }
+
+            // 插入任务
+            $job_id = db()->insert(sendJobsSql::$table,[
+                'email_id'  =>  $email['id'],
+                'maildata'  =>  $sendData,
+                'title'  =>  $sendData['jobName'] ? : $sendData['subject'],
+                'total'  =>  count($sendData['tos']),
+                'send_time' =>  $timer
+            ]);
+            if($job_id){
+                // 返回任务id
+                app()->_json(['job_id'=>$job_id]);
+            }
+
+            app()->e('send_timer_job_error');
+        }
+        else{
+            // 立即发送
+            $result = MailFun::sendEmail($sendData,$email);
+            if($result[0]){
+                app()->_json(['messageId'   => $result[1]]);
+            }
             // 错误
             // 错误
             app()->e($result[1]);
             app()->e($result[1]);
         }
         }
@@ -490,7 +523,9 @@ class Home extends Base {
 
 
         if($data){
         if($data){
             $sync_num = 0;
             $sync_num = 0;
-            $data['to_name'] = json_decode($data['to_name']??"[]",true);
+            $data['to_name'] = $data['to_name'] ? json_decode($data['to_name'],true) : [];
+            $data['cc'] = $data['cc'] ? json_decode($data['cc'],true) : [];
+            $data['bcc'] = $data['bcc'] ? json_decode($data['bcc'],true) : [];
 
 
             HOME_INFO_BODY:
             HOME_INFO_BODY:
             $body   =   db()->first(bodySql::first($id));
             $body   =   db()->first(bodySql::first($id));
@@ -551,9 +586,15 @@ class Home extends Base {
                 return [
                 return [
                     'data'  =>  $data
                     'data'  =>  $data
                 ];
                 ];
+            }// 草稿
+            else if(!$data['uid'] && $data['draft']){
+                $data['body'] = [];
+                return [
+                    'data'  =>  $data
+                ];
             }
             }
             // 循环几次
             // 循环几次
-            if($sync_num < 1){
+            if($data['uid']&&$sync_num < 1){
                 $mail   =   new Mail($email['email'],base64_decode($email['password']),$email['imap']);
                 $mail   =   new Mail($email['email'],base64_decode($email['password']),$email['imap']);
 
 
                 if($mail->login()){
                 if($mail->login()){

@@ -86,6 +86,8 @@ return [
 
 
     'save_draft_error'    =>  '草稿保存失败',
     'save_draft_error'    =>  '草稿保存失败',
 
 
+    'send_timer_job_error'    =>  '延迟发送失败',
+
 
 
 
 
 
 

@@ -122,6 +122,12 @@ class listsSql {
             'email_id'    =>  $email['id'],
             'email_id'    =>  $email['id'],
             'is_file'  =>  $data['attachment'] ? 1 : 0, //是否附件
             'is_file'  =>  $data['attachment'] ? 1 : 0, //是否附件
             'description'  =>  mb_substr(strip_tags($data['body']),0,150), //是否附件
             'description'  =>  mb_substr(strip_tags($data['body']),0,150), //是否附件
+            'references'    =>  [
+                'receipt'   =>  $data['receipt'],
+                'priority'  =>  $data['priority'],
+                'massSuit'  =>  $data['massSuit']?1:0,
+                'jobName'  =>  $data['jobName']??'',
+            ]
         ];
         ];
         $draftData['to'] = $data['tos'][0]['email'];
         $draftData['to'] = $data['tos'][0]['email'];
         $draftData['to_name'] = $data['tos'];
         $draftData['to_name'] = $data['tos'];
@@ -154,6 +160,8 @@ class listsSql {
             ];
             ];
 
 
             foreach ($data['attachment'] as $da){
             foreach ($data['attachment'] as $da){
+                $da['name'] = base64_encode($da['name']);
+                $da['filename'] = base64_encode($da['filename']);
                 $draftBody[] = $da;
                 $draftBody[] = $da;
             }
             }
 
 

@@ -15,7 +15,7 @@ class sendJobsSql {
      * 表
      * 表
      * @var string
      * @var string
      */
      */
-    public static $table = 'lists';
+    public static $table = 'send_jobs';