Merge branch 'zjl_adjust_20181026'

config/monitorDing.php

@@ -2,7 +2,7 @@
 
 
 return [
 return [
     // 是否开启报错写入
     // 是否开启报错写入
-    'enabled' => true,
+	'enabled' => env('DING_ALERT', false),
 
 
     // curl证书验证, 线下环境不用开启
     // curl证书验证, 线下环境不用开启
     'curl_verify' => true,
     'curl_verify' => true,

vendor/redgo/monitor-ding/src/MonitorDingClient.php

@@ -92,8 +92,7 @@ class MonitorDingClient {
         if (! config('monitorDing.enabled')) {
         if (! config('monitorDing.enabled')) {
             \Log::info('~~ Monitor Ding ~~');
             \Log::info('~~ Monitor Ding ~~');
             \Log::info($params);
             \Log::info($params);
-        }
-
+        } else {
             $ch = curl_init();
             $ch = curl_init();
             curl_setopt($ch, CURLOPT_URL, $this->webhook);
             curl_setopt($ch, CURLOPT_URL, $this->webhook);
             curl_setopt($ch, CURLOPT_POST, 1);
             curl_setopt($ch, CURLOPT_POST, 1);
@@ -112,4 +111,7 @@ class MonitorDingClient {
                 throw new SendErrorException($data['errmsg']);
                 throw new SendErrorException($data['errmsg']);
             }
             }
         }
         }
+
+        
+    }
 }
 }
\ No newline at end of file