fix tcp bug

lordlezehaf · lordlezehaf · commit 29dc74014051 · 2018-12-28T11:56:57.000+08:00
diff --git a/app/Components/Namesilo.php b/app/Components/Namesilo.php
@@ -106,9 +106,7 @@ private function curlRequest($url, $data = [])
     {
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 500);
-        // 为保证第三方服务器与微信服务器之间数据传输的安全性，所有微信接口采用https方式调用，必须使用下面2行代码打开ssl安全校验。
-        // 如果在部署过程中代码在此处验证失败，请到 http://curl.haxx.se/ca/cacert.pem 下载新的证书判别文件。
+        curl_setopt($ch, CURLOPT_TIMEOUT, 10);
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
         curl_setopt($ch, CURLOPT_URL, $url);
diff --git a/app/Console/Commands/AutoCheckNodeStatus.php b/app/Console/Commands/AutoCheckNodeStatus.php
@@ -120,11 +120,17 @@ private function checkNodes()
      */
     private function tcpCheck($ip)
     {
-        $url = 'https://ipcheck.need.sh/api_v2.php?ip=' . $ip;
-        $ret = $this->curlRequest($url);
-        $ret = json_decode($ret);
-        if (!$ret || $ret->result != 'success') {
-            Log::warning("【TCP阻断检测】ipcheck.need.sh的TCP阻断检测接口挂了");
+        try {
+            $url = 'https://ipcheck.need.sh/api_v2.php?ip=' . $ip;
+            $ret = $this->curlRequest($url);
+            $ret = json_decode($ret);
+            if (!$ret || $ret->result != 'success') {
+                Log::warning("【TCP阻断检测】检测" . $ip . "时，接口返回异常");
+
+                return false;
+            }
+        } catch (\Exception $e) {
+            Log::warning("【TCP阻断检测】检测" . $ip . "时，接口请求超时");
 
             return false;
         }
@@ -206,15 +212,15 @@ private function curlRequest($url, $data = [])
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 500);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 10);
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
         curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, [
-            'Accept: application/json', // 请求报头
-            'Content-Type: application/json', // 实体报头
-            'Content-Length: ' . strlen($data)
-        ]);
+//        curl_setopt($ch, CURLOPT_HTTPHEADER, [
+//            'Accept: application/json', // 请求报头
+//            'Content-Type: application/json', // 实体报头
+//            'Content-Length: ' . strlen($data)
+//        ]);
 
         // 如果data有数据，则用POST请求
         if ($data) {
diff --git a/app/helpers.php b/app/helpers.php
@@ -165,9 +165,7 @@ function getIPv6($ip)
         try {
             $ch = curl_init();
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-            curl_setopt($ch, CURLOPT_TIMEOUT, 500);
-            // 为保证第三方服务器与微信服务器之间数据传输的安全性，所有微信接口采用https方式调用，必须使用下面2行代码打开ssl安全校验。
-            // 如果在部署过程中代码在此处验证失败，请到 http://curl.haxx.se/ca/cacert.pem 下载新的证书判别文件。
+            curl_setopt($ch, CURLOPT_TIMEOUT, 10);
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
             curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
             curl_setopt($ch, CURLOPT_URL, $url);
diff --git a/composer.json b/composer.json
@@ -19,6 +19,7 @@
         "overtrue/laravel-lang": "~3.0",
         "paypal/rest-api-sdk-php": "*",
         "phpoffice/phpspreadsheet": "^1.4",
+        "predis/predis": "^1.1",
         "rap2hpoutre/laravel-log-viewer": "^0.19.1",
         "spatie/laravel-permission": "^2.23",
         "youzan/open-sdk": "^1.0"
diff --git a/composer.lock b/composer.lock
