From e10deb91dcdc7529958f9f4aaa94e7236f2864b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=BF=98=E5=88=9D=E5=BF=83?=
 <huazhipeng@vip.qq.com>
Date: Mon, 8 Jul 2024 10:20:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=8E=E5=8F=B0IP?=
 =?UTF-8?q?=E5=8F=98=E5=8A=A8=E6=8E=A7=E5=88=B6=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/app/adminapi/http/middleware/AuthMiddleware.php | 7 +++++--
 server/config/project.php                              | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/app/adminapi/http/middleware/AuthMiddleware.php b/server/app/adminapi/http/middleware/AuthMiddleware.php
index 2808a1026..5a06051f2 100644
--- a/server/app/adminapi/http/middleware/AuthMiddleware.php
+++ b/server/app/adminapi/http/middleware/AuthMiddleware.php
@@ -18,7 +18,8 @@ namespace app\adminapi\http\middleware;
 
 use app\common\{
     cache\AdminAuthCache,
-    service\JsonService
+    service\JsonService,
+    service\ConfigService
 };
 use think\helper\Str;
 
@@ -44,7 +45,9 @@ class AuthMiddleware
             return $next($request);
         }
 
-        if ($request->adminInfo['login_ip'] != request()->ip()) {
+        //判断管理员IP是否变动
+        $loginip_check = ConfigService::get('admin_login', 'loginip_check');
+        if ($loginip_check && $request->adminInfo['login_ip'] != request()->ip()) {
             return JsonService::fail('ip地址发生变化，请重新登录', [], -1);
         }
 
diff --git a/server/config/project.php b/server/config/project.php
index 8e6d8cffa..d0c26c37d 100644
--- a/server/config/project.php
+++ b/server/config/project.php
@@ -26,6 +26,8 @@ return [
         'password_error_times' => 5,
         // 限制禁止多少分钟不能登录
         'limit_login_time' => 30,
+        //是否开启IP变动检测
+        'loginip_check' => false,
     ],
 
     // 唯一标识，密码盐、路径加密等
-- 
Gitee


From ebb9116d38933619d85c6ed90b2c489dd295160d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=BF=98=E5=88=9D=E5=BF=83?=
 <huazhipeng@vip.qq.com>
Date: Thu, 11 Jul 2024 16:43:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/app/adminapi/validate/auth/AdminValidate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/app/adminapi/validate/auth/AdminValidate.php b/server/app/adminapi/validate/auth/AdminValidate.php
index 53b80e692..5592ad4f3 100644
--- a/server/app/adminapi/validate/auth/AdminValidate.php
+++ b/server/app/adminapi/validate/auth/AdminValidate.php
@@ -62,7 +62,7 @@ class AdminValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->remove(['password', 'edit'])
+        return $this->remove('password', 'edit')
             ->remove('id', true)
             ->remove('disable', true);
     }
-- 
Gitee