Merge pull request #413 from IronXiao/master

增加二维码发送到邮箱功能，以便人不在电脑旁登陆失效可以远程扫描登录
Merge branch 'master' of github.com:IronXiao/py12306
2021-10-21 17:37:34 +08:00 · 2021-09-30 09:44:20 +08:00 · 2021-09-30 09:43:33 +08:00 · 2021-09-30 09:38:08 +08:00 · 2021-09-30 09:37:51 +08:00 · 2021-09-29 19:07:43 +08:00
14 changed files with 306 additions and 24 deletions
--- a/env.docker.py.example
+++ b/env.docker.py.example
@@ -6,12 +6,14 @@ USER_ACCOUNTS = [
    {
        'key': 0,  # 如使用多个账号 key 不能重复
        'user_name': 'your user name',
-        'password': 'your password'
+        'password': '忽略',
        'type': 'qr'  # qr 为扫码登录，填写其他为密码登录
    },
    # {
    #     'key': 'wangwu',
    #     'user_name': 'wangwu@qq.com',
-    #     'password': 'wangwu'
+    #     'password': 'wangwu',
    #     'type': ''
    # }
 ]
--- a/env.py.example
+++ b/env.py.example
@@ -6,12 +6,14 @@ USER_ACCOUNTS = [
    {
        'key': 0,  # 如使用多个账号 key 不能重复
        'user_name': 'your user name',
-        'password': 'your password'
+        'password': '忽略',
        'type': 'qr'  # qr 为扫码登录，填写其他为密码登录
    },
    # {
    #     'key': 'wangwu',
    #     'user_name': 'wangwu@qq.com',
-    #     'password': 'wangwu'
+    #     'password': 'wangwu',
    #     'type': ''
    # }
 ]
--- a/py12306/app.py
+++ b/py12306/app.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
 import os
 import signal
 import sys
@@ -11,16 +10,19 @@ from py12306.log.order_log import OrderLog
 def app_available_check():
    # return True  # Debug
    if Config().IS_DEBUG:
        return True
    now = time_now()
-    if (now.hour >= 23 and now.minute >= 30) or now.hour < 6:
+    if now.weekday() == 1 and (now.hour > 23 and now.minute > 30 or now.hour < 5):
        CommonLog.add_quick_log(CommonLog.MESSAGE_12306_IS_CLOSED.format(time_now())).flush()
-        open_time = datetime.datetime(now.year, now.month, now.day, 6)
+        open_time = datetime.datetime(now.year, now.month, now.day, 5)
        if open_time < now:
            open_time += datetime.timedelta(1)
        sleep((open_time - now).seconds)
    elif 1 < now.hour < 5:
        CommonLog.add_quick_log(CommonLog.MESSAGE_12306_IS_CLOSED.format(time_now())).flush()
        open_time = datetime.datetime(now.year, now.month, now.day, 5)
        sleep((open_time - now).seconds)
    return True
--- a/py12306/helpers/api.py
+++ b/py12306/helpers/api.py
@@ -1,6 +1,4 @@
 # coding=utf-8
 # 查询余票
 import time
 HOST_URL_OF_12306 = 'kyfw.12306.cn'
 BASE_URL_OF_12306 = 'https://' + HOST_URL_OF_12306
