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

@@ -908,17 +908,17 @@ class ProductLogic extends  BaseLogic
                 //处理内容中的图片
 
                 /*****阿里巴巴国际站特殊情况处理start******/
-                preg_match_all('/<img src=(\'|\")(.*?) data-src=(\'|\")(.*?)>/i', $data[6], $result_alibaba);
-                if($result_alibaba[0] ?? []){
-                    foreach ($result_alibaba[0] as $v_ali){
-                        $data[6] = str_replace($v_ali,'',$data[6]);
-                    }
-
-                    $data[6] = str_replace('<noscript>','',$data[6]);
-                    $data[6] = str_replace('</noscript>','',$data[6]);
-                    $data[6] = str_replace('id="module_detail_video"','id="module_detail_video" hidden',$data[6]);
-                    $data[6] = str_replace('module-title="detailVideoShow"','module-title="detailVideoShow" hidden',$data[6]);
-                }
+//                preg_match_all('/<img src=(\'|\")(.*?) data-src=(\'|\")(.*?)>/i', $data[6], $result_alibaba);
+//                if($result_alibaba[0] ?? []){
+//                    foreach ($result_alibaba[0] as $v_ali){
+//                        $data[6] = str_replace($v_ali,'',$data[6]);
+//                    }
+//
+//                    $data[6] = str_replace('<noscript>','',$data[6]);
+//                    $data[6] = str_replace('</noscript>','',$data[6]);
+//                    $data[6] = str_replace('id="module_detail_video"','id="module_detail_video" hidden',$data[6]);
+//                    $data[6] = str_replace('module-title="detailVideoShow"','module-title="detailVideoShow" hidden',$data[6]);
+//                }
                 /*****阿里巴巴国际站特殊情况处理end******/
 
                 preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[6], $result_content);

@@ -234,7 +234,7 @@ class RankDataLogic extends BaseLogic
         $flg_ai = $this->getAiFlag($ai_projects, $domain);
         $ai_domain = str_replace('www.', '', $this->getAiProjects($domain)['domain'] ?? '');
         if (Str::endsWith($api_no, '_bmseo')) {
-            $list = RankDataBmseo::where('project_id', $project_id)->where('api_no', $api_no)->where('lang', $lang)->value('data') ?: [];
+            $list = RankDataBmseo::where('project_id', $project_id)->where('api_no', $api_no)->value('data') ?: [];
         } else {
             $list = RankData::where('project_id', $project_id)->where('api_no', $api_no)->where('lang', $lang)->value('data') ?: [];
         }