From 96e96ef8ccc1dbfabf95fcda4a95744719fb582a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 20 Jun 2024 09:21:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20KingClient=20=E6=B7=BB=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=974?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/third/king/k.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/third/king/k.py b/apps/third/king/k.py index 28bf9587..ba922b6d 100644 --- a/apps/third/king/k.py +++ b/apps/third/king/k.py @@ -47,6 +47,8 @@ class KingClient(HandleLogMixin): **kapis['login'], json=json, timeout=10, need_auth=False, raise_exception=False) if is_ok == "success": current_val = res['Authorization'] + else: + myLogger.error(f'获取token失败: {is_ok}-{res}') cache.set('king_token', current_val, timeout=None) return is_ok, current_val @@ -77,11 +79,11 @@ class KingClient(HandleLogMixin): ret = r.json() if 'code' in ret: if ret['code'] != 0: - if need_auth and ret['code'] in [-1, -2] and ret['message'] != 'failed': # 认证失败 + if need_auth and ret['code'] in [-1, -2] and url != '/api/v1/variables': # 认证失败 # 如果这里没有判断准确，可能会导致多次触发login - myLogger.error(f"亚控认证失败: {url}-{ret}") + myLogger.error(f"亚控认证失败: {self.headers}-{url}-{ret}") is_ok, _ = self._get_token() - if is_ok: + if is_ok == "success": return self.request(url, method, params, json, timeout, raise_exception, need_auth) err_detail = dict(detail=f"亚控错误: {ret['message']}",