From ba2323d4a2f8c602556f5c60d00ce8a15bfb58f3 Mon Sep 17 00:00:00 2001 From: yshtcn Date: Wed, 6 Sep 2023 11:37:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?-=20=E4=BD=BF=E6=97=A5=E5=BF=97=E5=92=8C?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BF=A1=E6=81=AF=E4=BD=BF=E7=94=A8=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=97=A5=E6=9C=9F=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ServerChanPush2TelegramBot.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/ServerChanPush2TelegramBot.py b/ServerChanPush2TelegramBot.py index 1f90943..879c0f0 100644 --- a/ServerChanPush2TelegramBot.py +++ b/ServerChanPush2TelegramBot.py @@ -4,9 +4,23 @@ import logging import json import re from urllib.parse import unquote +from datetime import datetime +from logging.handlers import TimedRotatingFileHandler -# 设置日志级别和日志文件 -logging.basicConfig(level=logging.INFO,filename="received_requests.log", filemode="a", encoding='utf-8') +# 获取当前日期 +current_date = datetime.now().strftime("%Y-%m-%d") + +# 创建一个处理器，该处理器每天午夜都会创建一个新的日志文件 +handler = TimedRotatingFileHandler(f"received_requests_{current_date}.log", when="midnight", interval=1, backupCount=10) +handler.suffix = "%Y-%m-%d" + +# 配置日志 +logging.basicConfig( + level=logging.INFO, + handlers=[handler], + format="%(asctime)s - %(levelname)s - %(message)s", + datefmt="%Y-%m-%d %H:%M:%S" +) # 初始化 Flask 应用 app = Flask(__name__) @@ -21,7 +35,8 @@ def load_config(): # 保存接收到的请求数据 def save_received_data(received_url, received_data): try: - with open("received_data.json", "a", encoding='utf-8') as f: + current_date = datetime.now().strftime("%Y-%m-%d") + with open(f"received_data_{current_date}.json", "a", encoding='utf-8') as f: json.dump({"received_url": received_url, "received_data": received_data}, f, ensure_ascii=False) f.write("\n") except Exception as e: @@ -30,7 +45,8 @@ def save_received_data(received_url, received_data): # 保存发送的请求数据 def save_sent_data(api_url, payload): try: - with open("sent_data.json", "a", encoding='utf-8') as f: + current_date = datetime.now().strftime("%Y-%m-%d") + with open(f"sent_data_{current_date}.json", "a", encoding='utf-8') as f: json.dump({"sent_url": api_url, "sent_data": payload}, f, ensure_ascii=False) f.write("\n") except Exception as e: From 663b7689e40b25592261ddac4deb625436dd252e Mon Sep 17 00:00:00 2001 From: yshtcn Date: Wed, 6 Sep 2023 23:21:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?-=20=E5=A2=9E=E5=8A=A0ServerChanPush2Telegr?= =?UTF-8?q?amBot.bat=EF=BC=9A=E5=8D=95=E8=BF=9B=E7=A8=8B=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=20-=20=E5=A2=9E=E5=8A=A0ServerChanPush2Teleg?= =?UTF-8?q?ramBot=5Fwsgi.bat=EF=BC=9A=E4=BD=BF=E7=94=A8waitress-serve?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=A8=8B=E5=BA=8F=20-=20=E4=BF=AE=E6=94=B9.g?= =?UTF-8?q?itignore=EF=BC=9A=E5=BF=BD=E7=95=A5bot=5Fconfig.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + ServerChanPush2TelegramBot.bat | 5 +++++ ServerChanPush2TelegramBot_wsgi.bat | 6 ++++++ 3 files changed, 12 insertions(+) create mode 100644 ServerChanPush2TelegramBot.bat create mode 100644 ServerChanPush2TelegramBot_wsgi.bat diff --git a/.gitignore b/.gitignore index 68bc17f..3e7a4a6 100644 --- a/.gitignore +++ b/.gitignore @@ -158,3 +158,4 @@ cython_debug/ # and can be added to the global gitignore or merged into this file. For a more nuclear # option (not recommended) you can uncomment the following to ignore the entire idea folder. #.idea/ +/bot_config.json diff --git a/ServerChanPush2TelegramBot.bat b/ServerChanPush2TelegramBot.bat new file mode 100644 index 0000000..a920db7 --- /dev/null +++ b/ServerChanPush2TelegramBot.bat @@ -0,0 +1,5 @@ +@echo off +@echo ServerChanPush2TelegramBot start +cd /d %~dp0 +py ServerChanPush2TelegramBot.py +pause \ No newline at end of file diff --git a/ServerChanPush2TelegramBot_wsgi.bat b/ServerChanPush2TelegramBot_wsgi.bat new file mode 100644 index 0000000..85b4e53 --- /dev/null +++ b/ServerChanPush2TelegramBot_wsgi.bat @@ -0,0 +1,6 @@ +@echo off +title -رաServerChanPush2TelegramBot +cd /d %~dp0 +:start +waitress-serve --threads=10 --listen=*:5000 ServerChanPush2TelegramBot:app +goto start \ No newline at end of file From 9f393f3bc9ab5b98158a5b00f2c2a661a495f0b2 Mon Sep 17 00:00:00 2001 From: yshtcn Date: Wed, 6 Sep 2023 23:26:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?-=E4=BF=AE=E6=94=B9ServerChanPush2TelegramB?= =?UTF-8?q?ot.py=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=88=B0=E9=98=9F=E5=88=97?= =?UTF-8?q?=E6=97=B6=E4=B8=BA200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ServerChanPush2TelegramBot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ServerChanPush2TelegramBot.py b/ServerChanPush2TelegramBot.py index 879c0f0..4fb231d 100644 --- a/ServerChanPush2TelegramBot.py +++ b/ServerChanPush2TelegramBot.py @@ -228,7 +228,7 @@ def index(): 'url': url }) write_pending_messages(pending_messages) - return jsonify({"error": "Failed to send message, added to pending list"}), 400 + return jsonify({"error": "Failed to send message, added to pending list"}), 200 if __name__ == "__main__": app.run(host='0.0.0.0', port=5000)