From e017703cd75f7470ffcc76d7881a30d12909ead3 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Wed, 10 Aug 2022 11:33:27 +0800
Subject: [PATCH] login_810

---
 admin/controllers/Login.php | 20 ++++++++---------
 admin/hooks/Auth.php        | 43 ++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/admin/controllers/Login.php b/admin/controllers/Login.php
index 65cb98ec..48efb0da 100644
--- a/admin/controllers/Login.php
+++ b/admin/controllers/Login.php
@@ -66,16 +66,16 @@ class Login extends CI_Controller
                 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)) {
-                    $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) {
-                        $ip_arr[] = json_decode($value['v'])->ip;
-                    }
-                    $ip_arr = array_merge($ip_arr, array_column($this->sys_admin_model->select(array(), '', '', '', 'login_ip'), 'login_ip'));
-                    if (!in_array($ip, $ip_arr)) {
-                        $check_view = true;
-                        $log = 1;
-                    }
+//                    $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) {
+//                        $ip_arr[] = json_decode($value['v'])->ip;
+//                    }
+//                    $ip_arr = array_merge($ip_arr, array_column($this->sys_admin_model->select(array(), '', '', '', 'login_ip'), 'login_ip'));
+//                    if (!in_array($ip, $ip_arr)) {
+//                        $check_view = true;
+//                        $log = 1;
+//                    }
                 }
             }
         }
diff --git a/admin/hooks/Auth.php b/admin/hooks/Auth.php
index 4b1897b8..39259095 100644
--- a/admin/hooks/Auth.php
+++ b/admin/hooks/Auth.php
@@ -47,28 +47,27 @@ class Auth {
             } 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) && $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();
-                foreach ($config_ip as $key => $value)
-                {
-                    $ip_arr[] = json_decode($value['v'])->ip;
-                }
-
-                $ip_arr = array_merge($ip_arr, array_column($CI->sys_admin_model->select(array(),'','','','login_ip'), 'login_ip'));
-                if(!in_array($ip, $ip_arr) && $dir)
-                {
-                    if($admin_user['id'] > 10){//管理员id>10去掉验证码登录
-                        $admin_info = array(
-                            'id' => $admin_user['id'],
-                        );
-                        $domain = explode('.', $_SERVER['HTTP_HOST']);
-                        array_shift($domain);
-                        $domain = implode('.', $domain);
-                        $CI->input->set_cookie(LOGIN_COOKIE, $CI->encryption->encrypt(json_encode($admin_info)), time() + 86400, $domain);
-                        $this->returnMsg('访问IP发生变化，请重新登录', '/login/check_view');
-                    }
-                }
+//                $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();
+//                foreach ($config_ip as $key => $value)
+//                {
+//                    $ip_arr[] = json_decode($value['v'])->ip;
+//                }
+//                $ip_arr = array_merge($ip_arr, array_column($CI->sys_admin_model->select(array(),'','','','login_ip'), 'login_ip'));
+//                if(!in_array($ip, $ip_arr) && $dir)
+//                {
+//                    if($admin_user['id'] > 10){//管理员id>10去掉验证码登录
+//                        $admin_info = array(
+//                            'id' => $admin_user['id'],
+//                        );
+//                        $domain = explode('.', $_SERVER['HTTP_HOST']);
+//                        array_shift($domain);
+//                        $domain = implode('.', $domain);
+//                        $CI->input->set_cookie(LOGIN_COOKIE, $CI->encryption->encrypt(json_encode($admin_info)), time() + 86400, $domain);
+//                        $this->returnMsg('访问IP发生变化，请重新登录', '/login/check_view');
+//                    }
+//                }
             }
 
             //权限分类筛选