From 17b8b5e246287315099688be74ef9d151fd8f6cb Mon Sep 17 00:00:00 2001 From: Oct-autumn Date: Tue, 18 Mar 2025 09:57:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96EULA=E5=92=8C?= =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96=E7=9A=84=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bot.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/bot.py b/bot.py index 54193b3d1..f5bfb7704 100644 --- a/bot.py +++ b/bot.py @@ -1,4 +1,5 @@ import asyncio +import hashlib import os import shutil import sys @@ -172,31 +173,37 @@ def check_eula(): privacy_file = Path("PRIVACY.md") eula_updated = True + eula_new_hash = None privacy_updated = True + privacy_new_hash = None eula_confirmed = False privacy_confirmed = False # 检查EULA确认文件是否存在 if eula_confirm_file.exists(): - # 检查EULA文件版本是否更新（与elua.confirmed文件对比） + # 检查EULA文件版本是否更新（对比哈希） with open(eula_file, "r") as f: eula_content = f.read() with open(eula_confirm_file, "r") as f: confirmed_content = f.read() - if eula_content == confirmed_content: + # 计算EULA文件的md5值 + eula_new_hash = hashlib.md5(eula_content.encode("utf-8")).hexdigest() + if eula_new_hash == confirmed_content: eula_confirmed = True eula_updated = False # 检查隐私条款确认文件是否存在 if privacy_confirm_file.exists(): - # 检查隐私条款文件版本是否更新（与privacy.confirmed文件对比） + # 检查隐私条款文件版本是否更新（对比哈希） with open(privacy_file, "r") as f: privacy_content = f.read() with open(privacy_confirm_file, "r") as f: confirmed_content = f.read() - if privacy_content == confirmed_content: + # 计算隐私条款文件的md5值 + privacy_new_hash = hashlib.md5(privacy_content.encode("utf-8")).hexdigest() + if privacy_new_hash == confirmed_content: privacy_confirmed = True privacy_updated = False @@ -208,9 +215,9 @@ def check_eula(): user_input = input().strip().lower() if user_input in ['同意', 'confirmed']: if eula_updated: - eula_confirm_file.write_text(eula_file.read_text(encoding="utf-8"),encoding="utf-8") + eula_confirm_file.write_text(eula_new_hash,encoding="utf-8") if privacy_updated: - privacy_confirm_file.write_text(privacy_file.read_text(encoding="utf-8"),encoding="utf-8") + privacy_confirm_file.write_text(privacy_new_hash,encoding="utf-8") break else: print('请输入"同意"或"confirmed"以继续运行') From 8e9042961588d3d1e352eb80d2f5e9e7f30bea10 Mon Sep 17 00:00:00 2001 From: Oct-autumn Date: Tue, 18 Mar 2025 10:28:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DEULA=E5=92=8C?= =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96=E5=A4=84=E7=90=86=E6=97=B6?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E7=BC=96=E7=A0=81=E4=B8=8D=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bot.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bot.py b/bot.py index f5bfb7704..ddf1cd359 100644 --- a/bot.py +++ b/bot.py @@ -183,9 +183,9 @@ def check_eula(): # 检查EULA确认文件是否存在 if eula_confirm_file.exists(): # 检查EULA文件版本是否更新（对比哈希） - with open(eula_file, "r") as f: + with open(eula_file, "r", encoding="utf-8") as f: eula_content = f.read() - with open(eula_confirm_file, "r") as f: + with open(eula_confirm_file, "r", encoding="utf-8") as f: confirmed_content = f.read() # 计算EULA文件的md5值 eula_new_hash = hashlib.md5(eula_content.encode("utf-8")).hexdigest() @@ -197,9 +197,9 @@ def check_eula(): # 检查隐私条款确认文件是否存在 if privacy_confirm_file.exists(): # 检查隐私条款文件版本是否更新（对比哈希） - with open(privacy_file, "r") as f: + with open(privacy_file, "r", encoding="utf-8") as f: privacy_content = f.read() - with open(privacy_confirm_file, "r") as f: + with open(privacy_confirm_file, "r", encoding="utf-8") as f: confirmed_content = f.read() # 计算隐私条款文件的md5值 privacy_new_hash = hashlib.md5(privacy_content.encode("utf-8")).hexdigest()