Переглянути джерело

Merge branch 'feature/NC-45' of http://16.162.42.175:8014/guanli/aklast into feature/NC-45

# Conflicts:
#	backendApi/config/params.php
zhangl 1 рік тому
батько
коміт
855e3add24

+ 4 - 4
backendApi/config/params.php

@@ -13,9 +13,10 @@ return [
         'v1/shop/order-period-adjust-batch',
         'v1/oauth/send-email-code',
         'v1/site/clear-login-failed-num',
-        'v1/site/open-member-ip-filter', 
-        'v1/site/close-member-ip-filter', 
-        'v1/site/open-backend-ip-filter', 
+        'v1/site/open-backend-ip-filter',
+        'v1/site/open-member-ip-filter',
+        'v1/site/close-member-ip-filter',
+        'v1/site/open-backend-ip-filter',
         'v1/site/close-backend-ip-filter',
     ],
     'noCheckPermissionActions' => [
@@ -69,7 +70,6 @@ return [
         'shop/order-period-adjust-batch',
         'oauth/send-email-code',
         'site/clear-login-failed-num',
-        'site/clear-login-failed-num', 
         'site/open-member-ip-filter', 
         'site/close-member-ip-filter', 
         'site/open-backend-ip-filter', 

+ 1 - 0
backendApi/modules/v1/controllers/BaseController.php

@@ -9,6 +9,7 @@
 namespace backendApi\modules\v1\controllers;
 
 use common\helpers\Date;
+use common\helpers\LoggerTool;
 use common\helpers\Tool;
 use common\libs\IpFilter;
 use common\models\UserInfo;

+ 1 - 0
frontendApi/modules/v1/controllers/BaseController.php

@@ -11,6 +11,7 @@ namespace frontendApi\modules\v1\controllers;
 use common\components\ActiveRecord;
 use common\helpers\Date;
 use common\helpers\Form;
+use common\helpers\LoggerTool;
 use common\helpers\Tool;
 use common\libs\IpFilter;
 use frontendApi\modules\v1\models\User;