From f7b8186e55a8c455a22b51708f02fc74272d3ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Mon, 3 Oct 2022 14:11:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=8E=A5=E5=8F=A3=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/third/dahua.py   |  5 +++--
 apps/third/speaker.py |  4 +++-
 apps/third/xunxi.py   | 24 ++++++++----------------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/apps/third/dahua.py b/apps/third/dahua.py
index 2a0ad635..0d709660 100644
--- a/apps/third/dahua.py
+++ b/apps/third/dahua.py
@@ -95,8 +95,9 @@ 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', errors=traceback.format_exc())
+        else:
+            ret = r.text
+        self.handle_log(result='error', response=ret)
         if raise_exception:
             raise APIException(**DH_REQUEST_ERROR)
         return 'error', DH_REQUEST_ERROR
diff --git a/apps/third/speaker.py b/apps/third/speaker.py
index 793d1ec6..034011a7 100644
--- a/apps/third/speaker.py
+++ b/apps/third/speaker.py
@@ -89,7 +89,9 @@ class SpClient:
                 return 'fail', err_detail
             # self.handle_log(result='success', response=ret)
             return 'success', ret
-        self.handle_log(result='error', errors=traceback.format_exc())
+        else:
+            ret = r.text
+        self.handle_log(result='error', response=ret)
         if raise_exception:
             raise APIException(**SP_REQUEST_ERROR)
         return 'error', SP_REQUEST_ERROR
diff --git a/apps/third/xunxi.py b/apps/third/xunxi.py
index 083e4202..346a7e12 100644
--- a/apps/third/xunxi.py
+++ b/apps/third/xunxi.py
@@ -35,26 +35,18 @@ class XxClient:
 
     def _get_token_loop(self):
         while self.isRuning:
-            self.isGetingToken = True
-            json = {
-                'licence': self.licence
-            }
-            is_ok, res = self.request(**xxapis['token_login'], json=json, raise_exception=False)
-            if is_ok == 'success':
-                self.token = res['token']
-            self.isGetingToken = False
+            self._get_token()
             time.sleep(1200)
 
-    def get_token(self):
+    def _get_token(self):
         self.isGetingToken = True
         json = {
             'licence': self.licence
         }
-        r = requests.post(json=json, url=settings.XX_BASE_URL + '/getAccessTokenV2', verify=False, timeout=120)
-        ret = r.json()
-        if ret.get('errorCode', 1) == 0:
-            self.isGetingToken = False
-            self.token = ret['data']['token']
+        is_ok, res = self.request(**xxapis['token_login'], json=json, raise_exception=False)
+        if is_ok == 'success':
+            self.token = res['token']
+        self.isGetingToken = False
 
     def setup(self):
         self.t = Thread(target=self._get_token_loop, args=(), daemon=True)
@@ -92,7 +84,7 @@ class XxClient:
         #     print_roundtrip(r)
         ret = r.json()
         if ret.get('errorCode') in ['1060000', 1060000]:
-            self.get_token()  # 重新获取token
+            self._get_token()  # 重新获取token
             self.request(url, method, params, json, timeout, raise_exception)  # 重新请求
         else:
             if ret['errorCode'] != 0:
@@ -104,7 +96,7 @@ class XxClient:
                 return 'fail', err_detail
             # self.handle_log(result='success', response=ret)
             return 'success', ret['data']
-        self.handle_log(result='error', errors=traceback.format_exc())
+        self.handle_log(result='error', response=ret)
         if raise_exception:
             raise APIException(**XX_REQUEST_ERROR)
         return 'error', XX_REQUEST_ERROR