From 5376fb15bf0922d967889bf70822cc0f35b68651 Mon Sep 17 00:00:00 2001 From: ICMYS <2414226545@qq.com> Date: Fri, 30 Sep 2022 10:23:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0salt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setting.py b/setting.py index cfc21b4..163a18d 100644 --- a/setting.py +++ b/setting.py @@ -1,9 +1,9 @@ # 米游社的Salt -mihoyobbs_Salt = "6J1hde1Wu02eF1DFlLpMjeg2dMloAytL" +mihoyobbs_Salt = "PVeGWIZACpxXZ1ibMVJPi9inCY4Nd4y2" mihoyobbs_Salt2 = "t0qEgfub6cvueAPgR5m9aQWWVciEer7v" -mihoyobbs_Salt_web = "Qqx8cyv7kuyD8fTw11SmvXSFHp7iZD29" +mihoyobbs_Salt_web = "yUZ3s0Sna1IrSNfk29Vo6vRapdOyqyhB" # 米游社的版本 -mihoyobbs_Version = "2.37.1" # Slat和Version相互对应 +mihoyobbs_Version = "2.38.1" # Salt和Version相互对应 # 米游社的客户端类型 mihoyobbs_Client_type = "2" # 1为ios 2为安卓 mihoyobbs_Client_type_web = "5" # 4为pc web 5为mobile web From 435376cef43c8ad1443ffdd230349fc994fbcfa3 Mon Sep 17 00:00:00 2001 From: Womsxd <45663319+Womsxd@users.noreply.github.com> Date: Tue, 4 Oct 2022 19:31:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config.py b/config.py index a746f45..8b88e6b 100644 --- a/config.py +++ b/config.py @@ -44,6 +44,8 @@ config = { } path = os.path.dirname(os.path.realpath(__file__)) + "/config" +if os.getenv("AutoMihoyoBBS_path") != "": + path = os.getenv("AutoMihoyoBBS_path") config_Path_json = f"{path}/config.json" config_Path = f"{path}/config.yaml" def copy_config(): From ba913488f0b7fec7355a48d563fdaf9b82700657 Mon Sep 17 00:00:00 2001 From: Womsxd <45663319+Womsxd@users.noreply.github.com> Date: Tue, 4 Oct 2022 20:07:51 +0800 Subject: [PATCH 3/4] edit --- config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.py b/config.py index 8b88e6b..beeb2ec 100644 --- a/config.py +++ b/config.py @@ -44,8 +44,8 @@ config = { } path = os.path.dirname(os.path.realpath(__file__)) + "/config" -if os.getenv("AutoMihoyoBBS_path") != "": - path = os.getenv("AutoMihoyoBBS_path") +if os.getenv("AutoMihoyoBBS_config_path") != "": + path = os.getenv("AutoMihoyoBBS_config_path") config_Path_json = f"{path}/config.json" config_Path = f"{path}/config.yaml" def copy_config(): From a10355276e9b9c461eef61f5be356834b4a41027 Mon Sep 17 00:00:00 2001 From: Womsxd <45663319+Womsxd@users.noreply.github.com> Date: Tue, 4 Oct 2022 21:19:36 +0800 Subject: [PATCH 4/4] fix --- config.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/config.py b/config.py index beeb2ec..0174e11 100644 --- a/config.py +++ b/config.py @@ -44,13 +44,16 @@ config = { } path = os.path.dirname(os.path.realpath(__file__)) + "/config" -if os.getenv("AutoMihoyoBBS_config_path") != "": +if os.getenv("AutoMihoyoBBS_config_path") is not None: path = os.getenv("AutoMihoyoBBS_config_path") config_Path_json = f"{path}/config.json" config_Path = f"{path}/config.yaml" + + def copy_config(): return config + def load_config_json(): with open(config_Path_json, "r") as f: data = json.load(f) @@ -109,7 +112,7 @@ def config_v7_update(data: dict): def load_config(p_path=None): global config if not p_path: - p_path=config_Path + p_path = config_Path with open(p_path, "r", encoding='utf-8') as f: data = yaml.load(f, Loader=yaml.FullLoader) if data['version'] == 7: @@ -121,14 +124,14 @@ def load_config(p_path=None): return config -def save_config(p_path=None,p_config=None): +def save_config(p_path=None, p_config=None): global serverless if serverless: log.info("云函数执行，无法保存") return None if not p_path: - p_path=config_Path - p_config=config + p_path = config_Path + p_config = config with open(p_path, "w+") as f: try: f.seek(0)