Update app.py

app.py

@@ -5,9 +5,9 @@ from flask import Flask, request, jsonify
 from datetime import datetime, timedelta
 import asyncio
 import re
-import webdav3.client as wc
 import threading
 import time
+from requests.auth import HTTPBasicAuth
 
 app = Flask(__name__)
 
@@ -475,18 +475,10 @@ async def unbanUser(chatId, userId):
         await sendTelegramMessage(chatId, f"用户 {userId} 已被解禁。")
         print(f"用户 {userId} 在群组 {chatId} 中被解禁。")
 
-WEBDAV_HOSTNAME = os.environ.get('WEBDAV_HOSTNAME')
+WEBDAV_URL = os.environ.get('WEBDAV_URL')
 WEBDAV_USERNAME = os.environ.get('WEBDAV_USERNAME')
 WEBDAV_PASSWORD = os.environ.get('WEBDAV_PASSWORD')
 
-webdav_options = {
- 'webdav_hostname': WEBDAV_HOSTNAME,
- 'webdav_login':    WEBDAV_USERNAME,
- 'webdav_password': WEBDAV_PASSWORD
-}
-
-webdav_client = wc.Client(webdav_options)
-
 def save_data_to_webdav():
     data = {
         'chatHistories': chatHistories,
@@ -499,15 +491,24 @@ def save_data_to_webdav():
     }
     
     json_data = json.dumps(data)
-    webdav_client.upload_content(json_data, '/tg_bot/bot_data.json')
-    print("数据已保存到WebDAV")
+    
+    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}")
 
 def load_data_from_webdav():
     global chatHistories, GROUP_SETTINGS, USER_SETTINGS, USER_LAST_ACTIVE, GROUP_ACTIVE_USERS, GROUP_INFO, BANNED_USERS
     
-    if webdav_client.check('/tg_bot/bot_data.json'):
-        json_data = webdav_client.download_content('/tg_bot/bot_data.json')
-        data = json.loads(json_data)
+    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']
@@ -519,7 +520,7 @@ def load_data_from_webdav():
         
         print("数据已从WebDAV加载")
     else:
-        print("WebDAV中没有找到数据,使用初始值")
+        print("WebDAV中没有找到数据或加载失败,使用初始值")
 
 def periodic_save():
     while True: