gx数据

@@ -42,22 +42,12 @@ class MonthAllCount extends Command
         $projectModel = new Project();
         $projectModel = new Project();
         $list = $projectModel->list(['delete_status'=>0,'type'=>['in',[1,2,3,4,6]]]);
         $list = $projectModel->list(['delete_status'=>0,'type'=>['in',[1,2,3,4,6]]]);
         foreach ($list as $v) {
         foreach ($list as $v) {
-            if($v['is_upgrade'] == 1){
-                $oldModel = new UpdateOldInfo();
-                $info = $oldModel->read(['project_id' => $v['id']]);
-                if ($info !== false) {
-                    $url = $info['old_domain_online'];
-                }else{
-                    continue;
-                }
-            }else{
-                $domainModel = new DomainInfo();
-                $info = $domainModel->read(['project_id'=>$v['id']]);
-                if($info === false){
-                    continue;
-                }
-                $url = $info['domain'];
+            $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 ,$v['is_upgrade']);
             $this->count($v['id'], $url ,$v['is_upgrade']);

@@ -48,24 +48,14 @@ class MonthCount extends Command
             if($v['type'] == Project::TYPE_ZERO){
             if($v['type'] == Project::TYPE_ZERO){
                 continue;
                 continue;
             }
             }
-            if($v['is_upgrade'] == 1){
-                $oldModel = new UpdateOldInfo();
-                $info = $oldModel->read(['project_id' => $v['id']]);
-                if ($info !== false) {
-                    $url = $info['old_domain_online'];
-                }else{
-                    continue;
+            $domainInfo = new DomainInfo();
+            if(!empty($v['domain'])){
+                $info = $domainInfo->read(['id'=>$v['domain']]);
+                if($info !== false){
+                    $url = $info['domain'];
                 }
                 }
             }else{
             }else{
-                $domainInfo = new DomainInfo();
-                if(!empty($v['domain'])){
-                    $info = $domainInfo->read(['id'=>$v['domain']]);
-                    if($info !== false){
-                        $url = $info['domain'];
-                    }
-                }else{
-                    $url = $v['test_domain'];
-                }
+                $url = $v['test_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;

@@ -48,24 +48,14 @@ class MonthCountDate extends Command
             if($v['type'] == Project::TYPE_ZERO){
             if($v['type'] == Project::TYPE_ZERO){
                 continue;
                 continue;
             }
             }
-            if($v['is_upgrade'] == 1){
-                $oldModel = new UpdateOldInfo();
-                $info = $oldModel->read(['project_id' => $v['id']]);
-                if ($info !== false) {
-                    $url = $info['old_domain_online'];
-                }else{
-                    continue;
+            $domainInfo = new DomainInfo();
+            if(!empty($v['domain'])){
+                $info = $domainInfo->read(['id'=>$v['domain']]);
+                if($info !== false){
+                    $url = $info['domain'];
                 }
                 }
             }else{
             }else{
-                $domainInfo = new DomainInfo();
-                if(!empty($v['domain'])){
-                    $info = $domainInfo->read(['id'=>$v['domain']]);
-                    if($info !== false){
-                        $url = $info['domain'];
-                    }
-                }else{
-                    $url = $v['test_domain'];
-                }
+                $url = $v['test_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;

@@ -41,15 +41,9 @@ class MonthProjectCount extends Command
 
 
     public function handle(){
     public function handle(){
         $project_id = $this->argument('project_id');
         $project_id = $this->argument('project_id');
-        $oldModel = new UpdateOldInfo();
-        $info = $oldModel->read(['project_id'=>$project_id]);
-        if($info !== false){
-            $url = $info['old_domain_online'];
-        }else{
-            $domainModel = new DomainInfo();
-            $info = $domainModel->read(['project_id'=>$project_id]);
-            $url = $info['domain'];
-        }
+        $domainModel = new DomainInfo();
+        $info = $domainModel->read(['project_id'=>$project_id]);
+        $url = $info['domain'];
         $projectModel = new Project();
         $projectModel = new Project();
         $projectInfo = $projectModel->read(['id'=>$project_id]);
         $projectInfo = $projectModel->read(['id'=>$project_id]);
         ProjectServer::useProject($project_id);
         ProjectServer::useProject($project_id);