🎨 优化

gsuid_core/utils/api/mys/request.py

@@ -25,6 +25,7 @@ from aiohttp import TCPConnector, ClientSession, ContentTypeError
 
 from gsuid_core.logger import logger
 from gsuid_core.utils.database.api import DBSqla
+from gsuid_core.utils.database.models import GsUser
 from gsuid_core.utils.plugins_config.gs_config import core_plugins_config
 
 from .api import _API
@@ -324,6 +325,10 @@ class BaseMysApi:
             if app_cookie is None:
                 return logger.warning('设备登录流程错误...')
         await self.device_login_and_save(device_id, fp, model_name, app_cookie)
+        if await GsUser.user_exists(uid, 'sr' if self.is_sr else None):
+            await GsUser.update_data_by_uid_without_bot_id(
+                uid, 'sr' if self.is_sr else None, fp=fp, device_id=device_id
+            )
         return fp, device_id, seed_id, seed_time
 
     async def _mys_request(
@@ -451,9 +456,17 @@ class MysApi(BaseMysApi):
                     except ContentTypeError:
                         data = await data.text()
                         return None, None
+                    logger.debug(data)
                     if isinstance(data, int):
                         return None, None
                     else:
+                        if 'code' in data and data['code'] != 0:
+                            if 'info' in data:
+                                msg = data["info"]
+                            else:
+                                msg = f'错误码{data["code"]}, 请检查API是否配置正确'
+                            logger.info(f'[upass] {msg}')
+                            return None, None
                         validate = data['data']['validate']
                         ch = data['data']['challenge']
         else:
@@ -617,8 +630,9 @@ class MysApi(BaseMysApi):
         if int(str(uid)[0]) < 6:
             HEADER = copy.deepcopy(self._HEADER)
             HEADER['Cookie'] = ck
-            HEADER['x-rpc-device_id'] = random_hex(32)
             HEADER['x-rpc-app_version'] = mys_version
+            header['x-rpc-device_id'] = await self.get_user_device_id(uid)
+            header['x-rpc-device_fp'] = await self.get_user_fp(uid)
             HEADER['x-rpc-client_type'] = '5'
             HEADER['X_Requested_With'] = 'com.mihoyo.hyperion'
             HEADER['DS'] = get_web_ds_token(True)

gsuid_core/utils/database/base_models.py

@@ -15,7 +15,7 @@ from sqlalchemy.future import select
 from sqlalchemy import delete, update
 from sqlalchemy.orm import sessionmaker
 from sqlmodel import Field, SQLModel, col
-from sqlalchemy.sql.expression import func
+from sqlalchemy.sql.expression import func, null
 from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
 
 from gsuid_core.data_store import get_res_path
@@ -522,9 +522,14 @@ class User(BaseModel):
     @classmethod
     @with_session
     async def get_all_user(
-        cls: Type[T_User], session: AsyncSession
+        cls: Type[T_User], session: AsyncSession, without_error: bool = True
     ) -> List[T_User]:
-        sql = select(cls).where(cls.cookie is not None, cls.cookie != '')
+        if without_error:
+            sql = select(cls).where(
+                cls.status == null(), cls.cookie != null(), cls.cookie != ''
+            )
+        else:
+            sql = select(cls).where(cls.cookie != null(), cls.cookie != '')
         result = await session.execute(sql)
         data = result.scalars().all()
         return data