| 
...
 | 
...
 | 
@@ -71,16 +71,16 @@ class Mail { | 
| 
 | 
 | 
             if($pass_err){
 | 
| 
 | 
 | 
                 // 是否是密码错误
 | 
| 
 | 
 | 
                 foreach ([
 | 
| 
 | 
 | 
                     'NO [ALERT] Invalid credentials (Failure)',// 登录失败
 | 
| 
 | 
 | 
                     'NO [AUTHENTICATIONFAILED] Invalid credentials (Failure)',// 登录失败
 | 
| 
 | 
 | 
                     'NO [AUTHENTICATIONFAILED] Authentication failed.',// 登录失败 权限
 | 
| 
 | 
 | 
                     'NO LOGIN Login error',// 登录失败
 | 
| 
 | 
 | 
                     'NO LOGIN auth error',// 登录失败
 | 
| 
 | 
 | 
                     'NO ERR.LOGIN.PASSERR',// 登录失败 密码错误
 | 
| 
 | 
 | 
                     'NO Login fail.',// 登录失败
 | 
| 
 | 
 | 
                     'NO LOGIN failed.', // 登录失败
 | 
| 
 | 
 | 
                              'NO [ALERT] Invalid credentials (Failure)',// 登录失败
 | 
| 
 | 
 | 
                              'NO [AUTHENTICATIONFAILED] Invalid credentials (Failure)',// 登录失败
 | 
| 
 | 
 | 
                              'NO [AUTHENTICATIONFAILED] Authentication failed.',// 登录失败 权限
 | 
| 
 | 
 | 
                              'NO LOGIN Login error',// 登录失败
 | 
| 
 | 
 | 
                              'NO LOGIN auth error',// 登录失败
 | 
| 
 | 
 | 
                              'NO ERR.LOGIN.PASSERR',// 登录失败 密码错误
 | 
| 
 | 
 | 
                              'NO Login fail.',// 登录失败
 | 
| 
 | 
 | 
                              'NO LOGIN failed.', // 登录失败
 | 
| 
 | 
 | 
 //                    'NO ERR.LOGIN.REQCODE', // 未知错误
 | 
| 
 | 
 | 
                     'NO [ALERT] Application-specific password', // 这个错误是没有提供特定的授权码
 | 
| 
 | 
 | 
                              'NO [ALERT] Application-specific password', // 这个错误是没有提供特定的授权码
 | 
| 
 | 
 | 
                          ] as $em){
 | 
| 
 | 
 | 
                     if(str_contains($e->getMessage(), $em)){
 | 
| 
 | 
 | 
                         db()->update(
 | 
| 
...
 | 
...
 | 
@@ -92,7 +92,7 @@ class Mail { | 
| 
 | 
 | 
                 }
 | 
| 
 | 
 | 
                 // 一天中超过 3次失败说明密码错误了
 | 
| 
 | 
 | 
 //                if(redis()->incr('email_login_error:'.md5($this->username),86400) > 10){
 | 
| 
 | 
 | 
                     // 登录失败了 ,
 | 
| 
 | 
 | 
                 // 登录失败了 ,
 | 
| 
 | 
 | 
 //                    db()->update(\Model\emailSql::$table,['pwd_error'=>1],dbWhere(['email'=>$this->username]));
 | 
| 
 | 
 | 
 //                }
 | 
| 
 | 
 | 
                 return -1;
 | 
| 
...
 | 
...
 | 
@@ -422,6 +422,34 @@ class Mail { | 
| 
 | 
 | 
                 $data['subject'] = mb_substr($data['subject'],0,3500);
 | 
| 
 | 
 | 
                 try {
 | 
| 
 | 
 | 
                     $id = $db->throw()->insert(listsSql::$table,$data);
 | 
| 
 | 
 | 
                     if($id){
 | 
| 
 | 
 | 
                         // 是否是预热邮件 aicc专用
 | 
| 
 | 
 | 
                         if(!empty($header['Aicc-Hot-Mail'])){
 | 
| 
 | 
 | 
                             try {
 | 
| 
 | 
 | 
                                 $f = $db->value(folderSql::first($data['folder_id'],'folder'));
 | 
| 
 | 
 | 
                                 $f = folderAlias($f);
 | 
| 
 | 
 | 
                                 if($f=='收件箱'){
 | 
| 
 | 
 | 
                                     $f = 's';
 | 
| 
 | 
 | 
                                 }elseif($f=='发件箱'){
 | 
| 
 | 
 | 
                                     $f = 'f';
 | 
| 
 | 
 | 
                                 }elseif($f=='垃圾箱'){
 | 
| 
 | 
 | 
                                     $f = 'l';
 | 
| 
 | 
 | 
                                 }
 | 
| 
 | 
 | 
                                 if(in_array($f,['s','f','l'])){
 | 
| 
 | 
 | 
                                     $db->throw()->insert('fob_hot_mail',[
 | 
| 
 | 
 | 
                                         'lists_id'  =>  $id,
 | 
| 
 | 
 | 
                                         'email_id'  =>  $data['email_id'],
 | 
| 
 | 
 | 
                                         'hot_form'  =>  $data['from'],
 | 
| 
 | 
 | 
                                         'folder'    =>  $f
 | 
| 
 | 
 | 
                                     ],false);
 | 
| 
 | 
 | 
                                 }
 | 
| 
 | 
 | 
                             }catch (\Throwable $exception){
 | 
| 
 | 
 | 
                                 logs($exception->getMessage());
 | 
| 
 | 
 | 
                             }
 | 
| 
 | 
 | 
 
 | 
| 
 | 
 | 
                         }
 | 
| 
 | 
 | 
                     }
 | 
| 
 | 
 | 
 
 | 
| 
 | 
 | 
                 }catch (\Throwable $e){
 | 
| 
 | 
 | 
                     // 插入失败,尝试更新
 | 
| 
 | 
 | 
                     $db->update(listsSql::$table,$data,dbWhere([
 | 
...
 | 
...
 | 
 |