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);