@@ -15,6 +13,18 @@ API_BASE_LOGIN = {
 API_USER_LOGIN_CHECK = BASE_URL_OF_12306 + '/otn/login/conf'
 API_AUTH_QRCODE_BASE64_DOWNLOAD = {
    'url': BASE_URL_OF_12306 + '/passport/web/create-qr64'
 }
 API_AUTH_QRCODE_CHECK = {
    'url': BASE_URL_OF_12306 + '/passport/web/checkqr'
 }
 API_USER_LOGIN = {
    'url': BASE_URL_OF_12306 + '/otn/login/userLogin'
 }
 API_AUTH_CODE_DOWNLOAD = {
    'url': BASE_URL_OF_12306 + '/passport/captcha/captcha-image?login_site=E&module=login&rand=sjrand&_={random}'
 }
--- a/py12306/helpers/notification.py
+++ b/py12306/helpers/notification.py
@@ -33,6 +33,11 @@ class Notification():
        self = cls()
        self.send_email_by_smtp(to, title, content)
    @classmethod
    def send_email_with_qrcode(cls, to, title='', qrcode_path=''):
        self = cls()
        self.send_email_by_smtp_with_qrcode(to, title, qrcode_path)
    @classmethod
    def send_to_telegram(cls, content=''):
        self = cls()
@@ -134,6 +139,46 @@ class Notification():
        except Exception as e:
            CommonLog.add_quick_log(CommonLog.MESSAGE_SEND_EMAIL_FAIL.format(e)).flush()
    def send_email_by_smtp_with_qrcode(self, to, title, qrcode_path):
        import smtplib
        from email.mime.text import MIMEText
        from email.mime.multipart import MIMEMultipart
        from email.mime.image import MIMEImage
        to = to if isinstance(to, list) else [to]
        message = MIMEMultipart()
        message['Subject'] = title
        message['From'] = Config().EMAIL_SENDER
        message['To'] = ", ".join(to)
        htmlFile = """
        <html>
          <head></head>
            <body>
              <p>
                这是你的二维码
              </p>
              <p>
              <br /><img src="cid:0", width=200, height=200  ></p>
            </body>
        </html>
        """
        htmlApart = MIMEText(htmlFile, 'html')
        imageFile = qrcode_path
        imageApart = MIMEImage(open(imageFile, 'rb').read(), imageFile.split('.')[-1])
        imageApart.add_header('Content-ID', '<0>')
        message.attach(imageApart)
        message.attach(htmlApart)
        try:
            server = smtplib.SMTP(Config().EMAIL_SERVER_HOST)
            server.ehlo()
            server.starttls()
            server.login(Config().EMAIL_SERVER_USER, Config().EMAIL_SERVER_PASSWORD)
            server.send_message(message)
            server.quit()
            CommonLog.add_quick_log(CommonLog.MESSAGE_SEND_EMAIL_WITH_QRCODE_SUCCESS).flush()
            self.push_bark(CommonLog.MESSAGE_SEND_EMAIL_WITH_QRCODE_SUCCESS)
        except Exception as e:
            CommonLog.add_quick_log(CommonLog.MESSAGE_SEND_EMAIL_FAIL.format(e)).flush()
    def send_dingtalk_by_webbook(self, content):
        from dingtalkchatbot.chatbot import DingtalkChatbot
        webhook = Config().DINGTALK_WEBHOOK
--- a/py12306/helpers/qrcode.py
+++ b/py12306/helpers/qrcode.py
@@ -0,0 +1,106 @@
 # -*- coding: utf-8 -*-
 import png
 def print_qrcode(path):
    """
    将二维码输出到控制台
    需要终端尺寸足够大才能显示
    :param path: 二维码图片路径 (PNG 格式)
    :return: None
    """
    reader = png.Reader(path)
    width, height, rows, info = reader.read()
    lines = list(rows)
    planes = info['planes']  # 通道数
    threshold = (2 ** info['bitdepth']) / 2  # 色彩阈值
    # 识别二维码尺寸
    x_flag = -1   # x 边距标志
    y_flag = -1   # y 边距标志
    x_white = -1  # 定位图案白块 x 坐标
    y_white = -1  # 定位图案白块 y 坐标
    i = y_flag
    while i < height:
        if y_white > 0 and x_white > 0:
            break
        j = x_flag
        while j < width:
            total = 0
            for k in range(planes):
                px = lines[i][j * planes + k]
                total += px
            avg = total / planes
            black = avg < threshold
            if y_white > 0 and x_white > 0:
                break
            if x_flag > 0 > x_white and not black:
                x_white = j
            if x_flag == -1 and black:
                x_flag = j
            if y_flag > 0 > y_white and not black:
                y_white = i
            if y_flag == -1 and black:
                y_flag = i
            if x_flag > 0 and y_flag > 0:
                i += 1
            j += 1
        i += 1
    assert y_white - y_flag == x_white - x_flag
    scale = y_white - y_flag
    assert width - x_flag == height - y_flag
    module_count = int((width - x_flag * 2) / scale)
    whole_white = '█'
    whole_black = ' '
    down_black = '▀'
    up_black = '▄'
    dual_flag = False
    last_line = []
    output = '\n'
    for i in range(module_count + 2):
        output += up_black
    output += '\n'
    i = y_flag
    while i < height - y_flag:
        if dual_flag:
            output += whole_white
        t = 0
        j = x_flag
        while j < width - x_flag:
            total = 0
            for k in range(planes):
                px = lines[i][j * planes + k]
                total += px
            avg = total / planes
            black = avg < threshold
            if dual_flag:
                last_black = last_line[t]
                if black and last_black:
                    output += whole_black
                elif black and not last_black:
                    output += down_black
                elif not black and last_black:
                    output += up_black
                elif not black and not last_black:
                    output += whole_white
            else:
                last_line[t:t+1] = [black]
            t = t + 1
            j += scale
        if dual_flag:
            output += whole_white + '\n'
        dual_flag = not dual_flag
        i += scale
    output += whole_white
    for i in range(module_count):
        output += up_black if last_line[i] else whole_white
    output += whole_white + '\n'
    print(output, flush=True)
--- a/py12306/log/common_log.py
+++ b/py12306/log/common_log.py
@@ -35,6 +35,8 @@ class CommonLog(BaseLog):
    MESSAGE_SEND_EMAIL_SUCCESS = '邮件发送成功，请检查收件箱'
    MESSAGE_SEND_EMAIL_FAIL = '邮件发送失败，请手动检查配置，错误原因 {}'
    MESSAGE_SEND_EMAIL_WITH_QRCODE_SUCCESS = '二维码邮件发送成功，请检查收件箱扫描登陆'
    MESSAGE_SEND_TELEGRAM_SUCCESS = 'Telegram推送成功'
    MESSAGE_SEND_TELEGRAM_FAIL = 'Telegram推送失败，错误原因 {}'
--- a/py12306/log/user_log.py
+++ b/py12306/log/user_log.py
@@ -13,6 +13,9 @@ class UserLog(BaseLog):
    MESSAGE_DOWNLAODING_THE_CODE = '正在下载验证码...'
    MESSAGE_CODE_AUTH_FAIL = '验证码验证失败 错误原因: {}'
    MESSAGE_CODE_AUTH_SUCCESS = '验证码验证成功 开始登录...'
    MESSAGE_QRCODE_DOWNLOADING = '正在下载二维码...'
    MESSAGE_QRCODE_DOWNLOADED = '二维码保存在: {}，请使用手机客户端扫描'
    MESSAGE_QRCODE_FAIL = '二维码获取失败: {}, {} 秒后重试'
    MESSAGE_LOGIN_FAIL = '登录失败 错误原因: {}'
    MESSAGE_LOADED_USER = '正在尝试恢复用户: {}'
    MESSAGE_LOADED_USER_SUCCESS = '用户恢复成功: {}'
--- a/py12306/order/order.py
+++ b/py12306/order/order.py
@@ -225,7 +225,7 @@ class Order:
        }
        response = self.session.post(API_SUBMIT_ORDER_REQUEST, data)
        result = response.json()
