作者 赵彬吉

update

... ... @@ -67,6 +67,7 @@ class UpdateProgress extends Command
public function getUpdateProgress($project_id){
$info = DB::connection('custom_mysql')->table('gl_update_progress')->whereRaw('total_num > current_num')->first();
if(!empty($info)){
$info = (array)$info;
//超时时间
$time = date("Y-m-d H:i:s",strtotime($info['created_at']) + $info['total_num'] * 60);
if($time > date("Y-m-d H:i:s")){
... ...
... ... @@ -215,7 +215,7 @@ class DomainInfoLogic extends BaseLogic
}
//域名是否都已经解析
if($info['domain'] && !$this->check_cname($info['domain'], $server_info)){
if(!empty($info['domain']) && !$this->check_cname($info['domain'], $server_info)){
$this->fail('域名' . $info['domain'] . '未解析至目标服务器');
}
foreach ($this->param['other_domain']??[] as $other_domain){
... ...
... ... @@ -525,7 +525,7 @@ class ProjectLogic extends BaseLogic
if($server_info && $domain_info){
//验证解析
if ($domain_info['domain'] && !DomainInfoLogic::instance()->check_cname($domain_info['domain'], $server_info)) {
if (!empty($domain_info['domain']) && !DomainInfoLogic::instance()->check_cname($domain_info['domain'], $server_info)) {
throw new AsideGlobalException(Code::SYSTEM_ERROR,'域名' . $domain_info['domain'] . '未解析至目标服务器');
}
$api_url = 'http://'.$server_info['init_domain'].'/api/createSite';
... ...