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

@@ -41,6 +41,7 @@ class UpgradeCount extends Command
         $projectModel = new Project();
         $projectModel = new Project();
         $list = $projectModel->list(['is_upgrade'=>1,'delete_status'=>0]);
         $list = $projectModel->list(['is_upgrade'=>1,'delete_status'=>0]);
         foreach ($list as $v) {
         foreach ($list as $v) {
+            if($v['is_upgrade'] == 1){
                 $oldModel = new UpdateOldInfo();
                 $oldModel = new UpdateOldInfo();
                 $info = $oldModel->read(['project_id' => $v['id']]);
                 $info = $oldModel->read(['project_id' => $v['id']]);
                 if ($info !== false) {
                 if ($info !== false) {
@@ -48,6 +49,14 @@ class UpgradeCount extends Command
                 }else{
                 }else{
                     continue;
                     continue;
                 }
                 }
+            }else{
+                $domainModel = new DomainInfo();
+                $info = $domainModel->read(['project_id'=>$v['id']]);
+                if($info === false){
+                    continue;
+                }
+                $url = $info['domain'];
+            }
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
             echo date('Y-m-d H:i:s') . '项目id：'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . '项目id：'.$v['id'] . PHP_EOL;
             $this->count($v['id'], $url);
             $this->count($v['id'], $url);

@@ -44,7 +44,7 @@ class SyncSubmitTask extends Command
             }
             }
             $this->output('任务' . $task_id . '开始');
             $this->output('任务' . $task_id . '开始');
             $task_info = SyncSubmitTaskModel::find($task_id);
             $task_info = SyncSubmitTaskModel::find($task_id);
-            if (empty($task_info) || $task_info->status) {
+            if (empty($task_info) || $task_info->status !=2) {
                 $this->output('任务不存在或者已执行');
                 $this->output('任务不存在或者已执行');
                 continue;
                 continue;
             }
             }
@@ -88,9 +88,11 @@ class SyncSubmitTask extends Command
             if (Redis::setnx($lockKey, 1)) {
             if (Redis::setnx($lockKey, 1)) {
                 // 设置锁的过期时间，防止死锁
                 // 设置锁的过期时间，防止死锁
                 Redis::expire($lockKey, 10);
                 Redis::expire($lockKey, 10);
-                $ids = SyncSubmitTaskModel::where('status', 0)->limit(100)->pluck('id');
-                foreach ($ids as $id) {
-                    Redis::lpush('sync_submit_task', $id);
+                $tasks = SyncSubmitTaskModel::where('status', 0)->limit(100)->get();
+                foreach ($tasks as $task) {
+                    $task->status = 2;
+                    $task->save();
+                    Redis::lpush('sync_submit_task', $task->id);
                 }
                 }
                 $task_id = Redis::rpop('sync_submit_task');
                 $task_id = Redis::rpop('sync_submit_task');
                 Redis::del($lockKey);
                 Redis::del($lockKey);