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

feat: kingclient优化

This commit is contained in:
caoqianming 2024-04-25 14:59:46 +08:00
parent 9600e95272
commit 7d8585856d
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/third/king/k.py
View File

@ -13,6 +13,7 @@ from apps.third.king.king_api import kapis
from apps.utils.tools import singleton from apps.utils.tools import singleton
from django.core.cache import cache from django.core.cache import cache
from apps.third.mixins import HandleLogMixin from apps.third.mixins import HandleLogMixin
import time
requests.packages.urllib3.disable_warnings() requests.packages.urllib3.disable_warnings()
myLogger = logging.getLogger('log') myLogger = logging.getLogger('log')
@ -38,20 +39,21 @@ class KingClient(HandleLogMixin):
'username': settings.KING_USERNAME, 'username': settings.KING_USERNAME,
'password': settings.KING_PASSWORD 'password': settings.KING_PASSWORD
} }
cache.set('king_token_request', 'requesting')
_, res = self.request( _, res = self.request(
**kapis['login'], json=json, timeout=10) **kapis['login'], json=json, timeout=10)
old_token = cache.get('king_token', '')
cache.set('king_token', res['Authorization'], timeout=None) cache.set('king_token', res['Authorization'], timeout=None)
if old_token: cache.set('king_token_request', 'done')
self.request(**kapis['logout'], authorization=old_token, raise_exception=False)
def request(self, url: str, method: str = 'post', params=dict(), json=dict(), timeout=20, raise_exception=True, authorization=''): def request(self, url: str, method: str = 'post', params=dict(), json=dict(), timeout=20, raise_exception=True):
if not self.king_enabled: if not self.king_enabled:
raise ParseError('亚控对接未启用') raise ParseError('亚控对接未启用')
if authorization: count = 6
self.headers['Authorization'] = authorization while cache.get('king_token_request', None) == 'requesting':
else: time.sleep(0.5)
self.headers['Authorization'] = cache.get('king_token', '') count = count - 1
if count < 0:
break
self.log = {"requested_at": now(), "id": uuid.uuid4(), "path": url, "method": method, self.log = {"requested_at": now(), "id": uuid.uuid4(), "path": url, "method": method,
"params": params, "body": json, "target": "king", "result": 10, "headers": self.headers} "params": params, "body": json, "target": "king", "result": 10, "headers": self.headers}
try: try:
@ -64,6 +66,10 @@ class KingClient(HandleLogMixin):
ret = r.json() ret = r.json()
if 'code' in ret: if 'code' in ret:
if ret['code'] != 0: if ret['code'] != 0:
if ret['code'] in [-1, -2]: # 认证失败
self._get_token()
self.request(url, method, params, json, timeout, raise_exception)
return
err_detail = dict(detail=f"亚控错误: {ret['message']}", err_detail = dict(detail=f"亚控错误: {ret['message']}",
code='king_' + str(ret['code'])) code='king_' + str(ret['code']))
self.handle_log(result='fail', response=ret) self.handle_log(result='fail', response=ret)