Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -48,18 +48,23 @@ class ReplaceHtml extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
-        $replaceHtmlModel = new TemplateReplaceHtml();
-        $replaceHtmlList = $replaceHtmlModel->list(['status'=>$replaceHtmlModel::STATUS]);
-        foreach ($replaceHtmlList as $k => $v){
-            ProjectServer::useProject($v['project_id']);
-            echo '开始,任务id:'.$v['id'].PHP_EOL;
-            $this->createReplaceHtmlLog($v);
-            //修改当前主任务状态为待执行
-            $replaceHtmlModel->edit(['status'=>$replaceHtmlModel::STATUS_START],['id'=>$v['id']]);
-            echo '结束'.PHP_EOL;
-            DB::disconnect('custom_mysql');
+        while (true){
+            $replaceHtmlModel = new TemplateReplaceHtml();
+            $replaceHtmlList = $replaceHtmlModel->list(['status'=>$replaceHtmlModel::STATUS]);
+            if(!empty($replaceHtmlList)){
+                foreach ($replaceHtmlList as $k => $v){
+                    ProjectServer::useProject($v['project_id']);
+                    echo '开始,任务id:'.$v['id'].PHP_EOL;
+                    $this->createReplaceHtmlLog($v);
+                    //修改当前主任务状态为待执行
+                    $replaceHtmlModel->edit(['status'=>$replaceHtmlModel::STATUS_START],['id'=>$v['id']]);
+                    echo '结束'.PHP_EOL;
+                    DB::disconnect('custom_mysql');
+                }
+            }
+            sleep(5);
+            return true;
         }
         }
-        return true;
     }
     }
 
 
     /**
     /**

@@ -55,6 +55,7 @@ class ReplaceHtmlLog extends Command
             $replaceHtmlLogList = $replaceHtmlLogModel->list(['replace_id'=>$value['id'],'status'=>$replaceHtmlLogModel::STATUS]);
             $replaceHtmlLogList = $replaceHtmlLogModel->list(['replace_id'=>$value['id'],'status'=>$replaceHtmlLogModel::STATUS]);
             ProjectServer::useProject($value['project_id']);
             ProjectServer::useProject($value['project_id']);
             foreach ($replaceHtmlLogList as $v){
             foreach ($replaceHtmlLogList as $v){
+                echo date('Y-m-d H:i:s') . '子任务id :'.$v['id'] . PHP_EOL;
                 $this->replaceHtml($v);
                 $this->replaceHtml($v);
                 $replaceHtmlLogModel->edit(['status'=>$replaceHtmlLogModel::STATUS_END],['id'=>$v['id']]);
                 $replaceHtmlLogModel->edit(['status'=>$replaceHtmlLogModel::STATUS_END],['id'=>$v['id']]);
             }
             }