Merge branch 'feature/ticker' into 'master'

fix See merge request !282

Merge branch 'feature/ticker' into 'master'
9cf63f40 · shajiaiming · 701c6486 · 94a6cd37 · 9cf63f40
Commit 9cf63f40 authored Jan 17, 2020 by shajiaiming
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

TrusteeShipService.php common/service/trusteeship/TrusteeShipService.php +5 -1

No files found.
--- a/common/service/trusteeship/TrusteeShipService.php
+++ b/common/service/trusteeship/TrusteeShipService.php
@@ -32,7 +32,11 @@ class TrusteeShipService

    public function send($method = 'GET', $uri, $params = [])
    {
-        $ch = new Curl();
+        $timeout = [
+            'connect_timeout' => 50000,
+            'timeout_ms' => 40000
+        ];
+        $ch = new Curl($timeout);
        if (!empty($this->header)) {
            $ch->setHeaders($this->header);
        }