Merge branch 'feature/2189-exceptionHandle' into dev

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

backendApi/config/params.php

@@ -1,6 +1,6 @@
 <?php
 return [
     'adminEmail' => 'admin@example.com',
-    'noCheckTokenActions' => ['v1/oauth/login', 'v1/oauth/no-login-modify-password', 'v1/oauth/refresh-access-token', 'v1/oauth/refresh-refresh-token', 'v1/oauth/refresh-token', 'v1/site/days-diff', 'v1/site/page-data', 'v1/site/captcha'],
-    'noCheckPermissionActions' => ['oauth/login', 'oauth/no-login-modify-password', 'oauth/refresh-access-token', 'oauth/refresh-refresh-token', 'oauth/refresh-token', 'oauth/info', 'site/base-info', 'site/days-diff', 'site/page-data', 'site/captcha', 'user/full-info', 'user/filter-user', 'user/generate-user-name', 'reconsume/cant-deduct-date', 'user/get-sub-com', 'user/chk-relation', 'user/get-period-num', 'user/company-bank-get', 'user/main-divide', 'user/chk-del-user', 'reconsume/deduct-audit-add', 'finance/perf-apply-get','file/upload-excel', 'user/move-net-type', 'user/move-get', 'user/reg-info-audit-get', 'user/status-audit-get', 'user/status-audit-get-statuses', 'user/close-login-get', 'user/close-dec-get', 'atlas/main-user-info', 'reconsume/change-audit-get', 'reconsume/cant-deduct-month', 'finance/change-balance-type', 'finance/balance-audit-get', 'file/token', 'finance/perf-audit-get', 'finance/invoice-audit-get', 'finance/withdraw-get', 'finance/deal-type-get', 'ad/upload', 'config/reg-type-get', 'config/pact-get', 'user/reg-info-audit-add-opt', 'reconsume/get-flow-deal-type', 'user/status-close-get', 'finance/mult-point', 'shop/upload', 'article/upload'],
+    'noCheckTokenActions' => ['v1/oauth/login', 'v1/oauth/no-login-modify-password', 'v1/oauth/refresh-access-token', 'v1/oauth/refresh-refresh-token', 'v1/oauth/refresh-token', 'v1/site/days-diff', 'v1/site/page-data', 'v1/site/captcha', 'v1/site/send-notice',],
+    'noCheckPermissionActions' => ['oauth/login', 'oauth/no-login-modify-password', 'oauth/refresh-access-token', 'oauth/refresh-refresh-token', 'oauth/refresh-token', 'oauth/info', 'site/base-info', 'site/days-diff', 'site/page-data', 'site/captcha', 'user/full-info', 'user/filter-user', 'user/generate-user-name', 'reconsume/cant-deduct-date', 'user/get-sub-com', 'user/chk-relation', 'user/get-period-num', 'user/company-bank-get', 'user/main-divide', 'user/chk-del-user', 'reconsume/deduct-audit-add', 'finance/perf-apply-get','file/upload-excel', 'user/move-net-type', 'user/move-get', 'user/reg-info-audit-get', 'user/status-audit-get', 'user/status-audit-get-statuses', 'user/close-login-get', 'user/close-dec-get', 'atlas/main-user-info', 'reconsume/change-audit-get', 'reconsume/cant-deduct-month', 'finance/change-balance-type', 'finance/balance-audit-get', 'file/token', 'finance/perf-audit-get', 'finance/invoice-audit-get', 'finance/withdraw-get', 'finance/deal-type-get', 'ad/upload', 'config/reg-type-get', 'config/pact-get', 'user/reg-info-audit-add-opt', 'reconsume/get-flow-deal-type', 'user/status-close-get', 'finance/mult-point', 'shop/upload', 'article/upload', 'site/send-notice',],
 ];

backendApi/config/urlManagerRules.php

@@ -17,6 +17,7 @@ return [
             'GET days-diff' => 'days-diff',
             'GET page-data' => 'page-data',
             'GET captcha' => 'captcha',
+            'GET send-notice' => 'send-notice',
         ],
     ],
     [

backendApi/modules/v1/controllers/SiteController.php

@@ -153,4 +153,17 @@ class SiteController extends BaseController
         return $menuResult;
     }
 
+    /**
+     * 发送钉钉测试信息
+     * @return mixed
+     * @throws \yii\web\HttpException
+     */
+    public function actionSendNotice()
+    {
+        $data = [
+            'code' => 400,
+            'message' => 'autoSendDingTalk',
+        ];
+        return static::notice(['data' => $data['bug监控正常运行，没有发现异常.']]);
+    }
 }

