周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 1f5771da5a157a3b2d941b03f9e9a0384907a90d 2 个父辈 8f6a0145 2ffa746b

Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

内嵌 并排对比
正在显示 4 个修改的文件 包含 84 行增加 和 52 行删除
@@ -81,69 +81,86 @@ class DomainInfo extends Command @@ -81,69 +81,86 @@ class DomainInfo extends Command
81 continue; 81 continue;
82 } 82 }
83 83
84 - //除自建站项目外，记录已解析到别的ip的域名  
85 - if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {  
86 - //过滤已解析到别的ip的域名 84 + if ($servers_ip_info['servers_id'] == ServerConfig::SELF_SITE_ID) {
  85 + //自建站项目，直接获取主站证书有效期并更新
  86 + $ssl_time = $this->getDomainSslTime($v['domain']);
  87 + if ($ssl_time['from'] && $ssl_time['to']) {
  88 + $v->certificate_start_time = $ssl_time['from'];
  89 + $v->certificate_end_time = $ssl_time['to'];
  90 + $v->save();
  91 + }
  92 +
  93 + if (empty($v['domain_end_time']) || $v['domain_end_time'] < date('Y-m-d H:i:s')) {
  94 + //获取主站域名有效期并更新
  95 + $valid_time = $this->getDomainValidTime($v['domain']);
  96 + if ($valid_time['start'] && $valid_time['end']) {
  97 + $v->domain_start_time = $valid_time['start'];
  98 + $v->domain_end_time = $valid_time['end'];
  99 + $v->save();
  100 + }
  101 + }
  102 + } else {
  103 + //除自建站项目外，记录已解析到别的ip的域名
87 if (!check_domain_record($v['domain'], $servers_ip_info)) { 104 if (!check_domain_record($v['domain'], $servers_ip_info)) {
88 Log::channel('analyze_other')->error('域名 [' . $v['domain'] . '] 已解析到别的IP'); 105 Log::channel('analyze_other')->error('域名 [' . $v['domain'] . '] 已解析到别的IP');
89 continue; 106 continue;
90 } 107 }
91 - }  
92 108
93 - //判断是否已经建站  
94 - if ($project_info['project_type'] == Project::PROJECT_TYPE_SEO) {  
95 - $type = DomainCreateTask::TYPE_BLOG;  
96 - } else {  
97 - $type = DomainCreateTask::TYPE_MAIN;  
98 - }  
99 - $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => DomainCreateTask::STATUS_SUC], ['id']);  
100 - if (!$task_info) {  
101 - continue;  
102 - }  
103 -  
104 - //获取主站证书有效期并更新  
105 - $ssl_time = $this->getDomainSslTime($v['domain']);  
106 - if ($ssl_time['from'] && $ssl_time['to']) {  
107 - $v->certificate_start_time = $ssl_time['from'];  
108 - $v->certificate_end_time = $ssl_time['to'];  
109 - $v->save();  
110 - } 109 + //判断是否已经建站
  110 + if ($project_info['project_type'] == Project::PROJECT_TYPE_SEO) {
  111 + $type = DomainCreateTask::TYPE_BLOG;
  112 + } else {
  113 + $type = DomainCreateTask::TYPE_MAIN;
  114 + }
  115 + $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => DomainCreateTask::STATUS_SUC], ['id']);
  116 + if (!$task_info) {
  117 + continue;
  118 + }
