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

@@ -35,9 +35,9 @@ class CountAllProject extends Command
 
 
     public function handle(){
     public function handle(){
 //        $noSixData = [];
 //        $noSixData = [];
-        $noSixData = $this->NoSixProject();
-//        $sixData = $this->sixProject();
-        $data = array_merge($noSixData,$sixData ?? []);
+//        $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;
     }
     }
@@ -52,16 +52,24 @@ 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=500';
-            $result = http_get($url);
+        while (true) {
+            $url = 'https://quanqiusou.cn/extend_api/api/projects.php?page=' . $i . '&pagesize=100';
+            $result = curl_get($url);
+            // 检查结果是否成功，并且结构符合预期
+            if (isset($result['data']['data']) && is_array($result['data']['data'])) {
                 $data = $result['data']['data'];
                 $data = $result['data']['data'];
-            if(empty($data)){
+                // 如果当前页没有数据，跳出循环
+                if (empty($data)) {
                     break;
                     break;
                 }
                 }
-            echo '执行页数:' .$i . PHP_EOL . date('Y-m-d H:i:s');
-            $res_data = array_merge($res_data,$data);
+                echo '执行页数:' . $i . PHP_EOL . date('Y-m-d H:i:s') . PHP_EOL;
+                $res_data = array_merge($res_data, $data);
                 $i++;
                 $i++;
+            } else {
+                // 如果数据结构不符合预期，输出错误信息并跳出循环
+                echo '数据结构不符合预期或请求失败，停止执行。' . PHP_EOL . json_encode($result);
+                break;
+            }
         }
         }
         return $res_data;
         return $res_data;
     }
     }
@@ -79,6 +87,7 @@ class CountAllProject extends Command
             if(empty($lists) || empty($lists['list'])){
             if(empty($lists) || empty($lists['list'])){
                 break;
                 break;
             }
             }
+            echo '执行页数:' . $i . PHP_EOL . date('Y-m-d H:i:s') . PHP_EOL;
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $data[] = [
                 $data[] = [
                     'project_id'=>$v['id'],
                     'project_id'=>$v['id'],