From 574254f7bc0246155d29cd5b0fd07edc2372b477 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:13:58 +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   | 3 +--
 apps/third/speaker.py | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/third/dahua.py b/apps/third/dahua.py
index 0d709660..547ff89b 100644
--- a/apps/third/dahua.py
+++ b/apps/third/dahua.py
@@ -82,6 +82,7 @@ class DhClient:
                                       timeout=timeout, files=files, verify=False)
         # if settings.DEBUG:
         #     print_roundtrip(r)
+        ret = r.text
         if r.status_code == 200:
             ret = r.json()
             if ret['code'] not in ['0', '100', '00000', '1000', 0, 100, 1000]:
@@ -95,8 +96,6 @@ class DhClient:
                 return 'fail', err_detail
             # self.handle_log(result='success', response=ret)  # 成功的日志就不记录了
             return 'success', ret['data'] if 'data' in ret else None
-        else:
-            ret = r.text
         self.handle_log(result='error', response=ret)
         if raise_exception:
             raise APIException(**DH_REQUEST_ERROR)
diff --git a/apps/third/speaker.py b/apps/third/speaker.py
index 034011a7..b98f9cd3 100644
--- a/apps/third/speaker.py
+++ b/apps/third/speaker.py
@@ -78,6 +78,7 @@ class SpClient:
                                       timeout=timeout, files=files, verify=False)
         # if settings.DEBUG:
         #     print_roundtrip(r)
+        ret = r.text
         if r.status_code == 200:
             ret = r.json()
             if 'code' in ret and ret['code'] not in ['0', '100', '00000', '1000', 0, 100, 1000]:
@@ -89,8 +90,6 @@ class SpClient:
                 return 'fail', err_detail
             # self.handle_log(result='success', response=ret)
             return 'success', ret
-        else:
-            ret = r.text
         self.handle_log(result='error', response=ret)
         if raise_exception:
             raise APIException(**SP_REQUEST_ERROR)