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

@@ -776,11 +776,7 @@ class ProjectUpdate extends Command
     //获取地址路由
     //获取地址路由
     protected function get_url_route($url)
     protected function get_url_route($url)
     {
     {
-        if (strpos($url, '%ec') !== false) {
-            $url = str_replace('%ec', 'v6SpecialStr', $url);
-            $url = urldecode($url);
-            $url = str_replace('v6SpecialStr', '%ec', $url);
-        } else {
+        if (strpos($url, '%3A') !== false || strpos($url, '%2F') !== false) {
             $url = urldecode($url);
             $url = urldecode($url);
         }
         }
         $arr = parse_url($url);
         $arr = parse_url($url);

@@ -11,6 +11,7 @@ use App\Rules\Ids;
 use App\Services\BatchExportService;
 use App\Services\BatchExportService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 
 /**
 /**
  * 精准询盘
  * 精准询盘
@@ -131,6 +132,12 @@ class InquiryController extends BaseController
             if(!empty($this->param['form_id'])){
             if(!empty($this->param['form_id'])){
                 $item = array_merge($item, $item['data']);
                 $item = array_merge($item, $item['data']);
             }
             }
+
+            foreach ($map as $field => $name) {
+                if (Str::startsWith($item[$field], '=')) {
+                    $item[$field] = "'" . $item[$field];
+                }
+            }
         }
         }
 
 
         //生成文件，发送到客户端
         //生成文件，发送到客户端

@@ -707,6 +707,21 @@ class ProductLogic extends  BaseLogic
             $content = '';
             $content = '';
             if($data[6]??''){
             if($data[6]??''){
                 //处理内容中的图片
                 //处理内容中的图片
+
+                /*****阿里巴巴国际站特殊情况处理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]);
+                }
+                /*****阿里巴巴国际站特殊情况处理end******/
+
                 preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[6], $result_content);
                 preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[6], $result_content);
                 if($result_content[2]??[]){
                 if($result_content[2]??[]){
                     foreach ($result_content[2] as $vc_img){
                     foreach ($result_content[2] as $vc_img){