尝试暂时用固定fp解决5003

Author: forchannot

handle/ssbq_handler.py

@@ -12,13 +12,13 @@
     PrivateCookie,
 )
 from LittlePaimon.utils import scheduler
-from LittlePaimon.utils.api import DAILY_NOTE_API, get_mihoyo_private_data
+from LittlePaimon.utils.api import DAILY_NOTE_API, get_cookie, get_mihoyo_private_data, mihoyo_headers
 from LittlePaimon.utils.requests import aiorequests
 from nonebot import get_bot
 from nonebot.adapters.onebot.v11 import Message
 from nonebot.params import CommandArg, Depends
 
-from ..captcha.captcha import get_pass_challenge, mihoyo_headers
+from ..captcha.captcha import get_pass_challenge
 from ..config.config import config
 from ..draw.ssbq_draw import draw_daily_note_card
 from ..utils.logger import Logger
@@ -55,9 +55,20 @@ async def get_subs(**kwargs) -> str:
 
 async def handle_ssbq(player: Player, sign_allow: bool):
     await LastQuery.update_last_query(player.user_id, player.uid)
-    data = await get_mihoyo_private_data(
-        player.uid, player.user_id, "daily_note"
+    server_id = "cn_qd01" if player.uid[0] == "5" else "cn_gf01"
+    cookie_info = await get_cookie(player.user_id, player.uid, True, True)
+    headers = mihoyo_headers(
+        cookie=cookie_info.cookie,
+        q=f"role_id={player.uid}&server={server_id}",
     )
+    headers["x-rpc-device_id"] = "3cf4ac6c-aeef-4e53-8f51-7d623b01d64d"
+    headers["x-rpc-device_fp"] = "38d7f1d1d0fff"
+    data = await aiorequests.get(
+        url=DAILY_NOTE_API,
+        headers=headers,
+        params={"server": server_id, "role_id": player.uid},
+    )
+    data = data.json()
     if isinstance(data, str):
         Logger.info(
             "原神实时便签",
@@ -67,10 +78,8 @@ async def handle_ssbq(player: Player, sign_allow: bool):
             False,
         )
         return f"{player.uid}{data}\n"
-    elif data["retcode"] in (1034, 5003):
-        if (
-            config.rrocr_key or config.third_api or config.ttocr_key
-        ) and sign_allow:
+    elif data["retcode"] == 1034:
+        if (config.rrocr_key or config.third_api or config.ttocr_key) and sign_allow:
             Logger.info(
                 "原神实时便签",
                 "➤➤",
@@ -131,13 +140,14 @@ async def handle_ssbq(player: Player, sign_allow: bool):
         return f'{player.uid}获取数据失败，msg为{data["message"]}\n'
     else:
         Logger.info(
-            "原神实时便签", "➤➤", {"用户": player.user_id, "UID": player.uid}, "获取数据成功"
+            "原神实时便签",
+            "➤➤",
+            {"用户": player.user_id, "UID": player.uid},
+            "获取数据成功",
         )
 
         try:
-            img = await draw_daily_note_card(
-                data["data"], player.uid, player.user_id
-            )
+            img = await draw_daily_note_card(data["data"], player.uid, player.user_id)
             Logger.info(
                 "原神实时便签",
                 "➤➤",
@@ -156,9 +166,7 @@ async def handle_ssbq(player: Player, sign_allow: bool):
             return f"{player.uid}绘制图片失败，{e}\n"
 
 
-@scheduler.scheduled_job(
-    "cron", minute=f"*/{config.ssbq_check}", misfire_grace_time=10
-)
+@scheduler.scheduled_job("cron", minute=f"*/{config.ssbq_check}", misfire_grace_time=10)
 async def check_note():
     if not config.ssbq_enable:
         return

handle/sy_handle.py

@@ -40,6 +40,9 @@ async def get_abyss_info(
         q=f"role_id={uid}&schedule_type={schedule_type}&server={server_id}",
         cookie=cookie_info.cookie,
     )
+    # 暂时用一个固定的device_id和device_fp
+    headers["x-rpc-device_id"] = "3cf4ac6c-aeef-4e53-8f51-7d623b01d64d"
+    headers["x-rpc-device_fp"] = "38d7f1d1d0fff"
     k = 0
     for i in range(3):
         data: dict = (
@@ -53,7 +56,7 @@ async def get_abyss_info(
                 },
             )
         ).json()
-        if data["retcode"] in (1034, 5003) and k < 2:
+        if data["retcode"] == 1034 and k < 2:
             k += 1
             Logger.info(
                 "原神深渊战报",
@@ -68,7 +71,7 @@ async def get_abyss_info(
                 continue
             else:
                 return "遇到验证码，但是过码失败"
-        elif data["retcode"] in (1034, 5003) and k == 2:
+        elif data["retcode"] == 1034 and k == 2:
             Logger.info(
                 "原神深渊战报",
                 "➤➤",