diff --git a/apps/third/dahua.py b/apps/third/dahua.py index 4be22f43..96719ea6 100644 --- a/apps/third/dahua.py +++ b/apps/third/dahua.py @@ -29,11 +29,12 @@ class DhClient: 大华 """ - def __init__(self, client_id=settings.DAHUA_CLIENTID, - client_secret=settings.DAHUA_SECRET): - if settings.DAHUA_ENABLED: - self.client_id = client_id - self.client_secret = client_secret + def __init__(self): + self.dahua_enabled = getattr(settings, 'DAHUA_ENABLED', False) + if self.dahua_enabled: + self.dahua_enabled = True + self.client_id = settings.DAHUA_CLIENTID + self.client_secret = settings.DAHUA_SECRET self.headers = {"Connection": "close"} self.isGetingToken = False self.log = {} @@ -54,7 +55,7 @@ class DhClient: def request(self, url: str, method: str, params=dict(), json=dict(), timeout=120, file_path_rela=None, raise_exception=True): - if not settings.DAHUA_ENABLED: + if not self.dahua_enabled: raise ParseError('大华对接未启用') self.headers['Authorization'] = 'bearer ' + cache.get('dh_token', '') self.headers['User-Id'] = '1' diff --git a/apps/third/king/k.py b/apps/third/king/k.py index 9abca14b..09764fbe 100644 --- a/apps/third/king/k.py +++ b/apps/third/king/k.py @@ -24,7 +24,8 @@ class KingClient(HandleLogMixin): """ def __init__(self) -> None: - if settings.KING_ENABLED: + self.king_enabled = getattr(settings, 'KING_ENABLED', False) + if self.king_enabled: self.headers = {} self.log = {} # self._get_token() @@ -45,7 +46,7 @@ class KingClient(HandleLogMixin): cache.set('king_token', res['Authorization'], timeout=None) def request(self, url: str, method: str = 'post', params=dict(), json=dict(), timeout=20, raise_exception=True): - if not settings.KING_ENABLED: + if not self.king_enabled: raise ParseError('亚控对接未启用') self.headers['Authorization'] = cache.get('king_token', '') self.log = {"requested_at": now(), "id": uuid.uuid4(), "path": url, "method": method, diff --git a/apps/third/speaker.py b/apps/third/speaker.py index 608440d7..bf8fc587 100644 --- a/apps/third/speaker.py +++ b/apps/third/speaker.py @@ -26,16 +26,15 @@ class SpClient: 音响接口 """ - def __init__(self, username=settings.SP_USERNAME, - password=settings.SP_PASSWORD) -> None: - if not settings.SP_ENABLED: - return None - self.username = username - self.password = password - self.headers = {"Connection": "close"} - self.isGetingToken = False - self.log = {} - self._get_token() + def __init__(self) -> None: + self.sp_enabled = getattr(settings, 'SP_ENABLED', False) + if self.sp_enabled: + self.username = settings.SP_USERNAME + self.password = settings.SP_PASSWORD + self.headers = {"Connection": "close"} + self.isGetingToken = False + self.log = {} + self._get_token() def _get_token(self): self.isGetingToken = True @@ -52,7 +51,7 @@ class SpClient: def request(self, url: str, method: str, params=dict(), json=dict(), timeout=120, file_path_rela=None, raise_exception=True): - if not settings.SP_ENABLED: + if not self.sp_enabled: raise ParseError('音响对接未启用') self.headers['Authorization'] = 'Bearer ' + cache.get('sp_token', '') self.log = {"requested_at": now(), "id": uuid.uuid4(), "path": url, "method": method, diff --git a/apps/third/xunxi.py b/apps/third/xunxi.py index 678c4716..d2cf9040 100644 --- a/apps/third/xunxi.py +++ b/apps/third/xunxi.py @@ -25,10 +25,11 @@ class XxClient: 寻息 """ - def __init__(self, licence=settings.XX_LICENCE, username=settings.XX_USERNAME) -> None: - if settings.XX_ENABLED: - self.licence = licence - self.username = username + def __init__(self) -> None: + self.xx_enabled = getattr(settings, 'XX_ENABLED', False) + if self.xx_enabled: + self.licence = settings.XX_LICENCE + self.username = settings.XX_USERNAME self.isGetingToken = False self.headers = {"Connection": "close"} self.log = {} @@ -45,7 +46,7 @@ class XxClient: self.isGetingToken = False def request(self, url: str, method: str = 'post', params=dict(), json=dict(), timeout=20, raise_exception=True): - if not settings.XX_ENABLED: + if not self.xx_enabled: raise ParseError('寻息对接未启用') params['accessToken'] = cache.get('xx_token', '') json['username'] = self.username