update

@@ -48,7 +48,7 @@ class RankData extends BaseCommands
 
 
         foreach ($list as $item){
         foreach ($list as $item){
             $model = GoogleRankModel::where('project_id', $item['project_id'])->where('lang', '')->first();
             $model = GoogleRankModel::where('project_id', $item['project_id'])->where('lang', '')->first();
-            if (!$model || $model->updated_date == date('Y-m-d')) {
+            if (!$model || $model->updated_date != date('Y-m-d')) {
                 $res = $api->getGoogleRank($item['api_no']);
                 $res = $api->getGoogleRank($item['api_no']);
                 if(!$res){
                 if(!$res){
                     $error++;
                     $error++;
@@ -63,7 +63,7 @@ class RankData extends BaseCommands
             //有小语种的
             //有小语种的
             if($item['minor_languages']){
             if($item['minor_languages']){
                 $model = GoogleRankModel::where('project_id', $item['project_id'])->where('lang', '<>', '')->first();
                 $model = GoogleRankModel::where('project_id', $item['project_id'])->where('lang', '<>', '')->first();
-                if (!$model || $model->updated_date == date('Y-m-d')) {
+                if (!$model || $model->updated_date != date('Y-m-d')) {
                     $res = $api->getGoogleRank($item['api_no'], 1);
                     $res = $api->getGoogleRank($item['api_no'], 1);
                     if(!$res){
                     if(!$res){
                         $error++;
                         $error++;
@@ -98,6 +98,7 @@ class RankData extends BaseCommands
 
 
         if(!$lang){
         if(!$lang){
             foreach ($data as &$ranks){
             foreach ($data as &$ranks){
+                ksort($ranks);
                 foreach ($ranks as &$rank){
                 foreach ($ranks as &$rank){
                     //处理排名
                     //处理排名
                     if(!in_array($project_id, $without_project_ids)){
                     if(!in_array($project_id, $without_project_ids)){

+<?php
+
+namespace App\Http\Logic\Aside\Project;
+
+
+use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Project\DomainInfo;
+use App\Models\Project\Payment;
+use MongoDB\Client;
+
+class DomainInfoLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->model = new DomainInfo();
+    }
+
+    public function getDomainInfo($project_id)
+    {
+        $project = app(ProjectLogic::class)->getInfo($project_id);
+        $domain = $project['deploy_optimize']['domain'];
+        $info = $this->model->where('project_id', $project_id)->first();
+        //不存在或时间过期了 重新获取信息
+        $expiration_date = $info['domain_info']['expiration_date'] ?? '';
+        $end_time = $info['ssl']['end_time'] ?? '';
+        if(!$info || $expiration_date < date("Y-m-d") || $end_time < date('Y-m-d')){
+            try {
+                $mongo = new Client("mongodb://root:globalso8837840@23.228.125.2:27017");
+                $db = $mongo->globalso_monitor;
+                $collection = $db->project_v1;
+                $project_zk = $collection->findOne(['main_url' => $domain]);
+                $info['domain'] = $domain;
+                $info['domain_info'] = (array) $project_zk['domain_info'] ?? [];
+                $info['ssl'] = (array) $project_zk['ssl'] ?? [];
+                parent::save($info);
+            }catch (\Exception $e){
+                return [];
+            }
+        }
+        return $info;
+    }
+}

@@ -5,6 +5,7 @@ namespace App\Http\Logic\Bside;
 
 
 use App\Helper\Arr;
 use App\Helper\Arr;
 use App\Helper\Translate;
 use App\Helper\Translate;
+use App\Http\Logic\Aside\Project\DomainInfoLogic;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Models\RankData\ExternalLinks;
 use App\Models\RankData\ExternalLinks;
 use App\Models\RankData\IndexedPages;
 use App\Models\RankData\IndexedPages;
@@ -12,6 +13,9 @@ use App\Models\RankData\RankData;
 use App\Models\RankData\RankWeek;
 use App\Models\RankData\RankWeek;
 use App\Models\RankData\RecommDomain;
 use App\Models\RankData\RecommDomain;
 use App\Models\RankData\Speed;
 use App\Models\RankData\Speed;
+use App\Utils\HttpUtils;
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 use Illuminate\Support\Str;
 
 
 class RankDataLogic extends BaseLogic
 class RankDataLogic extends BaseLogic
@@ -28,6 +32,7 @@ class RankDataLogic extends BaseLogic
 
 
         //查数据
         //查数据
         $project = app(ProjectLogic::class)->getInfo($project_id);
         $project = app(ProjectLogic::class)->getInfo($project_id);
+        $domain_info = app(DomainInfoLogic::class)->getDomainInfo($project_id);
         $rank = RankData::where('project_id', $project_id)->first();
         $rank = RankData::where('project_id', $project_id)->first();
         $rank_week = RankWeek::where('project_id', $project_id)->first();
         $rank_week = RankWeek::where('project_id', $project_id)->first();
         $recomm_domain = RecommDomain::where('project_id', $project_id)->first();
         $recomm_domain = RecommDomain::where('project_id', $project_id)->first();
@@ -48,7 +53,7 @@ class RankDataLogic extends BaseLogic
 
 
         //小语种列表
         //小语种列表
         $langs = Arr::pluck($project['deploy_optimize']['minor_languages'], 'tl');
         $langs = Arr::pluck($project['deploy_optimize']['minor_languages'], 'tl');
-        foreach ($langs as $lang){
+        foreach ($langs as $lang) {
             $data['langs'][$lang] = Translate::getTls($lang);
             $data['langs'][$lang] = Translate::getTls($lang);
         }
         }
 
 
@@ -56,8 +61,8 @@ class RankDataLogic extends BaseLogic
         $data['project'] = [
         $data['project'] = [
             'company' => $project['company'],
             'company' => $project['company'],
             'domain' => $project['deploy_optimize']['domain'],
             'domain' => $project['deploy_optimize']['domain'],
-            'domain_info' => '',
-            'cert_info' => '',
+            'domain_info' => ($domain_info['domain_info']['creation_date'] ?? '') . ' - ' . ($domain_info['domain_info']['expiration_date'] ?? ''),
+            'cert_info' => ($domain_info['ssl']['start_time'] ?? '') . ' - ' . ($domain_info['ssl']['end_time'] ?? ''),
             'plan' => str_replace('营销大师-', '全球搜-', $project['deploy_build']['plan'][0]),
             'plan' => str_replace('营销大师-', '全球搜-', $project['deploy_build']['plan'][0]),
             'keyword_num' => $project['deploy_build']['keyword_num'],
             'keyword_num' => $project['deploy_build']['keyword_num'],
             'compliance_day' => $rank['compliance_day'] ?? 0,
             'compliance_day' => $rank['compliance_day'] ?? 0,
@@ -96,7 +101,7 @@ class RankDataLogic extends BaseLogic
             'data' => array_values($indexed_pages['data'] ?? []),
             'data' => array_values($indexed_pages['data'] ?? []),
         ];
         ];
         //收录数加上当日数据
         //收录数加上当日数据
-        if((Arr::last($data['indexed_pages_chat']['labels'])) != date('Y-m-d')){
+        if ((Arr::last($data['indexed_pages_chat']['labels'])) != date('Y-m-d')) {
             $data['indexed_pages_chat']['labels'][] = date('Y-m-d');
             $data['indexed_pages_chat']['labels'][] = date('Y-m-d');
             $data['indexed_pages_chat']['data'][] = $data['indexed_pages_num'];
             $data['indexed_pages_chat']['data'][] = $data['indexed_pages_num'];
         }
         }
@@ -114,7 +119,205 @@ class RankDataLogic extends BaseLogic
      * @author zbj
      * @author zbj
      * @date 2023/5/12
      * @date 2023/5/12
      */
      */
-    public function keywords_rank_list(){
-        $lang = $this->request['lang'];
+    public function keywords_rank_list()
+    {
+        $page = intval($this->request['page'] ?: 1);
+        $lang = $this->request['lang'] ?: '';
+        $project_id = $this->user['project_id'];
+        $project = app(ProjectLogic::class)->getInfo($project_id);
+        $api_no = $project['deploy_optimize']['api_no'] ?? '';
+        $domain = $project['deploy_optimize']['domain'] ?? '';
+        $domain_arr = parse_url($domain);
+        $domain = $domain_arr['host'] ?? $domain_arr['path'];
+
+        //复制站点域名
+        $ext_projects = $this->getExtendProjects();
+        $flg_ext = $this->getExtFlag($ext_projects, $domain, $api_no);
+        $ext_domain = str_replace('www.', '', $this->getExtendProjects($api_no)['ext'] ?? '');
+        //AI站点域名
+        $ai_projects = $this->getAiProjects()['data'] ?? [];
+        $flg_ai = $this->getAiFlag($ai_projects, $domain);
+        $ai_domain = str_replace('www.', '', $this->getAiProjects($domain)['domain'] ?? '');
+
+
+        $list = RankData::where('project_id', $project_id)->where('lang', $lang)->value('data');
+        $list30 = []; //排名前三十的
+        $list30_0 = []; //排名前三十且近三天没有排名的
+        $list100 = []; //排名前100的
+        $list0 = [];//排名为0的
+        foreach ($list as $key => $v) {
+            $last = Arr::last($v);
+            $data = [];
+
+            //处理日期
+            foreach ($v as $date => $position) {
+                $data[date('m-d', strtotime($date . '+ 1 day'))] = $position['position'];
+            }
+
+            //域名类型
+            $domain_text = '主域名：' . str_replace('www.', '', $domain);
+            if (!empty($last['r'])) {
+                $domain_text = 'AI域名：' . $last['r'];
+                if (in_array($flg_ext, [1, 2]) || $flg_ai == 1) {
+                    if ($last['r'] == $ai_domain) {
+                        $domain_text = '星链域名: ' . $ai_domain;
+                    } else if ($last['r'] == $ext_domain) {
+                        $domain_text = '主域名2: ' . $ext_domain;
+                    } else {
+                        $domain_text = 'AI域名: ' . $last['r'];
+                    }
+                }
+            }
+            $v = [
+                'keyword' => $key,
+                'domain' => $domain_text,
+                'g' => $last['g'],  //1核心关键词
+                'position' => $data
+            ];
+            if ($last['position'] == 0) {
+                $list0[] = $v;
+            } elseif ($last['position'] <= 30) {
+                if (($v['position'][date('m-d', strtotime('-1day'))] ?? '') == 0 ||
+                    ($v['position'][date('m-d', strtotime('-2day'))] ?? '') == 0) {
+                    $list30_0[] = $v;
+                } else {
+                    $list30[] = $v;
+                }
+            } else {
+                $list100[] = $v;
+            }
+        }
+        //排序 排名前30的 按关键词长短排序 最近三天无排名的排后; 后30名的按排名排序
+        $list30 = collect($list30)->sortBy(function ($item) {
+            return strlen($item['keyword']);
+        })->values()->all();
+        $list30_0 = collect($list30_0)->sortBy(function ($item) {
+            return strlen($item['keyword']);
+        })->values()->all();
+        $list100 = collect($list100)->sortBy(function ($item) {
+            return Arr::last($item['position']);
+        })->values()->all();
+        $list = collect($list30)->merge($list30_0)->merge($list100)->merge($list0)->filter(function ($item) {
+            //搜索
+            if ($this->request['search']) {
+                return strpos($item['keyword'], $this->request['search']) !== false;
+            }
+            //前几名
+            if ($this->request['first']) {
+                $position = Arr::last($item['position']);
+                return $position > 0 && $position <= $this->request['first'];
+            }
+            //核心词
+            if ($this->request['g']) {
+                return $item['g'] == $this->request['g'];
+            }
+            return true;
+        })->values();
+        $data = [
+            "list" => $list->forPage($page, 100)->toArray(),
+            "total" => $list->count(),
+            "page" => $page,
+            "total_page" => ceil($list->count() / 100),
+            "size" => 100
+        ];
+        return $this->success($data);
+    }
+
+
+    /**
+     * 获取复制站点项目
+     * @author zbj
+     * @date 2023/5/12
+     */
+    public function getExtendProjects($api_no = null)
+    {
+        $key = 'extend_projects_list';
+        $data = Cache::get($key);
+        if (!$data) {
+            $api_url = 'http://api.quanqiusou.cn/google-rank/api/extend_projects.php';
+            try {
+                $data = HttpUtils::get($api_url, []);
+                if ($data) {
+                    $data = Arr::s2a($data);
+                    Cache::put($key, $data, 4 * 3600);
+                }
+            } catch (\Exception | GuzzleException $e) {
+                errorLog('复制站点项目获取失败', [], $e);
+                return false;
+            }
+        }
+        if ($api_no !== null) {
+            $data = collect($data)->where('apino', $api_no)->first();
+            return $data ?: [];
+        }
+        return $data;
+    }
+
+    /**
+     * 获取AI站点项目
+     * @author zbj
+     * @date 2023/5/12
+     */
+    public function getAiProjects($domain = null)
+    {
+        $key = 'ai_projects_list';
+        $data = Cache::get($key);
+        if (!$data) {
+            $api_url = 'https://demosite5.globalso.com/api/domain';
+            try {
+                $data = HttpUtils::get($api_url, []);
+                if ($data) {
+                    $data = Arr::s2a($data);
+                    Cache::put($key, $data, 4 * 3600);
+                }
+            } catch (\Exception | GuzzleException $e) {
+                errorLog('AI站点项目获取失败', [], $e);
+                return false;
+            }
+        }
+        if ($domain !== null) {
+            $domain = parse_url($domain);
+            $data = collect($data['data'])->where('bind_domain', $domain['host'] ?? $domain['path'])->first();
+            return $data ?: [];
+        }
+        return $data;
+    }
+
+    /**
+     * 获取复制项目标识
+     * @author zbj
+     * @date 2023/5/15
+     */
+    protected function getExtFlag($ext_projects, $domain, $api_no)
+    {
+        //复制站点标识
+        $flg_ext = 0;
+        if ($ext_projects) {
+            $ext_urls = array_column($ext_projects, 'ext');
+            $api_nos = array_column($ext_projects, 'apino');
+            if (in_array($api_no, $api_nos)) {
+                $flg_ext = 1;
+            }
+            if (in_array($domain, $ext_urls)) {
+                $flg_ext = 2;
+            }
+        }
+        return $flg_ext;
+    }
+
+    /**
+     * 获取AI项目标识
+     * @author zbj
+     * @date 2023/5/15
+     */
+    protected function getAiFlag($ai_projects, $domain)
+    {
+        $flg_ai = 0;
+        foreach ($ai_projects as $ai_project) {
+            if ($ai_project['bind_domain'] == $domain) {
+                $flg_ai = 1;
+            }
+        }
+        return $flg_ai;
     }
     }
 }
 }

+<?php
+
+namespace App\Models\Project;
+
+use App\Helper\Arr;
+use App\Models\Base;
+use App\Models\Devops\ServerConfig;
+use Illuminate\Support\Facades\Cache;
+
+class DomainInfo extends Base
+{
+    //设置关联表名
+    protected $table = 'gl_project_domain_info';
+
+
+    public function setDomainInfoAttribute($value){
+        $this->attributes['domain_info'] = Arr::a2s($value);
+    }
+
+    public function getDomainInfoAttribute($value){
+        return Arr::s2a($value);
+    }
+
+    public function setSslAttribute($value){
+        $this->attributes['ssl'] = Arr::a2s($value);
+    }
+
+    public function getSslAttribute($value){
+        return Arr::s2a($value);
+    }
+}

@@ -14,6 +14,7 @@
         "laravel/framework": "^8.75",
         "laravel/framework": "^8.75",
         "laravel/sanctum": "^2.11",
         "laravel/sanctum": "^2.11",
         "laravel/tinker": "^2.5",
         "laravel/tinker": "^2.5",
+        "mongodb/mongodb": "^1.6",
         "phpoffice/phpspreadsheet": "^1.28"
         "phpoffice/phpspreadsheet": "^1.28"
     },
     },
     "require-dev": {
     "require-dev": {