From 43111d5bc739e02e861c02c6ec25ab470da8fc74 Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Thu, 12 Jan 2023 22:32:54 +0800
Subject: [PATCH 01/18] refactor(main): using img-url for vip-shop-img
 cache,fix keyerr in notify task

---
 code/main.py | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/code/main.py b/code/main.py
index cf9b559..eab49c1 100644
--- a/code/main.py
+++ b/code/main.py
@@ -1403,7 +1403,8 @@ def is_CacheLatest(kook_user_id:str):
         is_Status = VipShopBgDict[kook_user_id]['status'] # 如果有切换登录用户/背景图，此为false
         # 判断图片是不是今天的（可能出现早八提醒的时候出错，导致缓存没有更新，是昨天的图）
         is_Today = (VipShopBgDict[kook_user_id]['cache_time']-GetTimeStampOf8AM())>=0 
-        return is_Today and is_Status # 有一个为false，结果就是false
+        is_Key = ('cache_img' in VipShopBgDict[kook_user_id]) # 键值是否存在
+        return is_Today and is_Status and is_Key# 有一个为false，结果就是false
     return False 
 
 # 获取每日商店的命令
@@ -1466,14 +1467,13 @@ async def get_daily_shop(msg: Message, *arg):
             # 开始画图
             draw_time = time.time()  #计算画图需要的时间
             is_vip = await vip_ck(msg.author_id) #判断用户是否为VIP
-            img_ret = {'status':True,'value':None}
+            img_ret = {'status':True,'value':None,'upload_flag':True}
             # 每天8点bot遍历完之后会把vip的商店结果图存起来
             shop_path = f"./log/img_temp_vip/shop/{msg.author_id}.png"
             # 如果是vip而且path存在,背景图/登录用户没有更改过,图片缓存时间正确
             if is_vip and (os.path.exists(shop_path)) and is_CacheLatest(msg.author_id):  
-                bg_vip_shop = Image.open(shop_path) #直接使用本地已经画好的图片
-                bg = copy.deepcopy(bg_vip_shop)
-                img_ret['value'] = bg # 放入返回值
+                img_ret['upload_flag'] = False #有缓存图，直接使用本地已有链接
+                dailyshop_img_src = VipShopBgDict[msg.author_id]['cache_img']
             elif is_vip and (msg.author_id in VipShopBgDict): #本地缓存路径不存在，或者缓存过期
                 play_currency = await fetch_valorant_point(userdict)#获取用户的vp和rp
                 vp = play_currency["Balances"]["85ad13f7-3d1b-5128-9eb2-7cd8ee0b5741"]  #vp
@@ -1493,15 +1493,16 @@ async def get_daily_shop(msg: Message, *arg):
             # 获取图片成功，打印画图耗时
             log_time += f"- [Drawing] {format(time.time() - draw_time,'.4f')} - [Au] {msg.author_id}"
             print(log_time)
-            # bg.save(f"test.png")  #保存到本地
-            imgByteArr = io.BytesIO()
-            bg.save(imgByteArr, format='PNG')
-            imgByte = imgByteArr.getvalue()
-            dailyshop_img_src = await bot_upimg.client.create_asset(imgByte)  # 上传图片
-            # 结束shop的总计时
-            end = time.perf_counter()
-            # 结果为浮点数，保留两位小数
-            shop_using_time = format(end - start, '.2f')
+            if img_ret['upload_flag']:
+                imgByteArr = io.BytesIO()
+                bg.save(imgByteArr, format='PNG')
+                imgByte = imgByteArr.getvalue()
+                dailyshop_img_src = await bot_upimg.client.create_asset(imgByte)  # 上传图片
+                if is_vip: #vip缓存图片
+                    VipShopBgDict[msg.author_id]['cache_img'] = dailyshop_img_src #设置图片url
+                    VipShopBgDict[msg.author_id]['cache_time'] = time.time() #设置图片缓存的时间
+            # 结束shop的总计时，结果为浮点数，保留两位小数
+            shop_using_time = format(time.perf_counter() - start, '.2f')
             
             # 商店的图片
             cm = CardMessage()
@@ -2196,7 +2197,7 @@ async def auto_skin_notify():
                         if img_ret['status']:
                             bg_shop = img_ret['value']
                             bg_shop.save(img_shop_path, format='PNG')
-                            VipShopBgDict['cache_time'] = time.time() #设置图片缓存的时间
+                            VipShopBgDict[vip]['cache_time'] = time.time() #设置图片缓存的时间
                         else:  #如果图片没有正常返回，那就发送文字版本
                             shop_text = ""
                             for skinuuid in list_shop:
@@ -2210,6 +2211,7 @@ async def auto_skin_notify():
                         log_time += f"- [Drawing] {format(time.time() - draw_time,'.4f')}  - [Au] {vip}"
                         print(log_time)
                         dailyshop_img_src = await bot_upimg.client.create_asset(img_shop_path)  # 上传图片
+                        VipShopBgDict[vip]['cache_img'] = dailyshop_img_src # 缓存图片url
                         # 结束shop的总计时 结果为浮点数，保留两位小数
                         using_time = format(time.perf_counter() - start, '.2f')
                         #卡片消息发送图片或者text

From f8fe73080efa405ff859824e5f316c9d4fee27da Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Thu, 12 Jan 2023 23:35:02 +0800
Subject: [PATCH 02/18] fix(EzAuth): fix keyerr of 'start_time' in 2faWait

---
 code/endpoints/EzAuth.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/code/endpoints/EzAuth.py b/code/endpoints/EzAuth.py
index 3ef79a5..5101499 100644
--- a/code/endpoints/EzAuth.py
+++ b/code/endpoints/EzAuth.py
@@ -68,13 +68,13 @@ def authorize(self,username, password,key):
             tokens = [token,token_id]
 
         elif "auth_failure" in r.text:
-            print(F"[EzAuth] k:{key} auth_failure, NOT EXIST")
-            User2faCode[key]= {'status':False,'err':"auth_failure, NOT EXIST"}
+            print(F"[EzAuth] k:{key} auth_failure, USER NOT EXIST")
+            User2faCode[key]= {'status':False,'err':"auth_failure, NOT EXIST",'start_time':time.time()}
             raise Exception("auth_failure")
 
         elif 'rate_limited' in r.text:
             print(F"[EzAuth] k:{key} auth rate limited")
-            User2faCode[key]= {'status':False,'err':"auth rate_limited"}
+            User2faCode[key]= {'status':False,'err':"auth rate_limited",'start_time':time.time()}
             raise Exception("auth rate_limited")
         
         else:# 到此处一般是需要邮箱验证的用户
@@ -248,16 +248,17 @@ async def auth2faWait(key,msg=None):
             
             # 开始循环检测status状态
             while(not User2faCode[key]['status']):
-                # 这里 -3s 是为了让该线程更晚获取到信息，要在auth线程break之后才删除键值
-                if (time.time()-User2faCode[key]['start_time']-3)>TFA_TIME_LIMIT: 
-                    del User2faCode[key]
-                    break # 超过10分钟，以无效处理
                 # 不为none，出现错误
                 if User2faCode[key]['err'] != None:
                     if 'rate_limited' in User2faCode[key]['err']:
                         raise auth_exceptions.RiotRatelimitError
                     else:
                         raise Exception(User2faCode[key]['err'])
+                # 这里 -3s 是为了让该线程更晚获取到信息，要在auth线程break之后才删除键值
+                if (time.time()-User2faCode[key]['start_time']-3)>TFA_TIME_LIMIT: 
+                    del User2faCode[key]
+                    break # 超过10分钟，以无效处理
+
                 # 睡一会再检测
                 await asyncio.sleep(0.3)
 

From 4e72af2b2b9e7f0e7d3e6f8641af5fdd5992fccb Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Thu, 12 Jan 2023 23:35:51 +0800
Subject: [PATCH 03/18] fiox(api): fix wrong file save path in apitoken,add
 traceback in apihandler

---
 code/endpoints/ApiHandler.py | 4 ++--
 code/endpoints/ApiToken.py   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/endpoints/ApiHandler.py b/code/endpoints/ApiHandler.py
index eba3e80..30122a9 100644
--- a/code/endpoints/ApiHandler.py
+++ b/code/endpoints/ApiHandler.py
@@ -1,7 +1,7 @@
 import json
 import time
 import threading
-import aiofiles
+import traceback
 from endpoints.EzAuth import auth_exceptions,auth2fa,auth2faWait,Get2faWait_Key,User2faCode
 from endpoints.ApiToken import token_ck,ApiTokenDict,save_token_files
 from endpoints.Gtime import GetTime
@@ -78,7 +78,7 @@ async def base_img_request(request):
         print(f"ERR! [{GetTime()}] login - riot_auth.riot_auth.auth_exceptions.RiotRatelimitError")
         return {'code': 200, 'message': "riot_auth.auth_exceptions.RiotRatelimitError",'info':'riot登录api超速，请稍后重试'}
     except Exception as result:
-        print(f"ERR! [{GetTime()}] login - {result}")
+        print(f"ERR! [{GetTime()}] login\n{traceback.format_exc()}")
         return {'code': 200, 'message': f"{result}",'info':'riot登录错误，详见message'}
     
     print(f'[{GetTime()}] [Api] k:{key} - user auth success')
diff --git a/code/endpoints/ApiToken.py b/code/endpoints/ApiToken.py
index f3f101d..7cd82fe 100644
--- a/code/endpoints/ApiToken.py
+++ b/code/endpoints/ApiToken.py
@@ -14,7 +14,7 @@ def get_uuid():
 
 def save_token_files(text=''):
     global ApiTokenDict
-    with open("./log/UserToken.json", 'w', encoding='utf-8') as fw2:
+    with open("./log/ApiToken.json", 'w', encoding='utf-8') as fw2:
         json.dump(ApiTokenDict, fw2, indent=2, sort_keys=True, ensure_ascii=False)
     print(f"[token] files saved! {text}")
 

From 6385cd53a98cf4781a9e81bcd11f1c255c271320 Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Thu, 12 Jan 2023 23:36:19 +0800
Subject: [PATCH 04/18] fix(main): fix keyerr of upload_flag

---
 code/main.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/main.py b/code/main.py
index eab49c1..ea949ed 100644
--- a/code/main.py
+++ b/code/main.py
@@ -1467,12 +1467,13 @@ async def get_daily_shop(msg: Message, *arg):
             # 开始画图
             draw_time = time.time()  #计算画图需要的时间
             is_vip = await vip_ck(msg.author_id) #判断用户是否为VIP
-            img_ret = {'status':True,'value':None,'upload_flag':True}
+            img_ret = {'status':True,'value':None}
+            upload_flag=True
             # 每天8点bot遍历完之后会把vip的商店结果图存起来
             shop_path = f"./log/img_temp_vip/shop/{msg.author_id}.png"
             # 如果是vip而且path存在,背景图/登录用户没有更改过,图片缓存时间正确
             if is_vip and (os.path.exists(shop_path)) and is_CacheLatest(msg.author_id):  
-                img_ret['upload_flag'] = False #有缓存图，直接使用本地已有链接
+                upload_flag=False #有缓存图，直接使用本地已有链接
                 dailyshop_img_src = VipShopBgDict[msg.author_id]['cache_img']
             elif is_vip and (msg.author_id in VipShopBgDict): #本地缓存路径不存在，或者缓存过期
                 play_currency = await fetch_valorant_point(userdict)#获取用户的vp和rp
@@ -1493,7 +1494,7 @@ async def get_daily_shop(msg: Message, *arg):
             # 获取图片成功，打印画图耗时
             log_time += f"- [Drawing] {format(time.time() - draw_time,'.4f')} - [Au] {msg.author_id}"
             print(log_time)
