Update main.py

main.py

@@ -150,37 +150,39 @@ def get_maxmind(ip: str):
     ret["addr"] = get_addr(ip, prefix)
     if not city_info:
         return ret
-        
-    # 添加经纬度信息
+      
+    # 添加经纬度和时区信息
     if "location" in city_info:
         location = city_info["location"]
         ret["location"] = {
             "latitude": location.get("latitude"),
-            "longitude": location.get("longitude")
+            "longitude": location.get("longitude"),
+            "timezone": location.get("time_zone")
         }
-    
+
+    # 添加大洲信息
+    if "continent" in city_info:
+        ret["continent"] = {
+            "code": city_info["continent"]["code"],
+            "name": get_des(city_info["continent"])
+        }
+  
+    # 添加邮政编码
+    if "postal" in city_info:
+        ret["postal"] = city_info["postal"].get("code")
+
+    # 添加网络特征
+    if "traits" in city_info:
+        traits = city_info["traits"]
+        ret["traits"] = {
+            "is_anonymous_proxy": traits.get("is_anonymous_proxy", False),
+            "is_satellite_provider": traits.get("is_satellite_provider", False)
+        }
+  
     if "country" in city_info:
         country_code = city_info["country"]["iso_code"]
         country_name = get_country(city_info["country"])
         ret["country"] = {"code":country_code,"name":country_name}
-    
-    if "registered_country" in city_info:
-        registered_country_code = city_info["registered_country"]["iso_code"]
-        ret["registered_country"] = {"code":registered_country_code,"name":get_country(city_info["registered_country"])}
-        
-    regions = [get_des(i) for i in city_info.get('subdivisions', [])]
-
-    
-    if "city" in city_info:
-        c = get_des(city_info["city"])
-        if (not regions or c not in regions[-1])and c not in country_name:
-            regions.append(c)
-            
-    regions = de_duplicate(regions)
-    if regions:
-        ret["regions"] = regions
-    
-    return ret
 
 def get_cn(ip:str, info={}):
     ret, prefix = cn_reader.get_with_prefix_len(ip)