Update server.py

server.py

@@ -383,14 +383,23 @@ def get_current_ip():
 
 def get_geo_info(ip_address):
     """根据 IP 地址获取地理位置信息"""
-    url = f"https://qifu-api.baidubce.com/ip/geo/v1/district?ip={ip_address}"
+    url = f"https://api.qjqq.cn/api/Local"
+    headers = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3"
+    }
     
-    response = requests.get(url)
+    response = requests.get(url, headers=headers)
     
     if response.status_code == 200:
-        geo_info = response.json()
-        if geo_info['code'] == 'Success':
-            return geo_info['data']
+        geo_info = response.json()  # 解析为 JSON 格式
+        
+        if geo_info['code'] == 200:
+            data = geo_info['data']
+            return {
+                'ip': data['ip'],
+                'country': data['country'],
+                'isp': data['isp']
+            }
         else:
             print("无法获取地理位置信息")
             return None
@@ -402,29 +411,38 @@ def replace_ip_and_country_in_file(file_path):
     try:
         # 获取当前 IP 地址
         ip_address = get_current_ip()
+        print(f"获取到当前 IP: {ip_address}")
         
         # 获取地理位置信息
         geo_info = get_geo_info(ip_address)
         
         if geo_info is not None:
+            print(f"获取到地理信息: {geo_info}")
+            
             # 读取文件内容
             with open(file_path, 'r', encoding='utf-8') as file:
                 content = file.read()
+                # print(f"读取到的文件内容: {content}")
             
-            # 使用正则表达式替换方括号中的内容
-            new_content = re.sub(r'\[ip\]', f'[{ip_address}]', content)
-            new_content = re.sub(r'\[country\]', f'[{geo_info["country"]}]', new_content)
+            # 使用正则表达式匹配 "IP[xxx]国家[yyy]" 的格式
+            pattern = r'IP\[.*?\]国家\[.*?\]'
+            replacement = f'机子IP[{geo_info["ip"]}]国家[{geo_info["country"]}] ISP[{geo_info["isp"]}]'
+            new_content = re.sub(pattern, replacement, content)
+            
+            # print(f"替换后的内容: {new_content}")
             
             # 将修改后的内容写回文件
             with open(file_path, 'w', encoding='utf-8') as file:
                 file.write(new_content)
             
-            print(f"成功将 [ip] 更新为 '[{ip_address}]', [country] 更新为 '[{geo_info['country']}]'")
+            print(f"成功更新为: IP[{geo_info['ip']}] 国家[{geo_info['country']}] ISP[{geo_info['isp']}]")
     
     except FileNotFoundError:
         print(f"错误: 文件 {file_path} 不存在。")
     except IOError as e:
         print(f"IO 错误: {e}")
+    except Exception as e:
+        print(f"发生其他错误: {e}")