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

@@ -81,14 +81,30 @@ class DomainInfo extends Command
                 continue;
                 continue;
             }
             }
 
 
+            if ($servers_ip_info['servers_id'] == ServerConfig::SELF_SITE_ID) {
+                //自建站项目，直接获取主站证书有效期并更新
+                $ssl_time = $this->getDomainSslTime($v['domain']);
+                if ($ssl_time['from'] && $ssl_time['to']) {
+                    $v->certificate_start_time = $ssl_time['from'];
+                    $v->certificate_end_time = $ssl_time['to'];
+                    $v->save();
+                }
+
+                if (empty($v['domain_end_time']) || $v['domain_end_time'] < date('Y-m-d H:i:s')) {
+                    //获取主站域名有效期并更新
+                    $valid_time = $this->getDomainValidTime($v['domain']);
+                    if ($valid_time['start'] && $valid_time['end']) {
+                        $v->domain_start_time = $valid_time['start'];
+                        $v->domain_end_time = $valid_time['end'];
+                        $v->save();
+                    }
+                }
+            } else {
                 //除自建站项目外，记录已解析到别的ip的域名
                 //除自建站项目外，记录已解析到别的ip的域名
-            if ($servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
-                //过滤已解析到别的ip的域名
                 if (!check_domain_record($v['domain'], $servers_ip_info)) {
                 if (!check_domain_record($v['domain'], $servers_ip_info)) {
                     Log::channel('analyze_other')->error('域名 [' . $v['domain'] . '] 已解析到别的IP');
                     Log::channel('analyze_other')->error('域名 [' . $v['domain'] . '] 已解析到别的IP');
                     continue;
                     continue;
                 }
                 }
-            }
 
 
                 //判断是否已经建站
                 //判断是否已经建站
                 if ($project_info['project_type'] == Project::PROJECT_TYPE_SEO) {
                 if ($project_info['project_type'] == Project::PROJECT_TYPE_SEO) {
@@ -148,6 +164,7 @@ class DomainInfo extends Command
                 }
                 }
             }
             }
         }
         }
+    }
 
 
     /**
     /**
      * 主站证书到期更新
      * 主站证书到期更新

@@ -23,6 +23,7 @@ use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainCreateTask;
 use App\Models\Domain\DomainCreateTask;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
+use App\Models\Geo\GeoLink;
 use App\Models\HomeCount\Count;
 use App\Models\HomeCount\Count;
 use App\Models\Industry\ProjectIndustry;
 use App\Models\Industry\ProjectIndustry;
 use App\Models\Inquiry\InquirySet;
 use App\Models\Inquiry\InquirySet;
@@ -329,6 +330,15 @@ class ProjectController extends BaseController
         if(isset($this->map['project_type'])){
         if(isset($this->map['project_type'])){
             $query = $query->where('gl_project.project_type',$this->map['project_type']);
             $query = $query->where('gl_project.project_type',$this->map['project_type']);
         }
         }
+        if(isset($this->param['geo'])){
+            if($this->param['geo'] == 1){
+                $query = $query->where('gl_project.geo_status',1);
+            }else{
+                $ids = GeoLink::pluck('project_id')->unique()->values()->all();
+                $query = $query->whereIn('gl_project.id',$ids);
+            }
+
+        }
         return $query;
         return $query;
     }
     }
 
 

@@ -44,7 +44,10 @@ class AiVideoTask extends Base
      */
      */
     public function videoFrequency(){
     public function videoFrequency(){
         return [
         return [
-            1 => '5-7',
+            1 => '3-4',
+            2 => '5-7',
+            3 => '7-10',
+            2 => '10-15',
         ];
         ];
     }
     }
 }
 }

@@ -139,7 +139,9 @@ class Project extends Base
     {
     {
         return [
         return [
             1 => 'GEO标准版',
             1 => 'GEO标准版',
-            2 => 'GEO商务版'
+            2 => 'GEO商务版',
+            3 => '白帽SEO版',
+            9 => 'GEO体验版'
         ];
         ];
     }
     }
     /**
     /**