From ac99307badf387ae0ad4d04b43ed0f41f234aa01 Mon Sep 17 00:00:00 2001
From: HibiKier <45528451+HibiKier@users.noreply.github.com>
Date: Thu, 20 May 2021 20:06:31 +0800
Subject: [PATCH] Update utils.py

---
 plugins/open_cases/utils.py | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/plugins/open_cases/utils.py b/plugins/open_cases/utils.py
index ff440ea0..464431cc 100644
--- a/plugins/open_cases/utils.py
+++ b/plugins/open_cases/utils.py
@@ -14,13 +14,9 @@ from util.utils import get_cookie_text
 from asyncio.exceptions import TimeoutError
 import pypinyin
 from nonebot.adapters.cqhttp.exception import ActionFailed
-<<<<<<< HEAD
 from configs.config import buff_proxy
-=======
->>>>>>> master
 
 url = "https://buff.163.com/api/market/goods"
-# proxies = 'http://49.75.59.242:3128'
 
 
 async def util_get_buff_price(case_name: str = "狂牙大行动") -> str:
@@ -63,11 +59,7 @@ async def util_get_buff_price(case_name: str = "狂牙大行动") -> str:
                         "search": skin
                     }
                     try:
-<<<<<<< HEAD
                         async with session.get(url, proxy=buff_proxy, params=parameter, timeout=20) as response:
-=======
-                        async with session.get(url, params=parameter, timeout=20) as response:
->>>>>>> master
                             if response.status == 200:
                                 data = (await response.json())["data"]
                                 total_page = data["total_page"]
@@ -175,11 +167,7 @@ async def util_get_buff_img(case_name: str = "狂牙大行动") -> str:
                 print(skin)
                 skin_name = ''
                 # try:
-<<<<<<< HEAD
                 async with session.get(url, proxy=buff_proxy, params=parameter, timeout=20) as response:
-=======
-                async with session.get(url, params=parameter, timeout=20) as response:
->>>>>>> master
                     if response.status == 200:
                         data = (await response.json())["data"]
                         total_page = data["total_page"]
@@ -273,7 +261,7 @@ async def update_count_daily():
             for user in users:
                 await user.update(
                     today_open_total=0,
-                    ).apply()
+                ).apply()
         bot = get_bot()
         gl = await bot.get_group_list(self_id=bot.self_id)
         gl = [g['group_id'] for g in gl]