From 39bfd7a65af6df857a629024de9ad6903dd54ff3 Mon Sep 17 00:00:00 2001
From: baiqwerdvd <158065462+baiqwerdvd@users.noreply.github.com>
Date: Mon, 9 Dec 2024 15:16:43 +0800
Subject: [PATCH] 11111

---
 ArknightsUID/arknightsuid_ap/draw_ap_card.py | 6 +++++-
 ArknightsUID/utils/api/skd/request.py        | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ArknightsUID/arknightsuid_ap/draw_ap_card.py b/ArknightsUID/arknightsuid_ap/draw_ap_card.py
index 49bce87..71a7846 100644
--- a/ArknightsUID/arknightsuid_ap/draw_ap_card.py
+++ b/ArknightsUID/arknightsuid_ap/draw_ap_card.py
@@ -8,7 +8,7 @@ from PIL import Image, ImageDraw
 
 from ..arknightsuid_resource.constants import CHARACTER_TABLE
 from ..utils.ark_api import ark_skd_api
-from ..utils.database.models import ArknightsBind
+from ..utils.database.models import ArknightsBind, ArknightsUser
 from ..utils.fonts.source_han_sans import (
     sans_font_18,
     sans_font_26,
@@ -47,6 +47,10 @@ async def get_ap_img(bot_id: str, user_id: str):
         for uid in uid_list:
             # status = await ark_skd_api.check_cred_valid(uid=uid)
             # if status is not bool:
+            # skd_uid = await ArknightsUser.get_user_attr_by_uid(
+            #     uid=uid,
+            #     attr="skd_uid",
+            # )
             useable_uid_list.append(uid)
         logger.info(f"[每日信息]可用UID: {useable_uid_list}")
         if len(useable_uid_list) == 0:
diff --git a/ArknightsUID/utils/api/skd/request.py b/ArknightsUID/utils/api/skd/request.py
index 83b3c20..fb5edce 100644
--- a/ArknightsUID/utils/api/skd/request.py
+++ b/ArknightsUID/utils/api/skd/request.py
@@ -140,10 +140,16 @@ class BaseArkApi:
         if isinstance(is_vaild, bool):
             # await ArknightsUser.delete_user_data_by_uid(uid)
             return -61
+        skd_uid = await ArknightsUser.get_user_attr_by_uid(
+            uid=uid,
+            attr="skd_uid",
+        )
+        if skd_uid is None:
+            return -60
         headers = deepcopy(_HEADER)
         headers["cred"] = cred
         headers["dId"] = await get_d_id()
-        url = ARK_PLAYER_INFO + f"?uid={uid}"
+        url = ARK_PLAYER_INFO + f"?uid={uid}&userId={skd_uid}"
         header = get_sign_header(token, url, "get", None, headers)
         raw_data = await self.ark_request(
             url=url,