FIX BUG

basic_plugins/shop/my_props/__init__.py

@@ -36,6 +36,6 @@ async def _(event: GroupMessageEvent):
     props = await BagUser.get_property(event.user_id, event.group_id)
     if props:
         await my_props.send(image(b64=await create_bag_image(props)))
-        logger.info(f"USER {event.user_id} GROUP {event.group_id} 查看我的道具")
+        logger.info(f"查看我的道具", "我的道具", event.user_id, event.group_id)
     else:
         await my_props.finish("您的背包里没有任何的道具噢~", at_sender=True)

basic_plugins/shop/shop_handle/__init__.py

@@ -92,10 +92,10 @@ async def _(event: MessageEvent, arg: Message = CommandArg()):
                 f"限时：{data.get('limit_time')}",
                 at_sender=True,
             )
-            logger.info(f"USER {event.user_id} 添加商品 {msg} 成功")
+            logger.info(f"添加商品 {msg} 成功", "添加商品", event.user_id)
         else:
             await shop_add_goods.send(f"添加商品 {msg} 失败了...", at_sender=True)
-            logger.warning(f"USER {event.user_id} 添加商品 {msg} 失败")
+            logger.warning(f"添加商品 {msg} 失败", "添加商品", event.user_id)
 
 
 @shop_del_goods.handle()
@@ -113,10 +113,10 @@ async def _(event: MessageEvent, arg: Message = CommandArg()):
             await shop_del_goods.send(f"删除商品 {goods_name} 成功了...", at_sender=True)
             if os.path.exists(f"{IMAGE_PATH}/shop_help.png"):
                 os.remove(f"{IMAGE_PATH}/shop_help.png")
-            logger.info(f"USER {event.user_id} 删除商品 {goods_name} 成功")
+            logger.info(f"删除商品成功", "删除商品", event.user_id, target=goods_name)
         else:
             await shop_del_goods.send(f"删除商品 {goods_name} 失败了...", at_sender=True)
-            logger.info(f"USER {event.user_id} 删除商品 {goods_name} 失败")
+            logger.info(f"删除商品失败", "删除商品", event.user_id, target=goods_name)
 
 
 @shop_update_goods.handle()
@@ -131,10 +131,10 @@ async def _(event: MessageEvent, arg: Message = CommandArg()):
         flag, name, text = await update_goods(**data)
         if flag:
             await shop_update_goods.send(f"修改商品 {name} 成功了...\n{text}", at_sender=True)
-            logger.info(f"USER {event.user_id} 修改商品 {name} 数据 {text} 成功")
+            logger.info(f"修改商品数据 {text} 成功", "修改商品", event.user_id, target=name)
         else:
             await shop_update_goods.send(name, at_sender=True)
-            logger.info(f"USER {event.user_id} 修改商品 {name} 数据 {text} 失败")
+            logger.info(f"修改商品数据 {text} 失败", "修改商品", event.user_id, target=name)
 
 
 @scheduler.scheduled_job(
@@ -147,7 +147,7 @@ async def _():
         await GoodsInfo.all().update(daily_purchase_limit={})
         logger.info("商品每日限购次数重置成功...")
     except Exception as e:
-        logger.error(f"商品每日限购次数重置出错 {type(e)}：{e}")
+        logger.error(f"商品每日限购次数重置出错", e=e)
 
 
 @scheduler.scheduled_job(

basic_plugins/shop/shop_handle/data_source.py

@@ -1,5 +1,5 @@
 import time
-from typing import Optional, Tuple, Union
+from typing import List, Optional, Tuple, Union
 
 from PIL import Image
 
@@ -25,7 +25,7 @@ async def create_shop_help() -> str:
     _dc = {}
     font_h = BuildImage(0, 0).getsize("正")[1]
     h = 10
-    _list = []
+    _list: List[GoodsInfo] = []
     for goods in goods_lst:
         if goods.goods_limit_time == 0 or time.time() < goods.goods_limit_time:
             _list.append(goods)

basic_plugins/shop/use/__init__.py

@@ -97,9 +97,7 @@ async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
                     await use_props.send(f"使用道具 {name} {num} 次成功！", at_sender=True)
                 if msg := await effect(bot, event, name, num, text, event.message):
                     await use_props.send(msg, at_sender=True)
-                logger.info(
-                    f"USER {event.user_id} GROUP {event.group_id} 使用道具 {name} {num} 次成功"
-                )
+                logger.info(f"使用道具 {name} {num} 次成功", event.user_id, event.group_id)
                 await UserShopGoldLog.create(
                     user_qq=event.user_id,
                     group_id=event.group_id,
@@ -110,7 +108,7 @@ async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
             else:
                 await use_props.send(f"使用道具 {name} {num} 次失败！", at_sender=True)
                 logger.info(
-                    f"USER {event.user_id} GROUP {event.group_id} 使用道具 {name} {num} 次失败"
+                    f"使用道具 {name} {num} 次失败", "使用道具", event.user_id, event.group_id
                 )
             await func_manager.run_handle(type_="after_handle", param=model, **kwargs)
     else: