Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_iteration_20190723

app/Http/Function.php

@@ -52,8 +52,8 @@
         if(!function_exists('curl_init')) exit('Need to open the curl extension');
         if(!function_exists('curl_init')) exit('Need to open the curl extension');
         $method = strtoupper($method);
         $method = strtoupper($method);
         $ci = curl_init();
         $ci = curl_init();
-        curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, 10);
-        curl_setopt($ci, CURLOPT_TIMEOUT, 10);
+        curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, 30);
+        curl_setopt($ci, CURLOPT_TIMEOUT, 30);
         curl_setopt($ci, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ci, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($ci, CURLOPT_SSL_VERIFYHOST, false);
         curl_setopt($ci, CURLOPT_SSL_VERIFYHOST, false);