通知

@@ -51,10 +51,9 @@ class syncMail {
 
 
         // 不是预热邮箱
         // 不是预热邮箱
         if($f=='收件箱'){
         if($f=='收件箱'){
-            // mimecast@wsa.aero
-            $filterEmail = ['mimecast@wsa.aero'];
+
             // 邮件过滤 这些邮箱都是系统邮箱
             // 邮件过滤 这些邮箱都是系统邮箱
-            if(!in_array($data['from'],$filterEmail) && !preg_match("/^((no-?reply)|(postmaster)|(mailer-daemon)|(email-notifications)|(googleplay-noreply)|(postmaster-noreply)|(privacy-noreply))@/i",$data['from']) && !$this->checkSubject($data['subject'])){
+            if(!$this->checkEmail($data['from']) && !$this->checkSubject($data['subject'])){
                 // 通知黑格 2024-08-22 新上 这个是异步的不会阻塞当前进程
                 // 通知黑格 2024-08-22 新上 这个是异步的不会阻塞当前进程
                 try {
                 try {
                     SaberGM::post('https://fob.ai.cc/api/email_new_push',[
                     SaberGM::post('https://fob.ai.cc/api/email_new_push',[
@@ -81,6 +80,31 @@ class syncMail {
     }
     }
 
 
     /**
     /**
+     * 验证邮箱
+     * @param $email
+     * @author：dc
+     * @time 2024/8/28 14:33
+     */
+    public function checkEmail($email){
+        // mimecast@wsa.aero
+        $filterEmail = ['mimecast@wsa.aero'];
+        if(in_array($email,$filterEmail)){
+            return true;
+        }
+
+        if(preg_match("/^((no-?reply)|(postmaster)|(mailer-daemon)|(email-notifications)|(googleplay-noreply)|(postmaster-noreply)|(privacy-noreply))@/i",$email)){
+            return true;
+        }
+
+        if(preg_match("/((no-?reply)|(postmaster)|(mailer-daemon)|(email-notifications))/i",$email)){
+            return true;
+        }
+
+
+        return false;
+    }
+
+    /**
      * 验证标题是否存在某些关键词
      * 验证标题是否存在某些关键词
      * @param string $subject
      * @param string $subject
      * @return bool
      * @return bool
@@ -97,6 +121,7 @@ class syncMail {
             'Undelivered Mail Returned',
             'Undelivered Mail Returned',
             'Mail delivery failed:',
             'Mail delivery failed:',
             'Delivery Status Notification',
             'Delivery Status Notification',
+            'Undeliverable:',
         ];
         ];
 
 
         foreach ($keys as $key){
         foreach ($keys as $key){