Merge branch 'dev' of http://16.162.42.175:8014/guanli/ngds into dev

# Conflicts:
#	common/components/SwooleAsyncTimer.php
#	common/helpers/DingTalk.php
#	console/controllers/ToolController.php

common/components/SwooleAsyncTimer.php

@@ -236,4 +236,4 @@ class SwooleAsyncTimer extends SwooleAsyncTimerComponent implements SocketInterf
             // 忽略错误
         }
     }
-}
+}

common/helpers/DingTalk.php

@@ -38,15 +38,15 @@ class DingTalk
         ];
 
         // 正式环境才发送
-//        if (YII_ENV == YII_ENV_PROD) {
-//            $result = self::request_by_curl(json_encode($data));
-//            if ($result['errcode'] > 0) {
-//                // 重新推送一次,如果失败,写错误日志
-//                $result = self::request_by_curl(json_encode($data));
-//                if (!$result['errcode']) {
-//                    LoggerTool::error([$result, $message]);
-//                }
-//            }
-//        }
+        if (in_array($_SERVER['HTTP_HOST'], ['ng-frontend-api.elken.com', 'ng-backend-api.elken.com'])) {
+            $result = self::request_by_curl(json_encode($data));
+            if ($result['errcode'] > 0) {
+                // 重新推送一次,如果失败,写错误日志
+                $result = self::request_by_curl(json_encode($data));
+                if (!$result['errcode']) {
+                    LoggerTool::error([$result, $message]);
+                }
+            }
+        }
     }
 }

console/controllers/ToolController.php

@@ -178,23 +178,42 @@ class ToolController extends BaseController
     /**
      * 自动送钉钉提醒
      */
-    public function actionAutoSendDingTalkTable() {
+    public function actionAutoSendDingTalkFrontend() {
 //        $ip = 'https://ng-frontend-api.elken.com';
-//        $ip = 'http://16.163.228.151:8026';
-//        $curl = curl_init();
-//        curl_setopt($curl, CURLOPT_URL, $ip . '/v1/site/send-notice');
-//        curl_setopt($curl, CURLOPT_TIMEOUT, 5000);
-//        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-//        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
-//        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-//        $res = curl_exec($curl);
-//        if ($res) {
-//            curl_close($curl);
-//            LoggerTool::info($res);
-//        } else {
-//            $error = curl_errno($curl);
-//            curl_close($curl);
-//            LoggerTool::error($error);
-//        }
+        $ip = 'http://16.163.228.151:8026';
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, $ip . '/v1/site/send-notice');
+        curl_setopt($curl, CURLOPT_TIMEOUT, 5000);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+        $res = curl_exec($curl);
+        if ($res) {
+            curl_close($curl);
+        } else {
+            $error = curl_errno($curl);
+            curl_close($curl);
+        }
+    }
+
+    /**
+     * 自动送钉钉提醒
+     */
+    public function actionAutoSendDingTalkBackend() {
+//        $ip = 'https://ng-frontend-api.elken.com';    // Prod
+        $ip = 'http://16.163.228.151:8025';   // test
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, $ip . '/v1/site/send-notice');
+        curl_setopt($curl, CURLOPT_TIMEOUT, 5000);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+        $res = curl_exec($curl);
+        if ($res) {
+            curl_close($curl);
+        } else {
+            $error = curl_errno($curl);
+            curl_close($curl);
+        }
     }
-}
+}