Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2026-10-18 10:40:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update utils.py

Browse Source
This commit is contained in:
HibiKier
2021-05-20 20:06:31 +08:00
committed by GitHub
parent 3b983ebc71
commit ac99307bad
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/open_cases/utils.py
-12
View File
@@ -14,13 +14,9 @@ from util.utils import get_cookie_text
from asyncio.exceptions import TimeoutError from asyncio.exceptions import TimeoutError
import pypinyin import pypinyin
from nonebot.adapters.cqhttp.exception import ActionFailed from nonebot.adapters.cqhttp.exception import ActionFailed
<<<<<<< HEAD
from configs.config import buff_proxy from configs.config import buff_proxy
=======
>>>>>>> master
url = "https://buff.163.com/api/market/goods" 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: 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 "search": skin
} }
try: try:
<<<<<<< HEAD
async with session.get(url, proxy=buff_proxy, params=parameter, timeout=20) as response: 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: if response.status == 200:
data = (await response.json())["data"] data = (await response.json())["data"]
total_page = data["total_page"] total_page = data["total_page"]
@@ -175,11 +167,7 @@ async def util_get_buff_img(case_name: str = "狂牙大行动") -> str:
print(skin) print(skin)
skin_name = '' skin_name = ''
# try: # try:
<<<<<<< HEAD
async with session.get(url, proxy=buff_proxy, params=parameter, timeout=20) as response: 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: if response.status == 200:
data = (await response.json())["data"] data = (await response.json())["data"]
total_page = data["total_page"] total_page = data["total_page"]