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

@@ -17,7 +17,14 @@ class Translate
 {
 {
     //接口地址
     //接口地址
 //    public static $url = 'https://translate.hbb618.cn/translates';
 //    public static $url = 'https://translate.hbb618.cn/translates';
-    public static $url = 'https://api.cmer.com/translates';
+    public static $url = 'https://api.cmer.com/';
+
+    public static $header = array(
+        'accept: application/json',
+        'Content-Type: application/json',
+        'apikey: UkzZljFv83Z2qBi5YR1o3f2otAVWtug6',
+        'X-CmerApi-Host:ai_translate.p.cmer.com'
+    );
 
 
     public static $tls_list = [
     public static $tls_list = [
         'en' => [
         'en' => [
@@ -734,7 +741,7 @@ class Translate
             'sl' => 'auto',
             'sl' => 'auto',
             'tls' => $tls,
             'tls' => $tls,
         ];
         ];
-        return Http::post(self::$url.$action, $data);
+        return http_post(self::$url.$action, json_encode($data),self::$header);
     }
     }
 
 
     /**
     /**
@@ -749,11 +756,8 @@ class Translate
         if (!$texts) {
         if (!$texts) {
             return '';
             return '';
         }
         }
-
-        $retsult = self::translate($texts, $tls)->json();
-
-        return $retsult[0]['texts'] ?? '';
-
+        $result = self::translate($texts, $tls);
+        return $result[0]['texts'] ?? '';
     }
     }
     /**
     /**
      * 翻译带源语种
      * 翻译带源语种
@@ -772,7 +776,7 @@ class Translate
             'sl' => 'auto',
             'sl' => 'auto',
             'tl' => $tl,
             'tl' => $tl,
         ];
         ];
-        return Http::post(self::$url . $action, $data);
+        return http_post(self::$url.$action, json_encode($data),self::$header);
     }
     }
 
 
 }
 }

@@ -286,14 +286,20 @@ class ProductLogic extends  BaseLogic
             'created_at'=>date('Y-m-d H:i:s'),
             'created_at'=>date('Y-m-d H:i:s'),
             'updated_at'=>date('Y-m-d H:i:s'),
             'updated_at'=>date('Y-m-d H:i:s'),
         ];
         ];
-        if(!empty($info['thumb'])){
-            $param['thumb']= Arr::a2s($info['thumb']);
-        }
-        if(!empty($info['gallery'])){
-            $param['gallery']= Arr::a2s($info['gallery']);
+        if(isset($info['icon']) && !empty($info['icon'])){
+            foreach ($info['icon'] as $k1 => $v1){
+                $info['icon'][$k1] = str_replace_url($v1);
+            }
+            $param['icon'] = Arr::a2s($info['icon'] ?? '');
         }
         }
-        if(!empty($info['icon'])){
-            $param['icon']= Arr::a2s($info['icon']);
+        //产品图
+        if(isset($info['gallery']) && !empty($info['gallery'])){
+            foreach ($info['gallery'] as $k => $v){
+                $v['url'] = str_replace_url($v['url']);
+                $info['gallery'][$k] = $v;
+            }
+            $param['thumb'] = Arr::a2s($info['gallery'][0] ?? '');
+            $param['gallery'] = Arr::a2s($info['gallery'] ?? '');
         }
         }
         return $param;
         return $param;
     }
     }