From 551ad5856f30c5a4e8e88003b102e6e6bef2a493 Mon Sep 17 00:00:00 2001
From: RBAmeto <46624927+RBAmeto@users.noreply.github.com>
Date: Wed, 18 Oct 2023 20:25:33 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E5=87=BA=E7=8E=B0=E7=9A=84-10001=20(#34)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修复可能出现的-10001

* 🚨 `pre-commit-ci`修复格式错误

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 gsuid_core/utils/api/mys/request.py | 39 +++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/gsuid_core/utils/api/mys/request.py b/gsuid_core/utils/api/mys/request.py
index 7ec0ccb..296c1ce 100644
--- a/gsuid_core/utils/api/mys/request.py
+++ b/gsuid_core/utils/api/mys/request.py
@@ -207,7 +207,7 @@ class BaseMysApi:
             url=_URL,
             method='GET',
             header=HEADER,
-            params=params if params else {'server': server_id, 'role_id': uid},
+            params=params if params else {'role_id': uid, 'server': server_id},
             use_proxy=True if is_os else False,
         )
         return data
@@ -265,6 +265,22 @@ class BaseMysApi:
 
             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,
@@ -307,13 +323,10 @@ class BaseMysApi:
                             )
                             pass_header = copy.deepcopy(header)
                             ch = await self._upass(pass_header)
-                            header['x-rpc-challenge'] = ch
-                            if isinstance(params, Dict):
-                                header['DS'] = get_ds_token(
-                                    '&'.join(
-                                        [f'{k}={v}' for k, v in params.items()]
-                                    )
-                                )
+                            if ch == '':
+                                return 114514
+                            else:
+                                header['x-rpc-challenge'] = ch
                     elif retcode != 0:
                         return retcode
                     else:
@@ -434,7 +447,7 @@ class MysApi(BaseMysApi):
                 async with client.request(
                     url=f'{_pass_api}&gt={gt}&challenge={ch}',
                     method='GET',
-                )as data:
+                ) as data:
                     try:
                         data = await data.json()
                     except ContentTypeError:
@@ -489,7 +502,9 @@ class MysApi(BaseMysApi):
             header=header,
         )
 
-    async def get_header_and_vl(self, header: Dict, ch, vl, is_bbs: bool = False):
+    async def get_header_and_vl(
+        self, header: Dict, ch, vl, is_bbs: bool = False
+    ):
         header['DS'] = get_ds_token(
             '',
             {
@@ -499,7 +514,9 @@ class MysApi(BaseMysApi):
             },
         )
         _ = await self._mys_request(
-            url=self.MAPI['VERIFY_URL'] if not is_bbs else self.MAPI['BBS_VERIFY_URL'],
+            url=self.MAPI['VERIFY_URL']
+            if not is_bbs
+            else self.MAPI['BBS_VERIFY_URL'],
             method='POST',
             header=header,
             data={