-            if img_ret['upload_flag']:
+            if upload_flag:
                 imgByteArr = io.BytesIO()
                 bg.save(imgByteArr, format='PNG')
                 imgByte = imgByteArr.getvalue()

From 6200788da1697c00fe3a5778bdecde4c0c7db8aa Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Thu, 12 Jan 2023 23:40:24 +0800
Subject: [PATCH 05/18] fix(main): nofity.task only create_asset when img ready

---
 code/main.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/main.py b/code/main.py
index ea949ed..bf7e3cd 100644
--- a/code/main.py
+++ b/code/main.py
@@ -2198,6 +2198,11 @@ async def auto_skin_notify():
                         if img_ret['status']:
                             bg_shop = img_ret['value']
                             bg_shop.save(img_shop_path, format='PNG')
+                            # 打印画图日志
+                            log_time += f"- [Drawing] {format(time.time() - draw_time,'.4f')}  - [Au] {vip}"
+                            print(log_time)
+                            dailyshop_img_src = await bot_upimg.client.create_asset(img_shop_path)  # 上传图片
+                            VipShopBgDict[vip]['cache_img'] = dailyshop_img_src # 缓存图片url
                             VipShopBgDict[vip]['cache_time'] = time.time() #设置图片缓存的时间
                         else:  #如果图片没有正常返回，那就发送文字版本
                             shop_text = ""
@@ -2208,11 +2213,7 @@ async def auto_skin_notify():
                                 shop_text += f"{res_item['data']['displayName']}     - VP {price}\n"
                             print(f"[BOT.TASK.NOTIFY] VAu:{vip} test img err, using text")
 
-                        # 打印日志
-                        log_time += f"- [Drawing] {format(time.time() - draw_time,'.4f')}  - [Au] {vip}"
-                        print(log_time)
-                        dailyshop_img_src = await bot_upimg.client.create_asset(img_shop_path)  # 上传图片
-                        VipShopBgDict[vip]['cache_img'] = dailyshop_img_src # 缓存图片url
+                        
                         # 结束shop的总计时 结果为浮点数，保留两位小数
                         using_time = format(time.perf_counter() - start, '.2f')
                         #卡片消息发送图片或者text

From e79ee13879696d7f08f7718f95264b2929545a86 Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Fri, 13 Jan 2023 15:56:36 +0800
Subject: [PATCH 06/18] fix(main): del err login_rate check in login

---
 code/main.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/code/main.py b/code/main.py
index bf7e3cd..8c48b56 100644
--- a/code/main.py
+++ b/code/main.py
@@ -1052,18 +1052,16 @@ async def login_authtoken(msg: Message, user: str = 'err', passwd: str = 'err',t
     elif Login_Forbidden:
         await Login_Forbidden_send(msg)
         return
-
-    global login_rate_limit, UserTokenDict, UserAuthDict
     try:
+        global login_rate_limit, UserTokenDict, UserAuthDict
         cm0 = CardMessage()
         c = Card(color='#fb4b57')  #卡片侧边栏颜色
 
-        if await check_global_login_rate(msg):# 全局请求超速
-            return
-        if await check_user_login_rate(msg):# 用户请求超速
-            print(f"Login  - Au:{msg.author_id} - raise user_login_rate_limit")
-            return
-
+        # if await check_global_login_rate(msg):# 全局请求超速
+        #     return
+        # if await check_user_login_rate(msg):# 用户请求超速
+        #     print(f"Login  - Au:{msg.author_id} - raise user_login_rate_limit")
+        #     return
         text = "正在尝试获取您的riot账户token"
         c.append(Module.Section(Element.Text(text, Types.Text.KMD), Element.Image(src=icon_cm.val_logo_gif, size='sm')))
         c.append(Module.Context(Element.Text("小憩一下，很快就好啦！", Types.Text.KMD)))

From c3a687897d547cdd0ea1b441500ff63491d73ab2 Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Fri, 13 Jan 2023 16:06:11 +0800
Subject: [PATCH 07/18] fix(main): add key 'cache' and 'bg' in VipShopBgDcit

---
 code/main.py | 94 +++++++++++++++++++++++++++-------------------------
 1 file changed, 49 insertions(+), 45 deletions(-)

diff --git a/code/main.py b/code/main.py
index 8c48b56..1902bd0 100644
--- a/code/main.py
+++ b/code/main.py
@@ -478,9 +478,9 @@ async def replace_illegal_img(user_id: str, num: int):
     """
     try:
         global VipShopBgDict
-        img_str = VipShopBgDict[user_id]["background"][num]
-        VipShopBgDict[user_id]["background"][num] = illegal_img_169
-        VipShopBgDict[user_id]["status"] = False  #需要重新加载图片
+        img_str = VipShopBgDict['bg'][user_id]["background"][num]
+        VipShopBgDict['bg'][user_id]["background"][num] = illegal_img_169
+        VipShopBgDict['bg'][user_id]["status"] = False  #需要重新加载图片
         with open("./log/VipUserShopBg.json", 'w', encoding='utf-8') as fw2:
             json.dump(VipShopBgDict, fw2, indent=2, sort_keys=True, ensure_ascii=False)
         print(f"[Replace_img] Au:{user_id} [{img_str}]")  #写入文件后打印log信息
@@ -501,7 +501,7 @@ async def check_vip_img():
         c.append(Module.Context(Element.Text("多次发送违禁图片会导致阿狸被封，请您慎重选择图片！", Types.Text.KMD)))
         #遍历vip用户的图片
         log_str_user = "[BOT.TASK] check_vip_img Au:"
-        for vip_user, vip_bg in VipShopBgDict.items():
+        for vip_user, vip_bg in VipShopBgDict['bg'].items():
             user = await bot.client.fetch_user(vip_user)
             sz = len(vip_bg["background"])
             i = 0
@@ -566,8 +566,8 @@ def len_VusBg(user_id: str):
        - len(VipShopBgDict[user_id]["background"])
        - return 0 if user not in dict 
     """
-    if user_id in VipShopBgDict:
-        return len(VipShopBgDict[user_id]["background"])
+    if user_id in VipShopBgDict['bg']:
+        return len(VipShopBgDict['bg'][user_id]["background"])
     else:
         return 0
 
@@ -575,7 +575,7 @@ def len_VusBg(user_id: str):
 #因为下面两个函数都要用，所以直接独立出来
 async def get_vip_shop_bg_cm(msg: Message):
     global VipShopBgDict
-    if msg.author_id not in VipShopBgDict:
+    if msg.author_id not in VipShopBgDict['bg']:
         return "您尚未自定义商店背景图！"
     elif len_VusBg(msg.author_id) == 0:
         return "您尚未自定义商店背景图！"
@@ -583,8 +583,8 @@ async def get_vip_shop_bg_cm(msg: Message):
     cm = CardMessage()
     c1 = Card(color='#e17f89')
     c1.append(Module.Header('您当前设置的商店背景图如下'))
-    c1.append(Module.Container(Element.Image(src=VipShopBgDict[msg.author_id]["background"][0])))
-    sz = len(VipShopBgDict[msg.author_id]["background"])
+    c1.append(Module.Container(Element.Image(src=VipShopBgDict['bg'][msg.author_id]["background"][0])))
+    sz = len(VipShopBgDict['bg'][msg.author_id]["background"])
     if sz > 1:
         c1.append(Module.Divider())
         c1.append(Module.Section(Element.Text('当前未启用的背景图，可用「/vip-shop-s 序号」切换', Types.Text.KMD)))
@@ -592,19 +592,19 @@ async def get_vip_shop_bg_cm(msg: Message):
         while (i < sz):
             try:
                 # 打开图片进行测试，没有问题就append
-                bg_test = Image.open(io.BytesIO(await img_requestor(VipShopBgDict[msg.author_id]["background"][i])))
+                bg_test = Image.open(io.BytesIO(await img_requestor(VipShopBgDict['bg'][msg.author_id]["background"][i])))
                 if i == 0:  #第一张图片只进行打开测试，没有报错就是没有违规，不进行后续的append操作
                     i += 1
                     continue
                 # 插入后续其他图片
                 c1.append(
                     Module.Section(Element.Text(f' [{i}]', Types.Text.KMD),
-                                   Element.Image(src=VipShopBgDict[msg.author_id]["background"][i])))
+                                   Element.Image(src=VipShopBgDict['bg'][msg.author_id]["background"][i])))
                 i += 1
             except UnidentifiedImageError as result:
                 err_str = f"ERR! [{GetTime()}] checking [{msg.author_id}] img\n```\n{result}\n"
                 #把被ban的图片替换成默认的图片，打印url便于日后排错
-                err_str += f"[UnidentifiedImageError] url={VipShopBgDict[msg.author_id]['background'][i]}\n```"
+                err_str += f"[UnidentifiedImageError] url={VipShopBgDict['bg'][msg.author_id]['background'][i]}\n```"
                 await replace_illegal_img(msg.author_id, i)  #替换图片
                 await bot.client.send(debug_ch, err_str)  # 发送消息到debug频道
                 print(err_str)
@@ -629,8 +629,8 @@ async def vip_shop_bg_set(msg: Message, icon: str = "err", *arg):
 
         x3 = "[None]"
         if icon != 'err':
-            user_ind = (msg.author_id in VipShopBgDict)  #判断当前用户在不在dict中
-            if user_ind and len(VipShopBgDict[msg.author_id]["background"]) >= 4:
+            user_ind = (msg.author_id in VipShopBgDict['bg'])  #判断当前用户在不在dict中
+            if user_ind and len(VipShopBgDict['bg'][msg.author_id]["background"]) >= 4:
                 text = f"当前仅支持保存4个自定义图片"
                 c.append(
                     Module.Section(Element.Text(text, Types.Text.KMD), Element.Image(src=icon_cm.that_it, size='sm')))
@@ -666,12 +666,12 @@ async def vip_shop_bg_set(msg: Message, icon: str = "err", *arg):
 
             #到插入的时候再创建list，避免出现图片没有通过检查，但是list又被创建了的情况
             if not user_ind:
-                VipShopBgDict[msg.author_id] = {}
-                VipShopBgDict[msg.author_id]["background"] = list()
+                VipShopBgDict['bg'][msg.author_id] = {}
+                VipShopBgDict['bg'][msg.author_id]["background"] = list()
                 #新建用户，但是有可能已经缓存了默认的背景图片，所以状态为false（重画）
-                VipShopBgDict[msg.author_id]["status"] = False
+                VipShopBgDict['bg'][msg.author_id]["status"] = False
             #插入图片
-            VipShopBgDict[msg.author_id]["background"].append(x3)
+            VipShopBgDict['bg'][msg.author_id]["background"].append(x3)
 
         cm = await get_vip_shop_bg_cm(msg)
         #先让测试bot把这个卡片发到频道，如果发出去了说明json没有问题
@@ -688,7 +688,7 @@ async def vip_shop_bg_set(msg: Message, icon: str = "err", *arg):
 
     except requester.HTTPRequester.APIRequestFailed as result:
         await APIRequestFailed_Handler("vip_shop",traceback.format_exc(),msg,bot,None,cm)
-        VipShopBgDict[msg.author_id]["background"].remove(x3)  #删掉里面的图片
+        VipShopBgDict['bg'][msg.author_id]["background"].remove(x3)  #删掉里面的图片
         print(f"[vip_shop] Au:{msg.author_id} remove(err_img)")
     except Exception as result:
         await BaseException_Handler("vip_shop",traceback.format_exc(),msg,bot,None,cm,"建议加入帮助频道找我康康到底是啥问题")
