From aaff62d46c4dea1414fc1786d9d8b7082d08cbfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Thu, 20 Nov 2025 09:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E9=94=80=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Login.php | 1 +
 application/api/model/Login.php      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/api/controller/Login.php b/application/api/controller/Login.php
index 63993b2..cbab1cd 100644
--- a/application/api/controller/Login.php
+++ b/application/api/controller/Login.php
@@ -359,6 +359,7 @@ class Login extends Controller
     {
         $token = input('token');
         $reslut = model('Login')->cancel($token);
+        return V(0, '注销请联系客服', null);
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
 
diff --git a/application/api/model/Login.php b/application/api/model/Login.php
index 9881619..5c67e31 100644
--- a/application/api/model/Login.php
+++ b/application/api/model/Login.php
@@ -138,7 +138,7 @@ class Login extends Model
                 }
             }
         }
-        $ip = request()->ip();
+        $ip = request()->server('HTTP_X_REAL_IP') ?: request()->server('HTTP_X_FORWARDED_FOR') ?: request()->ip();
         $block = db::name('block')->where(['type_text' => $ip,'type' => 3])->find();
         if ($block) {
             if($block['block_time'] != 0 && $block['block_time'] <= time()){
@@ -188,7 +188,7 @@ class Login extends Model
             $save_data['system'] = $system;
             $save_data['login_device'] = $login_device;
             $save_data['logintime'] = time();
-            $save_data['loginip'] = request()->ip();
+            $save_data['loginip'] = request()->server('HTTP_X_REAL_IP') ?: request()->server('HTTP_X_FORWARDED_FOR') ?: request()->ip();
             $save_data['updatetime'] = time();
             $save_data['prevtime'] = $user_info['logintime'];//上次登录时间
             $reslut = model('User')->update($save_data);