合并分支 'zhl' 到 'master'

'加抑制错误'



查看合并请求 !1461

@@ -624,7 +624,7 @@ class UpdateSeoTdk extends Command
         $info = Cache::get($cache_key);
         $info = Cache::get($cache_key);
         if(!$info){
         if(!$info){
             $projectOptimizeModel = new DeployOptimize();
             $projectOptimizeModel = new DeployOptimize();
-            $info = $projectOptimizeModel->read(['project_id' => $project_id], ['id', 'company_en_name', 'company_en_description', 'keyword_prefix', 'keyword_suffix']);
+            $info = $projectOptimizeModel->read(['project_id' => $project_id], ['id', 'company_en_name', 'company_en_description', 'keyword_prefix', 'keyword_suffix', 'brand_keyword']);
             $projectKeywordModel = new ProjectKeyword();
             $projectKeywordModel = new ProjectKeyword();
             $keywordInfo = $projectKeywordModel->read(['project_id'=>$project_id]);
             $keywordInfo = $projectKeywordModel->read(['project_id'=>$project_id]);
             $info['main_keyword'] = '';
             $info['main_keyword'] = '';

@@ -453,7 +453,7 @@ class PrivateController extends BaseController
             return $this->error('未找到当前域名对应的项目！');
             return $this->error('未找到当前域名对应的项目！');
         }
         }
 
 
-        $json = file_get_contents(storage_path('data/send_product_tag_keyword/' . $project->id . '.json'));
+        $json = @file_get_contents(storage_path('data/send_product_tag_keyword/' . $project->id . '.json'));
         $result = json_decode($json, true) ?: [];
         $result = json_decode($json, true) ?: [];
         return $this->success($result);
         return $this->success($result);
     }
     }