Bläddra i källkod

修改钉钉运行提醒报错

kevin_zhangl 3 år sedan
förälder
incheckning
791a29a682

+ 2 - 2
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',],
 ];

+ 1 - 0
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',
         ],
     ],
     [

+ 13 - 0
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监控正常运行,没有发现异常.']]);
+    }
 }

+ 2 - 1
common/config/params.php

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

+ 5 - 7
common/helpers/DingTalk.php

@@ -38,14 +38,12 @@ 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'] > 0) {
-                // 重新推送一次,如果失败,写错误日志
-                $result = self::request_by_curl(json_encode($data));
-                if (!$result['errcode']) {
-                    LoggerTool::error([$result, $message]);
-                }
+            if (!$result['errcode']) {
+                LoggerTool::error([$result, $message]);
             }
         }
     }

+ 25 - 4
console/controllers/ToolController.php

@@ -178,9 +178,32 @@ class ToolController extends BaseController
     /**
      * 自动送钉钉提醒
      */
-    public function actionAutoSendDingTalkTable() {
-        $ip = 'https://ng-frontend-api.elken.com';
+    public function actionAutoSendDingTalkFrontend() {
+//        $ip = 'https://ng-frontend-api.elken.com';
 //        $ip = 'http://16.163.228.151:8026';
+        $ip = 'http://local.ng.frontend.api.com';
+        $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:8026';   // test
+        $ip = 'http://local.ng.backend.api.com';    // dev
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $ip . '/v1/site/send-notice');
         curl_setopt($curl, CURLOPT_TIMEOUT, 5000);
@@ -190,11 +213,9 @@ class ToolController extends BaseController
         $res = curl_exec($curl);
         if ($res) {
             curl_close($curl);
-            LoggerTool::info($res);
         } else {
             $error = curl_errno($curl);
             curl_close($curl);
-            LoggerTool::error($error);
         }
     }
 }

+ 1 - 1
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监控正常运行,没有发现异常.']]);
     }
 }