Update server.py

server.py

@@ -91,6 +91,7 @@ def update():
     # os.system("apt-get install inotify-tools")
     os.system("pip install ruamel.yaml") # install ruamel.yaml to solve the import issue
     os.system("pip install pexpect")
+    os.system("pip install pytz")
     os.system('apt-get install pigz')
     os.system('apt-get install pv')
     print('-----------更新软件包列表结束-------------')
@@ -421,6 +422,9 @@ def frp(config_data1,config_file_path,backstage):
     
 import requests
 import re
+from datetime import datetime, timedelta
+import psutil  # 用于获取系统启动时间
+import pytz  # 用于处理时区
 
 def get_current_ip():
     """获取当前公共 IP 地址"""
@@ -437,7 +441,7 @@ def get_geo_info(ip_address):
     response = requests.get(url, headers=headers)
     
     if response.status_code == 200:
-        geo_info = response.json()  # 解析为 JSON 格式
+        geo_info = response.json()
         
         if geo_info['code'] == 200:
             data = geo_info['data']
@@ -446,48 +450,54 @@ def get_geo_info(ip_address):
                 'country': data['country'],
                 'isp': data['isp']
             }
-        else:
-            print("无法获取地理位置信息")
-            return None
-    else:
-        print(f"请求失败, 状态码: {response.status_code}")
-        return None
-
-def replace_ip_and_country_in_file(file_path):
+    return None
+
+def get_next_relay_time():
+    """获取下一次接力时间（系统启动时间+12小时，转换为中国时区）"""
+    # 获取系统启动时间
+    boot_time = datetime.fromtimestamp(psutil.boot_time())
+    # 设置为UTC时区
+    utc = pytz.UTC
+    boot_time = utc.localize(boot_time)
+    # 转换为中国时区
+    china_tz = pytz.timezone('Asia/Shanghai')
+    boot_time_china = boot_time.astimezone(china_tz)
+    # 加上12小时
+    next_time = boot_time_china + timedelta(hours=12)
+    return next_time.strftime("%Y-%m-%d %H:%M:%S")
+
+def replace_info_in_file(file_path):
     try:
-        # 获取当前 IP 地址
+        # 获取当前 IP 地址和地理信息
         ip_address = get_current_ip()
-        print(f"获取到当前 IP: {ip_address}")
-        
-        # 获取地理位置信息
         geo_info = get_geo_info(ip_address)
-        print(f"获取到地理信息: {geo_info}")
+        next_relay_time = get_next_relay_time()
         
         if geo_info is not None:
             # 读取文件内容
             with open(file_path, 'r', encoding='utf-8') as file:
                 content = file.read()
-                # print(f"读取到的文件内容: {content}")
             
-            # 使用正则表达式匹配 "IP[xxx] 国家 [yyy] IPS[zzz]" 的格式
-            pattern = r'IP\[.*?\]\s*国家\s*\[.*?\]\s*IPS\[.*?\]'
-            replacement = f'IP[{ip_address}] 国家 [{geo_info["country"]}] IPS[{geo_info["isp"]}]'
-            new_content = re.sub(pattern, replacement, content)
+            # 替换接力时间
+            time_pattern = r'接力时间\[.*?\]'
+            time_replacement = f'接力时间[{next_relay_time}]'
+            content = re.sub(time_pattern, time_replacement, content)
             
-            # print(f"替换后的内容: {new_content}")
+            # 替换 IP 信息
+            ip_pattern = r'IP\[.*?\]\s*国家\s*\[.*?\]\s*IPS\[.*?\]'
+            ip_replacement = f'IP[{ip_address}] 国家 [{geo_info["country"]}] IPS[{geo_info["isp"]}]'
+            content = re.sub(ip_pattern, ip_replacement, content)
             
-            # 将修改后的内容写回文件
+            # 写回文件
             with open(file_path, 'w', encoding='utf-8') as file:
-                file.write(new_content)
+                file.write(content)
             
-            print(f"成功更新为: IP[{ip_address}] 国家 [{geo_info['country']}] IPS[{geo_info['isp']}]")
+            print(f"成功更新信息：")
+            print(f"接力时间: {next_relay_time}")
+            print(f"IP信息: IP[{ip_address}] 国家 [{geo_info['country']}] IPS[{geo_info['isp']}]")
     
-    except FileNotFoundError:
-        print(f"错误: 文件 {file_path} 不存在。")
-    except IOError as e:
-        print(f"IO 错误: {e}")
     except Exception as e:
-        print(f"发生其他错误: {e}")
+        print(f"发生错误: {e}")
 
 import socket
 import subprocess