Update app.py

app.py

@@ -88,51 +88,63 @@ WEBDAV_USERNAME = os.environ.get('WEBDAV_USERNAME')
 WEBDAV_PASSWORD = os.environ.get('WEBDAV_PASSWORD')
 
 def save_data_to_webdav():
-    data = {
-        'chatHistories': chatHistories,
-        'GROUP_SETTINGS': GROUP_SETTINGS,
-        'USER_SETTINGS': USER_SETTINGS,
-        'USER_LAST_ACTIVE': {k: v.isoformat() for k, v in USER_LAST_ACTIVE.items()},
-        'GROUP_ACTIVE_USERS': {k: list(v) for k, v in GROUP_ACTIVE_USERS.items()},
-        'GROUP_INFO': {k: {**v, 'last_active': v['last_active'].isoformat()} for k, v in GROUP_INFO.items()},
-        'BANNED_USERS': {k: v.isoformat() for k, v in BANNED_USERS.items()}
-    }
-    
-    json_data = json.dumps(data)
-    
-    response = requests.put(f"{WEBDAV_URL}/tg_bot/bot_data.json", 
-                            data=json_data, 
-                            auth=HTTPBasicAuth(WEBDAV_USERNAME, WEBDAV_PASSWORD))
-    
-    if response.status_code in [200, 201, 204]:
-        print("数据已保存到WebDAV")
-    else:
-        print(f"保存到WebDAV失败: {response.status_code}")
+    print(f"开始保存数据到WebDAV: {datetime.now()}")
+    try:
+        data = {
+            'chatHistories': chatHistories,
+            'GROUP_SETTINGS': GROUP_SETTINGS,
+            'USER_SETTINGS': USER_SETTINGS,
+            'USER_LAST_ACTIVE': {k: v.isoformat() for k, v in USER_LAST_ACTIVE.items()},
+            'GROUP_ACTIVE_USERS': {k: list(v) for k, v in GROUP_ACTIVE_USERS.items()},
+            'GROUP_INFO': {k: {**v, 'last_active': v['last_active'].isoformat()} for k, v in GROUP_INFO.items()},
+            'BANNED_USERS': {k: v.isoformat() for k, v in BANNED_USERS.items()}
+        }
+        
+        json_data = json.dumps(data)
+        
+        response = requests.put(f"{WEBDAV_URL}/tg_bot/bot_data.json", 
+                                data=json_data, 
+                                auth=HTTPBasicAuth(WEBDAV_USERNAME, WEBDAV_PASSWORD),
+                                timeout=30)  # 添加超时
+        
+        if response.status_code in [200, 201, 204]:
+            print(f"数据已成功保存到WebDAV: {datetime.now()}")
+        else:
+            print(f"保存到WebDAV失败: {response.status_code}, {response.text}")
+    except Exception as e:
+        print(f"保存数据时发生错误: {e}")
 
 def load_data_from_webdav():
     global chatHistories, GROUP_SETTINGS, USER_SETTINGS, USER_LAST_ACTIVE, GROUP_ACTIVE_USERS, GROUP_INFO, BANNED_USERS
     
-    response = requests.get(f"{WEBDAV_URL}/tg_bot/bot_data.json", 
-                            auth=HTTPBasicAuth(WEBDAV_USERNAME, WEBDAV_PASSWORD))
-    
-    if response.status_code == 200:
-        data = json.loads(response.text)
-        
-        chatHistories = data['chatHistories']
-        GROUP_SETTINGS = data['GROUP_SETTINGS']
-        USER_SETTINGS = data['USER_SETTINGS']
-        USER_LAST_ACTIVE = {k: datetime.fromisoformat(v) for k, v in data['USER_LAST_ACTIVE'].items()}
-        GROUP_ACTIVE_USERS = {k: set(v) for k, v in data['GROUP_ACTIVE_USERS'].items()}
-        GROUP_INFO = {k: {**v, 'last_active': datetime.fromisoformat(v['last_active'])} for k, v in data['GROUP_INFO'].items()}
-        BANNED_USERS = {k: datetime.fromisoformat(v) for k, v in data['BANNED_USERS'].items()}
+    print(f"开始从WebDAV加载数据: {datetime.now()}")
+    try:
+        response = requests.get(f"{WEBDAV_URL}/tg_bot/bot_data.json", 
+                                auth=HTTPBasicAuth(WEBDAV_USERNAME, WEBDAV_PASSWORD),
+                                timeout=30)  # 添加超时
         
-        print("数据已从WebDAV加载")
-    else:
-        print("WebDAV中没有找到数据或加载失败,使用初始值")
+        if response.status_code == 200:
+            data = json.loads(response.text)
+            
+            chatHistories = data['chatHistories']
+            GROUP_SETTINGS = data['GROUP_SETTINGS']
+            USER_SETTINGS = data['USER_SETTINGS']
+            USER_LAST_ACTIVE = {k: datetime.fromisoformat(v) for k, v in data['USER_LAST_ACTIVE'].items()}
+            GROUP_ACTIVE_USERS = {k: set(v) for k, v in data['GROUP_ACTIVE_USERS'].items()}
+            GROUP_INFO = {k: {**v, 'last_active': datetime.fromisoformat(v['last_active'])} for k, v in data['GROUP_INFO'].items()}
+            BANNED_USERS = {k: datetime.fromisoformat(v) for k, v in data['BANNED_USERS'].items()}
+            
+            print(f"数据已从WebDAV成功加载: {datetime.now()}")
+        else:
+            print(f"从WebDAV加载数据失败: {response.status_code}, {response.text}")
+    except Exception as e:
+        print(f"加载数据时发生错误: {e}")
+        print("使用初始值")
 
 def periodic_save():
+    print("定期保存线程已启动")
     while True:
-        time.sleep(10)  # 等待60秒
+        time.sleep(60)  # 等待60秒
         save_data_to_webdav()
 
 # 在程序启动时加载数据
@@ -142,6 +154,7 @@ load_data_from_webdav()
 save_thread = threading.Thread(target=periodic_save)
 save_thread.daemon = True
 save_thread.start()
+print("定期保存线程已创建并启动")
 
 def make_telegram_request(method, data=None):
     url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/{method}"