获取三方token优化

apps/third/dahua.py

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

apps/third/xunxi.py

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