作者 刘锟

update

@@ -5,6 +5,7 @@ namespace App\Http\Logic\Aside\Project; @@ -5,6 +5,7 @@ namespace App\Http\Logic\Aside\Project;
5 use App\Enums\Common\Code; 5 use App\Enums\Common\Code;
6 use App\Exceptions\AsideGlobalException; 6 use App\Exceptions\AsideGlobalException;
7 use App\Models\Com\NoticeLog; 7 use App\Models\Com\NoticeLog;
  8 +use App\Models\Com\UpdateLog;
8 use App\Models\Devops\ServerConfig; 9 use App\Models\Devops\ServerConfig;
9 use App\Models\Project\ProjectRenew; 10 use App\Models\Project\ProjectRenew;
10 use App\Models\Template\BSettingTemplate; 11 use App\Models\Template\BSettingTemplate;
@@ -90,6 +91,15 @@ class ProjectLogic extends BaseLogic @@ -90,6 +91,15 @@ class ProjectLogic extends BaseLogic
90 if(isset($info['deploy_build']['other_project']) && !empty($info['deploy_build']['other_project'])){ 91 if(isset($info['deploy_build']['other_project']) && !empty($info['deploy_build']['other_project'])){
91 $info['deploy_build']['other_project']= json_decode($info['deploy_build']['other_project']); 92 $info['deploy_build']['other_project']= json_decode($info['deploy_build']['other_project']);
92 } 93 }
  94 + //升级项目采集完成时间
  95 + $collect_time = '';
  96 + if($info['is_upgrade'] == 1){
  97 + $collect_info = UpdateLog::where('project_id',$id)->where('api_type','blog')->first();
  98 + if($collect_info){
  99 + $collect_time = $collect_info->collect_status == 0 ? '采集中' : $collect_info->updated_at;
  100 + }
  101 + }
  102 + $info['collect_time'] = $collect_time;
93 return $this->success($info); 103 return $this->success($info);
94 } 104 }
95 105