From c7318fe8eeb62a7d4dec45b5151465094cb79d2a Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 9 May 2022 15:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9F=B3=E5=93=8D=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/third/views.py   |  3 ++-
 apps/utils/speaker.py | 20 +++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/apps/third/views.py b/apps/third/views.py
index e7842bc5..53614837 100755
--- a/apps/third/views.py
+++ b/apps/third/views.py
@@ -42,7 +42,8 @@ class SpTestView(APIView):
 
         音响测试接口
         """
-        _, res = spClient.request(**spapis['device_list'])
+        params = {"page": 1, "pageSize": 10000}
+        _, res = spClient.request(**spapis['device_list'], params=params)
         return Response(res)
 
 
diff --git a/apps/utils/speaker.py b/apps/utils/speaker.py
index f8a4302e..fde4d552 100644
--- a/apps/utils/speaker.py
+++ b/apps/utils/speaker.py
@@ -36,11 +36,11 @@ class SpClient:
                     "password": self.password
                 }
             }
-            r = requests.post(params=params,
+            r = requests.post(json=params,
                               url=settings.SP_BASE_URL + '/api/users/login', verify=False)
             if r.status_code == 200:
                 ret = r.json()
-                self.headers['Authorization'] = 'bearer ' + ret['user']['token']
+                self.headers['Authorization'] = 'Bearer ' + ret['user']['token']
             time.sleep(3600)
 
     def get_token(self):
@@ -53,8 +53,7 @@ class SpClient:
         r = requests.post(params=params, url=settings.SP_BASE_URL + '/evo-apigw/evo-oauth/oauth/token', verify=False)
         if r.status_code == 200:
             ret = r.json()
-            print(ret)
-            self.headers['Authorization'] = 'bearer ' + ret['user']['token']
+            self.headers['Authorization'] = 'Bearer ' + ret['user']['token']
             self.isGetingToken = False
 
     def setup(self):
@@ -93,17 +92,24 @@ class SpClient:
                 if raise_exception:
                     raise APIException(**SP_REQUEST_ERROR)
                 return 'error', SP_REQUEST_ERROR
-            # if settings.DEBUG:
-            #     print_roundtrip(r)
+            if settings.DEBUG:
+                print_roundtrip(r)
             if r.status_code == 200:
                 ret = r.json()
                 if 'code' in ret and ret['code'] not in ['0', '100', '00000', '1000', 0, 100, 1000]:
-                    detail = '音响错误:{}'.format(str(ret['msg']))
+                    detail = '音响错误:{}'.format(str(ret.get('msg', '')))
                     err_detail = dict(detail=detail, code='sp_'+str(ret['code']))
                     if raise_exception:
                         raise ParseError(**err_detail)
                     return 'fail', dict(detail=detail, code='sp_'+str(ret['code']))
                 return 'success', ret
+            else:
+                ret = r.json()
+                detail = '音响错误:{}-{}'.format(str(ret.get('type', '')), str(ret.get('message', '')))
+                err_detail = dict(detail=detail, code='sp_'+str(ret['code']))
+                if raise_exception:
+                    raise ParseError(**err_detail)
+                return 'fail', dict(detail=detail, code='sp_'+str(ret['code']))
         if raise_exception:
             raise APIException(**SP_REQUEST_ERROR)
         return 'error', SP_REQUEST_ERROR