-        if result.get('data') == 'N':
+        if result.get('data') == '0':
            OrderLog.add_quick_log(OrderLog.MESSAGE_SUBMIT_ORDER_REQUEST_SUCCESS).flush()
            return True
        else:
--- a/py12306/query/job.py
+++ b/py12306/query/job.py
@@ -1,4 +1,3 @@
 import sys
 from datetime import timedelta
 from datetime import datetime
@@ -154,14 +153,14 @@ class Job:
            QueryLog.add_quick_log(msg).flush(publish=False)
            raise RuntimeError(msg)
        else:
-            pass
+            return date_query.strftime("%Y-%m-%d")
    def query_by_date(self, date):
        """
        通过日期进行查询
        :return:
        """
-        self.judge_date_legal(date)
+        date = self.judge_date_legal(date)
        from py12306.helpers.cdn import Cdn
        QueryLog.add_log(('\n' if not is_main_thread() else '') + QueryLog.MESSAGE_QUERY_START_BY_DATE.format(date,
                                                                                                              self.left_station,
--- a/py12306/query/query.py
+++ b/py12306/query/query.py
@@ -1,3 +1,4 @@
 from base64 import b64decode
 from py12306.config import Config
 from py12306.cluster.cluster import Cluster
 from py12306.app import app_available_check
@@ -5,7 +6,7 @@ from py12306.helpers.func import *
 from py12306.helpers.request import Request
 from py12306.log.query_log import QueryLog
 from py12306.query.job import Job
-from py12306.helpers.api import API_QUERY_INIT_PAGE
+from py12306.helpers.api import API_QUERY_INIT_PAGE, API_GET_BROWSER_DEVICE_ID
@singleton
@@ -29,6 +30,7 @@ class Query:
    def __init__(self):
        self.session = Request()
        self.request_device_id()
        self.cluster = Cluster()
        self.update_query_interval()
        self.update_query_jobs()
@@ -117,6 +119,32 @@ class Query:
        self.jobs.append(job)
        return job
    def request_device_id(self):
        """
        获取加密后的浏览器特征 ID
        :return:
        """
        response = self.session.get(API_GET_BROWSER_DEVICE_ID)
        if response.status_code == 200:
            try:
                result = json.loads(response.text)
                response = self.session.get(b64decode(result['id']).decode())
                if response.text.find('callbackFunction') >= 0:
                    result = response.text[18:-2]
                result = json.loads(result)
                if not Config().is_cache_rail_id_enabled():
                    self.session.cookies.update({
                        'RAIL_EXPIRATION': result.get('exp'),
                        'RAIL_DEVICEID': result.get('dfp'),
                    })
                else:
                    self.session.cookies.update({
                        'RAIL_EXPIRATION': Config().RAIL_EXPIRATION,
                        'RAIL_DEVICEID': Config().RAIL_DEVICEID,
                    })
            except:
                return False
    @classmethod
    def wait_for_ready(cls):
        self = cls()
--- a/py12306/user/job.py
+++ b/py12306/user/job.py
@@ -1,4 +1,4 @@
-import json
+import base64
 import pickle
 import re
 from os import path
@@ -11,6 +11,7 @@ from py12306.helpers.event import Event
 from py12306.helpers.func import *
 from py12306.helpers.request import Request
 from py12306.helpers.type import UserType
 from py12306.helpers.qrcode import print_qrcode
 from py12306.log.order_log import OrderLog
 from py12306.log.user_log import UserLog
 from py12306.log.common_log import CommonLog
@@ -23,6 +24,7 @@ class UserJob:
    key = None
    user_name = ''
    password = ''
    type = 'qr'
    user = None
    info = {}  # 用户信息
    last_heartbeat = None
@@ -30,6 +32,7 @@ class UserJob:
    user_loaded = False  # 用户是否已加载成功
    passengers = []
    retry_time = 3
    retry_count = 0
    login_num = 0  # 尝试登录次数
    # Init page
@@ -51,6 +54,7 @@ class UserJob:
        self.key = str(info.get('key'))
        self.user_name = info.get('user_name')
        self.password = info.get('password')
        self.type = info.get('type')
    def update_user(self):
        from py12306.user.user import User
@@ -111,7 +115,10 @@ class UserJob:
        if expire: UserLog.print_user_expired()
        self.is_ready = False
        UserLog.print_start_login(user=self)
-        return self.login()
+        if self.type == 'qr':
            return self.qr_login()
        else:
            return self.login()
    def login(self):
        """
@@ -150,6 +157,82 @@ class UserJob:
        return False
    def qr_login(self):
        self.request_device_id()
        image_uuid, png_path = self.download_code()
        while True:
            data = {
                'RAIL_DEVICEID': self.session.cookies.get('RAIL_DEVICEID'),
                'RAIL_EXPIRATION': self.session.cookies.get('RAIL_EXPIRATION'),
                'uuid': image_uuid,
                'appid': 'otn'
            }
            response = self.session.post(API_AUTH_QRCODE_CHECK.get('url'), data)
            result = response.json()
            result_code = int(result.get('result_code'))
            if result_code == 0:
                time.sleep(2)
            elif result_code == 1:
                UserLog.add_quick_log('请确认登录').flush()
                time.sleep(2)
            elif result_code == 2:
                break
            elif result_code == 3:
                try:
                    os.remove(png_path)
                except Exception as e:
                    UserLog.add_quick_log('无法删除文件: {}'.format(e)).flush()
                image_uuid = self.download_code()
        try:
            os.remove(png_path)
        except Exception as e:
            UserLog.add_quick_log('无法删除文件: {}'.format(e)).flush()
        self.session.get(API_USER_LOGIN, allow_redirects=True)
        new_tk = self.auth_uamtk()
        user_name = self.auth_uamauthclient(new_tk)
        self.update_user_info({'user_name': user_name})
        self.session.get(API_USER_LOGIN, allow_redirects=True)
        self.login_did_success()
        return True
    def download_code(self):
        try:
            UserLog.add_quick_log(UserLog.MESSAGE_QRCODE_DOWNLOADING).flush()
            response = self.session.post(API_AUTH_QRCODE_BASE64_DOWNLOAD.get('url'), data={'appid': 'otn'})
            result = response.json()
            if result.get('result_code') == '0':
                img_bytes = base64.b64decode(result.get('image'))
                try:
                    os.mkdir(Config().USER_DATA_DIR + '/qrcode')
                except FileExistsError:
                    pass
                png_path = path.normpath(Config().USER_DATA_DIR + '/qrcode/%d.png' % time.time())
                with open(png_path, 'wb') as file:
                    file.write(img_bytes)
                    file.close()
                if os.name == 'nt':
                    os.startfile(png_path)
                else:
                    print_qrcode(png_path)
                UserLog.add_log(UserLog.MESSAGE_QRCODE_DOWNLOADED.format(png_path)).flush()
                Notification.send_email_with_qrcode(Config().EMAIL_RECEIVER, '你有新的登录二维码啦!', png_path)
                self.retry_count = 0
                return result.get('uuid'), png_path
            raise KeyError('获取二维码失败: {}'.format(result.get('result_message')))
        except Exception as e:
            UserLog.add_quick_log(
                UserLog.MESSAGE_QRCODE_FAIL.format(e, self.retry_time)).flush()
            self.retry_count = self.retry_count + 1
            if self.retry_count == 20:
                self.retry_count = 0
                try:
                    os.remove(self.get_cookie_path())
                except:
                    pass
            time.sleep(self.retry_time)
            return self.download_code()
    def check_user_is_login(self):
        response = self.session.get(API_USER_LOGIN_CHECK)
        is_login = response.json().get('data.is_login', False) == 'Y'
@@ -189,11 +272,10 @@ class UserJob:
            try:
                result = json.loads(response.text)
                headers = {
-                    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36"
+                    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.61 Safari/537.36"
                }
                from base64 import b64decode
                self.session.headers.update(headers)
-                response = self.session.get(b64decode(result['id']).decode())
+                response = self.session.get(base64.b64decode(result['id']).decode())
                if response.text.find('callbackFunction') >= 0:
                    result = response.text[18:-2]
                result = json.loads(result)
--- a/py12306/user/user.py
+++ b/py12306/user/user.py
@@ -32,7 +32,7 @@ class User:
    @classmethod
    def run(cls):
        self = cls()
-        app_available_check()
+        # app_available_check() 用户系统不休息
        self.start()
        pass
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-i http://mirrors.aliyun.com/pypi/simple/  --trusted-host mirrors.aliyun.com
+-i https://pypi.tuna.tsinghua.edu.cn/simple
 appdirs==1.4.3
 beautifulsoup4==4.7.0
 bs4==0.0.1
@@ -12,7 +12,7 @@ Flask-JWT-Extended==3.15.0
 idna==2.8
 itsdangerous==1.1.0
 Jinja2==2.10
-lxml==4.3.0
+lxml==4.6.3
 MarkupSafe==1.1.0
 parse==1.9.0
 pyee==5.0.0
@@ -28,6 +28,7 @@ tqdm==4.28.1
 urllib3==1.24.2
 w3lib==1.19.0
 websockets==7.0
-Werkzeug==0.15.3
+Werkzeug==0.15.5
 DingtalkChatbot==1.3.0
 lightpush==0.1.3
 pypng
Author	SHA1	Message	Date
pjialin	8e13823d88	Merge pull request #413 from IronXiao/master 增加二维码发送到邮箱功能，以便人不在电脑旁登陆失效可以远程扫描登录	2021-10-21 17:37:34 +08:00
IronXiao	481a9c0310	Merge branch 'master' of github.com:IronXiao/py12306	2021-09-30 09:44:20 +08:00
IronXiao	43caf8fdc8	fix some error	2021-09-30 09:43:33 +08:00
IronXiao	ac4abae019	Merge branch 'master' of github.com:IronXiao/py12306	2021-09-30 09:38:08 +08:00
IronXiao	08799d61f0	增加二维码发送到邮箱功能，以便人不在电脑旁登陆失效可以远程扫描登录	2021-09-30 09:37:51 +08:00
IronXiao	6e5ceca134	增加二维码发送到邮箱功能，以便人不在电脑旁登陆失效可以远程扫描登录	2021-09-29 19:07:43 +08:00
pjialin	db34583c7d	Merge pull request #412 from Gardelll/feature/qr_login 添加扫码登录功能	2021-09-27 09:54:23 +08:00
Gardel	4f3abc9446	优化终端二维码显示 Signed-off-by: Gardel <sunxinao@hotmail.com>	2021-09-26 14:04:33 +08:00
Gardel	c98c423c5e	调整网站服务时间网站服务时间以调整为：”全天提供信息查询及退票服务，每日5:00至次日1:00（周二为5:00至23:30）提供售票改签服务“ 见 [互联网购票须知](https://kyfw.12306.cn/otn/gonggao/saleTicketMeans.html?toservicetime&linktypeid=means3) Signed-off-by: Gardel <sunxinao@hotmail.com>	2021-09-25 17:39:36 +08:00
Gardel	f7c8ff4daa	修改二维码打印逻辑防止并发输出日志时错位 Signed-off-by: Gardel <sunxinao@hotmail.com>	2021-09-25 17:35:09 +08:00
Gardel	68a508e30a	添加扫码登录功能 Signed-off-by: Gardel <sunxinao@hotmail.com>	2021-09-24 21:36:37 +08:00
pjialin	49d35aabdc	Merge pull request #401 from DingGHui/master 修改调用submitApi返回值判断	2021-01-07 10:02:16 +08:00
DingGuangHui	9e529c1f9f	修改调用submitApi返回值判断	2021-01-06 16:59:17 +08:00
Jalin	6b6bf41a51	更新为清华 pypi 源 #358	2020-01-10 20:56:07 +08:00
pjialin	badc8b8c31	Merge pull request #357 from pjialin/fix/drag-captcha 更新滑动验证码识别	2020-01-10 20:06:35 +08:00