Skip to content

1.增加二维码扫码各状态回调通知，沿用show回调实现 2.二维码异常后不退出进程 3.增加reLogin方法用于重新生成登录二维码 #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cyatom01 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

1.增加二维码扫码各状态回调通知，沿用show回调实现 2.二维码异常后不退出进程 3.增加reLogin方法用于重新生成登录二维码 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added aligo/.DS_Store
View file
Open in desktop
Binary file not shown.
13 changes: 11 additions & 2 deletions aligo/core/Auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def debug_log(self, response: requests.Response):
def error_log_exit(self, response: requests.Response):
"""打印错误日志并退出"""
self.debug_log(response)
exit(-1)
#exit(-1)

@overload
def __init__(
Expand Down Expand Up @@ -199,6 +199,9 @@ def _save(self):
"""保存配置文件"""
self.log.info(f'保存配置文件 {self._name}')
json.dump(asdict(self.token), self._name.open('w', encoding='utf8'))

def reLogin(self):
self._login()

# noinspection PyPep8Naming
def _login(self):
Expand All @@ -207,6 +210,7 @@ def _login(self):
response = self._login_by_qrcode()

if response.status_code != 200:
self._show('QR_GET_ERROR')
self.log.error('登录失败')
self.error_log_exit(response)

Expand Down Expand Up @@ -236,7 +240,7 @@ def _login_by_qrcode(self) -> requests.Response:
if self._email:
self._send_email(qr_link)
else:
qrcode_png = self._show(qr_link)
qrcode_png = self._show(self._name_name,'NEW',qr_link)
if qrcode_png:
self.log.info(f'二维码图片文件 {qrcode_png}')
self.log.info('等待扫描二维码')
Expand All @@ -250,6 +254,10 @@ def _login_by_qrcode(self) -> requests.Response:
login_data = response.json()['content']['data']
# noinspection PyPep8Naming
qrCodeStatus = login_data['qrCodeStatus']
#just first times can call show method
if qrCodeStatus != 'NEW':
self._show(self._name_name,qrCodeStatus)

# noinspection SpellCheckingInspection
if qrCodeStatus == 'NEW':
pass
Expand All @@ -266,6 +274,7 @@ def _login_by_qrcode(self) -> requests.Response:
else:
self.log.warning('未知错误 可能二维码已经过期')
self.error_log_exit(response)
break
time.sleep(3)
self._login_timeout.check_timeout()

Expand Down