合并分支 'akun' 到 'master'

Akun



查看合并请求 !266

@@ -66,7 +66,7 @@ class HtmlLanguageSpecialCollect extends Command
         //设置数据库
         //设置数据库
         $project = ProjectServer::useProject($project_id);
         $project = ProjectServer::useProject($project_id);
         if ($project) {
         if ($project) {
-            $collect_info = CollectTask::select(['id', 'domain', 'route', 'language'])->where('id', $collect_id)->where('status', CollectTask::STATUS_UN)->where('language', '!=', '')->first();
+            $collect_info = CollectTask::select(['id', 'domain', 'route', 'language'])->where('id', $collect_id)->where('status', CollectTask::STATUS_UN)->where('language', '=', '')->first();
 
 
             if (!$collect_info) {
             if (!$collect_info) {
                 sleep(2);
                 sleep(2);
@@ -138,7 +138,7 @@ class HtmlLanguageSpecialCollect extends Command
         }
         }
 
 
 
 
-        $update_log = UpdateLog::where('status', UpdateLog::STATUS_COM)->where('collect_status', '>', UpdateLog::COLLECT_STATUS_MAIN)->orderBy('collect_status', 'asc')->first();
+        $update_log = UpdateLog::where('project_id',555)->where('status', UpdateLog::STATUS_COM)->where('collect_status', '>', UpdateLog::COLLECT_STATUS_MAIN)->orderBy('collect_status', 'asc')->first();
         if (!$update_log) {
         if (!$update_log) {
             return false;
             return false;
         }
         }