diff --git a/apps/third/xunxi.py b/apps/third/xunxi.py index b6d39e14..2c445a66 100644 --- a/apps/third/xunxi.py +++ b/apps/third/xunxi.py @@ -27,15 +27,9 @@ class XxClient: self.username = username self.isGetingToken = False self.headers = {"Connection": "close"} - self.isRuning = True self.token = '' self.log = {} - self.setup() - - def _get_token_loop(self): - while self.isRuning: self._get_token() - time.sleep(600) def _get_token(self): self.isGetingToken = True @@ -47,15 +41,6 @@ class XxClient: self.token = res['token'] self.isGetingToken = False - def setup(self): - Thread(target=XxClient._get_token_loop, args=(self, ), daemon=True).start() - - def __del__(self): - """ - 自定义销毁 - """ - self.isRuning = False - def request(self, url: str, method: str = 'post', params=dict(), json=dict(), timeout=20, raise_exception=True): if not settings.XX_ENABLED: raise ParseError('寻息对接未启用') @@ -77,11 +62,11 @@ class XxClient: ret = r.text if 300 > r.status_code >= 200: ret = r.json() - # if ret.get('errorCode') in ['1060000', 1060000]: - # self._get_token() # 重新获取token - # self.request(url, method, params, json, timeout, raise_exception) # 重新请求 - # else: if ret['errorCode'] != 0: + if ret.get('errorCode') in ['1060000', 1060000]: + self._get_token() # 重新获取token + self.request(url, method, params, json, timeout, raise_exception) # 重新请求 + return err_detail = dict(detail='寻息错误:' + '|'.join(ret['errorMsg']), code='xx_' + str(ret['errorCode'])) self.handle_log(result='fail', response=ret)