From dbcb3651c9200304014e40afe25e149d8e806c22 Mon Sep 17 00:00:00 2001
From: RBAmeto <46624927+RBAmeto@users.noreply.github.com>
Date: Wed, 18 Oct 2023 20:48:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D-10001?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gsuid_core/utils/api/mys/request.py | 33 ++++++++++++-----------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/gsuid_core/utils/api/mys/request.py b/gsuid_core/utils/api/mys/request.py
index 296c1ce..4952651 100644
--- a/gsuid_core/utils/api/mys/request.py
+++ b/gsuid_core/utils/api/mys/request.py
@@ -262,25 +262,10 @@ class BaseMysApi:
                 uid = params['role_id']
                 header['x-rpc-device_id'] = await self.get_user_device_id(uid)
                 header['x-rpc-device_fp'] = await self.get_user_fp(uid)
-
+                
             for _ in range(2):
                 print(header)
-                if isinstance(params, Dict):
-                    header['DS'] = get_ds_token(
-                        '&'.join(
-                            [
-                                f'{k}={v}'
-                                for k, v in sorted(
-                                    params.items(), key=lambda x: x[0]
-                                )
-                            ]
-                        )
-                    )
-                if isinstance(data, Dict):
-                    header['DS'] = get_ds_token(
-                        '',
-                        data,
-                    )
+                
                 async with client.request(
                     method,
                     url=url,
@@ -315,9 +300,7 @@ class BaseMysApi:
                                 header['x-rpc-device_fp'] = new_fp
                             return retcode
                         else:
-                            header['x-rpc-challenge_game'] = (
-                                '6' if self.is_sr else '2'
-                            )
+                            header['x-rpc-challenge_game'] = '6' if self.is_sr else '2'
                             header['x-rpc-page'] = (
                                 '3.1.3_#/rpg' if self.is_sr else '3.1.3_#/ys'
                             )
@@ -327,6 +310,16 @@ class BaseMysApi:
                                 return 114514
                             else:
                                 header['x-rpc-challenge'] = ch
+                            if 'DS' in header:
+                                if isinstance(params, Dict):
+                                    q = '&'.join(
+                                            [f'{k}={v}' for k, v in sorted(
+                                                params.items(), key=lambda x: x[0]
+                                                )]
+                                            )
+                                else:
+                                    q = ''
+                                header['DS'] = get_ds_token(q, data)
                     elif retcode != 0:
                         return retcode
                     else: