|
...
|
...
|
@@ -13,6 +13,7 @@ use App\Enums\Common\Code; |
|
|
|
use App\Helper\Arr;
|
|
|
|
use App\Http\Controllers\Bside\BaseController;
|
|
|
|
use App\Models\Com\Notify;
|
|
|
|
use App\Models\Com\UpdateLog;
|
|
|
|
use App\Models\Com\UpdateNotify;
|
|
|
|
use App\Models\Com\UpdateProgress;
|
|
|
|
use App\Models\Devops\ServerConfig;
|
|
...
|
...
|
@@ -50,7 +51,7 @@ class CNoticeController extends BaseController |
|
|
|
$is_sitemap = intval($request->input('is_sitemap', 0));
|
|
|
|
//获取项目所在服务器
|
|
|
|
$project_model = new Project();
|
|
|
|
$project_info = $project_model->read(['id'=>$project_id],['serve_id']);
|
|
|
|
$project_info = $project_model->read(['id'=>$project_id],['serve_id','is_upgrade']);
|
|
|
|
if(!$project_info){
|
|
|
|
$this->fail('未查询到项目数据');
|
|
|
|
}
|
|
...
|
...
|
@@ -58,6 +59,14 @@ class CNoticeController extends BaseController |
|
|
|
$serve_ip_info = $serve_ip_model->read(['id'=>$project_info['serve_id']],['servers_id']);
|
|
|
|
$servers_id = $serve_ip_info ? $serve_ip_info['servers_id'] : 0;
|
|
|
|
|
|
|
|
//如果是升级项目,判断是否还有采集在进行中
|
|
|
|
if($project_info['is_upgrade'] == 1){
|
|
|
|
$collect_info = UpdateLog::getProjectUpdate($project_id);
|
|
|
|
if($collect_info == '采集中'){
|
|
|
|
$this->fail('当前升级项目还有页面正在采集,请采集完成之后再更新静态页面');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if($servers_id == ServerConfig::SELF_SITE_ID){
|
|
|
|
//自建站服务器:如果项目已经上线,不请求C端接口,数据直接入库
|
|
|
|
$domain_model = new DomainInfo();
|
...
|
...
|
|