bugfix
This commit is contained in:
parent
cd4edf8058
commit
c638340cd6
@ -119,7 +119,10 @@ class HttpClient:
|
|||||||
connector = None
|
connector = None
|
||||||
if use_proxy:
|
if use_proxy:
|
||||||
connector = ProxyConnector.from_url(self.socks5_proxy_url)
|
connector = ProxyConnector.from_url(self.socks5_proxy_url)
|
||||||
async with aiohttp.ClientSession(connector=connector) as session:
|
reco = aiohttp.ClientSession(connector=connector)
|
||||||
|
else:
|
||||||
|
reco = aiohttp.ClientSession()
|
||||||
|
async with reco as session:
|
||||||
if params == {}:
|
if params == {}:
|
||||||
params = None
|
params = None
|
||||||
if data == {}:
|
if data == {}:
|
||||||
@ -130,6 +133,7 @@ class HttpClient:
|
|||||||
if headers == {}:
|
if headers == {}:
|
||||||
headers = None
|
headers = None
|
||||||
|
|
||||||
|
print(f'{method=},{ url=}, {headers=}, {data=}')
|
||||||
resp = await session.request(method, url,
|
resp = await session.request(method, url,
|
||||||
params=params,
|
params=params,
|
||||||
data=data,
|
data=data,
|
||||||
@ -220,16 +224,24 @@ class JsonHttpAPI:
|
|||||||
data = None
|
data = None
|
||||||
if datatmpl:
|
if datatmpl:
|
||||||
datadic = json.loads(self.te.renders(datatmpl, ns1))
|
datadic = json.loads(self.te.renders(datatmpl, ns1))
|
||||||
|
data = json.dumps(datadic, ensure_ascii=False)
|
||||||
|
"""
|
||||||
data = FormData()
|
data = FormData()
|
||||||
for k,v in datadic.items():
|
for k,v in datadic.items():
|
||||||
data.add_field(k, v)
|
data.add_field(k, v)
|
||||||
|
headers['Content-Type'] = 'multipart/form-data'
|
||||||
info(f'{data=},{ns=}, {datatmpl=}')
|
"""
|
||||||
|
info(f'{data=},{ns=}, {headers=}')
|
||||||
|
if stream_func:
|
||||||
resp = await self.hc.request(url, method=method, headers=headers,
|
resp = await self.hc.request(url, method=method, headers=headers,
|
||||||
response_type=None,
|
|
||||||
stream_func=stream_func,
|
stream_func=stream_func,
|
||||||
params=params,
|
params=params,
|
||||||
data=data)
|
data=data)
|
||||||
|
else:
|
||||||
|
resp = await self.hc.request(url, method=method, headers=headers,
|
||||||
|
response_type=RESPONSE_JSON,
|
||||||
|
params=params,
|
||||||
|
data=data)
|
||||||
ret = resp
|
ret = resp
|
||||||
if resptmpl:
|
if resptmpl:
|
||||||
ns1 = self.env.copy()
|
ns1 = self.env.copy()
|
||||||
|
Loading…
Reference in New Issue
Block a user