Merge remote-tracking branch 'origin/master' into akun

刘锟
app/Console/Commands/Domain/RemainDay.php
app/Console/Commands/RankData/RankData.php
app/Http/Controllers/Aside/ExtentModule/ExtensionModuleController.php
app/Http/Controllers/Bside/Template/CustomTemplateController.php
app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
app/Http/Logic/Bside/RankData/RankDataLogic.php
app/Models/ExtentModule/ExtensionModule.php
--- a/app/Console/Commands/Domain/RemainDay.php
查看文件 @a685584
+++ b/app/Console/Commands/Domain/RemainDay.php
查看文件 @a685584
@@ -25,7 +25,14 @@ class RemainDay extends Command
     protected $signature = 'remain_day';
     protected $projectId = [
-        1434
+        1434,1812
+    ];//需要单独处理的项目
+
+    /**
+     * @var 暂停的项目
+     */
+    protected $ceaseProjectId = [
+        354
     ];//需要单独处理的项目
     /**
      * The console command description.
@@ -62,6 +69,11 @@ class RemainDay extends Command
             }else{
                 if($item['type'] == Project::TYPE_TWO){
                     //获取当前项目的达标天数
+                    if(in_array($item->id,$this->ceaseProjectId) && ($item->is_compliance == 1)){
+                        //查看今日是否达标(已达标减1)
+                        $item->finish_remain_day = (($item->finish_remain_day - 1) < 0) ? 0 : $item->finish_remain_day - 1;
+                        $item->pause_days = $item->pause_days + 1;
+                    }
                     $compliance_day  = $item->finish_remain_day ?? 0;
                     $remain_day = $item['deploy_build']['service_duration'] - $compliance_day;
                 }else{
--- a/app/Console/Commands/RankData/RankData.php
查看文件 @a685584
+++ b/app/Console/Commands/RankData/RankData.php
查看文件 @a685584
@@ -44,24 +44,13 @@ class RankData extends BaseCommands
     public function do()
     {
         try {
-
-
             Log::channel('rank_data')->info('开始-排名数据');
-            //同步api_no
-//            try {
-//                $this->SyncApiNo();
-//            } catch (\Exception $e) {
-//                Log::channel('rank_data')->error('同步api_no失败：' . $e->getMessage());
-//            }
-
-
             //所有项目 今日是否达标 重置
             //有失败会重跑任务，导致达标又被重置 加缓存一天只重置一次
             if (!Cache::get('clear_remain_today_' . date('Y-m-d'))) {
                 Project::where('is_remain_today', 1)->update(['is_remain_today' => 0]);
                 Cache::set('clear_remain_today_' . date('Y-m-d'), 1, 24 * 3600);
             }
-
             $error = 0;
             $api = new QuanqiusouApi();
             //有排名api编号的项目
@@ -102,7 +91,6 @@ class RankData extends BaseCommands
         if(!$deploy_optimizes){
             return true;
         }
-
         $api = new QuanqiusouApi();
         $ai_nos = $api->getWebApiNo();
         if($ai_nos){
--- a/app/Http/Controllers/Aside/ExtentModule/ExtensionModuleController.php 0 → 100644
查看文件 @a685584
+++ b/app/Http/Controllers/Aside/ExtentModule/ExtensionModuleController.php 0 → 100644
查看文件 @a685584
+<?php
+/**
+ * @remark :
+ * @name   :ExtensionModuleController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/8/7 11:47
+ */
+
+namespace App\Http\Controllers\Aside\ExtentModule;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Models\ExtentModule\ExtensionModule;
+
+class ExtensionModuleController extends BaseController
+{
+    /**
+     * @remark :获取当前项目的拓展数据模块
+     * @name   :getModuleLists
+     * @author :lyh
+     * @method :post
+     * @time   :2024/8/7 11:48
+     */
+    public function getModuleLists(){
+        $extensionModuleModel = new ExtensionModule();
+        $list = $extensionModuleModel->list();
+        $this->response('success',Code::SUCCESS,$list);
+    }
+}
--- a/app/Http/Controllers/Bside/Template/CustomTemplateController.php
查看文件 @a685584
+++ b/app/Http/Controllers/Bside/Template/CustomTemplateController.php
查看文件 @a685584
@@ -29,8 +29,10 @@ class CustomTemplateController extends BaseController
     public function lists(CustomTemplateLogic $customTemplateLogic){
         $lists = $customTemplateLogic->customTemplateLists($this->map,$this->page,$this->row,$this->order);
         if (!empty($lists)){
+            $userModel = new User();
             foreach ($lists['list'] as $k => $v){
                 $v['url'] = $v['url'].'/';
+                $v['operator_name'] =  $userModel->getName($v['operator_id']);
                 $lists['list'][$k] = $v;
             }
         }
--- a/app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
查看文件 @a685584
+++ b/app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
查看文件 @a685584
@@ -494,7 +494,7 @@ class BTemplateLogic extends BaseLogic
                 }
             }
         }
