From da64b1a09ae99056c72654110acd5c2298fd7545 Mon Sep 17 00:00:00 2001 From: dengbw Date: Thu, 29 Jul 2021 17:19:15 +0800 Subject: [PATCH] admin_login_729 --- admin/controllers/Login.php | 4 ++-- admin/hooks/Auth.php | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/admin/controllers/Login.php b/admin/controllers/Login.php index d73d390a..dbf4b443 100644 --- a/admin/controllers/Login.php +++ b/admin/controllers/Login.php @@ -68,9 +68,9 @@ class Login extends CI_Controller } elseif (!password_verify($password, $admin_user['password'])) { return $this->show_json(0, '密码错误'); } else { - if(false !== strpos($_SERVER['HTTP_HOST'], "hd-admin.dev.xiaoyu.com") || false !== strpos($_SERVER['HTTP_HOST'], "admin.test.haodian.cn")){ + if(false !== strpos($_SERVER['HTTP_HOST'], "admin.dev.liche.cn") || false !== strpos($_SERVER['HTTP_HOST'], "admin.lc.haodian.cn")){ //开发测试不校验IP - }elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) { + }elseif (filter_var($ip, FILTER_VALIDATE_IP)) { $this->load->model('sys/sys_config_model'); $config_ip = $this->sys_config_model->select(array("v LIKE '%\"status\":\"1\"%'" => NULL, "k" => "site")); foreach ($config_ip as $key => $value) { diff --git a/admin/hooks/Auth.php b/admin/hooks/Auth.php index dda18395..19b367ef 100644 --- a/admin/hooks/Auth.php +++ b/admin/hooks/Auth.php @@ -42,10 +42,9 @@ class Auth { $ip_arr = array(); if($this->is_ignore($user_info['id'])){ //免检 - } elseif(false !== strpos($_SERVER['HTTP_HOST'], "hd-admin.dev.xiaoyu.com") || false !== strpos($_SERVER['HTTP_HOST'], "admin.test.haodian.cn")){ + } elseif(false !== strpos($_SERVER['HTTP_HOST'], "admin.dev.liche.cn") || false !== strpos($_SERVER['HTTP_HOST'], "admin.lc.haodian.cn")){ //开发测试免检 - } elseif(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) && $ip != $admin_user['login_ip']) - { + } elseif(filter_var($ip, FILTER_VALIDATE_IP) && $ip != $admin_user['login_ip']) { $CI->load->model('sys/sys_config_model'); $config_ip = $CI->sys_config_model->select(array("v LIKE '%\"status\":\"1\"%'" => NULL,"k" => "site")); $ip_arr = array();