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

@@ -34,7 +34,8 @@ class CountAllProject extends Command
 
 
 
 
     public function handle(){
     public function handle(){
-        $noSixData = $this->NoSixProject();
+        $noSixData = [];
+//        $noSixData = $this->NoSixProject();
         $sixData = $this->sixProject();
         $sixData = $this->sixProject();
         $data = array_merge($noSixData,$sixData);
         $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');

@@ -37,18 +37,18 @@ class TestController extends BaseController
 
 
     public function NoSixProject(){
     public function NoSixProject(){
         $res_data = [];
         $res_data = [];
-        $i = 1;
-        while (true){
-            $url = 'https://quanqiusou.cn/extend_api/api/projects.php?page='.$i.'&pagesize=100';
+//        $i = 1;
+//        while (true){
+            $url = 'https://quanqiusou.cn/extend_api/api/projects.php?page='.200.'&pagesize=100';
             $result = http_get($url);
             $result = http_get($url);
-            $data = $result['data'];
-            if(empty($data)){
-                break;
-            }
-            $res_data = array_merge($res_data,$data['data']);
-            $i++;
-        }
-        return $res_data;
+//            $data = $result['data'];
+//            if(empty($data)){
+//                break;
+//            }
+//            $res_data = array_merge($res_data,$data['data']);
+//            $i++;
+//        }
+        return $result;
     }
     }
 
 
     public function SixProject(){
     public function SixProject(){