日报增加Cookie有效期检测(ALF字段), 按剩余天数分级预警
This commit is contained in:
@@ -651,6 +651,7 @@ async def _build_daily_report() -> str:
|
|||||||
from shared.models.account import Account
|
from shared.models.account import Account
|
||||||
from shared.models.signin_log import SigninLog
|
from shared.models.signin_log import SigninLog
|
||||||
from shared.models.user import User
|
from shared.models.user import User
|
||||||
|
from shared.crypto import decrypt_cookie, derive_key
|
||||||
|
|
||||||
today_start = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
|
today_start = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
|
||||||
now = datetime.now()
|
now = datetime.now()
|
||||||
@@ -729,19 +730,37 @@ async def _build_daily_report() -> str:
|
|||||||
if msg:
|
if msg:
|
||||||
rank_details.append({"name": name, "topic": topic, "message": msg})
|
rank_details.append({"name": name, "topic": topic, "message": msg})
|
||||||
|
|
||||||
# 4. Cookie 即将失效的账号(超过 3 天未检查)
|
# 4. Cookie 过期时间检测(从 ALF 字段解析)
|
||||||
stale_cutoff = now - timedelta(days=3)
|
cookie_expiry = []
|
||||||
stale_result = await session.execute(
|
all_accounts_result = await session.execute(
|
||||||
select(Account.remark, Account.weibo_user_id, Account.last_checked_at)
|
select(Account.id, Account.remark, Account.weibo_user_id,
|
||||||
.where(Account.status == "active")
|
Account.encrypted_cookies, Account.iv, Account.status)
|
||||||
.where(
|
.where(Account.status.in_(["active", "pending"]))
|
||||||
(Account.last_checked_at < stale_cutoff) | (Account.last_checked_at == None)
|
|
||||||
)
|
)
|
||||||
)
|
key = derive_key(shared_settings.COOKIE_ENCRYPTION_KEY)
|
||||||
stale_accounts = [
|
for acc_row in all_accounts_result.all():
|
||||||
(row[0] or row[1], row[2].strftime("%m-%d %H:%M") if row[2] else "从未")
|
acc_id, remark, uid, enc_cookies, iv, status = acc_row
|
||||||
for row in stale_result.all()
|
name = remark or uid
|
||||||
]
|
try:
|
||||||
|
cookie_str = decrypt_cookie(enc_cookies, iv, key)
|
||||||
|
alf = ""
|
||||||
|
for pair in cookie_str.split(";"):
|
||||||
|
pair = pair.strip()
|
||||||
|
if pair.startswith("ALF="):
|
||||||
|
alf = pair.split("=", 1)[1].strip()
|
||||||
|
break
|
||||||
|
if alf and alf.isdigit():
|
||||||
|
expire_dt = datetime.fromtimestamp(int(alf))
|
||||||
|
remain_days = (expire_dt - now).days
|
||||||
|
cookie_expiry.append({
|
||||||
|
"name": name,
|
||||||
|
"expire": expire_dt.strftime("%m-%d"),
|
||||||
|
"remain": remain_days,
|
||||||
|
})
|
||||||
|
else:
|
||||||
|
cookie_expiry.append({"name": name, "expire": "未知", "remain": -1})
|
||||||
|
except Exception:
|
||||||
|
cookie_expiry.append({"name": name, "expire": "解密失败", "remain": -1})
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
await eng.dispose()
|
await eng.dispose()
|
||||||
@@ -777,10 +796,22 @@ async def _build_daily_report() -> str:
|
|||||||
for r in rank_details:
|
for r in rank_details:
|
||||||
lines.append(f" {r['name']} - {r['topic']}: {r['message']}")
|
lines.append(f" {r['name']} - {r['topic']}: {r['message']}")
|
||||||
|
|
||||||
if stale_accounts:
|
if cookie_expiry:
|
||||||
lines += ["", "⚠️ 需要关注"]
|
lines += ["", "🍪 Cookie 有效期"]
|
||||||
for name, last in stale_accounts:
|
expiring_soon = []
|
||||||
lines.append(f" {name} (上次检查: {last})")
|
for ce in cookie_expiry:
|
||||||
|
remain = ce["remain"]
|
||||||
|
if remain < 0:
|
||||||
|
lines.append(f" ⚠️ {ce['name']}: {ce['expire']}")
|
||||||
|
elif remain <= 3:
|
||||||
|
lines.append(f" 🔴 {ce['name']}: {ce['expire']} (剩 {remain} 天,即将过期!)")
|
||||||
|
expiring_soon.append(ce["name"])
|
||||||
|
elif remain <= 7:
|
||||||
|
lines.append(f" 🟡 {ce['name']}: {ce['expire']} (剩 {remain} 天)")
|
||||||
|
else:
|
||||||
|
lines.append(f" 🟢 {ce['name']}: {ce['expire']} (剩 {remain} 天)")
|
||||||
|
if expiring_soon:
|
||||||
|
lines.append(f" ⚠️ 请尽快重新扫码: {', '.join(expiring_soon)}")
|
||||||
|
|
||||||
if total_logs == 0:
|
if total_logs == 0:
|
||||||
lines += ["", "💤 今日暂无签到记录"]
|
lines += ["", "💤 今日暂无签到记录"]
|
||||||
|
|||||||
@@ -12,6 +12,11 @@ import re
|
|||||||
import asyncio
|
import asyncio
|
||||||
|
|
||||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "backend"))
|
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "backend"))
|
||||||
|
sys.path.insert(0, os.path.join(os.path.dirname(__file__)))
|
||||||
|
|
||||||
|
# 兼容容器内运行(/app 目录)
|
||||||
|
if os.path.exists("/app/shared"):
|
||||||
|
sys.path.insert(0, "/app")
|
||||||
|
|
||||||
from shared.config import shared_settings
|
from shared.config import shared_settings
|
||||||
from shared.crypto import decrypt_cookie, derive_key
|
from shared.crypto import decrypt_cookie, derive_key
|
||||||
@@ -56,6 +61,16 @@ async def main():
|
|||||||
|
|
||||||
print(f"🍪 Cookie 数量: {len(cookies)}, keys: {list(cookies.keys())}")
|
print(f"🍪 Cookie 数量: {len(cookies)}, keys: {list(cookies.keys())}")
|
||||||
|
|
||||||
|
# 检查 Cookie 有效期
|
||||||
|
from datetime import datetime
|
||||||
|
alf = cookies.get("ALF", "")
|
||||||
|
if alf and alf.isdigit():
|
||||||
|
expire_time = datetime.fromtimestamp(int(alf))
|
||||||
|
remain = (expire_time - datetime.now()).days
|
||||||
|
print(f"📅 Cookie 过期时间: {expire_time.strftime('%Y-%m-%d %H:%M:%S')} (还剩 {remain} 天)")
|
||||||
|
else:
|
||||||
|
print(f"📅 ALF 字段: {alf or '无'} (无法判断过期时间)")
|
||||||
|
|
||||||
await engine.dispose()
|
await engine.dispose()
|
||||||
|
|
||||||
# 测试 1: 访问 weibo.com
|
# 测试 1: 访问 weibo.com
|
||||||
|
|||||||
Reference in New Issue
Block a user