This commit is contained in:
Tokumeikoi
2020-03-02 20:29:17 +08:00
parent c8cb1f8e83
commit 47686d50c5
6 changed files with 48 additions and 60 deletions

View File

@ -112,7 +112,7 @@ class AuthController extends Controller
abort(500, '用户名或密码错误');
}
if (!$user->enable) {
if ($user->banned) {
abort(500, '该账户已被停止使用');
}
@ -159,7 +159,7 @@ class AuthController extends Controller
if (!$user) {
abort(500, '用户不存在');
}
if (!$user->enable) {
if ($user->banned) {
abort(500, '该账户已被停止使用');
}
$request->session()->put('email', $user->email);

View File

@ -11,7 +11,7 @@ class UserUpdate extends FormRequest
'password' => 'nullable',
'transfer_enable' => 'numeric',
'expired_at' => 'integer',
'enable' => 'required|in:0,1',
'banned' => 'required|in:0,1',
'plan_id' => 'nullable|integer',
'commission_rate' => 'nullable|integer|min:0|max:100',
'discount' => 'nullable|integer|min:0|max:100',
@ -38,8 +38,8 @@ class UserUpdate extends FormRequest
'email.email' => '邮箱格式不正确',
'transfer_enable.numeric' => '流量格式不正确',
'expired_at.integer' => '到期时间格式不正确',
'enable.required' => '账户状态不能为空',
'enable.in' => '账户状态格式不正确',
'banned.required' => '是否封禁不能为空',
'banned.in' => '是否封禁格式不正确',
'is_admin.required' => '是否管理员不能为空',
'is_admin.in' => '是否管理员格式不正确',
'plan_id.integer' => '订阅计划格式不正确',

View File

@ -14,7 +14,7 @@ class ServerService
$query->where('expired_at', '>=', time())
->orWhere('expired_at', NULL);
})
->where('enable', 1)
->where('banned', 1)
->select([
'id',
'email',

View File

@ -8,7 +8,7 @@ class UserService
{
public function isAvailable(User $user)
{
if ($user->enable && $user->transfer_enable && ($user->expired_at > time() || $user->expired_at === NULL)) {
if (!$user->banned && $user->transfer_enable && ($user->expired_at > time() || $user->expired_at === NULL)) {
return true;
}
return false;
@ -21,19 +21,7 @@ class UserService
$query->where('expired_at', '>=', time())
->orWhere('expired_at', NULL);
})
->where('enable', 1)
->select([
'id',
'email',
't',
'u',
'd',
'transfer_enable',
'enable',
'v2ray_uuid',
'v2ray_alter_id',
'v2ray_level'
])
->where('banned', 0)
->get();
}