From e101d942a267dd9c3123e4a9ad079f46502bed87 Mon Sep 17 00:00:00 2001
From: KimigaiiWuyi <444835641@qq.com>
Date: Fri, 22 Sep 2023 00:09:22 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E5=BA=95?=
 =?UTF-8?q?=E5=B1=82=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=87=B4=E7=9A=84`?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=99=BB=E9=99=86`=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gsuid_core/utils/cookie_manager/add_ck.py | 21 +++++++++++----------
 gsuid_core/utils/database/base_models.py  |  8 +++++---
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/gsuid_core/utils/cookie_manager/add_ck.py b/gsuid_core/utils/cookie_manager/add_ck.py
index ee87c81..db5ba3b 100644
--- a/gsuid_core/utils/cookie_manager/add_ck.py
+++ b/gsuid_core/utils/cookie_manager/add_ck.py
@@ -237,33 +237,32 @@ async def _deal_ck(bot_id: str, mes: str, user_id: str) -> str:
     fp = await mys_api.generate_fp_by_uid(uid)
 
     # 往数据库添加内容
-    if uid and await GsUser.user_exists(uid):
+    if uid_bind and await GsUser.user_exists(uid_bind):
         await GsUser.update_data_by_uid(
-            uid,
+            uid_bind,
             bot_id,
             cookie=account_cookie,
             status=None,
             stoken=app_cookie,
-            sr_uid=sr_uid,
+            sr_uid=sr_uid_bind,
             fp=fp,
         )
-    elif sr_uid and await GsUser.user_exists(sr_uid, 'sr'):
+    elif sr_uid_bind and await GsUser.user_exists(sr_uid_bind, 'sr'):
         await GsUser.update_data_by_uid(
-            sr_uid,
+            sr_uid_bind,
             bot_id,
             'sr',
             cookie=account_cookie,
             status=None,
             stoken=app_cookie,
-            sr_uid=sr_uid,
             fp=fp,
         )
     else:
         await GsUser.insert_data(
             user_id=user_id,
             bot_id=bot_id,
-            uid=uid,
-            sr_uid=sr_uid,
+            uid=uid_bind,
+            sr_uid=sr_uid_bind,
             mys_id=account_id,
             cookie=account_cookie,
             stoken=app_cookie if app_cookie else None,
@@ -271,8 +270,10 @@ async def _deal_ck(bot_id: str, mes: str, user_id: str) -> str:
             push_switch='off',
             bbs_switch='off',
             draw_switch='off',
-            region=SERVER.get(uid[0], 'cn_gf01') if uid else None,
-            sr_region=SR_SERVER.get(sr_uid[0], None) if sr_uid else None,
+            region=SERVER.get(uid_bind[0], 'cn_gf01') if uid_bind else None,
+            sr_region=SR_SERVER.get(sr_uid_bind[0], None)
+            if sr_uid_bind
+            else None,
             fp=fp,
             device_id=device_id,
             sr_push_switch='off',
diff --git a/gsuid_core/utils/database/base_models.py b/gsuid_core/utils/database/base_models.py
index 0564651..12f85a1 100644
--- a/gsuid_core/utils/database/base_models.py
+++ b/gsuid_core/utils/database/base_models.py
@@ -111,11 +111,13 @@ class BaseBotIDModel(BaseIDModel):
         game_name: Optional[str] = None,
         **data,
     ) -> int:
-        if not await cls.data_exist(uid=uid):
-            return await cls.full_insert_data(uid=uid, bot_id=bot_id, **data)
+        uid_name = cls.get_gameid_name(game_name)
+        if not await cls.data_exist(**{uid_name: uid}):
+            data[uid_name] = uid
+            return await cls.full_insert_data(bot_id=bot_id, **data)
 
         sql = update(cls).where(
-            getattr(cls, cls.get_gameid_name(game_name)) == uid,
+            getattr(cls, uid_name) == uid,
             cls.bot_id == bot_id,
         )
         if data is not None: