Merge branch 'yang-zt-fix' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Jobs/LogisticZopSync.php

@@ -332,7 +332,7 @@ class LogisticZopSync implements ShouldQueue
         $request->setUrl($url);
         $request->setBody(json_encode([
             'billCode' => $this->logistic_number,
-        ]));
+        ],JSON_UNESCAPED_UNICODE));
         return json_decode($client->execute($request));
     }
 }

app/library/zop/ZopClient.php

@@ -3,6 +3,7 @@
 
 namespace App\library\zop;
 use App\library\zop\ZopHttpUtil;
+use Illuminate\Support\Facades\Http;
 
 class ZopClient
 {
@@ -40,22 +41,20 @@ class ZopClient
             $data_digest = base64_encode(md5($str_to_digest, TRUE));
             $headers = array(
                 "Content-Type: application/x-www-form-urlencoded; charset=UTF-8",
-                "x-companyid: " .$this->zopProperties->getCompanyid(),
-                "x-datadigest: " .$data_digest
+                "x-companyid: " . $this->zopProperties->getCompanyid(),
+                "x-datadigest: " . $data_digest
             );
             return $this->httpClient->post($url, $headers, http_build_query($fixedParams), 2000);
-        } else{
+        } else {
             $url = $zopRequest->getUrl();
             $body = $zopRequest->getBody();
-            $str_to_digest = $body.$this->zopProperties->getKey();
+            $str_to_digest = $body . $this->zopProperties->getKey();
             $data_digest = base64_encode(md5($str_to_digest, TRUE));
-            $headers = array(
-                "Content-Type: application/json; charset=UTF-8",
-                "x-companyid: ".$this->zopProperties->getCompanyid(),
-                "x-datadigest: ".$data_digest
-            );
-            return $this->httpClient->post($url, $headers, $body, 2000);
-
+            return Http::withHeaders([
+                'Content-Type' => 'application/json; charset=UTF-8',
+                'x-companyid' => $this->zopProperties->getCompanyid(),
+                'x-datadigest' => $data_digest,
+            ])->withBody(json_encode((array)json_decode($body), JSON_UNESCAPED_UNICODE), 'application/json')->post($url)->body();
         }
     }
 }

tests/Feature/LogisticZopSyncTest.php

@@ -39,7 +39,7 @@ class LogisticZopSyncTest extends TestCase
 
     public function test_get()
     {
-        LogisticZopSync::dispatch('73228204974140');
+        LogisticZopSync::dispatch('75600023806455');
     }