111 119
112 - if (empty($v['domain_end_time']) || $v['domain_end_time'] < date('Y-m-d H:i:s')) {  
113 - //获取主站域名有效期并更新  
114 - $valid_time = $this->getDomainValidTime($v['domain']);  
115 - if ($valid_time['start'] && $valid_time['end']) {  
116 - $v->domain_start_time = $valid_time['start'];  
117 - $v->domain_end_time = $valid_time['end']; 120 + //获取主站证书有效期并更新
  121 + $ssl_time = $this->getDomainSslTime($v['domain']);
  122 + if ($ssl_time['from'] && $ssl_time['to']) {
  123 + $v->certificate_start_time = $ssl_time['from'];
  124 + $v->certificate_end_time = $ssl_time['to'];
118 $v->save(); 125 $v->save();
119 } 126 }
120 - }  
121 127
122 - if ($v['amp_status'] == 1) {  
123 - $domain_array = parse_url($v['domain']);  
124 - $host = $domain_array['host'] ?? $domain_array['path'];  
125 - $host_array = explode('.', $host);  
126 - if (count($host_array) <= 2) {  
127 - array_unshift($host_array, 'm');  
128 - } else {  
129 - $host_array[0] = 'm'; 128 + if (empty($v['domain_end_time']) || $v['domain_end_time'] < date('Y-m-d H:i:s')) {
  129 + //获取主站域名有效期并更新
  130 + $valid_time = $this->getDomainValidTime($v['domain']);
  131 + if ($valid_time['start'] && $valid_time['end']) {
  132 + $v->domain_start_time = $valid_time['start'];
  133 + $v->domain_end_time = $valid_time['end'];
  134 + $v->save();
  135 + }
130 } 136 }
131 - $amp_domain = implode('.', $host_array);  
132 137
133 - if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {  
134 - //过滤已解析到别的ip的AMP域名  
135 - if (!check_domain_record($amp_domain, $servers_ip_info)) {  
136 - Log::channel('analyze_other')->error('AMP域名 [' . $amp_domain . '] 已解析到别的IP');  
137 - continue; 138 + if ($v['amp_status'] == 1) {
  139 + $domain_array = parse_url($v['domain']);
  140 + $host = $domain_array['host'] ?? $domain_array['path'];
  141 + $host_array = explode('.', $host);
  142 + if (count($host_array) <= 2) {
  143 + array_unshift($host_array, 'm');
  144 + } else {
  145 + $host_array[0] = 'm';
  146 + }
  147 + $amp_domain = implode('.', $host_array);
  148 +
  149 + if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
  150 + //过滤已解析到别的ip的AMP域名
  151 + if (!check_domain_record($amp_domain, $servers_ip_info)) {
  152 + Log::channel('analyze_other')->error('AMP域名 [' . $amp_domain . '] 已解析到别的IP');
  153 + continue;
  154 + }
138 } 155 }
139 - }  
140 156
141 - //获取AMP站证书有效期并更新  
142 - $amp_ssl_time = $this->getDomainSslTime($amp_domain);  
143 - if ($amp_ssl_time['from'] && $amp_ssl_time['to']) {  
144 - $v->amp_certificate_start_time = $amp_ssl_time['from'];  
145 - $v->amp_certificate_end_time = $amp_ssl_time['to'];  
146 - $v->save(); 157 + //获取AMP站证书有效期并更新
  158 + $amp_ssl_time = $this->getDomainSslTime($amp_domain);
  159 + if ($amp_ssl_time['from'] && $amp_ssl_time['to']) {
  160 + $v->amp_certificate_start_time = $amp_ssl_time['from'];
  161 + $v->amp_certificate_end_time = $amp_ssl_time['to'];
  162 + $v->save();
  163 + }
147 } 164 }
148 } 165 }
149 } 166 }
@@ -23,6 +23,7 @@ use App\Models\Devops\ServersIp; @@ -23,6 +23,7 @@ use App\Models\Devops\ServersIp;
23 use App\Models\Domain\DomainCreateTask; 23 use App\Models\Domain\DomainCreateTask;
24 use App\Models\Domain\DomainInfo; 24 use App\Models\Domain\DomainInfo;
25 use App\Models\Domain\DomainInfo as DomainInfoModel; 25 use App\Models\Domain\DomainInfo as DomainInfoModel;
  26 +use App\Models\Geo\GeoLink;
26 use App\Models\HomeCount\Count; 27 use App\Models\HomeCount\Count;
27 use App\Models\Industry\ProjectIndustry; 28 use App\Models\Industry\ProjectIndustry;
28 use App\Models\Inquiry\InquirySet; 29 use App\Models\Inquiry\InquirySet;
@@ -329,6 +330,15 @@ class ProjectController extends BaseController @@ -329,6 +330,15 @@ class ProjectController extends BaseController
329 if(isset($this->map['project_type'])){ 330 if(isset($this->map['project_type'])){
330 $query = $query->where('gl_project.project_type',$this->map['project_type']); 331 $query = $query->where('gl_project.project_type',$this->map['project_type']);
331 } 332 }
  333 + if(isset($this->param['geo'])){
  334 + if($this->param['geo'] == 1){
  335 + $query = $query->where('gl_project.geo_status',1);
  336 + }else{
  337 + $ids = GeoLink::pluck('project_id')->unique()->values()->all();
  338 + $query = $query->whereIn('gl_project.id',$ids);
  339 + }
  340 +
  341 + }
332 return $query; 342 return $query;
333 } 343 }
334 344
@@ -44,7 +44,10 @@ class AiVideoTask extends Base @@ -44,7 +44,10 @@ class AiVideoTask extends Base
44 */ 44 */
45 public function videoFrequency(){ 45 public function videoFrequency(){
46 return [ 46 return [
47 - 1 => '5-7', 47 + 1 => '3-4',
  48 + 2 => '5-7',
  49 + 3 => '7-10',
  50 + 2 => '10-15',
48 ]; 51 ];
49 } 52 }
50 } 53 }
@@ -139,7 +139,9 @@ class Project extends Base @@ -139,7 +139,9 @@ class Project extends Base
139 { 139 {
140 return [ 140 return [
141 1 => 'GEO标准版', 141 1 => 'GEO标准版',
142 - 2 => 'GEO商务版' 142 + 2 => 'GEO商务版',
  143 + 3 => '白帽SEO版',
  144 + 9 => 'GEO体验版'
143 ]; 145 ];
144 } 146 }
145 /** 147 /**