-        $data['main_html'] = characterTruncation($html,'/<main\b[^>]*>(.*?)<\/main>/s');
+        $data['main_html'] = characterTruncationStr($html,"<main","</main>");
         $data['main_css'] = characterTruncation($html,'/<style id="globalsojs-styles">(.*?)<\/style>/s');
         return $this->success($data);
     }
--- a/app/Http/Logic/Bside/RankData/RankDataLogic.php
查看文件 @a685584
+++ b/app/Http/Logic/Bside/RankData/RankDataLogic.php
查看文件 @a685584
@@ -375,9 +375,7 @@ class RankDataLogic extends BaseLogic
             if (!$project) {
                 throw new \Exception($api_no . '关联的项目不存在');
             }
-
             $api = new QuanqiusouApi();
-
             $model = RankData::where('project_id', $project_id)->where('lang', '')->first();
             if (!$model || $model->updated_date != date('Y-m-d') || $force) {
                 $res = $api->getGoogleRank($api_no, '', 7, $force);
@@ -424,9 +422,11 @@ class RankDataLogic extends BaseLogic
     public function save_rank($project_id, $data, int $indexed_pages_num = 0, string $lang = ''){
         $without_project_ids = [];  //不用处理排名的项目
         $without_extension_project_ids = [658]; //是否达标只统计主词的
+        $extension_project_ids = [354]; //扩展词也到达标的
         $first_num = $first_page_num = $first_three_pages_num = $first_five_pages_num = $first_ten_pages_num = 0;
         $first_page_without_extension_num = 0; //不算扩展词在首页的数量
+        $first_page_extension_num = 0; //扩展词在首页的数量
         foreach ($data as &$ranks){
             ksort($ranks);
@@ -448,6 +448,7 @@ class RankDataLogic extends BaseLogic
             if($last['position'] > 0 && $last['position'] <= 10){
                 $first_page_num ++;
                 $last['g'] == 1 && $first_page_without_extension_num++;
+                $last['g'] == 2 && $first_page_extension_num++;
             }
             //排名前三页
             if($last['position'] > 0 && $last['position'] <= 30){
@@ -482,6 +483,9 @@ class RankDataLogic extends BaseLogic
         if(in_array($project_id, $without_extension_project_ids)){
             $is_compliance = $first_page_without_extension_num >= $keyword_num;
         }
+        if(in_array($project_id, $extension_project_ids)){
+            $is_compliance = $first_page_extension_num >= $keyword_num;
+        }
         if ($keyword_num && $type == Project::TYPE_TWO && $is_compliance) {
             Log::channel('rank_data')->info('项目' . $project_id . ':关键词达标'. $keyword_num .' - ' . $first_page_num . ' - ' . $first_page_without_extension_num);
             //项目表更新
--- a/app/Models/ExtentModule/ExtensionModule.php 0 → 100644
查看文件 @a685584
+++ b/app/Models/ExtentModule/ExtensionModule.php 0 → 100644
查看文件 @a685584
+<?php
+/**
+ * @remark :
+ * @name   :ExtensionModule.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/8/7 14:13
+ */
+
+namespace App\Models\ExtentModule;
+
+use App\Models\Base;
+
+class ExtensionModule extends Base
+{
+
+    protected $table = 'gl_extension_module';
+    //连接数据库
+    protected $connection = 'custom_mysql';
+}