Merge remote-tracking branch 'origin/master' into akun

@@ -64,6 +64,7 @@ class DeleteBlogCategory extends Command
             $list = $noticeLogModel->list(['status'=>NoticeLog::STATUS_PENDING,'type'=>NoticeLog::DELETE_BLOG_CATEGORY],'id',['*'],'asc',100);
             $list = $noticeLogModel->list(['status'=>NoticeLog::STATUS_PENDING,'type'=>NoticeLog::DELETE_BLOG_CATEGORY],'id',['*'],'asc',100);
             if(empty($list)){
             if(empty($list)){
                 sleep(100);
                 sleep(100);
+                continue;
             }
             }
             foreach ($list as $item){
             foreach ($list as $item){
                 echo 'start:' . $item['id'] . PHP_EOL;
                 echo 'start:' . $item['id'] . PHP_EOL;

@@ -64,6 +64,7 @@ class DeleteCustomCategory extends Command
             $list = $noticeLogModel->list(['status'=>NoticeLog::STATUS_PENDING,'type'=>NoticeLog::DELETE_CUSTOM_CATEGORY],'id',['*'],'asc',100);
             $list = $noticeLogModel->list(['status'=>NoticeLog::STATUS_PENDING,'type'=>NoticeLog::DELETE_CUSTOM_CATEGORY],'id',['*'],'asc',100);
             if(empty($list)){
             if(empty($list)){
                 sleep(100);
                 sleep(100);
+                continue;
             }
             }
             foreach ($list as $item){
             foreach ($list as $item){
                 echo 'start:' . $item['id'] . PHP_EOL;
                 echo 'start:' . $item['id'] . PHP_EOL;

@@ -64,6 +64,7 @@ class DeleteNewsCategory extends Command
             $list = $noticeLogModel->list(['status'=>NoticeLog::STATUS_PENDING,'type'=>NoticeLog::DELETE_NEWS_CATEGORY],'id',['*'],'asc',100);
             $list = $noticeLogModel->list(['status'=>NoticeLog::STATUS_PENDING,'type'=>NoticeLog::DELETE_NEWS_CATEGORY],'id',['*'],'asc',100);
             if(empty($list)){
             if(empty($list)){
                 sleep(100);
                 sleep(100);
+                continue;
             }
             }
             foreach ($list as $item){
             foreach ($list as $item){
                 echo 'start:' . $item['id'] . PHP_EOL;
                 echo 'start:' . $item['id'] . PHP_EOL;

@@ -65,6 +65,7 @@ class DeleteProductCategory extends Command
             $list = $noticeLogModel->list(['status'=>NoticeLog::STATUS_PENDING,'type'=>NoticeLog::DELETE_PRODUCT_CATEGORY],'id',['*'],'asc',100);
             $list = $noticeLogModel->list(['status'=>NoticeLog::STATUS_PENDING,'type'=>NoticeLog::DELETE_PRODUCT_CATEGORY],'id',['*'],'asc',100);
             if(empty($list)){
             if(empty($list)){
                 sleep(100);
                 sleep(100);
+                continue;
             }
             }
             foreach ($list as $item){
             foreach ($list as $item){
                 echo 'start:' . $item['id'] . PHP_EOL;
                 echo 'start:' . $item['id'] . PHP_EOL;

@@ -64,7 +64,7 @@ class ReplaceHtml extends Command
             $replaceHtmlList = $replaceHtmlModel->list(['status'=>$replaceHtmlModel::STATUS]);
             $replaceHtmlList = $replaceHtmlModel->list(['status'=>$replaceHtmlModel::STATUS]);
             if(empty($replaceHtmlList)){
             if(empty($replaceHtmlList)){
                 sleep(100);
                 sleep(100);
-                return true;
+                continue;
             }
             }
             foreach ($replaceHtmlList as $v){
             foreach ($replaceHtmlList as $v){
                 ProjectServer::useProject($v['project_id']);
                 ProjectServer::useProject($v['project_id']);
@@ -79,6 +79,7 @@ class ReplaceHtml extends Command
                 echo '结束'.PHP_EOL;
                 echo '结束'.PHP_EOL;
                 DB::disconnect('custom_mysql');
                 DB::disconnect('custom_mysql');
             }
             }
+            sleep(50);
             return true;
             return true;
         }
         }
     }
     }

@@ -66,7 +66,7 @@ class ReplaceHtmlLog extends Command
                 echo '结束'.PHP_EOL;
                 echo '结束'.PHP_EOL;
             }
             }
         }
         }
-        sleep(5);
+        sleep(20);
         return true;
         return true;
     }
     }