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

third dahua xunxi speaker 优化2

This commit is contained in:
caoqianming 2022-12-31 20:21:01 +08:00
parent 7e3a1f4f78
commit cf0ac02660
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/third/dahua.py
View File

@ -8,7 +8,6 @@ import uuid
import requests import requests
from django.conf import settings from django.conf import settings
from rest_framework.exceptions import APIException, ParseError from rest_framework.exceptions import APIException, ParseError
from requests.exceptions import RequestException
from apps.third.errors import DH_REQUEST_ERROR from apps.third.errors import DH_REQUEST_ERROR
from apps.third.models import Tlog from apps.third.models import Tlog
@ -85,8 +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
except RequestException: except Exception:
self.handle_log(result='error', response=None) self.handle_log(result='error', response=None, errors=traceback.format_exc())
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

5
apps/third/speaker.py
View File

@ -7,7 +7,6 @@ import logging
import requests import requests
from rest_framework.exceptions import APIException, ParseError from rest_framework.exceptions import APIException, ParseError
from django.conf import settings from django.conf import settings
from requests.exceptions import RequestException
from apps.third.errors import SP_REQUEST_ERROR from apps.third.errors import SP_REQUEST_ERROR
from apps.third.models import Tlog from apps.third.models import Tlog
@ -80,8 +79,8 @@ class SpClient:
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 return 'success', ret
except RequestException: except Exception:
self.handle_log(result='error', response=None) self.handle_log(result='error', response=None, errors=traceback.format_exc())
if raise_exception: if raise_exception:
raise APIException(**SP_REQUEST_ERROR) raise APIException(**SP_REQUEST_ERROR)
return 'error', SP_REQUEST_ERROR return 'error', SP_REQUEST_ERROR

5
apps/third/xunxi.py
View File

@ -6,7 +6,6 @@ import uuid
import requests import requests
from django.conf import settings from django.conf import settings
from rest_framework.exceptions import APIException, ParseError from rest_framework.exceptions import APIException, ParseError
from requests.exceptions import RequestException
from apps.third.errors import XX_REQUEST_ERROR from apps.third.errors import XX_REQUEST_ERROR
from apps.third.models import Tlog from apps.third.models import Tlog
@ -73,8 +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']
except RequestException: except Exception:
self.handle_log(result='error', response=None) self.handle_log(result='error', response=None, errors=traceback.format_exc())
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