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

@@ -34,10 +34,10 @@ class CountAllProject extends Command
 
 
 
 
     public function handle(){
     public function handle(){
-        $noSixData = [];
-//        $noSixData = $this->NoSixProject();
-        $sixData = $this->sixProject();
-        $data = array_merge($noSixData,$sixData);
+//        $noSixData = [];
+        $noSixData = $this->NoSixProject();
+//        $sixData = $this->sixProject();
+        $data = array_merge($noSixData,$sixData ?? []);
         echo 'success:' .count($data) . PHP_EOL . date('Y-m-d H:i:s');
         echo 'success:' .count($data) . PHP_EOL . date('Y-m-d H:i:s');
         return true;
         return true;
     }
     }
@@ -55,7 +55,7 @@ class CountAllProject extends Command
         while (true){
         while (true){
             $url = 'https://quanqiusou.cn/extend_api/api/projects.php?page='.$i.'&pagesize=500';
             $url = 'https://quanqiusou.cn/extend_api/api/projects.php?page='.$i.'&pagesize=500';
             $result = http_get($url);
             $result = http_get($url);
-            $data = $result['data'];
+            $data = $result['data']['data'];
             if(empty($data)){
             if(empty($data)){
                 break;
                 break;
             }
             }