zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

三方接口修改headers

This commit is contained in:
曹前明 2022-09-15 12:56:58 +08:00
parent f452472755
commit 4b4ad0f45f
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/third/dahua.py
View File

@ -30,7 +30,7 @@ class DhClient:
if settings.DAHUA_ENABLED: if settings.DAHUA_ENABLED:
self.client_id = client_id self.client_id = client_id
self.client_secret = client_secret self.client_secret = client_secret
self.headers = {} self.headers = {"Connection": "close"}
self.isGetingToken = False self.isGetingToken = False
self.isRuning = True self.isRuning = True
self.token = None self.token = None
@ -68,7 +68,7 @@ class DhClient:
self.isRuning = False self.isRuning = False
# self.t.join() # self.t.join()
def request(self, url: str, method: str, params=dict(), json=dict(), timeout=10, def request(self, url: str, method: str, params=dict(), json=dict(), timeout=120,
file_path_rela=None, raise_exception=True): file_path_rela=None, raise_exception=True):
if not settings.DAHUA_ENABLED: if not settings.DAHUA_ENABLED:
raise ParseError('大华对接未启用') raise ParseError('大华对接未启用')

4
apps/third/speaker.py
View File

@ -29,7 +29,7 @@ class SpClient:
return None return None
self.username = username self.username = username
self.password = password self.password = password
self.headers = {} self.headers = {"Connection": "close"}
self.isGetingToken = False self.isGetingToken = False
self.isRuning = True self.isRuning = True
self.t = None # 线程 self.t = None # 线程
@ -78,7 +78,7 @@ class SpClient:
self.isRuning = False self.isRuning = False
# self.t.join() # self.t.join()
def request(self, url: str, method: str, params=dict(), json=dict(), timeout=10, def request(self, url: str, method: str, params=dict(), json=dict(), timeout=120,
file_path_rela=None, raise_exception=True): file_path_rela=None, raise_exception=True):
if not settings.SP_ENABLED: if not settings.SP_ENABLED:
raise ParseError('音响对接未启用') raise ParseError('音响对接未启用')

7
apps/third/xunxi.py
View File

@ -26,6 +26,7 @@ class XxClient:
self.licence = licence self.licence = licence
self.username = username self.username = username
self.isGetingToken = False self.isGetingToken = False
self.headers = {"Connection": "close"}
self.isRuning = True self.isRuning = True
self.token = '' self.token = ''
self.log = {} self.log = {}
@ -38,7 +39,7 @@ class XxClient:
'licence': self.licence 'licence': self.licence
} }
try: try:
r = requests.post(json=json, url=settings.XX_BASE_URL + '/getAccessTokenV2', verify=False, timeout=20) r = requests.post(json=json, url=settings.XX_BASE_URL + '/getAccessTokenV2', verify=False, timeout=120)
ret = r.json() ret = r.json()
if ret.get('errorCode', 1) == 0: if ret.get('errorCode', 1) == 0:
self.token = ret['data']['token'] self.token = ret['data']['token']
@ -51,7 +52,7 @@ class XxClient:
json = { json = {
'licence': self.licence 'licence': self.licence
} }
r = requests.post(json=json, url=settings.XX_BASE_URL + '/getAccessTokenV2', verify=False, timeout=20) r = requests.post(json=json, url=settings.XX_BASE_URL + '/getAccessTokenV2', verify=False, timeout=120)
ret = r.json() ret = r.json()
if ret.get('errorCode', 1) == 0: if ret.get('errorCode', 1) == 0:
self.isGetingToken = False self.isGetingToken = False
@ -88,7 +89,7 @@ class XxClient:
break break
else: else:
r = getattr(requests, method)('{}{}'.format(settings.XX_BASE_URL, url), r = getattr(requests, method)('{}{}'.format(settings.XX_BASE_URL, url),
params=params, json=json, timeout=timeout, verify=False) headers=self.headers, params=params, json=json, timeout=timeout, verify=False)
# if settings.DEBUG: # if settings.DEBUG:
# print_roundtrip(r) # print_roundtrip(r)
ret = r.json() ret = r.json()