x

@@ -391,6 +391,13 @@ class Mail {
         if(!empty($body)){
         if(!empty($body)){
             $description = '';
             $description = '';
             foreach ($body as $key=>$item){
             foreach ($body as $key=>$item){
+
+                if(!empty($item['body'])){
+                    // 过滤二进制
+                    $item['body'] = preg_replace('/<0x[a-f\d]+>/','',$item['body']);
+                    $body[$key]['body'] = base64_encode($item['body']);
+                }
+
                 if(!$description && in_array($item['type']??'',['text/html','text/plain'])){
                 if(!$description && in_array($item['type']??'',['text/html','text/plain'])){
 
 
                     if(!empty($item['charset'])){
                     if(!empty($item['charset'])){
@@ -411,9 +418,7 @@ class Mail {
 
 
                 }
                 }
 
 
-                if(!empty($body[$key]['body'])){
-                    $body[$key]['body'] = base64_encode($body[$key]['body']);
-                }
+
 
 
                 if(!empty($body[$key]['filename'])){
                 if(!empty($body[$key]['filename'])){
                     $body[$key]['filename'] = base64_encode($body[$key]['filename']);
                     $body[$key]['filename'] = base64_encode($body[$key]['filename']);