@@ -704,14 +704,14 @@ async def vip_shop_bg_set_s(msg: Message, num: str = "err", *arg):
         global VipShopBgDict
         if not await vip_ck(msg):
             return
-        if msg.author_id not in VipShopBgDict:
+        if msg.author_id not in VipShopBgDict['bg']:
             await msg.reply("您尚未自定义商店背景图！")
             return
 
         num = int(num)
-        if num < len(VipShopBgDict[msg.author_id]["background"]):
+        if num < len(VipShopBgDict['bg'][msg.author_id]["background"]):
             try:  #打开用户需要切换的图片
-                bg_vip = Image.open(io.BytesIO(await img_requestor(VipShopBgDict[msg.author_id]["background"][num])))
+                bg_vip = Image.open(io.BytesIO(await img_requestor(VipShopBgDict['bg'][msg.author_id]["background"][num])))
             except UnidentifiedImageError as result:
                 err_str = f"ERR! [{GetTime()}] vip_shop_s_imgck\n```\n{result}\n```"
                 await msg.reply(f"图片违规！请重新上传\n{err_str}")
@@ -719,10 +719,10 @@ async def vip_shop_bg_set_s(msg: Message, num: str = "err", *arg):
                 print(err_str)
                 return
             # 图片检查通过，交换两个图片的位置
-            icon_num = VipShopBgDict[msg.author_id]["background"][num]
-            VipShopBgDict[msg.author_id]["background"][num] = VipShopBgDict[msg.author_id]["background"][0]
-            VipShopBgDict[msg.author_id]["background"][0] = icon_num
-            VipShopBgDict[msg.author_id]['status'] = False  #修改图片之后，因为8点bot存储了商店图，所以需要重新获取新的背景
+            icon_num = VipShopBgDict['bg'][msg.author_id]["background"][num]
+            VipShopBgDict['bg'][msg.author_id]["background"][num] = VipShopBgDict['bg'][msg.author_id]["background"][0]
+            VipShopBgDict['bg'][msg.author_id]["background"][0] = icon_num
+            VipShopBgDict['bg'][msg.author_id]['status'] = False  #修改图片之后，因为8点bot存储了商店图，所以需要重新获取新的背景
 
             # #进行缩放+贴上图后保存
             # bg_vip = resize_vip(1280,720,bg_vip)
@@ -744,7 +744,7 @@ async def vip_shop_bg_set_s(msg: Message, num: str = "err", *arg):
         # 修改/新增都需要写入文件
         with open("./log/VipUserShopBg.json", 'w', encoding='utf-8') as fw2:
             json.dump(VipShopBgDict, fw2, indent=2, sort_keys=True, ensure_ascii=False)
-        print(f"[vip-shop-s] Au:{msg.author_id} switch to [{VipShopBgDict[msg.author_id]['background'][0]}]")
+        print(f"[vip-shop-s] Au:{msg.author_id} switch to [{VipShopBgDict['bg'][msg.author_id]['background'][0]}]")
     except requester.HTTPRequester.APIRequestFailed as result:
         await APIRequestFailed_Handler("vip_shop_s",traceback.format_exc(),msg,bot,None,cm)
     except Exception as result:
@@ -760,15 +760,15 @@ async def vip_shop_bg_set_d(msg: Message, num: str = "err", *arg):
     try:
         if not await vip_ck(msg):
             return
-        if msg.author_id not in VipShopBgDict:
+        if msg.author_id not in VipShopBgDict['bg']:
             await msg.reply("您尚未自定义商店背景图！")
             return
 
         num = int(num)
-        if num < len(VipShopBgDict[msg.author_id]["background"]) and num > 0:
+        if num < len(VipShopBgDict['bg'][msg.author_id]["background"]) and num > 0:
             # 删除图片
-            del_img_url = VipShopBgDict[msg.author_id]["background"][num]
-            del VipShopBgDict[msg.author_id]["background"][num]
+            del_img_url = VipShopBgDict['bg'][msg.author_id]["background"][num]
+            del VipShopBgDict['bg'][msg.author_id]["background"][num]
         elif num == 0:
             await msg.reply("不支持删除当前正在使用的背景图！")
             return
@@ -1110,8 +1110,8 @@ async def login_authtoken(msg: Message, user: str = 'err', passwd: str = 'err',t
         # 如果是vip用户，则执行下面的代码
         if await vip_ck(msg.author_id):
             global VipShopBgDict #因为换了用户，所以需要修改状态码重新获取商店
-            if msg.author_id in VipShopBgDict:
-                VipShopBgDict[msg.author_id]['status']=False
+            if msg.author_id in VipShopBgDict['bg']:
+                VipShopBgDict['bg'][msg.author_id]['status']=False
                 #为了保险起见，保存一下状态信息到文件
                 with open("./log/VipUserShopBg.json", 'w', encoding='utf-8') as fw1:
                     json.dump(VipShopBgDict, fw1, indent=2, sort_keys=True, ensure_ascii=False)
@@ -1397,12 +1397,16 @@ def isSame_Authuuid(msg: Message):
 # 判断缓存好的图片是否可用
 def is_CacheLatest(kook_user_id:str):
     # 判断vip用户是否在背景图中，且没有 切换登录用户/切换背景图
-    if kook_user_id in VipShopBgDict:
-        is_Status = VipShopBgDict[kook_user_id]['status'] # 如果有切换登录用户/背景图，此为false
+    is_Status = False
+    if kook_user_id in VipShopBgDict['bg']:
+        is_Status = VipShopBgDict['bg'][kook_user_id]['status'] # 如果有切换登录用户/背景图，此为false
         # 判断图片是不是今天的（可能出现早八提醒的时候出错，导致缓存没有更新，是昨天的图）
-        is_Today = (VipShopBgDict[kook_user_id]['cache_time']-GetTimeStampOf8AM())>=0 
-        is_Key = ('cache_img' in VipShopBgDict[kook_user_id]) # 键值是否存在
+    if kook_user_id in VipShopBgDict['cache']:
+        is_Today = (VipShopBgDict['cache'][kook_user_id]['cache_time']-GetTimeStampOf8AM())>=0 
+        is_Key = ('cache_img' in VipShopBgDict['cache'][kook_user_id]) # 键值是否存在
         return is_Today and is_Status and is_Key# 有一个为false，结果就是false
+    else:
+        VipShopBgDict['cache'][kook_user_id] = {'cache_time':0}
     return False 
 
 # 获取每日商店的命令
@@ -1472,12 +1476,12 @@ async def get_daily_shop(msg: Message, *arg):
             # 如果是vip而且path存在,背景图/登录用户没有更改过,图片缓存时间正确
             if is_vip and (os.path.exists(shop_path)) and is_CacheLatest(msg.author_id):  
                 upload_flag=False #有缓存图，直接使用本地已有链接
-                dailyshop_img_src = VipShopBgDict[msg.author_id]['cache_img']
-            elif is_vip and (msg.author_id in VipShopBgDict): #本地缓存路径不存在，或者缓存过期
+                dailyshop_img_src = VipShopBgDict['cache'][msg.author_id]['cache_img']
+            elif is_vip and (msg.author_id in VipShopBgDict['bg']): #本地缓存路径不存在，或者缓存过期
                 play_currency = await fetch_valorant_point(userdict)#获取用户的vp和rp
                 vp = play_currency["Balances"]["85ad13f7-3d1b-5128-9eb2-7cd8ee0b5741"]  #vp
                 rp = play_currency["Balances"]["e59aa87c-4cbf-517a-5983-6e81511be9b7"]  #R点
-                background_img = ('err' if msg.author_id not in VipShopBgDict else VipShopBgDict[msg.author_id]["background"][0])
+                background_img = ('err' if msg.author_id not in VipShopBgDict['bg'] else VipShopBgDict['bg'][msg.author_id]["background"][0])
                 img_ret = await get_shop_img_169(list_shop,vp=vp,rp=rp,bg_img_src=background_img)
             else:# 普通用户/没有自定义图片的vip用户
                 img_ret = await get_shop_img_11(list_shop)
@@ -1498,8 +1502,8 @@ async def get_daily_shop(msg: Message, *arg):
                 imgByte = imgByteArr.getvalue()
                 dailyshop_img_src = await bot_upimg.client.create_asset(imgByte)  # 上传图片
                 if is_vip: #vip缓存图片
-                    VipShopBgDict[msg.author_id]['cache_img'] = dailyshop_img_src #设置图片url
-                    VipShopBgDict[msg.author_id]['cache_time'] = time.time() #设置图片缓存的时间
+                    VipShopBgDict['cache'][msg.author_id]['cache_img'] = dailyshop_img_src #设置图片url
+                    VipShopBgDict['cache'][msg.author_id]['cache_time'] = time.time() #设置图片缓存的时间
             # 结束shop的总计时，结果为浮点数，保留两位小数
             shop_using_time = format(time.perf_counter() - start, '.2f')
             
@@ -2191,7 +2195,7 @@ async def auto_skin_notify():
                         vp = play_currency["Balances"]["85ad13f7-3d1b-5128-9eb2-7cd8ee0b5741"]  #vp
                         rp = play_currency["Balances"]["e59aa87c-4cbf-517a-5983-6e81511be9b7"]  #R点
                         # 设置用户背景图，如果在则用，否则返回err
-                        background_img = ('err' if vip not in VipShopBgDict else VipShopBgDict[vip]["background"][0])
+                        background_img = ('err' if vip not in VipShopBgDict['bg'] else VipShopBgDict['bg'][vip]["background"][0])
                         img_ret = await get_shop_img_169(list_shop,vp=vp,rp=rp,bg_img_src=background_img)
                         if img_ret['status']:
                             bg_shop = img_ret['value']
@@ -2200,8 +2204,8 @@ async def auto_skin_notify():
                             log_time += f"- [Drawing] {format(time.time() - draw_time,'.4f')}  - [Au] {vip}"
                             print(log_time)
                             dailyshop_img_src = await bot_upimg.client.create_asset(img_shop_path)  # 上传图片
-                            VipShopBgDict[vip]['cache_img'] = dailyshop_img_src # 缓存图片url
-                            VipShopBgDict[vip]['cache_time'] = time.time() #设置图片缓存的时间
+                            VipShopBgDict['cache'][vip]['cache_img'] = dailyshop_img_src # 缓存图片url
+                            VipShopBgDict['cache'][vip]['cache_time'] = time.time() #设置图片缓存的时间
                         else:  #如果图片没有正常返回，那就发送文字版本
                             shop_text = ""
                             for skinuuid in list_shop:

From 8eb1313c528bcafabef657f00c1f6bf4101b7cd2 Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Sun, 15 Jan 2023 11:37:06 +0800
Subject: [PATCH 08/18] fix(shopimg):fix bad transparency mask in sm_comp_169

---
 code/endpoints/ShopImg.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/endpoints/ShopImg.py b/code/endpoints/ShopImg.py
index ccd292e..22c903f 100644
--- a/code/endpoints/ShopImg.py
+++ b/code/endpoints/ShopImg.py
@@ -153,6 +153,7 @@ def sm_comp_169(skin_img_url, skin_name, price, skin_level_icon, skinuuid):
     
     # 缩放皮肤等级图标
     level_icon = level_icon.resize((25, 25), Image.Resampling.LANCZOS)
+    level_icon = level_icon.convert('RGBA')
     bg.paste(level_icon, (368, 11), level_icon) # 在指定位置粘贴皮肤等级图标
     text = zhconv.convert(skin_name, 'zh-cn')  # 将名字简体化
     draw = ImageDraw.Draw(bg)  # 让bg这个图层能被写字

From e5f6babc257170f947726d82871b0b942fbcb258 Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Sun, 15 Jan 2023 11:56:36 +0800
Subject: [PATCH 09/18] fix(main): add status update in shop/notify task for
 vip user

---
 code/main.py       |  21 +++++++++++++--------
 screenshot/log.png | Bin 7514 -> 7459 bytes
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/code/main.py b/code/main.py
index 1902bd0..22caca8 100644
--- a/code/main.py
+++ b/code/main.py
@@ -413,7 +413,8 @@ async def buy_vip_uuid(msg: Message, uuid: str = 'err', *arg):
     try:
         #把bot传过去是为了让阿狸在有人成兑换激活码之后发送消息到log频道
         ret = await using_vip_uuid(msg, uuid, bot,debug_ch)
-
+        global VipShopBgDict #在用户兑换vip的时候就创建此键值
+        VipShopBgDict['cache'][msg.author_id] = {'cache_time':0,'cache_img':None}
     except Exception as result:
         await BaseException_Handler("vip-u",traceback.format_exc(),msg,bot,None,None,"建议加入帮助频道找我康康到底是啥问题")
         err_str = f"ERR! [{GetTime()}] vip-u\n```\n{traceback.format_exc()}\n```"
@@ -1403,10 +1404,10 @@ def is_CacheLatest(kook_user_id:str):
         # 判断图片是不是今天的（可能出现早八提醒的时候出错，导致缓存没有更新，是昨天的图）
     if kook_user_id in VipShopBgDict['cache']:
         is_Today = (VipShopBgDict['cache'][kook_user_id]['cache_time']-GetTimeStampOf8AM())>=0 
-        is_Key = ('cache_img' in VipShopBgDict['cache'][kook_user_id]) # 键值是否存在
-        return is_Today and is_Status and is_Key# 有一个为false，结果就是false
-    else:
-        VipShopBgDict['cache'][kook_user_id] = {'cache_time':0}
+        is_Cache = VipShopBgDict['cache'][kook_user_id]['cache_img'] != None
+        return is_Today and is_Status and is_Cache# 有一个为false，结果就是false
+    else:# 如果不在，初始化为none
+        VipShopBgDict['cache'][kook_user_id] = {'cache_time':0,'cache_img':None}
     return False 
 
 # 获取每日商店的命令
@@ -1450,7 +1451,8 @@ async def get_daily_shop(msg: Message, *arg):
             }
             log_time = ""
             a_time = time.time()
