作者 刘锟

update

@@ -539,7 +539,6 @@ class Temp extends Command @@ -539,7 +539,6 @@ class Temp extends Command
539 continue; 539 continue;
540 } 540 }
541 if ($serve_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) { 541 if ($serve_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
542 - continue;  
543 if (!check_domain_record($amp_domain, $serve_ip_info)) { 542 if (!check_domain_record($amp_domain, $serve_ip_info)) {
544 $this->output('项目id:' . $project_id . ', domain:' . $domain . ' | 未解析到目标服务器'); 543 $this->output('项目id:' . $project_id . ', domain:' . $domain . ' | 未解析到目标服务器');
545 continue; 544 continue;
@@ -559,7 +558,7 @@ class Temp extends Command @@ -559,7 +558,7 @@ class Temp extends Command
559 if (!$notify) { 558 if (!$notify) {
560 $data['data'] = Arr::a2s(['domain' => $amp_domain, 'url' => [], 'language' => []]); 559 $data['data'] = Arr::a2s(['domain' => $amp_domain, 'url' => [], 'language' => []]);
561 $data['status'] = Notify::STATUS_INIT; 560 $data['status'] = Notify::STATUS_INIT;
562 - if ($serve_ip_info['servers_id'] == ServerConfig::SELF_TEST_ID || $serve_ip_info['servers_id'] == 2) { 561 + if ($serve_ip_info['servers_id'] == 2) {
563 $data['is_pull_html_zip'] = Notify::IS_PULL_HTML_ZIP_TRUE; 562 $data['is_pull_html_zip'] = Notify::IS_PULL_HTML_ZIP_TRUE;
564 } 563 }
565 $notify_model->add($data); 564 $notify_model->add($data);
@@ -701,11 +700,14 @@ class Temp extends Command @@ -701,11 +700,14 @@ class Temp extends Command
701 continue; 700 continue;
702 } 701 }
703 702
704 - if (!check_domain_record($domain, $serve_ip_info)) {  
705 - $this->output('项目id:' . $project_id . ', domain:' . $domain . ' | 未解析到目标服务器');  
706 - continue; 703 + if ($serve_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
  704 + if (!check_domain_record($domain, $serve_ip_info)) {
  705 + $this->output('项目id:' . $project_id . ', domain:' . $domain . ' | 未解析到目标服务器');
  706 + continue;
  707 + }
707 } 708 }
708 709
  710 +
709 $data = [ 711 $data = [
710 'project_id' => $project_id, 712 'project_id' => $project_id,
711 'type' => 1, 713 'type' => 1,
@@ -718,6 +720,9 @@ class Temp extends Command @@ -718,6 +720,9 @@ class Temp extends Command
718 if (!$notify) { 720 if (!$notify) {
719 $data['data'] = Arr::a2s(['domain' => $domain, 'url' => null, 'language' => []]); 721 $data['data'] = Arr::a2s(['domain' => $domain, 'url' => null, 'language' => []]);
720 $data['status'] = Notify::STATUS_INIT; 722 $data['status'] = Notify::STATUS_INIT;
  723 + if ($serve_ip_info['servers_id'] == 2) {
  724 + $data['is_pull_html_zip'] = Notify::IS_PULL_HTML_ZIP_TRUE;
  725 + }
721 $notify_model->add($data); 726 $notify_model->add($data);
722 727
723 $this->output('项目id:' . $project_id . ', domain:' . $domain . ' | success'); 728 $this->output('项目id:' . $project_id . ', domain:' . $domain . ' | success');