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

@@ -7,6 +7,7 @@ use App\Helper\Arr;
 use App\Helper\Gpt;
 use App\Helper\Gpt;
 use App\Models\Ai\AiCommand;
 use App\Models\Ai\AiCommand;
 use App\Models\Com\NoticeLog;
 use App\Models\Com\NoticeLog;
+use App\Models\Com\UpdateNotify;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
 use App\Models\Project\AggregateKeywordAffix;
 use App\Models\Project\AggregateKeywordAffix;
@@ -133,7 +134,7 @@ class KeywordPageAiContent extends Command
             }
             }
             Redis::expire($cache_key, 120);
             Redis::expire($cache_key, 120);
 
 
-            $keyword = Keyword::where('id', $id)->select(['id', 'title', 'sale_title', 'sale_content', 'table_html', 'count_title', 'count_html'])->first();
+            $keyword = Keyword::where('id', $id)->select(['id', 'title', 'sale_title', 'sale_content', 'table_html', 'count_title', 'count_html', 'route'])->first();
 
 
             echo getmypid() . ' ' . date('Y-m-d H:i:s') . ' id：' . $keyword['id'] . ' project_id：' . $task->project_id . PHP_EOL;
             echo getmypid() . ' ' . date('Y-m-d H:i:s') . ' id：' . $keyword['id'] . ' project_id：' . $task->project_id . PHP_EOL;
 
 
@@ -171,6 +172,8 @@ class KeywordPageAiContent extends Command
             }
             }
             if ($update) {
             if ($update) {
                 $keyword->save();
                 $keyword->save();
+                //tdk已更新的数据，存入按需更新表
+                UpdateNotify::addUpdateItem($task->project_id, 'product_keyword', $keyword['route']);
                 $update_rows++;
                 $update_rows++;
             }
             }
         }
         }

@@ -214,7 +214,7 @@ class RankDataController extends BaseController
             $data = [
             $data = [
                 'position' => 0,
                 'position' => 0,
             ];
             ];
-            $res = HttpUtils::get('http://rank.waimaoq.com/luminati_rank', $param);
+            $res = HttpUtils::get('http://rank.waimaoq.com/luminati_rank', $param, [], 20);
             if ($res) {
             if ($res) {
                 $res = Arr::s2a($res);
                 $res = Arr::s2a($res);
                 $data['position'] = $res['position'] ?? '';
                 $data['position'] = $res['position'] ?? '';

@@ -12,7 +12,6 @@ class AutoPullNotify extends Base
     {
     {
         return [
         return [
             1 => '硅谷云服务器',
             1 => '硅谷云服务器',
-            20 => '硅谷建站服务器01',
             25 => '硅谷建站服务器02',
             25 => '硅谷建站服务器02',
             15 => '硅谷IDC服务器01(6.0美服1)',
             15 => '硅谷IDC服务器01(6.0美服1)',
             14 => '硅谷IDC服务器02(6.0美服2)',
             14 => '硅谷IDC服务器02(6.0美服2)',
@@ -27,7 +26,7 @@ class AutoPullNotify extends Base
             24 => '白帽专属服务器02',
             24 => '白帽专属服务器02',
             23 => '西班牙服务器',
             23 => '西班牙服务器',
             6 => '自建站服务器群',
             6 => '自建站服务器群',
-            27 => '硅谷建站服务器03',
+            27 => '硅谷建站服务器01',
         ];
         ];
     }
     }