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

@@ -48,8 +48,10 @@ class ReplaceHtml extends Command
      */
     public function handle()
     {
+        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;
@@ -59,8 +61,11 @@ class ReplaceHtml extends Command
                     echo '结束'.PHP_EOL;
                     DB::disconnect('custom_mysql');
                 }
+            }
+            sleep(5);
             return true;
         }
+    }
 
     /**
      * @remark :生成子任务

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