diff --git a/config.py b/config.py index 2ca9f3a..cc3f2c4 100644 --- a/config.py +++ b/config.py @@ -86,7 +86,7 @@ def clear_cookies(): data["mihoyobbs_Login_ticket"] = "" data["mihoyobbs_Stuid"] = "" data["mihoyobbs_Stoken"] = "" - data["mihoyobbs_Cookies"] = "" + data["mihoyobbs_Cookies"] = "CookieError" f.seek(0) f.truncate() temp_text = json.dumps(data, sort_keys=False, indent=4, separators=(', ', ': ')) diff --git a/main.py b/main.py index 0a4506e..885f5a0 100644 --- a/main.py +++ b/main.py @@ -81,6 +81,8 @@ def main(): else: log.info("崩坏3签到功能未启用!") return 0, return_data + elif config.mihoyobbs_Cookies == "CookieError": + raise CookieError('Cookie expires') else: log.warning("Config未启用!") return 1, "Config未启用!" diff --git a/main_multi.py b/main_multi.py index cad7378..3a74970 100644 --- a/main_multi.py +++ b/main_multi.py @@ -55,7 +55,12 @@ def main_multi(autorun: bool): f'没执行{len(results["close"])}个,失败{len(results["error"])}个' \ f'\r\n没执行的配置文件: {results["close"]}\r\n执行失败的配置文件: {results["error"]}' log.info(push_message) - push.push(0, push_message) + status = 0 + if len(results["error"]) == len(config_list): + status = 1 + elif len(results["error"]) < len(config_list): + status = 2 + push.push(status, push_message) if __name__ == "__main__": diff --git a/push.py b/push.py index 3370764..16135d6 100644 --- a/push.py +++ b/push.py @@ -18,8 +18,10 @@ def load_config(): def title(status): if status == 0: return "「米游社脚本」执行成功!" - else: + elif status == 1: return "「米游社脚本」执行失败!" + elif status == 2: + return "「米游社脚本」部分账号执行失败!" # telegram的推送