x

@@ -325,17 +325,20 @@ class Body {
                 // 是文本还是附件
                 // 是文本还是附件
                 else if(strpos($data['type'],'text/') === 0 ){
                 else if(strpos($data['type'],'text/') === 0 ){
 
 
+                    $tempbody = trim($this->body_remove_tag($data['body'],'Content-ID:'));
+
+                    $tempbody = $this->body_remove_tag($tempbody,"Content-");
+                    $tempbody = $this->body_remove_tag($tempbody,"Content-");
+                    $tempbody = $this->body_remove_tag($tempbody,"Content-");
+                    $tempbody = $this->body_remove_tag($tempbody,"Content-");
+
                     // 这里还有可能出现附件
                     // 这里还有可能出现附件
-                    if($filename&&!empty($isfileattachment)){
+                    if($filename&&!empty($isfileattachment)&&MailFun::isBase64($tempbody)){
                         $data = $this->parseFile($data,$filename);
                         $data = $this->parseFile($data,$filename);
                     }else{
                     }else{
                         // tag
                         // tag
-                        $data['body'] = trim($this->body_remove_tag($data['body'],'Content-ID:'));
 
 
-                        $data['body'] = $this->body_remove_tag($data['body'],"Content-");
-                        $data['body'] = $this->body_remove_tag($data['body'],"Content-");
-                        $data['body'] = $this->body_remove_tag($data['body'],"Content-");
-                        $data['body'] = $this->body_remove_tag($data['body'],"Content-");
+                        $data['body'] = $tempbody;
 
 
                         // body解密
                         // body解密
                         switch($data['encode']??''){
                         switch($data['encode']??''){