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

获取三方token优化

This commit is contained in:
caoqianming 2022-11-17 17:50:17 +08:00
parent e24c632593
commit e84f012e09
2 changed files with 54 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/third/dahua.py
View File

@ -36,7 +36,7 @@ class DhClient:
self.headers = {"Connection": "close"} self.headers = {"Connection": "close"}
self.isGetingToken = False self.isGetingToken = False
self.log = {} self.log = {}
self._get_token() # self._get_token()
def _get_token(self): def _get_token(self):
self.isGetingToken = True self.isGetingToken = True
@ -45,7 +45,7 @@ class DhClient:
'client_id': self.client_id, 'client_id': self.client_id,
'client_secret': self.client_secret 'client_secret': self.client_secret
} }
is_ok, res = self.request(**dhapis['token_login'], params=params, raise_exception=False) is_ok, res = self.request(**dhapis['token_login'], params=params, raise_exception=False, timeout=2)
if is_ok == 'success': if is_ok == 'success':
cache.set('dh_token', res['access_token'], timeout=None) cache.set('dh_token', res['access_token'], timeout=None)
self.isGetingToken = False self.isGetingToken = False
@ -64,6 +64,7 @@ class DhClient:
if params: if params:
url = url.format(**params) url = url.format(**params)
self.log.update({"path": url}) self.log.update({"path": url})
try:
r = getattr(requests, method)('{}{}'.format(settings.DAHUA_BASE_URL, url), r = getattr(requests, method)('{}{}'.format(settings.DAHUA_BASE_URL, url),
headers=self.headers, params=params, json=json, headers=self.headers, params=params, json=json,
timeout=timeout, files=files, verify=False) timeout=timeout, files=files, verify=False)
@ -83,7 +84,8 @@ class DhClient:
return 'fail', err_detail return 'fail', err_detail
# self.handle_log(result='success', response=ret) # 成功的日志就不记录了 # self.handle_log(result='success', response=ret) # 成功的日志就不记录了
return 'success', ret['data'] if 'data' in ret else None return 'success', ret['data'] if 'data' in ret else None
self.handle_log(result='error', response=ret) except Exception:
self.handle_log(result='error', response=None)
if raise_exception: if raise_exception:
raise APIException(**DH_REQUEST_ERROR) raise APIException(**DH_REQUEST_ERROR)
return 'error', DH_REQUEST_ERROR return 'error', DH_REQUEST_ERROR

8
apps/third/xunxi.py
View File

@ -31,14 +31,14 @@ class XxClient:
self.isGetingToken = False self.isGetingToken = False
self.headers = {"Connection": "close"} self.headers = {"Connection": "close"}
self.log = {} self.log = {}
self._get_token() # self._get_token()
def _get_token(self): def _get_token(self):
self.isGetingToken = True self.isGetingToken = True
json = { json = {
'licence': self.licence 'licence': self.licence
} }
is_ok, res = self.request(**xxapis['token_login'], json=json, raise_exception=False) is_ok, res = self.request(**xxapis['token_login'], json=json, raise_exception=False, timeout=2)
if is_ok == 'success': if is_ok == 'success':
cache.set('xx_token', res['token'], timeout=None) cache.set('xx_token', res['token'], timeout=None)
self.isGetingToken = False self.isGetingToken = False
@ -52,6 +52,7 @@ class XxClient:
json['licence'] = settings.XX_LICENCE json['licence'] = settings.XX_LICENCE
self.log = {"requested_at": now(), "id": uuid.uuid4(), "path": url, "method": method, self.log = {"requested_at": now(), "id": uuid.uuid4(), "path": url, "method": method,
"params": params, "body": json, "target": "xunxi", "result": 10, "headers": self.headers} "params": params, "body": json, "target": "xunxi", "result": 10, "headers": self.headers}
try:
r = getattr(requests, method)('{}{}'.format(settings.XX_BASE_URL, url), r = getattr(requests, method)('{}{}'.format(settings.XX_BASE_URL, url),
headers=self.headers, 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:
@ -71,7 +72,8 @@ class XxClient:
raise ParseError(**err_detail) raise ParseError(**err_detail)
return 'fail', err_detail return 'fail', err_detail
return 'success', ret['data'] return 'success', ret['data']
self.handle_log(result='error', response=ret) except Exception:
self.handle_log(result='error', response=None)
if raise_exception: if raise_exception:
raise APIException(**XX_REQUEST_ERROR) raise APIException(**XX_REQUEST_ERROR)
return 'error', XX_REQUEST_ERROR return 'error', XX_REQUEST_ERROR