MIDI/midi-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-09-17 20:49:06 +08:00
parent ca2d1da548 68ff3cfdea
commit 3c07a370e8
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/api/model/User.php
View File

@@ -825,6 +825,10 @@ class User extends Model
//更新用户ip //更新用户ip
public function update_user_ip($user_id,$ip){ public function update_user_ip($user_id,$ip){
//判断$ip是否是汉字
if(preg_match('/[\x{4e00}-\x{9fa5}]+/u', $ip)){
$ip = '未知';
}
$data = [ $data = [
'address_ip' => $ip 'address_ip' => $ip
]; ];

2
application/cron/controller/FriendEnd.php
View File

@@ -33,7 +33,7 @@ class FriendEnd
$friending_info = db::name('vs_user_friending')->where('room_id', $room['id'])->where('status', 1)->order('id', 'desc')->find(); $friending_info = db::name('vs_user_friending')->where('room_id', $room['id'])->where('status', 1)->order('id', 'desc')->find();
if($friending_info){ if($friending_info){
//判断结束时间是否到期 //判断结束时间是否到期
if($friending_info['end_time'] <= time()){ if($friending_info['end_time'] <= time() || $room['step'] == 3){
model('Friend')->end_friend(0,$room['id'],$friending_info['id'],1); model('Friend')->end_friend(0,$room['id'],$friending_info['id'],1);
} }
} }