gx脚本

@@ -2,6 +2,7 @@
 
 
 namespace App\Console\Commands\Domain;
 namespace App\Console\Commands\Domain;
 
 
+use App\Models\Project\DeployOptimize;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
@@ -47,10 +48,15 @@ class RemainDay extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
-        $list = Project::whereIn('type', [Project::TYPE_TWO,Project::TYPE_THREE,Project::TYPE_FOUR])->with(['deploy_optimize'])->get();
+        $list = Project::whereIn('type', [Project::TYPE_TWO,Project::TYPE_THREE,Project::TYPE_FOUR])->get();
         foreach ($list as $item){
         foreach ($list as $item){
             if(in_array($item->id,$this->projectId)){
             if(in_array($item->id,$this->projectId)){
-                $diff = time() - strtotime($item->deploy_optimize->start_date);
+                $optimizeModel = new DeployOptimize();
+                $opInfo = $optimizeModel->read(['project_id'=>$item->id],['start_date']);
+                if($opInfo === false){
+                    continue;
+                }
+                $diff = time() - strtotime($opInfo['start_date'] ?? $item->uptime);
                 $remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24));
                 $remain_day = $item['deploy_build']['service_duration'] - floor($diff / (60 * 60 * 24));
             }else{
             }else{
                 if($item['type'] == Project::TYPE_TWO){
                 if($item['type'] == Project::TYPE_TWO){