diff --git a/djc_helper.py b/djc_helper.py index 054b235835..22a75ee225 100644 --- a/djc_helper.py +++ b/djc_helper.py @@ -4576,10 +4576,15 @@ def query_dnf_helper_chronicle_info(self) -> DnfHelperChronicleUserActivityTopIn res = self.dzhu_post("活动基础状态信息", "getUserActivityTopInfo", self.get_common_params()) return DnfHelperChronicleUserActivityTopInfo().auto_update_config(res.get("data", {})) - @try_except(show_exception_info=False, return_val_on_except=DnfHelperChronicleUserTaskList()) - def query_dnf_helper_chronicle_user_task_list(self) -> DnfHelperChronicleUserTaskList: + @try_except(show_exception_info=False, return_val_on_except=(DnfHelperChronicleUserTaskList(), True)) + def query_dnf_helper_chronicle_user_task_list(self) -> tuple[DnfHelperChronicleUserTaskList, bool]: res = self.dzhu_post("任务信息", "getUserTaskList", self.get_common_params()) - return DnfHelperChronicleUserTaskList().auto_update_config(res.get("data", {})) + + user_task_info = DnfHelperChronicleUserTaskList().auto_update_config(res.get("data", {})) + # {'result': 0, 'returnCode': -30003, 'returnMsg': '登录态失效,请重新登录'} + token_expired = res.get("returnCode", 0) == -30003 + + return user_task_info, token_expired @try_except(return_val_on_except=False) def check_dnf_helper_chronicle_auto_match(self, user_buy_info: BuyInfo, print_waring=True) -> bool: diff --git a/main_def.py b/main_def.py index 8cf789f520..3abdde5d28 100644 --- a/main_def.py +++ b/main_def.py @@ -948,10 +948,16 @@ def get_account_status(idx: int, account_config: AccountConfig, common_config: C levelInfo, chronicle_points = djcHelper.query_dnf_helper_chronicle_info().get_level_info_and_points_to_show() partner_Info = "" - user_task_info = djcHelper.query_dnf_helper_chronicle_user_task_list() + user_task_info, token_expired = djcHelper.query_dnf_helper_chronicle_user_task_list() if user_task_info.hasPartner: partner_Info = user_task_info.get_partner_info(account_config.dnf_helper_info) + if token_expired: + if account_config.dnf_helper_info.token != "": + levelInfo = "token已过期" + else: + levelInfo = "token未配置" + user_info_db = ( DnfHelperChronicleUserActivityTopInfoDB().with_context(djcHelper.get_dnf_helper_chronicle_db_key()).load() )