-            global UserShopDict # UserShopDict每天早八会被清空，如果用户在里面且玩家id一样，那么说明已经获取过当日商店了
+            global UserShopDict,VipShopBgDict 
+            # UserShopDict每天早八会被清空，如果用户在里面且玩家id一样，那么说明已经获取过当日商店了
             if msg.author_id in UserShopDict and isSame_Authuuid(msg): #直接使用本地已有的当日商店
                 list_shop = UserShopDict[msg.author_id]["SkinsPanelLayout"]["SingleItemOffers"] # 商店刷出来的4把枪
                 timeout = shop_time_remain() # 通过当前时间计算商店剩余时间
@@ -1501,7 +1503,8 @@ async def get_daily_shop(msg: Message, *arg):
                 bg.save(imgByteArr, format='PNG')
                 imgByte = imgByteArr.getvalue()
                 dailyshop_img_src = await bot_upimg.client.create_asset(imgByte)  # 上传图片
-                if is_vip: #vip缓存图片
+                if is_vip: #vip缓存图片+设置状态
+                    if msg.author_id in VipShopBgDict['bg']: VipShopBgDict['bg'][msg.author_id]['status'] = True
                     VipShopBgDict['cache'][msg.author_id]['cache_img'] = dailyshop_img_src #设置图片url
                     VipShopBgDict['cache'][msg.author_id]['cache_time'] = time.time() #设置图片缓存的时间
             # 结束shop的总计时，结果为浮点数，保留两位小数
@@ -2138,7 +2141,7 @@ async def check_notify_err_user(msg:Message):
 
 #独立函数，为了封装成命令+定时
 async def auto_skin_notify():
-    global SkinNotifyDict, SkinRateDict, UserShopDict
+    global SkinNotifyDict, SkinRateDict, UserShopDict,VipShopBgDict
     try:
         print(f"[BOT.TASK.NOTIFY] Start at {GetTime()}")  #开始的时候打印一下
         UserShopDict = {}#清空用户的商店
@@ -2204,8 +2207,10 @@ async def auto_skin_notify():
                             log_time += f"- [Drawing] {format(time.time() - draw_time,'.4f')}  - [Au] {vip}"
                             print(log_time)
                             dailyshop_img_src = await bot_upimg.client.create_asset(img_shop_path)  # 上传图片
+                            VipShopBgDict['cache'][vip] = {}
                             VipShopBgDict['cache'][vip]['cache_img'] = dailyshop_img_src # 缓存图片url
                             VipShopBgDict['cache'][vip]['cache_time'] = time.time() #设置图片缓存的时间
+                            if vip in VipShopBgDict['bg']: VipShopBgDict['bg'][vip]['status'] = True
                         else:  #如果图片没有正常返回，那就发送文字版本
                             shop_text = ""
                             for skinuuid in list_shop:
diff --git a/screenshot/log.png b/screenshot/log.png
index f9aa67b35456ddda0fcc8f6ba4c12fc98f07596c..6bf07fe178fa278e5c32fdfc4491ea224fd9c5bf 100644
GIT binary patch
literal 7459
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

