mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-09-29 00:32:06 +08:00
first
This commit is contained in:
@@ -14,7 +14,10 @@ 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'
|
||||
@@ -60,7 +63,11 @@ 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"]
|
||||
@@ -168,7 +175,11 @@ 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"]
|
||||
|
||||
Reference in New Issue
Block a user