filter

backendApi/modules/v1/controllers/BaseController.php

@@ -48,7 +48,7 @@ class BaseController extends \yii\rest\ActiveController {
 
         $request = Yii::$app->request;
         if (\Yii::$app->redis->get('backend_ip_filter') && !in_array($request->getUrl(), $notFilterApi)) {
-            if (!(new IpFilter())->frontApiCheck('backend')) {
+            if (!(new IpFilter())->checkIp('backend')) {
                 throw new \Exception('用户名或密码错误');
             }
         }

backendApi/modules/v1/models/LoginForm.php

@@ -122,7 +122,7 @@ class LoginForm extends Model {
             }
             // 验证IP
             $loginIp = $_SERVER['REMOTE_ADDR'];
-            if (\Yii::$app->redis->get('backend_ip_filter') && !(new IpFilter())->frontApiCheck('backend', true)) {
+            if (\Yii::$app->redis->get('backend_ip_filter') && !(new IpFilter())->checkIp('backend', true)) {
                 $this->_updateFailTimes($transaction, '登陆IP异常，无法登陆. ' . $loginIp);
                 throw new Exception('用户名或密码错误');
             }

common/libs/IpFilter.php

@@ -16,7 +16,7 @@ class IpFilter
      * @throws BadRequestHttpException
      * @return bool
      */
-    public function frontApiCheck($source, $isLogin = false)
+    public function checkIp($source, $isLogin = false): bool
     {
         $request = Yii::$app->request;
         $getParams = Yii::$app->request->get();
@@ -24,7 +24,7 @@ class IpFilter
         $remoteAddr = $_SERVER['REMOTE_ADDR']; // 获取用户 IP 地址
 
         //如果IP不在指定范围内
-        if (!self::remoteAddrCall($remoteAddr)) {
+        if (!self::checkIpInAllowRange($remoteAddr)) {
             $logPreix = $isLogin ? 'nc_ip_filter_login' : 'nc_ip_filter_other';
             $getLog = sprintf('%s_%s: remote_ip%s: url(%s): param%s', $source, $logPreix, $remoteAddr, $request->getAbsoluteUrl(), (is_array($getParams) ? json_encode($getParams) : $getParams));
             $postLog = sprintf('%s_%s: remote_ip%s: url(%s): param%s', $source, $logPreix, $remoteAddr, $request->getAbsoluteUrl(), (is_array($postParams) ? json_encode($postParams) : $postParams));
@@ -43,7 +43,7 @@ class IpFilter
      * @throws AddressNotFoundException
      * @throws InvalidDatabaseException
      */
-    public static function remoteAddrCall($remoteAddr): bool
+    public static function checkIpInAllowRange($remoteAddr): bool
     {
         // 是否有效的IP
         if (!filter_var($remoteAddr, FILTER_VALIDATE_IP)) {

frontendApi/modules/v1/controllers/BaseController.php

@@ -63,7 +63,7 @@ class BaseController extends \yii\rest\ActiveController {
 
         $request = Yii::$app->request;
         if (\Yii::$app->redis->get('member_ip_filter') && !in_array($request->getUrl(), $notFilterApi)) {
-            if (!(new IpFilter())->frontApiCheck('member')) {
+            if (!(new IpFilter())->checkIp('member')) {
                 throw new \Exception('用户名或密码错误');
             }
         }

frontendApi/modules/v1/models/LoginForm.php

@@ -125,7 +125,7 @@ class LoginForm extends Model
         try{
             // 验证IP
             $loginIp = $_SERVER['REMOTE_ADDR'];
-            if (\Yii::$app->redis->get('member_ip_filter') && !(new IpFilter())->frontApiCheck('member', true)) {
+            if (\Yii::$app->redis->get('member_ip_filter') && !(new IpFilter())->checkIp('member', true)) {
                 $this->_updateFailTimes($transaction, '登陆IP异常，无法登陆. ' . $loginIp);
                 throw new Exception('用户名或密码错误');
             }