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

@@ -52,18 +52,18 @@ class CountAllProject extends Command
     public function NoSixProject(){
     public function NoSixProject(){
         $res_data = [];
         $res_data = [];
         $i = 1;
         $i = 1;
-//        while (true){
-            $url = 'https://quanqiusou.cn/extend_api/api/projects.php?page='.$i.'&pagesize=100';
+        while (true){
+            $url = 'https://quanqiusou.cn/extend_api/api/projects.php?page='.$i.'&pagesize=2';
             $result = http_get($url);
             $result = http_get($url);
             $data = $result['data']['data'];
             $data = $result['data']['data'];
-            echo '执行页数:' .json_encode($data) . PHP_EOL . date('Y-m-d H:i:s');
-//            if(empty($data)){
-//                break;
-//            }
+            echo '执行页数:' .$result['data']['total'] . PHP_EOL . date('Y-m-d H:i:s');
+            if(empty($data)){
+                break;
+            }
             echo '执行页数:' .$i . PHP_EOL . date('Y-m-d H:i:s');
             echo '执行页数:' .$i . PHP_EOL . date('Y-m-d H:i:s');
             $res_data = array_merge($res_data,$data);
             $res_data = array_merge($res_data,$data);
             $i++;
             $i++;
-//        }
+        }
         return $res_data;
         return $res_data;
     }
     }