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

@@ -439,7 +439,7 @@ class ProductLogic extends  BaseLogic
                     'category_id' => $category_id,
                     'category_id' => $category_id,
                     'keyword_id' => $keyword_id,
                     'keyword_id' => $keyword_id,
                     'intro' => $data[5] ?? '',
                     'intro' => $data[5] ?? '',
-                    'content' => $data[6] ?? '',
+                    'content' => $data[6] ? preg_replace('/[\x{10000}-\x{10FFFF}]/u','',$data[6]) : '',
                     'seo_mate' => Arr::a2s($seo_mate),
                     'seo_mate' => Arr::a2s($seo_mate),
                     'created_uid' => $user_id,
                     'created_uid' => $user_id,
                     'status' => Product::STATUS_ON
                     'status' => Product::STATUS_ON

@@ -74,6 +74,7 @@ class CosService
      */
      */
     public static function uploadRemote($project_id,$image_type,$file_url)
     public static function uploadRemote($project_id,$image_type,$file_url)
     {
     {
+        return '';
         $ext = explode('.',$file_url);
         $ext = explode('.',$file_url);
 
 
         $filename = uniqid().rand(10000,99999).'.'.end($ext);
         $filename = uniqid().rand(10000,99999).'.'.end($ext);