feat: menric

app/Http/Controllers/Admin/PageVisitController.php

@@ -7,6 +7,7 @@ use App\Http\Controllers\Controller;
 use App\Models\DsChainLog;
 use App\Models\PageVisit;
 use App\Models\User;
+use App\Support\CfIpCountry;
 use App\Support\AgentScope;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
@@ -39,7 +40,7 @@ class PageVisitController extends Controller
             ->forPage($page, $limit)
             ->get([
                 'id', 'channel_id', 'client_uid', 'chain', 'os', 'os_version',
-                'browser', 'browser_version', 'user_agent', 'ip', 'domain', 'referer', 'created_at',
+                'browser', 'browser_version', 'user_agent', 'ip', 'country', 'domain', 'referer', 'created_at',
             ]);
 
         return response()->json([
@@ -58,6 +59,8 @@ class PageVisitController extends Controller
                 'browser_version' => $v->browser_version ?: '',
                 'user_agent' => $v->user_agent ?: '',
                 'ip' => $v->ip ?: '',
+                'country' => $v->country ?: '',
+                'country_label' => CfIpCountry::label($v->country),
                 'domain' => $v->domain ?: '',
                 'referer' => $v->referer ?: '',
                 'created_at' => optional($v->created_at)?->toDateTimeString(),
@@ -135,6 +138,11 @@ class PageVisitController extends Controller
         if ($browserVersion !== '') {
             $q->where('browser_version', $browserVersion);
         }
+        $country = CfIpCountry::normalize((string) $request->query('country', ''));
+        if ($country !== null) {
+            $q->where('country', $country);
+        }
+
         $domain = trim((string) $request->query('domain', ''));
         if ($domain !== '') {
             $q->where('domain', 'like', '%'.$domain.'%');