自动回复

@@ -81,15 +81,15 @@ class fob_ai_mail_auto_reply {
                     continue;
                 }
                 // 查询数据
-                $data = $this->db->throw()->first(\Model\listsSql::first('`id` = '.$did,'`id`,`folder_id`,`email_id`,`subject`,`is_hots`,`from`,`udate`'));
+                $data = $this->db->throw()->first(\Model\listsSql::first('`id` = '.$did,'`id`,`folder_id`,`email_id`,`subject`,`is_hots`,`from`,`udate`,`to`'));
                 if($data && !$data['is_hots']){
-                    _echo('处理 '.$data['id']);
+
                     // 不是屏蔽的
                     $body = getBodyHtml(getMailBody($data['id']));
                     if(isAiAutoMail($data['from'],$data['subject'],$body)===0){
                         // 在检查下是否是 收件箱
                         if($this->db->value(\Model\folderSql::has(['id'=>$data['folder_id'],'origin_folder'=>'INBOX']))){
-
+                            _echo('处理 '.$data['id']);
                             // 检查 是否开启了自动回复
                             list($postid,$source) = $this->getPostid($data['email_id']);
                             if($source == 2){
@@ -101,7 +101,7 @@ class fob_ai_mail_auto_reply {
                                     $ret = \Lib\Mail\MailFun::sendEmail([
                                         'subject'   =>  'Re:'.$data['subject'],
                                         'tos'   =>  [['email'=>$data['from'],'name'=>explode('@',$data['from'])[0]]],
-                                        'body'  => $this->trimBody($replySetting['content'],$body)
+                                        'body'  => $this->trimBody($data,$replySetting['content'],$body)
                                     ],$email);
                                     _echo('回复成功'.$data['id'].'==='.$postid);
                                     $this->log([$data,$replySetting,$ret]); // 立即写入日志
@@ -122,10 +122,16 @@ class fob_ai_mail_auto_reply {
 
     }
 
-    public function trimBody($reply,$inbox){
+    public function trimBody($data,$reply,$inbox){
         $reply = explode('</body>',$reply,2);
 
-        return $reply[0]."<pre>{$inbox}</pre>".($reply[1]??'');
+        return $reply[0]."<pre>------------------ 原始邮件 ------------------
+发件人: {$data['from']};
+发送时间: ".date("Y年m月d日 H:i",$data['udate'])."
+收件人: {$data['to']};
+主题: {$data['subject']}
+
+{$inbox}</pre>".($reply[1]??'');
     }