From b102995ab1091d1095d043c64a18c56bc2e3b4a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 17 Nov 2025 14:33:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BF=A1=E6=81=AF=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Login.php      | 11 ++++++++---
 application/api/model/SingerSong.php |  6 ++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/application/api/model/Login.php b/application/api/model/Login.php
index 1b60bf2..9881619 100644
--- a/application/api/model/Login.php
+++ b/application/api/model/Login.php
@@ -17,8 +17,13 @@ class Login extends Model
         if ($block) {
             return ['code' => 0, 'msg' => '设备已被封禁', 'data' => null];
         }
-        $ip = request()->ip();
-        $block = db::name('block')->where(['type_text' => $ip,'type' => 3])->find();
+        //获取请求ip
+        $login_ip = request()->server('HTTP_X_REAL_IP') ?: request()->server('HTTP_X_FORWARDED_FOR') ?: request()->ip();
+        if (empty($login_ip)) {
+            return ['code' => 0, 'msg' => '无法获取客户端IP地址', 'data' => null];
+        }
+
+        $block = db::name('block')->where(['type_text' => $login_ip,'type' => 3])->find();
         if ($block) {
             return ['code' => 0, 'msg' => 'ip已被封禁', 'data' => null];
         }
@@ -30,7 +35,7 @@ class Login extends Model
         $data['username'] = $user_name;
         $data['mobile'] = $user_name;
         $data['nickname'] = '游客'.$user_code;
-        $data['joinip'] = request()->ip();
+        $data['joinip'] = $login_ip;
         $data['birthday'] = date('Y-m-d');
         $data['avatar'] = get_system_config_value('web_site').'/data/avatar/head_pic.png';
         $data['profile'] = '这个人很懒，什么都没写';
diff --git a/application/api/model/SingerSong.php b/application/api/model/SingerSong.php
index 54f1201..8f2a1b5 100644
--- a/application/api/model/SingerSong.php
+++ b/application/api/model/SingerSong.php
@@ -375,6 +375,12 @@ class SingerSong extends Model
                         model('Chat')->sendMsg(1071,$next_song_info['room_id'],$data);
 
                     }else{
+                        $song_info_data = [
+                            'text' => '房间当前演唱歌曲变化',
+                            'song_info' => null
+                        ];
+                        model('Chat')->sendMsg(1070,$sonng_log['room_id'],$song_info_data);
+
                         $data = [
                             'text' => '房间下一首演唱歌曲变化',
                             'next_song_info' => null