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

@@ -14,6 +14,7 @@ use App\Models\Product\CategoryRelated;
 use App\Models\Product\Keyword;
 use App\Models\Product\Product;
 use App\Models\Project\DeployBuild;
+use App\Models\Project\DeployOptimize;
 use App\Models\Project\Project;
 use App\Models\Template\BCustomTemplate;
 use App\Models\WebSetting\WebLanguage;
@@ -44,6 +45,27 @@ class Temp extends Command
     }
 
     /**
+     * 未被标注 特殊前后缀   && 未达标项目 && 优化开始时间 > 2025-01-01 00:00:00 ,开启自动添加聚合页关键词的前后缀关键词配置
+     * @author Akun
+     * @date 2025/04/02 14:00
+     */
+    public function changeIsAutoKeywords(){
+        $project_list = DeployOptimize::where('special', 'not like', '%,8,%')->where('start_date', '>', '2025-01-01 00:00:00')->get();
+
+        foreach ($project_list as $project) {
+            $is_remain_today = Project::where('id', $project->project_id)->value('is_remain_today');
+            if ($is_remain_today) {
+                continue;
+            }
+
+            $project->is_auto_keywords = 1;
+            $project->save();
+
+            $this->output('ID:' . $project->id . ' | success');
+        }
+    }
+
+    /**
      * 3424项目导入pdf
      * @return bool
      * @throws \Exception

@@ -424,6 +424,8 @@ class ProjectUpdate extends Command
                                                     ];
                                                     $detailModel->insert($data_s);
                                                 }
+
+                                                CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PRODUCT, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
                                             }
                                         }
                                         if ($six_read) {
@@ -582,6 +584,8 @@ class ProjectUpdate extends Command
                                                     'release_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
                                                     'sort' => $item['sort'] ?? 0,
                                                 ], ['id' => $news['id']]);
+
+                                                CollectTask::_insert($item['url'], $project_id, $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $news['id'], $domain_arr['host'], $link_type, $language_list, $page_list);
                                             }
                                         }
                                     } catch (\Exception $e) {
@@ -637,9 +641,7 @@ class ProjectUpdate extends Command
 
                                             CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PAGE, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
                                         } else {
-                                            $id = $custom['id'];
-                                            $six_read = $custom['six_read'];
-                                            if ($six_read) {
+                                            if ($custom['six_read']) {
                                                 //按5.0展示才需要更新数据
                                                 $model->edit([
                                                     'name' => $item['ttile'],
@@ -647,7 +649,9 @@ class ProjectUpdate extends Command
                                                     'keywords' => $item['keywords'] ?? '',
                                                     'description' => $item['description'] ?? '',
                                                     'html' => $item['content'] ?? '',
-                                                ], ['id' => $id]);
+                                                ], ['id' => $custom['id']]);
+
+                                                CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PAGE, $custom['id'], $domain_arr['host'], $link_type, $language_list, $page_list);
                                             }
                                         }
                                     } catch (\Exception $e) {
@@ -779,6 +783,8 @@ class ProjectUpdate extends Command
                                                         'release_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
                                                         'image' => $new_img
                                                     ], ['id' => $id]);
+
+                                                    CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_MODULE, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
                                                 }
                                             }