合并分支 'akun' 到 'master'

Akun



查看合并请求 !290

@@ -136,7 +136,7 @@ class HtmlCollect extends Command
         }
         }
 
 
 
 
-        $update_log = UpdateLog::where('status', UpdateLog::STATUS_COM)->where('collect_status', UpdateLog::COLLECT_STATUS_UN)->orderBy('project_id', 'asc')->first();
+        $update_log = UpdateLog::whereNotIn('project_id', [555, 626])->where('status', UpdateLog::STATUS_COM)->where('collect_status', UpdateLog::COLLECT_STATUS_UN)->orderBy('project_id', 'asc')->first();
         if (!$update_log) {
         if (!$update_log) {
             return false;
             return false;
         }
         }

@@ -138,7 +138,7 @@ class HtmlLanguageSpecialCollect extends Command
         }
         }
 
 
 
 
-        $update_log = UpdateLog::where('project_id', 555)->where('status', UpdateLog::STATUS_COM)->where('collect_status', '>', UpdateLog::COLLECT_STATUS_MAIN)->first();
+        $update_log = UpdateLog::whereIn('project_id', [555, 626])->where('status', UpdateLog::STATUS_COM)->where('collect_status', UpdateLog::COLLECT_STATUS_UN)->first();
         if (!$update_log) {
         if (!$update_log) {
             return false;
             return false;
         }
         }
@@ -176,7 +176,7 @@ class HtmlLanguageSpecialCollect extends Command
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
 
 
         if ($complete) {
         if ($complete) {
-            $update_log->collect_status = UpdateLog::COLLECT_STATUS_MAIN;
+            $update_log->collect_status = UpdateLog::COLLECT_STATUS_COM;
             $update_log->save();
             $update_log->save();
             return 0;
             return 0;
         }
         }