common/components/SwooleAsyncTimer.php

@@ -71,9 +71,9 @@ class SwooleAsyncTimer extends SwooleAsyncTimerComponent implements SocketInterf
             // 初始化备份历史奖金数据表
 //            TaskFunc::initAutoBakBalance();
             // 初始化自动发送钉钉推送消息
-            if (YII_ENV == YII_ENV_PROD) {
+//            if (YII_ENV == YII_ENV_PROD) {
 //                TaskFunc::initAutoSendDingTalk();
-            }
+//            }
         }
     }
 

common/config/params.php

@@ -354,7 +354,8 @@ return [
     ],
     // 钉钉消息
     'DingTalk' => [
-        'accessToken' => 'f6b61da1e4cef364298cbac4cad0af23f19a0b34a113ee4d39986d1f796c51b0',
+//        'accessToken' => 'f6b61da1e4cef364298cbac4cad0af23f19a0b34a113ee4d39986d1f796c51b0',
+        'accessToken' => '39e7dc7860296bb47daf0bf4d06395c9a1ec19783f655a0aa2985b02780141d7',
         'atMobiles'   => [],
         'atUserIds'   => ['rob9muw'],
         'isAtAll'     => false,

common/helpers/DingTalk.php

@@ -38,15 +38,13 @@ 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]);
-//                }
-//            }
-//        }
+        $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]);
+            }
+        }
     }
 }

common/libs/taskQueue/TaskFunc.php

@@ -45,40 +45,40 @@ class TaskFunc
         print_r('执行到测试任务'.PHP_EOL);
     }
 
-    /**
-     * 初始化自动发送钉钉提醒任务
-     */
-    public static function initAutoSendDingTalk() {
-        // 查看数据库中是否存在未开始的任务，如果没有就添加一个新任务
-        if(!TaskQueue::find()->where('TYPE=:TYPE AND CONTENT=:CONTENT AND STARTED_AT>:STARTED_AT', [':TYPE'=>Queue::TYPE_FUNC, ':CONTENT'=>TaskFunc::class.'::autoSendDingTalkTable', ':STARTED_AT'=>Date::nowTime()])->asArray()->exists()){
-            // 获取站点配置中的备份时间
-            $config = Cache::getSystemConfig();
-            $sendDingTalkTime = $config['sendDingTalkTime']['VALUE'];
-            Queue::instance()->addTask(Queue::TYPE_FUNC, TaskFunc::class.'::autoSendDingTalkTable', [], Queue::LOOP_TYPE_DAY, $sendDingTalkTime, 0);
-        }
-    }
-
-    /**
-     * 自动送钉钉提醒
-     */
-    public static function autoSendDingTalkTable() {
-        $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);
-        }
-    }
+//    /**
+//     * 初始化自动发送钉钉提醒任务
+//     */
+//    public static function initAutoSendDingTalk() {
+//        // 查看数据库中是否存在未开始的任务，如果没有就添加一个新任务
+//        if(!TaskQueue::find()->where('TYPE=:TYPE AND CONTENT=:CONTENT AND STARTED_AT>:STARTED_AT', [':TYPE'=>Queue::TYPE_FUNC, ':CONTENT'=>TaskFunc::class.'::autoSendDingTalkTable', ':STARTED_AT'=>Date::nowTime()])->asArray()->exists()){
+//            // 获取站点配置中的备份时间
+//            $config = Cache::getSystemConfig();
+//            $sendDingTalkTime = $config['sendDingTalkTime']['VALUE'];
+//            Queue::instance()->addTask(Queue::TYPE_FUNC, TaskFunc::class.'::autoSendDingTalkTable', [], Queue::LOOP_TYPE_DAY, $sendDingTalkTime, 0);
+//        }
+//    }
+//
+//    /**
+//     * 自动送钉钉提醒
+//     */
+//    public static function autoSendDingTalkTable() {
+//        $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);
+//        }
+//    }
 }

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);
+        }
     }
 }

frontendApi/modules/v1/controllers/SiteController.php

@@ -334,6 +334,6 @@ class SiteController extends BaseController
             'message' => 'autoSendDingTalk',
         ];
 
-        return static::notice(['data' => $data['bug监控正常运行，没有发现异常，奥利给！']]);
+        return static::notice(['data' => $data['bug监控正常运行，没有发现异常.']]);
     }
 }