diff --git a/application/api/model/Login.php b/application/api/model/Login.php index 8660d8f..019b0b2 100644 --- a/application/api/model/Login.php +++ b/application/api/model/Login.php @@ -109,22 +109,24 @@ class Login extends Model if ($block) { if($block['block_time'] != 0 && $block['block_time'] <= time()){ db('block')->where(['id' => $block['id']])->delete(); - } - if($block['block_time'] == 0){ - return ['code' => 301, 'msg' => '用户已被永久封禁', 'data' => null]; }else{ - return ['code' => 301, 'msg' => '用户已被封禁,解封时间:'.date('Y-m-d H:i:s',$block['block_time']), 'data' => null]; + if($block['block_time'] == 0){ + return ['code' => 301, 'msg' => '用户已被永久封禁', 'data' => null]; + }else{ + return ['code' => 301, 'msg' => '用户已被封禁,解封时间:'.date('Y-m-d H:i:s',$block['block_time']), 'data' => null]; + } } } $block = db::name('block')->where(['type_text' => $login_device,'type' => 2])->find(); if ($block) { if($block['block_time'] != 0 && $block['block_time'] <= time()){ db('block')->where(['id' => $block['id']])->delete(); - } - if($block['block_time'] == 0){ - return ['code' => 301, 'msg' => '设备已被永久封禁', 'data' => null]; }else{ - return ['code' => 301, 'msg' => '设备已被封禁,解封时间:'.date('Y-m-d H:i:s',$block['block_time']), 'data' => null]; + if($block['block_time'] == 0){ + return ['code' => 301, 'msg' => '设备已被永久封禁', 'data' => null]; + }else{ + return ['code' => 301, 'msg' => '设备已被封禁,解封时间:'.date('Y-m-d H:i:s',$block['block_time']), 'data' => null]; + } } } $ip = request()->ip(); @@ -132,11 +134,12 @@ class Login extends Model if ($block) { if($block['block_time'] != 0 && $block['block_time'] <= time()){ db('block')->where(['id' => $block['id']])->delete(); - } - if($block['block_time'] == 0){ - return ['code' => 301, 'msg' => 'ip已被永久封禁', 'data' => null]; }else{ - return ['code' => 301, 'msg' => 'ip已被封禁,解封时间:'.date('Y-m-d H:i:s',$block['block_time']), 'data' => null]; + if($block['block_time'] == 0){ + return ['code' => 301, 'msg' => 'ip已被永久封禁', 'data' => null]; + }else{ + return ['code' => 301, 'msg' => 'ip已被封禁,解封时间:'.date('Y-m-d H:i:s',$block['block_time']), 'data' => null]; + } } }