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

@@ -35,7 +35,7 @@ class Temp extends Command
 
 
     public function handle()
     public function handle()
     {
     {
-        $this->create_domain_task();
+        $this->create_update_keyword_page();
     }
     }
 
 
     /**
     /**
@@ -538,10 +538,12 @@ class Temp extends Command
                 $this->output('项目id:' . $project_id . ' | 未查询到服务器数据');
                 $this->output('项目id:' . $project_id . ' | 未查询到服务器数据');
                 continue;
                 continue;
             }
             }
+            if ($serve_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
                 if (!check_domain_record($amp_domain, $serve_ip_info)) {
                 if (!check_domain_record($amp_domain, $serve_ip_info)) {
                     $this->output('项目id:' . $project_id . ', domain:' . $domain . ' | 未解析到目标服务器');
                     $this->output('项目id:' . $project_id . ', domain:' . $domain . ' | 未解析到目标服务器');
                     continue;
                     continue;
                 }
                 }
+            }
 
 
             //判断是否已有更新进行中
             //判断是否已有更新进行中
             $data = [
             $data = [
@@ -556,6 +558,9 @@ class Temp extends Command
             if (!$notify) {
             if (!$notify) {
                 $data['data'] = Arr::a2s(['domain' => $amp_domain, 'url' => [], 'language' => []]);
                 $data['data'] = Arr::a2s(['domain' => $amp_domain, 'url' => [], 'language' => []]);
                 $data['status'] = Notify::STATUS_INIT;
                 $data['status'] = Notify::STATUS_INIT;
+                if ($serve_ip_info['servers_id'] == 2) {
+                    $data['is_pull_html_zip'] = Notify::IS_PULL_HTML_ZIP_TRUE;
+                }
                 $notify_model->add($data);
                 $notify_model->add($data);
             }
             }
 
 
@@ -563,6 +568,168 @@ class Temp extends Command
         }
         }
     }
     }
 
 
+    /**
+     * 创建指定项目聚合页生成任务
+     * @author Akun
+     * @date 2025/02/11 13:50
+     */
+    public function create_update_keyword_page()
+    {
+        $ids_str = '46
+83
+91
+150
+190
+206
+219
+221
+232
+233
+238
+287
+290
+299
+319
+321
+353
+356
+388
+389
+456
+457
+475
+491
+518
+535
+554
+600
+624
+650
+728
+732
+783
+807
+835
+881
+896
+913
+947
+1001
+1320
+1336
+1373
+1424
+1442
+1455
+1466
+1505
+1584
+1597
+1617
+1682
+1770
+1816
+1824
+1835
+1860
+1870
+1896
+1913
+1989
+1991
+1992
+2022
+2037
+2059
+2060
+2062
+2104
+2115
+2129
+2131
+2135
+2191
+2204
+2217
+2245
+2257
+2287
+2309
+2313
+2330
+2336
+2337
+2338
+2351
+2391
+2418
+2423
+2435
+2462
+2496
+2504
+2505
+2660
+2768
+2811
+2874
+3157
+';
+        $ids_arr = array_filter(explode('
+', $ids_str));
+        $project_list = Project::select(['id', 'serve_id'])->whereIn('id', $ids_arr)->get();
+
+        $domain_model = new DomainInfo();
+        $notify_model = new Notify();
+        $server_ip_model = new ServersIp();
+
+        foreach ($project_list as $value) {
+            $project_id = $value->id;
+
+            $domain_info = $domain_model->read(['project_id' => $project_id, 'status' => 1], ['id', 'domain']);
+            if (!$domain_info) {
+                //过滤未绑定正式域名的项目
+                continue;
+            }
+            $domain = $domain_info['domain'];
+
+            //获取项目所在服务器
+            $serve_ip_info = $server_ip_model->read(['id' => $value->serve_id], ['domain', 'ip', 'servers_id']);
+            if (!$serve_ip_info) {
+                $this->output('项目id:' . $project_id . ' | 未查询到服务器数据');
+                continue;
+            }
+
+            if ($serve_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
+                if (!check_domain_record($domain, $serve_ip_info)) {
+                    $this->output('项目id:' . $project_id . ', domain:' . $domain . ' | 未解析到目标服务器');
+                    continue;
+                }
+            }
+
+
+            $data = [
+                'project_id' => $project_id,
+                'type' => 1,
+                'route' => 4,
+                'server_id' => $serve_ip_info['servers_id'],
+                'status' => ['!=', Notify::STATUS_FINISH_SITEMAP]
+            ];
+            $notify = $notify_model->read($data, ['id']);
+
+            if (!$notify) {
+                $data['data'] = Arr::a2s(['domain' => $domain, 'url' => null, 'language' => []]);
+                $data['status'] = Notify::STATUS_INIT;
+                if ($serve_ip_info['servers_id'] == 2) {
+                    $data['is_pull_html_zip'] = Notify::IS_PULL_HTML_ZIP_TRUE;
+                }
+                $notify_model->add($data);
+
+                $this->output('项目id:' . $project_id . ', domain:' . $domain . ' | success');
+            }
+        }
+    }
+
     public function output($msg)
     public function output($msg)
     {
     {
         echo date('Y-m-d H:i:s') . ' | ' . $msg . PHP_EOL;
         echo date('Y-m-d H:i:s') . ' | ' . $msg . PHP_EOL;