Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -107,7 +107,9 @@ class VideoTask extends Command
                     'project_id' => $task_project->project_id,
                     'project_id' => $task_project->project_id,
                     'keyword_id' => $val->id,
                     'keyword_id' => $val->id,
                     'keyword' => $val->title,
                     'keyword' => $val->title,
-                    'data' => json_encode(['url' => $keywordInfo['url'],'title' => $keywordInfo['title'], 'description' => $keywordInfo['keyword_content'], 'images' => $keywordInfo['product_list'], 'keywords' => $keywordInfo['keyword_list']]),
+                    'data' => json_encode(['url' => $keywordInfo['url'],'title' => $keywordInfo['title'],
+                        'description' => $keywordInfo['keyword_content'], 'images' => $keywordInfo['product_list'],
+                        'keywords' => $keywordInfo['keyword_list']]),
                     'status' => KeywordVideoTaskLog::STATUS_INIT,
                     'status' => KeywordVideoTaskLog::STATUS_INIT,
                     'updated_at' => date('Y-m-d H:i:s'),
                     'updated_at' => date('Y-m-d H:i:s'),
                     'created_at' => date('Y-m-d H:i:s'),
                     'created_at' => date('Y-m-d H:i:s'),
@@ -226,7 +228,8 @@ class VideoTask extends Command
                 }
                 }
             }else{
             }else{
                 $product_all_id = Product::where("project_id", $project_id)->where("status",Product::STATUS_ON)->pluck('id')->toArray();
                 $product_all_id = Product::where("project_id", $project_id)->where("status",Product::STATUS_ON)->pluck('id')->toArray();
-                $product_id = array_rand($product_all_id, 40);
+                $number = 40;
+                $product_id = array_rand($product_all_id,  min(count($product_all_id, $number-count($productIds))));
                 $products = Product::where("project_id", $project_id)->whereIn("id", $product_id)->get();
                 $products = Product::where("project_id", $project_id)->whereIn("id", $product_id)->get();
             }
             }
         }
         }
@@ -239,6 +242,12 @@ class VideoTask extends Command
                 if(count($data) > 13){
                 if(count($data) > 13){
                     break;
                     break;
                 }
                 }
+                if (strpos($item->keyword_id, ','.$productKeyword->id.',') === false) {
+                    //不包含
+                    $productModel = new Product();
+                    $keyword_id = $item->keyword_id . $productKeyword->id.',';
+                    $productModel->edit(['keyword_id'=>$keyword_id],['id'=>$item->id]);
+                }
                 $data[] = ['url'=>getImageUrl($item->thumb['url']),'title'=>$item->title];
                 $data[] = ['url'=>getImageUrl($item->thumb['url']),'title'=>$item->title];
             }
             }
         }
         }

@@ -48,11 +48,11 @@ class RankData extends BaseCommands
 
 
             Log::channel('rank_data')->info('开始-排名数据');
             Log::channel('rank_data')->info('开始-排名数据');
             //同步api_no
             //同步api_no
-            try {
-                $this->SyncApiNo();
-            } catch (\Exception $e) {
-                Log::channel('rank_data')->error('同步api_no失败：' . $e->getMessage());
-            }
+//            try {
+//                $this->SyncApiNo();
+//            } catch (\Exception $e) {
+//                Log::channel('rank_data')->error('同步api_no失败：' . $e->getMessage());
+//            }
 
 
 
 
             //所有项目 今日是否达标 重置
             //所有项目 今日是否达标 重置
@@ -70,7 +70,7 @@ class RankData extends BaseCommands
             //当日所有站点谷歌收录数据
             //当日所有站点谷歌收录数据
             $site_res = $api->getSiteRes();
             $site_res = $api->getSiteRes();
             if (!$site_res) {
             if (!$site_res) {
-                return false;
+                Log::channel('rank_data')->error('谷歌收录数据获取失败');
             }
             }
             foreach ($list as $item) {
             foreach ($list as $item) {
                 echo $item['api_no'] . PHP_EOL;
                 echo $item['api_no'] . PHP_EOL;

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>206]);
+        $list = $projectModel->list(['id'=>969]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;

@@ -30,10 +30,10 @@ class KeywordRequest extends FormRequest
     public function rules()
     public function rules()
     {
     {
         return [
         return [
-            'title'=>'required|max:50',
-            'seo_title'=>'max:200',
-            'seo_keywords'=>'max:200',
-            'seo_description'=>'max:200',
+            'title'=>'required|max:200',
+            'seo_title'=>'max:255',
+            'seo_keywords'=>'max:500',
+            'seo_description'=>'max:500',
             'related_news_ids'=>'array|max:2',
             'related_news_ids'=>'array|max:2',
             'related_blog_ids'=>'array|max:2',
             'related_blog_ids'=>'array|max:2',
         ];
         ];
@@ -43,10 +43,10 @@ class KeywordRequest extends FormRequest
     {
     {
         return [
         return [
             'title.required' => '请输入关键词',
             'title.required' => '请输入关键词',
-            'title.max' => '关键词不能超过50个字符',
-            'seo_title.max' => 'SEO标题不能超过200个字符',
-            'seo_keywords.max' => 'SEO关键词不能超过200个字符',
-            'seo_description.max' => 'SEO描述不能超过200个字符',
+            'title.max' => '关键词不能超过200个字符',
+            'seo_title.max' => 'SEO标题不能超过255个字符',
+            'seo_keywords.max' => 'SEO关键词不能超过500个字符',
+            'seo_description.max' => 'SEO描述不能超过500个字符',
             'related_news_ids.max' => '关联新闻不能超过两条',
             'related_news_ids.max' => '关联新闻不能超过两条',
             'related_blog_ids.max' => '关联博客不能超过两条',
             'related_blog_ids.max' => '关联博客不能超过两条',
         ];
         ];