feat: better geoip2 error handling

Anankke/SSPanel-UIM#1875
The-NeXT-Project · Mar 31, 2023 · a63d0fa · a63d0fa
1 parent c556524
commit a63d0fa
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/Utils/Tools.php b/src/Utils/Tools.php
@@ -25,18 +25,30 @@ final class Tools
     public static function getIpLocation($ip): string
     {
         $geoip = new GeoIP2();
+        $err_msg = '';
+        $city = null;
+        $country = null;
+
+        if ($_ENV['maxmind_license_key'] === '') {
+            $err_msg = 'GeoIP2 服务未配置';
+        }
+
         try {
             $city = $geoip->getCity($ip);
             $country = $geoip->getCountry($ip);
         } catch (AddressNotFoundException|InvalidDatabaseException $e) {
-            return '未知';
+            $err_msg = '未知错误';
         }
 
         if ($city !== null) {
             return $city . ', ' . $country;
         }
 
-        return $country;
+        if ($country !== null) {
+            return $country;
+        }
+
+        return $err_msg;
     }
 
     /**