literal 7514
zcmc(kS5#APo5h15L=Z>>DN>CJC|!^u9RmDOiYOpR54|JOk<b)E7Zs2WK|ur3i%OLu
zy_e9dktUtc%e;Kw%$hY<Gk0^tI)re}+n)XG-#+1wG*zi7uTerE5Nfr5kdGk{k{xjU
z2ucoquJeWcf<V}=t05J1yi-@x{9Sd14q7r^F>M9&n_)yEn#o2*v*a&cpm*;#f%Ue(
z5&mRcPp-rCDzfQ%*+7Ehmrw>?fq}!vEky}$?XH)8)XQ&<-%B*0d}hWF@qVyt1jS2r
zE6QEzwR~-z+<sceXw}}@R8?C^iI1#^RC~=r>e0mHg7oxus$aJTIRw@ybh%MT{9e)*
zu|RXCQ1cH3jltdLAK5{u?w|kdBMILk`1SHT@}f);aG`#!{(t{Mx=L9^#bY(KOI@jw
zB11Vh<2lauTi(aTDID#sYn9(tk6652+b!g2rl3VPHa>25dVDb0->(=(%MoK}Le`Y6
z8aoA9`4Ov;BBt%{F9V04teBoXSS}wfG}Q_rr^eb1<Y*fj8a^&;)^8~&q%&qA6ELZk
zXiE@Qw>JlOOioU=UFc3jB1K(i>c0^Z1x+>i`T5(#@(k@<TylT>xW77Wy5GR~)-A2O
zTQgb2hNde`D)IE7C!jy$?AXTM$w{NVoatzUNIW^(a|o$V@BY)3^5xsN4^uu1X*wwl
zH%S<FL^Eq@($WJ?eO9NZkN=2UBuv)@$lbelFRpPmbG9*T{Ks&Th|TAZA8*bstrZNq
z*xN@iy_)b_uSr-*mkUV0!^`_6KR;@%_Q-j8AeWY!Nhq*(E55K-3%&IYQvz-?I5P4N
z5;-(9v=bX}9HJ7-&NjpaNtW^wh>wr&YvBlRJVKuj&;x-@H1Q3`VD8+x^Va$)-*CRc
z_IGd5BL5>#Tz>w?Qk$Oslf7w<%Ic}Q@$vC56%`2)5fMC6QYqw@ndB{gMP-#c;QNR2
zp1Rbt2|Xuy@dO4XlSgj&)@UzCv(sXr0*O>KVU0ymQ3Fe4a0Ol6anH{<N`xX0eTi`;
zFR^h}h?Rzdl_tzH!&ATZr6i_xqttow{@01+p}g{W4-XGW;CxH0MMna^w$t#?ke$`M
z|3Z|Ej_$qV=+(m?)9ZM2wmjz>z84zsli^iQ7WTS0^!EOIYzSs!#3I(<PT`)*!SrEI
z@I|V(jxrV(8Fo@289j_5Jhvk*C~Jd(&bUgzXu>qcuLQlq%xoW^Oz^9oDV}D$Ka2B-
zR@Ekj4Ej2{uUqDejrMky23mW1@CC+?9tA$1|7E`WchuI=aj?C-tSr-OeTow?h{uyc
zG}EQSgM%-qCyU<3c2Tp4ao)J0<gi^IL|U;HCd@q?I1p1vil=xJfxX#b6#a<Da(R8L
zrfH?84K-Em!-;U5u9a~%xN%m1!}Zs8#PdEy^<kC2o$QV)AY0qo6jW7PsJ~HhG4L&l
zlOXCP)4D&uKuCO>boQ1`|7K9x>Y7icl-MzJOJU94pIKR39tkB6ag|`LSgt$X>fl5~
zUAsrg;lC4S_x;P0TotluE!hJyWo2bfg!IYIz_af+RAV^B#l`2)sPYbd)$Y$kQq8Jb
z0c#IT>o7z}JNRejErr;jjCXBst}FG{1q2v<ce@C2-TiCua_OO|qLq~uQc~m$z5FFt
z$Y<*}rX*3oxM8H&qA%~Mpi%A1gV0GTi_27p)SRp|UUs;#h3zErn|%eaA7(;KrTo{U
z1QI(EsNISpyrS0%1g)<c2{3}CcN%xFx0gqb)c94}C9RHEhG2wHO;B(*=AUM;y@?mG
z)-PVX5P^UaVp9sEQFe9~0EJzcR_DEm<xlBnHt=4(LK8N-={>V|l-)f_^bpQ__qoUO
zs&MAekwgAzDj(RYO9({|k8)2(aJo1V^jELiwV)36!0NcpHHCk!;JtH4$g2H4iyMc!
zqkgXo1Of9PjFvLfgpq3I4m|#a&<Yx-c11|sy6<84skUb!1k0nH6bbE=&FJy;q=7^-
z@Lzz>?r+ZLSh1t`&0%oQzav3jQ$7@xlb$R&8Y!VtYu`wbuLg3pNFmmpAA-;)hqIu}
zTBgrVy<l)qT4o*T?keby?=YDy4KamBCun}U3MmNvhlA{^zeyacRSm_1pPKkwM81k<
z5w~wK@m;zFgIjkce_|_LnGQJUFnyDh6dpoB%Qb}lb&YRPO@%@G<g=0G-EeE#t>6@W
z=7&7={lSI^tmCbJ@^F;8y0b*zY=%SqFM_q)VU6(kwD60MohzlXW~x0_^eincGfPUY
zWccqUnJ4`Wp}4`zO9f<QaVU=w?3IAgx4@{V%a_@unIIdx<1RPk<T(8H)-FOE$1A9j
zufo`UTPrk{{sGU+`F2$~oT)m(0EcWI!WELnCHY{3uXS)l7kt_~SYvIfGAh9M!SH1w
zz573D(Se<v>c<OmXMHh4!^6RtB446CWcQ>hJDW6HCAy*7XZy-`ey&SJncQ&6qD2u(
z`0<YteN_`9i;8D@Myi(L;g*_PX7xN0?LRwgH&ErZ2AK@8m*|y+U#=D6>?dY+=OP7z
zF+wl*U0-heq|jafhwaU~cOiY*surNgA%QY}yMdS@%eE_!`WHPiVg5(Eb{=9bQ<o79
z4X>#zOscqnZj?{A*+##DwIZK-7;btT+%M@Fy*lW93N`AeCpffX1;_0x1Hha<2h~aQ
ze&Wb)J-MzY=Y71{B8+OnU@X82aw7gte5VWaKQpOtWPb4A!NyW<#@G*4E*~(fOFjxQ
zeLI<P-^fE0K!sx<H_1kMO5s!!o%f5qhk2|?koD#7iWf;SvJ%(AzdJt3Kb&>dKVqj>
zRuE!}Y7cFgb)8V}SoXgsCWheVrttCc@m?**&rKcSbo1nq-s?4cmwW0Cm-9Fg`TE5O
zXTznK4dt3|ByktG&rVfJB^BQg6|eQ+gIaBd8`l3qaaRKdr(<zAxYZ6R%gKzSUI2qw
zNATL-QMn&%VBfiNd_!A4AN|O{Ae@5ZrO=$dvhqa?6m(CKV_DQeC4NQO(^HIw?Y^ac
zq8c?gjEXe!hxw1wLldPkpj-&~R)k|2_fs;V?9BPSqkF=82QPE*?<v@~RLMl(oY9VN
znkQymIq50wo@66>n{k3`Pc0R(sjR=1VUbr`l>^JS98Y?)l*ZbLI2`T+?@2BwE<=}^
zA$O_ncUrQS5DhFY)$qL^OHqH7e1nFy8mV5nwASVQ%|7%*9o%=FWK7evX_D8gwdOOW
z$Un%Ib`?%udaQdj0&Baw=s%h-*Fj2R&`aP?o_iirq_DnTeE4(l%agd2l*sjfv!ngV
zb#$2N*&&{Xj}NJ$Law8$tfr=>!zOYj>-m>yYkPaMfl3g022+0kEX4&kJsbyr2Z;g=
zmm6Clo&^q#&JiZe*of8K4vx`R=L(KWWn)^s%Gg8wnt$%BSzU>TKB83-DMpH{6}qA4
z|J((2Uz?p3!^xBQ@b@hV>$384b0Abezz-L*L#+yoz6S#lNlK?EutCcBbR<{HDrHcw
zoFMnp_)HW>cF;U$Q^hZh*B_$p80~V;rdZbs&_YlL*`t~IoH^Bmb>s+3p4<xl8<d1G
z#6URjI==E~QSq;W_~Asr*~vbzPS<o>TI+h!q{8Or=2&V8F~#ImzE@yRP=_(=+Xq56
z-KkJ*+OWoCXvBT&i^wG}$s>4VWYYyv|BY?m8aRob<+5ysAS%|SI=&%DUY_dO+<oUt
zL#hw#v8q(AZaE0K0MR@_3ZI%9Y--Wa{HARSkwj=p_D~;_7`U@GIlghcHd&>B^xp0g
z*BJk{-7TeUWRzM&y(G^G6T0di_k}V8rg*DF-(c~zYg=Srpo70kx+4DQ$5f(`Kq8me
z7M1;kbLAIk`w1dJF5*aNSsbfHl|k>XH}MX?a&NT<tI-#_pANn%27PN0f&Nub$*q}M
z|Lytw8?eu(Cr1`d7&utxje61?kDb%W(a~_wB~UZ<LB`8|>RZ5nUfG&sojHWcz@W%#
z?FVGHHl?*Qx*&amw%WQ^XI)1&x^xu(Ap`}*&5X7AHWQWo5Sfc-{Ioj1E25V>#3C=7
zW+;UJe4}lBYmCv!Aj$b`qmj0+w>Q(N>pJ3nd^~f)*RNld4GfqIOls`CPv@E=!B{q%
z=n`rh-Bos#4#er|;`UEo$%kLva7z#<vCU2_-G3?j#59qEUouT|wT~8dd$9N=a_Ti4
zNUe2b)2>8Z(#pC*0FBUk&(^8Gc~y0S{8a5FqZJo~=ExES#P#&p2L?wI^Guo3#kX9F
zi$sBdyyMaUZT?n{Rz?gCcjtX#;(U@#da=9He`?iDff8~bOMb14wqS>{NB_{k4&mSV
zVi2&l0WXzEmzS~`UvEoELfVKsL28}QMW;c0BI&2<8a2x)l!^kUpk9A~DGCO6aJ_5Z
zK=zwJP`=b)>^1qiF^raFm|4tGzw`AA3K~`jJS!{f`feg#>5Yhka2}#WVpP@Y=e=iS
zlt>y#G?~V(he27i-ls^$p{8d`&O;o;D!tAr#au>re=&#QjOOQ?zJ~tO_pW(kD!%TJ
zGH+s&DyMuqHmc(S5)%_uiPtxmfc<_j72ktw2u?@-9x6Ii7D8a$7fQ{8pqNP_iWbfn
z#UR}#xGt0uI)G;k64qnO!vsCaCwTyT2)oa3I6XamW>FC=0-KqY^>b&{8C}OgAP{U_
zT*RGT4B>Pa$14Rvuk5{bG;qnM_tqKv)^MA?-w!$khM&mk1+x|oV(BB5y&DYEOCsCe
zt%`-yErKwALtWj*Ng+LoWfZ67&L8pmkvehb2~2<g<KKV&Af%*NfNg8aHz@6$n24&V
z5bM}$yGhHib8{g6HDBjKBD09K{^1QqnM?lUT_dWNr;{ftYBB-G^Bi$WNp?R%LQanU
z+$4oy)F>T>^Rvdrp1Db|o&!__wl{`N>ai0;qq`I+>%P-p75gbf*^Jm6^`y5CN}1?@
zl~HiO7kmQF<FSg03a-oiM|h_W%bSAgqqQm>L&Jy8l__FQV@M=Y%4_YTh)ws$k-MQw
zXnT8m490f4*8d~!4jj%Vhn9}#5*Gd-@f-nQrT9ZGGw2NGM3lg1a6X3qPY><(H)emk
zN?<TNa&mIb!@}x&TZb!!Po6xX`)c(4EhQDz7c4dygQ?wb7R)(+gn{L!u|RiA;OEZg
zu`>Mi1_C=gtY>d$cRhEYEx7w5TaVnCG$@K>VGD9F1S!ub4CcYZhfnMn8h0f0d*9U;
zTeP$;x%UI#_T_ve0QzXcLeRiY<&24jF6lLy>0UMw2U8;wiN8Io?2h+0Z&$>a`vOm{
zmgzEG>pt#O*|$<yr^zDbm>DZ~`eFF1q3Y|`ufK>zoBxQH^*@Bc`@-qCTNk#^k@O4h
z!NWuWjbf|I1KU7EE&w0<32Xxb@mM!r%z2^})&21n_~+m5_w4{5fQ4vXA=*D#zuY*X
z?>&C)-&kGUo^}r0{SXHCP;j9}s^7~DF1V=86l~5xTr}|F|Hl`SdZ>YD={$a{2)19n
z{PyJ+jpk=IKPaj0Z+}1E<3BwaS^%fr!3OK3&?ORA@B^6&A+}>>c7wyi3HC3TE?tjO
zjb+y;zn$=X^mv+P;;A#M!FjlV!Tb*}XYrhjWE6a?tqqT6m3&*fTVB{#Sxe*xY%Ib*
zJvyouE3?Z4EYOv{a`}m|u?K*~>$JH<o}Z&8Ah(ZWmkmF*pS`=Z7f%lfJqVa^7Ejf*
zX&@?P!2p#WqwBu<&bl%I$B!gK1dp$3j*#=ZdwQa}Qzd!$`J2y4;b^te0ndeqVv}NU
zsUaqqPc}y~IuLMqd2nD4{q%ph-#+K_3AYY@9v&WfA0NqU*RHt|+T%Y?(Y|1-o2Eqs
zH_jFri%*`MX$2h8)gDc*qehC%TRS?G^z;})saZnzrUOiQ2Zo13mj-gP%gX3Ma-oPu
z%TiKO3b`*nI`?jCKFp=HD8hYp6o^(Jf%2Ta1T!q|4hEX_s8vrUwuKZC+(7`33B<2x
zfC&r&iVpg<LYz~TJJf!a8QJ4iyUk|w!(A<}5;*KtBV%JW$P76DBPCW3ktzRXXJ5Ha
zk5o-=3>1eO!zHerazM!dUf3;W0DQr>^PARA494QW8Zz!xbLyEEyRmTz>-YL`g6Efs
z7*M|g_OL8kp3|&@U0FMmhw?%Ygq23M>7UxF(IRuwyLa!38q%^#KxUr(a{b*37Znpj
zE%kq55=N0>pylP|kidil2H*f#kgpC8eIfO2@3^%Af~&pb%EI9&kz~r+MQ(%#e9y}M
z={SDj=GNQS7gy$oD!7hJItP074kGgGY_ta*S_t~t=e)c|P>_B7{lUPd!jP{3Vqbu0
zX2?b#AHQ7v*P1#{NOY#lutY~kKkuQMBVNs071}jdSPvo#`6)ml3h<hrq-$Z@E-4O#
z0%-=Lv#oJATD!WUi-_5=vUmB$`}%^;QHV(h0ul099>lCK01K)BPA3McC3hm4?z?<j
zJzZK78x88-{O?HdIYJ4T)~1#nfg#_W^u~@nIWhh7yX{?Tceje2-R;x8x-$}p3Hrba
z23Lu`W;G%>m&Vw%!mBrK{ud-{wm;hlZntzyY2N%a>(w(B)?mI&KI<ysh_8I$=O-0P
z!xk|yVU%xLXHvQcTtg@!mP3vPp_n1-e;)3DJ4P`DbtDSjV7fe)?zh%AX6x+y>%Z{V
z6Qn`s`1^5!jxHR_bLrr@)<%HLJ8mtNLX#TTjTwbieGLt247AE?T`Zq&T^jPxzxjcb
zI%=b$oL$qwfp-Xxr-S#sx<q%yeqOxpfEo_J9iiCV+#G5(<-cc~Eb$yQ$Ug2gUJ*C2
z^wGG=vyYTk+U!|fUgvp;cCsEYFjeDsuC5?{GpmQRcXi$4TPK2$>N7~Z(3_E_Ku44B
zIoP(uu!&lCGTq_l{{(nC1cO<tT9>^h;mYX`Bs<1-9&kaK%e1WT?x@W>H?2+&kZomu
zy^<m2RY35SX+E<WE--#*Sn2%9sw1KAgRn)}JR2Ju(*3I`6MS77Zm`U&H)ek2=Fp7@
zcUAQ-25dfIjk6f-s&f>fLht0+Hg8uW8FnxZaAv_j@VroeSq^D-Egj~A@1I7Aul*0N
z)^90(w6x}SsXGw^C{XORZUU*Va2f~rwU`yAzH%PraUza4!sMD}eul)w$G=`)w%=JE
zq5_c_plW%*6Xdk)j{0@~jl6H&w8ZI53K@}>cEyQ33#H{k>T8TUXAVq%d+Cl%|F{Gk
zv21N^30bznoN&fP{{!6(bSAwQNc8_br;v*>;TR`Ay^ttbiSTX?ny?!&e$wn;W1te7
z!4Ys&kvRjD=oFcGQ!eBE>fL9Un-_Al>)#f-Fx2bnuJ-F8Al_@=7mC2bu1=?jyO6`p
zXB%FJ5(GgIke|=z)Mo@vhMSw4knfJ|-?4HkNRdqsI}8rmI%?!siB-p=$B%<SHIzN9
znC>JCQBVqC*grw@L|_j}y~zvqo{J#QfDsw<7&+@&`un%(vv#(+)5SnW)0c4ME0BuL
zhtSFv`A^xKhU018F@e6@#M27y(im3@)pXl{k;qSVV`-zd7EO=wlz@o+{@Bt(37tx3
za6IEKla<64CsLapRP*ORfeYUGfwvr^%I!x53TqGVU|QYlRshub!Qdd^>>VAo)3*k;
zjT2G5H|3|jP;DYuQd;_au{X=P^uSt)fmc^I8|^phRc+$(>O-Uj=o3KaT(drS|KU3f
zH<nupKMer!Sl6&khCjnXPlh-jeq;ob3b2(xm@UVfl=_>*8kiQ3)6j7M!*<=pAx<j0
zuk1Ti6Nj@8dIT*ULCt$sW$`>fx(-lPv(7+}7uB#UQ~^4=Lt_IrP-}xa9u_EB*<F-E
z9Gdg`+7nAIZ0bw4=X}GF5>0#NUc8U^(qC?=!QfNg^VE&o+Y3Du@Y!6slP`8G134Ov
zUn{4sm9wpagbrkyEmVTly-vGRj;&~$_rfccFM&UjV2$}4rOQ6EeDWl98{oKq^od-u
z-0>`}_x^0y^A7$>P7v};A5HBcrph@b+!x<e+^qpvV2_ut-o9(?-|Q@<{u0=!K-o9Y
zpdp)EZU%4+G85LokAHqYExD0JCXs$1Ht@j2u=w7uC3h9|&B(y4N@JQ<1T^Ar^9oUA
zl($Dzf|Z8sLJ(%*eS?W4)GJrtP{C5h+R!>8GV%smT;^$kkwP8%WMeTqR)tm0YmF6r
zUgZ?AW8I`~bg`k%G6RO?){Bg6(Gf`GMYZ3jr&KOm_pB<nS;MBn9Cyz~Ql-3TK#@fi
z8EY9DvT$jpLJ<*L9=r=A+qI}lwtppN^#nI%vQSrv{EH;lxioX>aJYt5PgQ6b-=Jo$
z2)5d!lMr~@W-IFv&mSxzwk5m#R&XpUA7M#FIGTs!#r?ErM-2?mIkrS|zEK?1PCAPp
zqvZf#>OGZPF(Vw<J^fFHb@X0a?91jvOn6QE=MX`VOpRzrajE^nwgQem2pWXJ%Ln!}
zE9mCkE0=sW?%4c9D8-Ao8~j697@W)IiAeaeG9Fo(QI&fn2RR140tC7jF$FR$VoFW%
zKtZ|Pr#=_n?5DAyK0jkNP@o(U*m|(QmJ?gGPdC-I$e4gXP}VMk*R>uhX1&=}*Hj@>
zic{8ayFxfA)y#d;@oZ<kkpVwQVK#GEmIXCBT!?7UI}y$6SrF;O{*JH5eqHM{1Fub>
zhz2?>X>)IMSMohjFk9`sIZnXHVe|7ZKP@yFiV0Vim6VkHAZm97I5T1YLw6lr-K^?r
z)*k6?^~%Y{1!hT7#{H91=-GvWqiAWKcz-o6AhHJK8<(<)x81lL2^aZg`p!sZfKD>q
zwZwR8)D#AQlW1#eTOY+N(pzXM2ZOh_xASEr3NQ19mo@623*3j3pBJzHy$c#5)*=sw
zvx2*2zRg{={LS}knd<HiiH1?nqQ*0jKct}E$4!4A5Pff4NMw2g!9U%IjCyb?u=7*P
z>?Vyd0i^ew2vJc{rt}QS7hEMJC8*k1KVZ_dBfZ-@I<jj;{tb>fx=(_R{cyNz!t(LL
zW650YzYYuL4!#4Ct|olVJvbwDBo?EZDV-=(t*yDxr`s703*71-0;{X5Kl|0K6jZqa
zEBtLCTIj#WkLh+QSBePC5fo(TY97nrE%BD}GiWyTc`L#l1Qm_IHW``o2FIW&`w4Cy
zKFbE3n(hl6dHUt{R}XhrBf;TjO0NSvwn;1um@KQEURMR~6TBw75#uuP4gTrVC*WJo
zV>y)=)^LMT>#XnJnVp=RCaur90*}A7*}kq~)<Zj7&z#(3Z1a74wmx0Q(HKfSfKCJw
zY|)c01Gh>}N!e_@5u2Hr2?3Dui2foqHTBpy{d^kUV)*Ibibj2Iz?KI_Mc$jJI|2eZ
zpB^UWjJ+=-j8C76@#_}_f|_IUpn*`c-G7fh8lUb5PU?vnTcf+2Y7A?Z%gcEd(E5QJ
zOP28y>q?hNxhry@oV7&$UvCqokrw|qx|unH^rC5fZ;sUXgLkG7HDyg?fudRPe*h^D
Brz!vd


From 99b7b4dab1d53f34ed4ef19ec587b1311f66324d Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Sun, 15 Jan 2023 12:27:55 +0800
Subject: [PATCH 10/18] fix(ApiHandler): only fetch vp/rp when 16-9 img

---
 code/endpoints/ApiHandler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/endpoints/ApiHandler.py b/code/endpoints/ApiHandler.py
index 30122a9..0e0a7e6 100644
--- a/code/endpoints/ApiHandler.py
+++ b/code/endpoints/ApiHandler.py
@@ -90,7 +90,6 @@ async def base_img_request(request):
     resp = await fetch_daily_shop(userdict)  #获取每日商店
     print(f'[{GetTime()}] [Api] fetch_daily_shop success')
     list_shop = resp["SkinsPanelLayout"]["SingleItemOffers"]  # 商店刷出来的4把枪
-    res_vprp = await fetch_vp_rp_dict(userdict) # 获取vp和r点
 
     # 自定义背景
     if 'img_src' in params:
@@ -105,6 +104,7 @@ async def base_img_request(request):
     if 'img_ratio' in params and params['img_ratio']=='1':
         ret = await get_shop_img_11(list_shop,bg_img_src=img_src)
     else:
+        res_vprp = await fetch_vp_rp_dict(userdict) # 只有16-9的图片需获取vp和r点
         ret = await get_shop_img_169(list_shop,vp=res_vprp['vp'],rp=res_vprp['rp'],bg_img_src=img_src)
     # 打印计时
     print("[IMGdraw]",format(time.perf_counter() - start, '.2f'))# 结果为浮点数，保留两位小数

From 34d12146a54dc32bb8302b3c61c5a0abb1cfa4f6 Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Sun, 15 Jan 2023 12:28:13 +0800
Subject: [PATCH 11/18] docs(api): update api docs

---
 docs/valorant-shop-img-api.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/valorant-shop-img-api.md b/docs/valorant-shop-img-api.md
index 67e5df1..ed93efb 100644
--- a/docs/valorant-shop-img-api.md
+++ b/docs/valorant-shop-img-api.md
@@ -13,7 +13,7 @@ Api是一个网页链接，能够方便的被用户使用或被开发者调用
 | ---------- | --------------------- | -------- |
 | /shop-img  | 直接返回并跳转商店的图片  | 正常   |
 | /shop-url  | 以`json`格式返回商店图片url  | 正常   |
-| /tfa  | 邮箱验证接口，需和/shop-url接口配合使用 | 正常   |
+| /tfa  | 邮箱验证接口，需和`/shop-url`接口配合使用 | 正常   |
 
 
 ## 1.使用示例
@@ -51,7 +51,11 @@ https://val.outpost54.top/shop-img?token=API的密钥&account=账户&passwd=密
 
 结果示例图（16-9）
 
-<img src="https://img.kookapp.cn/assets/2023-01/2Vffq4s9rX1ry0zj.png" alt="16-9-img-result">
+<img src="https://img.kookapp.cn/assets/2023-01/2Vffq4s9rX1ry0zj.png" weight="400px" alt="16-9-img-result">
+
+结果示例图（1-1）
+
+<img src="https://img.kookapp.cn/attachments/2023-01/15/JR3hnXIab60rs0rs.png" weight="300px" hight ="300px" alt="1-1-img-result">
 
 ## 2.注意事项
 

From 6a38519a747a3488fee1a45f720bb7b67ef0b9f0 Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Sun, 15 Jan 2023 16:19:17 +0800
Subject: [PATCH 12/18] feat(api): add traceback print in except

---
 code/api.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/code/api.py b/code/api.py
index 98bcd41..deb3119 100644
--- a/code/api.py
+++ b/code/api.py
@@ -26,7 +26,9 @@ async def get_dailshop_img(request):
         else:
             return web.Response(body=json.dumps(ret,ensure_ascii=False), content_type='application/json')
     except:
-        return web.Response(body=json.dumps({'code':200,'message': 'unkown err','info':f'未知错误','except':f'{traceback.format_exc()}'},ensure_ascii=False), content_type='application/json')
+        err_cur = traceback.format_exc()
+        print(f"[{GetTime()}] [Api] ERR in /shop-img\n{err_cur}")
+        return web.Response(body=json.dumps({'code':200,'message': 'unkown err','info':f'未知错误','except':f'{err_cur}'},ensure_ascii=False), content_type='application/json')
     
 # 获取图片url
 @routes.get('/shop-url')
@@ -36,7 +38,9 @@ async def get_dailshop_img(request):
         ret = await base_img_request(request)
         return web.Response(body=json.dumps(ret,ensure_ascii=False), content_type='application/json')
     except:
-        return web.Response(body=json.dumps({'code':200,'message': 'unkown err','info':f'未知错误','except':f'{traceback.format_exc()}'},ensure_ascii=False), content_type='application/json')
+        err_cur = traceback.format_exc()
+        print(f"[{GetTime()}] [Api] ERR in /shop-url\n{err_cur}")
+        return web.Response(body=json.dumps({'code':200,'message': 'unkown err','info':f'未知错误','except':f'{err_cur}'},ensure_ascii=False), content_type='application/json')
 
 @routes.post('/tfa')
 async def get_dailshop_img(request):
@@ -45,7 +49,9 @@ async def get_dailshop_img(request):
         ret = await tfa_code_requeset(request)
         return web.Response(body=json.dumps(ret,ensure_ascii=False), content_type='application/json')
     except:
-        return web.Response(body=json.dumps({'code':200,'message': 'unkown err','info':f'未知错误','except':f'{traceback.format_exc()}'},ensure_ascii=False), content_type='application/json')
+        err_cur = traceback.format_exc()
+        print(f"[{GetTime()}] [Api] ERR in /tfa\n{err_cur}")
+        return web.Response(body=json.dumps({'code':200,'message': 'unkown err','info':f'未知错误','except':f'{err_cur}'},ensure_ascii=False), content_type='application/json')
     
 
 print(f"[API Start] starting at {GetTime()}")

From 91672755799e24dbd80ad3cf25d9f94aba3782f5 Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Sun, 15 Jan 2023 16:19:33 +0800
Subject: [PATCH 13/18] feat(makefile): add ps to search for pid

---
 code/makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/makefile b/code/makefile
index 7c2aa9d..0356db3 100644
--- a/code/makefile
+++ b/code/makefile
@@ -1,3 +1,7 @@
 .PHONY:run
 run:
-	nohup py3 -u start.py >> ./log/bot.log 2>&1 &
\ No newline at end of file
+	nohup py3 -u start.py >> ./log/bot.log 2>&1 &
+
+.PHONY:ps
+ps:
+	ps jax | head -1 && ps jax | grep start.py | grep -v grep
\ No newline at end of file

From 59f27f38d8d4dc4fc1d369ea85a14abc8593764f Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Sun, 15 Jan 2023 20:46:58 +0800
Subject: [PATCH 14/18] fix(ShopImg): using standrand_x/y to replace
 1.78(1280/720)

---
 code/endpoints/ShopImg.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/endpoints/ShopImg.py b/code/endpoints/ShopImg.py
index 22c903f..e21f156 100644
--- a/code/endpoints/ShopImg.py
+++ b/code/endpoints/ShopImg.py
@@ -98,7 +98,7 @@ def resize_standard(standard_x, standard_y, img):
     log_info = "[resize_std] "
     log_info += f"原始图片大小:({w},{h}) - "
     ratio = w / h
-    if ratio <= 1.78:
+    if ratio <= standard_x/standard_y:
         sizeco = w / standard_x
         log_info += f"缩放系数:{format(sizeco,'.3f')} - "
         w_s = int(w / sizeco)

From 69ca8993f42d561f1fe9c12ae3dc923e7b76edcb Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Sun, 15 Jan 2023 20:49:56 +0800
Subject: [PATCH 15/18] feat(api): add GetTime print in api log

---
 code/endpoints/ApiHandler.py |  2 +-
 code/endpoints/ApiToken.py   | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/endpoints/ApiHandler.py b/code/endpoints/ApiHandler.py
index 0e0a7e6..a66c3c3 100644
--- a/code/endpoints/ApiHandler.py
+++ b/code/endpoints/ApiHandler.py
@@ -107,7 +107,7 @@ async def base_img_request(request):
         res_vprp = await fetch_vp_rp_dict(userdict) # 只有16-9的图片需获取vp和r点
         ret = await get_shop_img_169(list_shop,vp=res_vprp['vp'],rp=res_vprp['rp'],bg_img_src=img_src)
     # 打印计时
-    print("[IMGdraw]",format(time.perf_counter() - start, '.2f'))# 结果为浮点数，保留两位小数
+    print(f"[{GetTime()}] [IMGdraw]",format(time.perf_counter() - start, '.2f'))# 结果为浮点数，保留两位小数
 
     start = time.perf_counter()
     if ret['status']:
diff --git a/code/endpoints/ApiToken.py b/code/endpoints/ApiToken.py
index 7cd82fe..086e97e 100644
--- a/code/endpoints/ApiToken.py
+++ b/code/endpoints/ApiToken.py
@@ -1,6 +1,7 @@
 import uuid
 import json
 import time
+from endpoints.Gtime import GetTime
 
 # 所有token
 with open("./log/ApiToken.json", 'r', encoding='utf-8') as frpr:
@@ -16,7 +17,7 @@ def save_token_files(text=''):
     global ApiTokenDict
     with open("./log/ApiToken.json", 'w', encoding='utf-8') as fw2:
         json.dump(ApiTokenDict, fw2, indent=2, sort_keys=True, ensure_ascii=False)
-    print(f"[token] files saved! {text}")
+    print(f"[{GetTime()}] [API token] files saved! [{text}]")
 
 # 生成uuid
 def create_token_uuid(num: int = 10, day: int = 30):
@@ -53,7 +54,7 @@ def create_token_uuid(num: int = 10, day: int = 30):
     for uuid in NewUuid:
         text += f"{uuid}" + "\n"
 
-    print(f"[token] create_token_uuid - num:{num} - day:{day}")
+    print(f"[{GetTime()}] [token] create_token_uuid - num:{num} - day:{day}")
     return text
 
 # 检查用户token是否失效或者不是token
@@ -71,13 +72,13 @@ async def token_ck(token:str):
             del ApiTokenDict['data'][token]
             # 更新uuid
             save_token_files("token expire")
-            print(f"[token-ck] T:{token} out of date")
+            print(f"[{GetTime()}] [token-ck] T:{token} out of date")
             return False
         else:#没有过期，返回真
-            print(f"[token-ck] T:{token} is token")
+            print(f"[{GetTime()}] [token-ck] T:{token} is token")
             return True
     else:#token不在
-        print(f"[token-ck] T:{token} not token")
+        print(f"[{GetTime()}] [token-ck] T:{token} not token")
         return False
 
 

From 0e2c66134a0425e80b879b52c5fa0673e3ff21f2 Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Sun, 15 Jan 2023 20:50:10 +0800
Subject: [PATCH 16/18] docs(api): update api docs

---
 docs/valorant-shop-img-api.md | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/docs/valorant-shop-img-api.md b/docs/valorant-shop-img-api.md
index ed93efb..4351d85 100644
--- a/docs/valorant-shop-img-api.md
+++ b/docs/valorant-shop-img-api.md
@@ -142,29 +142,19 @@ import requests
 
 url = "https://val.outpost54.top/shop-url"
 params = {
-    "token":"你的api-token",
+    "token":"api-token",
     "account": "拳头账户",
     "passwd": "拳头密码",
     "img-src": "https://img.kookapp.cn/assets/2022-09/KV5krdRx080qo0f0.jpg"
 }
-res = requests.get(url,params=params,verify=False)
+res = requests.get(url,params=params)
 print(res.json())
 ~~~
 
-由于ssl证书原因，您使用的时候可能会遇到下面的报错，请忽略。
+运行即可获得商店返回结果
 
-~~~
-/home/muxue/.local/lib/python3.10/site-packages/urllib3/connectionpool.py:1045: InsecureRequestWarning: Unverified HTTPS request is being made to host 'val.outpost54.top'. Adding certificate verification is strongly advised. See: https://urllib3.readthedocs.io/en/1.26.x/advanced-usage.html#ssl-warnings
-  warnings.warn(
-~~~
-
-网站使用的是`JOYSSL`提供的ssl证书，直接访问**不会**报不安全。本人很菜，不知道这里的报错是啥原因
+~~~~
+{'code': 0, 'message': 'https://img.kookapp.cn/attachments/2023-01/15/mLjpR95mZ20rs0rs.png', 'info': '商店图片获取成功'}
+~~~~
 
-可以用下面的办法解除这个报错
-
-~~~python
-from urllib3.connectionpool import InsecureRequestWarning
-import urllib3
-urllib3.disable_warnings(InsecureRequestWarning)
-~~~
 

From 87fa9125ed7ca1a90067c532b016f24a79947f2f Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Sun, 15 Jan 2023 23:14:20 +0800
Subject: [PATCH 17/18] feat(EzAuth): add cookie transfer from EzAuth to
 RiotAuth

---
 code/endpoints/EzAuth.py | 19 ++++++++++++++++++-
 code/main.py             |  6 +++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/code/endpoints/EzAuth.py b/code/endpoints/EzAuth.py
index 5101499..9fd02a3 100644
--- a/code/endpoints/EzAuth.py
+++ b/code/endpoints/EzAuth.py
@@ -11,6 +11,7 @@
 import copy
 import random
 from riot_auth import auth_exceptions,RiotAuth
+from http.cookies import SimpleCookie
 
 RiotClient = "RiotClient/62.0.1.4852117.4789131"
 User2faCode = {}
@@ -115,6 +116,7 @@ def authorize(self,username, password,key):
 
         self.base_headers = {'User-Agent': f"{RiotClient} %s (Windows;10;;Professional, x64)",'Authorization': f'Bearer {self.access_token}',}
         self.session.headers.update(self.base_headers)
+        self.cookie = self.session.cookies
 
         self.entitlements_token = self.get_entitlement_token()
         self.emailverifed = self.get_emailverifed()
@@ -214,7 +216,22 @@ def get_Token(self):
         }
         return userdict
 
-#EzAuth(username="",password="")
+    def get_CookieDict(self):
+        # cookie转换成dict
+        ck_dict = requests.utils.dict_from_cookiejar(self.cookie)
+        return ck_dict
+
+    async def get_RiotAuth(self):
+        # cookie dict导入到SimpleCookie
+        Scookie = SimpleCookie(self.get_CookieDict())
+        rauth = RiotAuth()
+        # 更新cookie
+        rauth._cookie_jar.update_cookies(Scookie)
+        ret = await rauth.reauthorize() # 测试登录
+        if ret:
+            return rauth
+        else: #失败返回None
+            raise Exception('EzAuth change to RiotAuth failed')
 
 
 ###################################### Riot Auth ######################################################
diff --git a/code/main.py b/code/main.py
index 22caca8..2b91365 100644
--- a/code/main.py
+++ b/code/main.py
@@ -1079,7 +1079,7 @@ async def login_authtoken(msg: Message, user: str = 'err', passwd: str = 'err',t
             th = threading.Thread(target=auth2fa, args=(user,passwd,key))
             th.start()
             resw = await auth2faWait(key=key,msg=msg) # 随后主执行流来这里等待
-            res_auth = resw['auth']
+            res_auth = await resw['auth'].get_RiotAuth() # 直接获取RiotAuth对象
         # 如果没有抛出异常，那就是完成登录了
         UserTokenDict[msg.author_id] = {'auth_user_id': res_auth.user_id, 'GameName':'None', 'TagLine':'0000'} 
         userdict = {
@@ -1234,8 +1234,8 @@ async def check_re_auth(def_name: str = "", msg: Union[Message, str] = ''):
     user_id = "[ERR!]"  #先给userid赋值，避免下方打印的时候报错（不出意外是会被下面的语句修改的）
     try:
         user_id = msg if isinstance(msg, str) else msg.author_id  #如果是str就直接用
-        if UserAuthDict[user_id]['2fa']:
-            return True #先判断是否为2fa账户，如果是，那就不进行reauthrize操作
+        # if UserAuthDict[user_id]['2fa']:
+        #     return True #先判断是否为2fa账户，如果是，那就不进行reauthrize操作
         auth = UserAuthDict[user_id]['auth']
         userdict = {
             'auth_user_id': auth.user_id,

From ba3234a31df649773dce1a9fff85a0d7e7098568 Mon Sep 17 00:00:00 2001
From: Ewait <s2522446388@163.com>
Date: Mon, 16 Jan 2023 08:52:40 +0800
Subject: [PATCH 18/18] docs(README): update README/README_EN

---
 README.md    | 43 ++++++++++++++++--------------------------
 README_EN.md | 53 +++++++++++++++++-----------------------------------
 2 files changed, 33 insertions(+), 63 deletions(-)

diff --git a/README.md b/README.md
index 203ed63..95c9362 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@
 </div>
 
 ## 功能
-当前机器人基本完善，目前支持回复Valorant游戏错误码、查询Valorant每日商店/夜市/vp/r点，和一些简单功能。
+当前机器人基本完善，目前支持回复Valorant游戏错误码、查询Valorant每日商店/夜市/vp/r点，和一些简单功能。邮箱验证用户登录也已添加。
 
 下面是目前支持的功能列表：
 
@@ -29,7 +29,6 @@
 | `/Ahri`           | 回复使用帮助（因`/help`和其他机器人冲突，故用阿狸的英文名`Ahri`替代） |
 | `/vhelp` | Valorant相关查询功能的帮助命令                     |
 
-关于商店查询的**初步功能**已经添加，但是其`稳定性/是否封号`未知，建议**谨慎**使用！
 
 
 | 游戏相关      | 功能                                       |
@@ -42,7 +41,7 @@
 | `/logout` | 退出riot账户登录 |
 | `/shop` | 获取每日商店的4个皮肤 |
 | `/night` | 获取夜市的6个皮肤 |
-| `/uinfo`或`/point` | 获取玩家卡面和称号，剩余vp和r点 |
+| `/uinfo` 或 `/point` | 获取玩家卡面和称号，剩余vp和r点 |
 | `/notify-a 皮肤名` | 搜索皮肤名，并提供选项将指定皮肤加入商店提醒 |
 | `/notify-l` | 查看当前已经设置了提醒的皮肤 |
 | `/notify-d 皮肤uuid` | 使用uuid删除不需要提醒的皮肤 |
@@ -56,17 +55,11 @@
 |`/rts 序号 打分 吐槽`|选中皮肤序号，给该皮肤打个分(0~100) 再吐槽一下!|
 |`/kkn`|查看昨日评分最高/最低的用户|
 
-更多vip用户的特殊功能
+每日商店刷枪提醒功能 `/notify-a` 需要用户**保持登录状态**，bot会在每天的`08:00AM`遍历列表，查看您的商店是否刷出了您想要的皮肤；如果是vip用户，则会直接发送当日商店的图片。
 
->* 「全新商店返回值」vip用户将获取到16-9的超帅商店返回值
->* 「保存登录信息」vip用户登陆后，阿狸会自动保存您的cookie。在阿狸维护重启的时候，您的登录信息不会丢失
->* 「早八商店提醒」阿狸将在早8点获取vip用户的每日商店并私聊发图给用户，同时会对这张图片进行缓存，当天使用/shop命令的时候，只需2s获取结果，三倍于普通用户的响应速度！
->
->目前商店查询背景图diy支持16-9(横屏)的图片，图片url获取：`PC端将图片上传到kook→点击图片→底部...处复制图片链接→使用/vip-shop命令设置背景` [教程图](https://img.kookapp.cn/assets/2022-12/nICYcewY8a0u00yt.png) 
->
->请不要设置违规图片(擦边也不行)！若因为您上传违禁图片后导致阿狸被封，您将被剥夺vip并永久禁止兑换vip
+cookie 登录信息将在2-3天后失效，所以皮肤提醒功能会出现用户没有登录而无法获取的情况。
 
-每日商店刷枪提醒功能需要用户**保持登录状态**，bot会在每天的`08:01`遍历列表，查看您的商店是否刷出了您想要的皮肤
+`/rate` 参与的打分，其会显示在 `/shop` 商店查询结果的尾部，同时统计当日商店最高分和最低分，可以在第二天用 `/kkn` 来查看。
 
 | 其他命令    | 功能                                                         |
 | ----------------- | ------------------------------------------------------------ |
@@ -99,6 +92,8 @@
 <img src="./screenshot/vip_daily_shop.png" height="300px" alt="vip_shop">
 </details>
 
+----
+
 ### valorant-shop-img-api
 
 > Api源码见 [api.py](./code/api.py)
@@ -123,13 +118,9 @@ Api请求返回示例图：
 pip install -r requirements.txt
 ~~~
 
-> Q：为何`khl.py`只需要3.6.8以上版本，而本仓库需要3.8+？
->
-> A：因为Valorant的第三方`Python Api`需要3.8+版本
-
-建议根据[khl.py](https://github.com/TWT233/khl.py)的`example`教程，学习KOOK机器人的基本搭建（很简单的，相信我）
+建议根据 [khl.py/example](https://github.com/TWT233/khl.py/tree/main/example) 的教程，学习KOOK机器人的基本搭建（很简单的，相信我）
 
-如果你想直接使用本机器人，可以转到本仓库[WIKI](https://github.com/Aewait/Valorant-kaiheila-bot/wiki)查看更多引导内容
+如果你想直接使用本机器人，可以转到本仓库 [WIKI](https://github.com/Aewait/Valorant-kaiheila-bot/wiki) 查看更多引导内容
 
 ----
 
@@ -148,9 +139,7 @@ pip install -r requirements.txt
 - [ ] 以类似抽卡的方式，用按钮、图片等等方式显示用户的夜市
 - [ ] Api增加使用Riot Token调用的接口，方便本地管理登录信息，调用api画图
 
-~~由于很多人在使用类似商店查询软件后被ban，我决定正式停止相关功能的开发~~
-
-咳咳，虽然初步的商店查询功能已经上线，但是其是否`封号`依旧有争论！目前功能已经上线一个月有余，且询问过外网开发者，其表示没有听说过有人因为使用api被封号。
+咳咳，虽然初步的商店查询功能已经上线，但是其是否`封号`依旧有争论！目前功能已经上线半年有余，未出现异常现象；且询问过外网开发者，其表示没有听说过有人因为使用api查询而被封号。
 
 **如果您担心风险，请不要使用相关功能**！bot的`/vhelp`命令`/login`命令中有相关警告提示，使用即代表您同意了承担风险！
 
@@ -161,16 +150,16 @@ pip install -r requirements.txt
 ## 依赖
 
 由于本人压根没有系统的学过Python，所以本仓库的很多代码都是根据他人教程修改后使用的
-* 基本框架参考[khl.py](https://github.com/TWT233/khl.py)提供的`kook sdk`以及使用教程
-* Valorant游戏`leaderboard`排行榜获取基于 [frissyn/valorant.py](https://github.com/frissyn/valorant.py/) 提供的`sdk`
-* Valorant游戏主要查询代码基于 [ValorantClientAPI](https://github.com/HeyM1ke/ValorantClientAPI) 项目提供的`api文档`
+* 基本框架参考[khl.py](https://github.com/TWT233/khl.py)提供的  `kook sdk` 以及使用教程
+* Valorant游戏皮肤/捆绑包/玩家卡面等素材源自 [valorant-api.com](https://valorant-api.com/)
+* Valorant游戏主要商店查询代码基于 [ValorantClientAPI](https://github.com/HeyM1ke/ValorantClientAPI) 项目提供的 `api文档`
 * 通过账户密码获取 `riot_auth_token` 基于 [floxay/python-riot-auth](https://github.com/floxay/python-riot-auth) 项目
 
 
 ### 特别鸣谢🎁
-* [@DeeChael](https://github.com/DeeChael) for helping me debug
-* [@Edint386](https://github.com/Edint386) for adding `PIL_code` for `/shop` 
-* [@staciax](https://github.com/staciax) for [Valorant-DiscordBot/issues/74](https://github.com/staciax/Valorant-DiscordBot/issues/74)
+* [@DeeChael](https://github.com/DeeChael) 帮我 debug
+* [@Edint386](https://github.com/Edint386) 帮助添加了 `PIL` 代码来进行 `/shop` 的画图 
+* [@staciax](https://github.com/staciax) for [Valorant-DiscordBot/issues/74](https://github.com/staciax/Valorant-DiscordBot/issues/74) & [issues/97](https://github.com/staciax/Valorant-DiscordBot/issues/97)
 
 
 ### 支持本项目😘
diff --git a/README_EN.md b/README_EN.md
index 1b633bc..3ff2067 100644
--- a/README_EN.md
+++ b/README_EN.md
@@ -19,11 +19,6 @@ KOOK(once called kaiheila) is a Chinese voice communication software.
 
 >Because this bot are only used in Chinese platform,so I didn't write a more detail Readme in English.Sorry for that
 
-I just develop basic `/login` and `/shop` to fetch daily shop, hoping it's save for using 
-
-* night market check as `/night` command was publish at `v0.2.4`
-
-----
 
 ## Command
 
@@ -59,9 +54,9 @@ Recommended to use after the Valorant_Function is stable.
 |`/rts NO. point comment`|select skin_no. to rate a point(0~100) and leave a comment to it|
 |`/kkn`|checkout yesterday's heighest/lowest rate_point of daily shop |
 
-notify function require user to stay `login`, bot wil fetch your daily shop at `08:01AM GMT+8` .If the skin is in daily shop, bot will send a private message to user.
+notify function require user to stay `login`, bot wil fetch your daily shop at `08:00AM GMT+8` .If the skin is in daily shop, bot will send a private message to user.
 
-If the user is a vip, the bot will also send the full picture of the store on that day through private message.
+If the user is a vip, the bot will also send the full picture of the daily-shop on that day through private message.
 
 >Because the bot is only using in Chinese platform, the skin `name` only support `zh-TW`
 
@@ -93,56 +88,42 @@ You can find image examples for the functions in [screenshot](./screenshot) flod
 
 <img src="./screenshot/night.png" height="300px" alt="night">
 
+<img src="./screenshot/val_api_img.png" height="300px" alt="api_shop_img">
+
 </details>
 
-For more guild and information, check out [wiki pages](https://github.com/Aewait/Valorant-kaiheila-bot/wiki)
 
 ----
 
-## Breaking Changes at `V0.2.0`
-First Breaking Changes for bot
-## 1. publish vip!
-### 1.1 add vip daily shop reply 
-vip user will get different daily shop reply from bot.
-* normal user get `1000*1000` img
-* vip user get `1280*720` img
+## How to used?
+
 
-this background can be modified by vip-user,using picture they liked!
+make sure your Windows/Linux `Python` version `3.8+`
 
-<img src="./screenshot/vip_daily_shop.png" height="290px" alt="vip_shop">
+~~~
+pip install -r requirements.txt
+~~~
 
-### 1.2 add special command for vip user
-* `vip-u`: get vip from uuid
-* `vip-c`: check remaining time for vip
-* `vip-l`: list vip user
-* `vip-shop`: vip user can modify their background of daily shop
+It is highly recommand to checkout [khl.py/example](https://github.com/TWT233/khl.py/tree/main/example) first for basic kook bot init
 
-### 1.3 more great fuctions!
-* vip user will get automatic daily shop reply at `8AM BJS`
-* bot will log vip user daily shop img, next time when vip user use `/shop` command, bot will upload it from local path instead of drawing the img,which will save `2-3s` of response time
-* using `aiohttp cookie_jar` to save vip user cookie, don't need to login again when bot restart because of maintenance。
+If you want to use this bot, go [WIKI](https://github.com/Aewait/Valorant-kaiheila-bot/wiki) for more infomation
 
-## 2. other changes
-* `add_date` will fetch `debug_channel` at start,don't need to fetch every time when exception
-* change err reply to card message, bot will update msg instead of replying a new one when using `/shop` or `/uinfo`
-* add `class icon` for easy manage icon-url
 
 ---
 
 ## About
 
 Many codes in this repo are modified and used according to others' tutorials
-* KOOK_api base on [khl.py](https://github.com/TWT233/khl.py)
-* ValorantGameApi base on [frissyn/valorant.py](https://github.com/frissyn/valorant.py/)
+* KOOK Bot base on [khl.py](https://github.com/TWT233/khl.py)
+* Valorant Skin Api base on [valorant-api.com](https://valorant-api.com/)
 * Main fetch_code base on [ValorantClientAPI](https://github.com/HeyM1ke/ValorantClientAPI)
-* Fetch riot_auth_token base on [floxay/python-riot-auth](https://github.com/floxay/python-riot-auth)
+* Fetch riot_auth_token base on [floxay/python-riot-auth](https://github.com/floxay/python-riot-auth) & 
 
 
 ### Special Thanks🎁
 * [@DeeChael](https://github.com/DeeChael) for helping me debug
 * [@Edint386](https://github.com/Edint386) for adding PIL_code for `/shop` 
-* [@staciax](https://github.com/staciax) for [Valorant-DiscordBot/issues/74](https://github.com/staciax/Valorant-DiscordBot/issues/74)
+* [@staciax](https://github.com/staciax) for [Valorant-DiscordBot/issues/74](https://github.com/staciax/Valorant-DiscordBot/issues/74) & [issues/97](https://github.com/staciax/Valorant-DiscordBot/issues/97)
 
 
-If you like this project,please hit a star!✨
-> sorry for my poor English
+If you like this project,please hit a star!✨
\ No newline at end of file