作者 赵彬吉

update

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