diff --git a/gateway/scripts/dashboard.py b/gateway/scripts/dashboard.py index efab076..4d48c42 100644 --- a/gateway/scripts/dashboard.py +++ b/gateway/scripts/dashboard.py @@ -1823,9 +1823,20 @@ def api_wechat_status(): _dlogs = _dr.stdout + _dr.stderr _showing_qr = ("扫描以下二维码" in _dlogs) or ("Access the URL to login" in _dlogs) _login_err = _dlogs.count("loginCheck") >= 2 + _logged_in = "logged in" in _dlogs + _has_msg = "Message:" in _dlogs except Exception: _showing_qr = False _login_err = False + _logged_in = False + _has_msg = False + # 登录成功是最高优先级: 有 logged in 或正在收发消息 = 已登录 + if _logged_in or _has_msg: + result["online"] = True + result["message"] = "已登录" + result["qr_url"] = None + result["qr_timestamp"] = None + return jsonify(result) if _showing_qr: result["online"] = False result["message"] = "等待扫码登录"