gx

@@ -34,14 +34,15 @@ class CountAllProject extends Command
 
 
 
 
     public function handle(){
     public function handle(){
+        $countAllModel = new AllProject;
+        AllProject::truncate();
 //        $noSixData = [];
 //        $noSixData = [];
         $noSixData = $this->NoSixProject();
         $noSixData = $this->NoSixProject();
-//        $sixData = $this->sixProject();
+        $countAllModel->insert($noSixData);
+        $sixData = $this->sixProject();
+        $countAllModel->insert($sixData);
         $data = array_merge($noSixData ?? [],$sixData ?? []);
         $data = array_merge($noSixData ?? [],$sixData ?? []);
-        $countAllModel = new AllProject;
-        AllProject::truncate();
         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');
-        $countAllModel->insert($data);
         return true;
         return true;
     }
     }
 
 
@@ -69,8 +70,12 @@ class CountAllProject extends Command
                     if(empty($v['online_date'])){
                     if(empty($v['online_date'])){
                         $v['online_date'] = null;
                         $v['online_date'] = null;
                     }
                     }
+                    if($v['is_admin5'] == 5){
+                        $v['version'] = 2;
+                    }else{
+                        $v['version'] = 3;
+                    }
                     $v['is_upgrade'] = 0;
                     $v['is_upgrade'] = 0;
-                    $v['version'] = 2;
                     $v['status'] = 0;
                     $v['status'] = 0;
                     $v['created_at'] = $v['updated_at'] = date('Y-m-d H:i:s');
                     $v['created_at'] = $v['updated_at'] = date('Y-m-d H:i:s');
                     $data[$k] = $v;
                     $data[$k] = $v;