合并分支 'master-server' 到 'master'

gx数据



查看合并请求 !1000

@@ -39,17 +39,20 @@ class SendAutoEmail extends Command
                 $smtpModel = new Smtp();
                 $smtpInfo = $smtpModel->read(['project_id'=>$value['project_id']]);
                 if($smtpInfo === false){
+                    $status = AutoEmailLog::STATUS_ERROR;
                     $this->output('任务：' . $smtpInfo['id'] . '失败，未配置SMTP');
-                    continue;
+                }else{
+                    $status = $this->toQueue($value,$smtpInfo);
                 }
-                $this->toQueue($value,$smtpInfo);
+                $autoEmailLogModel = new AutoEmailLog();
+                $autoEmailLogModel->edit(['status'=>$status],['id'=>$value['id']]);
             }
         }
         return true;
     }
 
     /**
-     * @remark :执行方法
+     * @remark :发送邮件
      * @name   :toQueue
      * @author :lyh
      * @method :post
@@ -68,8 +71,7 @@ class SendAutoEmail extends Command
             $status = AutoEmailLog::STATUS_ERROR;
             $this->output('任务：' . $info['id'] . ' 邮箱' . $info['email'] . '发送失败,' . $e->getMessage());
         }
-        $autoEmailLogModel = new AutoEmailLog();
-        return $autoEmailLogModel->edit(['status'=>$status],['id'=>$info['id']]);
+        return $status;
     }
 
     /**