作者 李宇航

合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !1740
@@ -488,7 +488,12 @@ class OptimizeController extends BaseController @@ -488,7 +488,12 @@ class OptimizeController extends BaseController
488 $this->fail('请先设置域名'); 488 $this->fail('请先设置域名');
489 } 489 }
490 $domain = 'https://' . $domainInfo['domain'] . '/'; 490 $domain = 'https://' . $domainInfo['domain'] . '/';
491 - $data = []; 491 + $data = [
  492 + 'ai_blog' => [],
  493 + 'product' => [],
  494 + 'product_category'=>[],
  495 + 'product_keyword' => [],
  496 + ];
492 ProjectServer::useProject($this->param['project_id']); 497 ProjectServer::useProject($this->param['project_id']);
493 $productModel = new Product(); 498 $productModel = new Product();
494 $this->processChunkedList($productModel, ['status' => $productModel::STATUS_ON], ['id', 'title', 'route'], $domain, $data, 'product'); 499 $this->processChunkedList($productModel, ['status' => $productModel::STATUS_ON], ['id', 'title', 'route'], $domain, $data, 'product');
@@ -81,13 +81,16 @@ class RankDataLogic extends BaseLogic @@ -81,13 +81,16 @@ class RankDataLogic extends BaseLogic
81 } 81 }
82 $g_top_plan['day'] = $g_top_plan['service_day'] - $g_top_plan['is_compliance']; 82 $g_top_plan['day'] = $g_top_plan['service_day'] - $g_top_plan['is_compliance'];
83 } 83 }
  84 + $plan = Project::planMap();
  85 + $seo_plan = Project::seoMap();
84 //项目信息 86 //项目信息
85 $data['project'] = [ 87 $data['project'] = [
86 'company' => $project['company'], 88 'company' => $project['company'],
87 'domain' => $domain_info['domain'] ?? '', 89 'domain' => $domain_info['domain'] ?? '',
88 'domain_info' => $domain_info['domain_info'] ?? '', 90 'domain_info' => $domain_info['domain_info'] ?? '',
89 'cert_info' => $domain_info['cert_info'] ?? '', 91 'cert_info' => $domain_info['cert_info'] ?? '',
90 - 'plan' => Project::planMap()[$project['deploy_build']['plan']], 92 + 'plan' => $plan[$project['deploy_build']['plan']] ?? 0,
  93 + 'seo_plan' => $seo_plan[$project['deploy_build']['seo_plan']] ?? 0,
91 'keyword_num' => $project['deploy_build']['keyword_num'], 94 'keyword_num' => $project['deploy_build']['keyword_num'],
92 'compliance_day' => $project['finish_remain_day'] ?? 0, 95 'compliance_day' => $project['finish_remain_day'] ?? 0,
93 'remain_day' => $project['remain_day'], 96 'remain_day' => $project['remain_day'],