From 0a2ac863a7700ea8fc321ec5badcea85bb1935ab Mon Sep 17 00:00:00 2001 From: RachelOS <1327444968@qq.com> Date: Thu, 11 Dec 2025 13:05:07 +0800 Subject: [PATCH] 1.4.8-Fix --- driver/playwright_driver.py | 4 +++- driver/wx_api.py | 6 +++++- jobs/failauth.py | 8 ++++---- web_ui/dist/index.html | 4 ++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/driver/playwright_driver.py b/driver/playwright_driver.py index c72ed528..fbe76ee8 100644 --- a/driver/playwright_driver.py +++ b/driver/playwright_driver.py @@ -113,8 +113,10 @@ class PlaywrightController: return self.page except Exception as e: print(f"浏览器启动失败: {str(e)}") + tips="Docker环境;您可以设置环境变量INSTALL=True并重启Docker自动安装浏览器环境;如需要切换浏览器可以设置环境变量BROWSER_TYPE=firefox 支持(firefox,webkit,chromium),开发环境请手工安装" + print(tips) self.cleanup() - raise e + raise Exception(tips) def string_to_json(self, json_string): try: diff --git a/driver/wx_api.py b/driver/wx_api.py index 427b6dc3..d72ef5c2 100644 --- a/driver/wx_api.py +++ b/driver/wx_api.py @@ -798,7 +798,11 @@ class WeChatAPI: if rel==False: print_warning("未登录，Token登录失败") return rel - + def QRcode(self): + return { + "code":f"/{self.wx_login_url}?t={(time.time())}", + "is_exists":self.GetHasCode(), + } def GetCode(self,CallBack=None,Notice=None): if self.GetHasCode(): return { diff --git a/jobs/failauth.py b/jobs/failauth.py index 5411f4eb..e4bbf71f 100644 --- a/jobs/failauth.py +++ b/jobs/failauth.py @@ -1,4 +1,4 @@ -from driver.wx import WX_API +from driver.base import WX_API from core.config import cfg from jobs.notice import sys_notice from driver.success import Success @@ -7,18 +7,18 @@ def send_wx_code(title:str="",url:str=""): if cfg.get("server.send_code",False): WX_API.GetCode(Notice=CallBackNotice,CallBack=Success) pass -def CallBackNotice(): +def CallBackNotice(data=None,ext_data=None): url=WX_API.QRcode()['code'] svg=""" """ - rss_domain=cfg.get("rss.base_url","") + rss_domain=str(cfg.get("rss.base_url","")) url=rss_domain+str(url) text=f"- 服务名：{cfg.get('server.name','')}\n" text+=f"- 发送时间： {time.strftime('%Y-%m-%d %H:%M:%S',time.localtime(time.time()))}" if WX_API.GetHasCode(): text+=f"![二维码]({url})" text+=f"\n- 请使用微信扫描二维码进行授权" - sys_notice(text, cfg.get("server.code_title","WeRss授权过期,扫码授权")) \ No newline at end of file + sys_notice(text, str(cfg.get("server.code_title","WeRss授权过期,扫码授权"))) \ No newline at end of file diff --git a/web_ui/dist/index.html b/web_ui/dist/index.html index b5475e2f..cce52704 100644 --- a/web_ui/dist/index.html +++ b/web_ui/dist/index.html @@ -15,8 +15,8 @@ WeRss微信公众号订阅助手 - - + +