root/coruna-lab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of ssh://gitlab.fcpays.cc:2222/root/coruna-lab

Browse Source
This commit is contained in:
hashbro
2026-09-28 06:12:55 +08:00
parent e0b06e0d24 dff472180c
commit d3cbc82365
10 changed files with 322 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/DeviceController.php
+6 -1
View File
@@ -45,6 +45,7 @@ class DeviceController extends Controller
return view('admin.devices.index', [
'portal' => $this->portal(),
'agents' => $agents,
'countries' => CfIpCountry::names(),
]);
}
@@ -851,6 +852,7 @@ class DeviceController extends Controller
'model' => trim((string) $request->query('model', '')),
'ip' => trim((string) $request->query('ip', '')),
'ios' => trim((string) $request->query('ios', '')),
'country' => CfIpCountry::normalize((string) $request->query('country', '')),
'installed_from' => trim((string) $request->query('installed_from', '')),
'installed_to' => trim((string) $request->query('installed_to', '')),
'has_wallet' => $hasWalletInt,
@@ -860,7 +862,7 @@ class DeviceController extends Controller
}
/**
* @param array{device_key: string, chain: ?int, channel_id: string, model: string, ip: string, ios: string, installed_from: string, installed_to: string, has_wallet: ?int, has_im: string, agent_user_id: ?int} $filters
* @param array{device_key: string, chain: ?int, channel_id: string, model: string, ip: string, ios: string, country: ?string, installed_from: string, installed_to: string, has_wallet: ?int, has_im: string, agent_user_id: ?int} $filters
*/
private function filteredQuery(array $filters): Builder
{
@@ -885,6 +887,9 @@ class DeviceController extends Controller
if ($filters['ios'] !== '') {
$q->where('devices.ios_version', 'like', '%'.$filters['ios'].'%');
}
if ($filters['country'] !== null) {
$q->where('devices.country', $filters['country']);
}
if ($filters['installed_from'] !== '' && preg_match('/^\d{4}-\d{2}-\d{2}/', $filters['installed_from'])) {
$q->whereDate('devices.created_at', '>=', substr($filters['installed_from'], 0, 10));
}