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

@@ -31,10 +31,14 @@ class SyncSubmitTask extends Command
         while (true) {
         while (true) {
             $task_id = Redis::rpop('sync_submit_task');
             $task_id = Redis::rpop('sync_submit_task');
             if(!$task_id){
             if(!$task_id){
-                sleep(3);
                 continue;
                 continue;
             }
             }
+
             $this->output('任务' . $task_id . '开始');
             $this->output('任务' . $task_id . '开始');
+
+            $time = time();
+            DB::enableQueryLog(); //启用查询日志
+
             $task_info = SyncSubmitTaskModel::find($task_id);
             $task_info = SyncSubmitTaskModel::find($task_id);
             if (empty($task_info) || $task_info->status !=3) {
             if (empty($task_info) || $task_info->status !=3) {
                 $this->output('任务不存在或者已执行');
                 $this->output('任务不存在或者已执行');
@@ -43,7 +47,6 @@ class SyncSubmitTask extends Command
             try {
             try {
                 $project = Project::getProjectByDomain($task_info['data']['domain'] ?? '');
                 $project = Project::getProjectByDomain($task_info['data']['domain'] ?? '');
                 $task_info->project_id = $project->id;
                 $task_info->project_id = $project->id;
-
                 SyncSubmitTaskService::handler($task_info);
                 SyncSubmitTaskService::handler($task_info);
                 $task_info->status = 1;
                 $task_info->status = 1;
                 $task_info->save();
                 $task_info->save();
@@ -68,6 +71,12 @@ class SyncSubmitTask extends Command
 
 
                 $this->output('任务失败：' . $e->getMessage());
                 $this->output('任务失败：' . $e->getMessage());
             }
             }
+
+            $use_time = time() - $time;
+            if($use_time > 1){
+                //数据库查询
+                $this->output('任务用时:' .$use_time . ' | ' . json_encode(DB::getQueryLog(),JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+            }
         }
         }
     }
     }
 
 

@@ -44,7 +44,6 @@ class SyncSubmitTaskDistribution extends Command
                     }
                     }
                 }
                 }
             }
             }
-            sleep(3);
         }
         }
     }
     }