1
0
mirror of https://github.com/v2board/v2board.git synced 2025-05-04 15:24:49 +08:00

Merge pull request from v2board/dev

1.4.2
This commit is contained in:
tokumeikoi 2020-12-13 23:19:33 +08:00 committed by GitHub
commit 962cfa9bea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 9 deletions

@ -58,6 +58,7 @@ class UserController extends Controller
$res[$i]['plan_name'] = $plan[$k]['name'];
}
}
$res[$i]['subscribe_url'] = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $res[$i]['token'];
}
return response([
'data' => $res,

@ -14,7 +14,7 @@ class UserFetch extends FormRequest
public function rules()
{
return [
'filter.*.key' => 'required|in:id,email,transfer_enable,d,expired_at,uuid,token,invite_by_email,invite_user_id',
'filter.*.key' => 'required|in:id,email,transfer_enable,d,expired_at,uuid,token,invite_by_email,invite_user_id,plan_id',
'filter.*.condition' => 'required|in:>,<,=,>=,<=,模糊',
'filter.*.value' => 'required'
];

@ -304,6 +304,7 @@ class ServerService
} else {
$server[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_SHADOWSOCKS_LAST_CHECK_AT', $server[$i]['id']));
}
$server[$i]['available'] = (time() - 300) < $server[$i]['last_check_at'];
}
return $server->toArray();
}
@ -332,6 +333,7 @@ class ServerService
} else {
$server[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $server[$i]['id']));
}
$server[$i]['available'] = (time() - 300) < $server[$i]['last_check_at'];
}
return $server->toArray();
}
@ -351,6 +353,7 @@ class ServerService
} else {
$server[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $server[$i]['id']));
}
$server[$i]['available'] = (time() - 300) < $server[$i]['last_check_at'];
}
return $server->toArray();
}

@ -236,5 +236,5 @@ return [
| The only modification by laravel config
|
*/
'version' => '1.4.1.1605605380'
'version' => '1.4.2.1607697118'
];

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long