gx

@@ -35,9 +35,9 @@ class CountAllProject extends Command
 
     public function handle(){
         AllProject::truncate();
-        $noSixData = $this->NoSixProject();
-//        $sixData = $this->sixProject();
-        $data = array_merge($noSixData ?? [],$sixData ?? []);
+        $noSixCount = $this->NoSixProject();
+        $sixCount = $this->sixProject();
+        $data = $noSixCount + $sixCount;
         echo 'success:' .count($data) . PHP_EOL . date('Y-m-d H:i:s');
         return true;
     }
@@ -50,7 +50,7 @@ class CountAllProject extends Command
      * @time   :2024/11/11 15:21
      */
     public function NoSixProject(){
-        $res_data = [];
+        $count = 0;
         $i = 1;
         while (true) {
             $url = 'https://quanqiusou.cn/extend_api/api/projects.php?page=' . $i . '&pagesize=500';
@@ -77,6 +77,7 @@ class CountAllProject extends Command
                     $data[$k] = $v;
                 }
                 echo '执行页数:' . $i . PHP_EOL . date('Y-m-d H:i:s') . PHP_EOL;
+                $count = $count + count($data);
                 $countAllModel = new AllProject;
                 $countAllModel->insert($data);
                 $i++;
@@ -88,7 +89,7 @@ class CountAllProject extends Command
                 break;
             }
         }
-        return $res_data;
+        return $count;
     }
 
     public function httpGetProxy($url){
@@ -112,6 +113,7 @@ class CountAllProject extends Command
     }
 
     public function sixProject(){
+        $count = 0;
         $projectModel = new Project();
         $manageModel = new ManageHr();
         $i = 1;
@@ -154,9 +156,13 @@ class CountAllProject extends Command
                     'updated_at'=>date('Y-m-d H:i:s'),
                 ];
             }
+            $count = $count + count($data);
+            $countAllModel = new AllProject;
+            $countAllModel->insert($data);
+            sleep(1);
             $i++;
         }
-        return $data;
+        return $count;
     }
 
     /**