From ee17d9416a321a2fdb0d1c9315c1e1ddaf50e32c Mon Sep 17 00:00:00 2001
From: funsugar <44894230+funsugar@users.noreply.github.com>
Date: Tue, 1 Apr 2025 17:27:58 +0800
Subject: [PATCH] Update util.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复根据IP地址获取城市地址出错的问题
---
 main/xiaozhi-server/core/utils/util.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/main/xiaozhi-server/core/utils/util.py b/main/xiaozhi-server/core/utils/util.py
index b361bff3..764ce689 100644
--- a/main/xiaozhi-server/core/utils/util.py
+++ b/main/xiaozhi-server/core/utils/util.py
@@ -67,11 +67,13 @@ def is_private_ip(ip_addr):
 
 def get_ip_info(ip_addr):
     try:
-        url = "https://whois.pconline.com.cn/ipJson.jsp?json=true"
+        url = f"https://whois.pconline.com.cn/ipJson.jsp?json=true&ip={ip_addr}"
         resp = requests.get(url).json()
 
         ip_info = {
-            "city": resp.get("city")
+            "city": resp.get("city"),
+            "region": resp.get("region"),
+            "addr": resp.get("addr")
         }
         return ip_info
     except Exception as e:
@@ -182,4 +184,4 @@ def extract_json_from_string(input_string):
     match = re.search(pattern, input_string)
     if match:
         return match.group(1)  # 返回提取的 JSON 字符串
-    return None
\ No newline at end of file
+    return None