From fd8c5001283ccfd3eb0af869e4c3d1602da060e8 Mon Sep 17 00:00:00 2001 From: IronXiao Date: Mon, 6 Jan 2020 16:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E6=89=93=E7=A0=81=E5=B9=B3=E5=8F=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env.docker.py.example | 3 ++- env.py.example | 3 ++- py12306/app.py | 2 +- py12306/config.py | 2 ++ py12306/helpers/OCR.py | 7 +++++-- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/env.docker.py.example b/env.docker.py.example index 4bb5fe8..1ce8d78 100644 --- a/env.docker.py.example +++ b/env.docker.py.example @@ -28,7 +28,8 @@ QUERY_JOB_THREAD_ENABLED = 0 # 是否开启多线程查询，开启后第个任 # 打码平台账号 # 目前只支持免费打码接口 和 若快打码，注册地址：http://www.ruokuai.com/login -AUTO_CODE_PLATFORM = 'free' # 免费填写 free 若快 ruokuai # 免费打码无法保证持续可用，如失效请手动切换 +AUTO_CODE_PLATFORM = 'free' # 免费填写 free 若快 ruokuai # 免费打码无法保证持续可用，如失效请手动切换 #个人本地打码填写 user,并修改 API_USER_CODE_QCR_API +API_USER_CODE_QCR_API = '' AUTO_CODE_ACCOUNT = { 'user': 'your user name', 'pwd': 'your password' diff --git a/env.py.example b/env.py.example index 4887eed..b17cb17 100644 --- a/env.py.example +++ b/env.py.example @@ -28,7 +28,8 @@ QUERY_JOB_THREAD_ENABLED = 0 # 是否开启多线程查询，开启后第个任 # 打码平台账号 # 目前只支持免费打码接口 和 若快打码，注册地址：http://www.ruokuai.com/login -AUTO_CODE_PLATFORM = 'free' # 免费填写 free 若快 ruokuai # 免费打码无法保证持续可用，如失效请手动切换 +AUTO_CODE_PLATFORM = 'free' # 免费填写 free 若快 ruokuai # 免费打码无法保证持续可用，如失效请手动切换; 个人打码填写 user 并修改API_USER_CODE_QCR_API 为自己地址 +API_USER_CODE_QCR_API = '' AUTO_CODE_ACCOUNT = { # 使用 free 可用省略 'user': 'your user name', 'pwd': 'your password' diff --git a/py12306/app.py b/py12306/app.py index 4bf5317..c7bcf03 100644 --- a/py12306/app.py +++ b/py12306/app.py @@ -81,7 +81,7 @@ class App: @classmethod def check_auto_code(cls): - if Config().AUTO_CODE_PLATFORM == 'free': return True + if Config().AUTO_CODE_PLATFORM == 'free' or Config().AUTO_CODE_PLATFORM == 'user': return True if not Config().AUTO_CODE_ACCOUNT.get('user') or not Config().AUTO_CODE_ACCOUNT.get('pwd'): return False return True diff --git a/py12306/config.py b/py12306/config.py index 9944832..eb88c36 100644 --- a/py12306/config.py +++ b/py12306/config.py @@ -22,6 +22,8 @@ class Config: QUERY_JOB_THREAD_ENABLED = 0 # 打码平台账号 AUTO_CODE_PLATFORM = '' + #用户打码平台地址 + API_USER_CODE_QCR_API = '' AUTO_CODE_ACCOUNT = {'user': '', 'pwd': ''} # 输出日志到文件 OUT_PUT_LOG_TO_FILE_ENABLED = 0 diff --git a/py12306/helpers/OCR.py b/py12306/helpers/OCR.py index a20f6bd..d124a08 100644 --- a/py12306/helpers/OCR.py +++ b/py12306/helpers/OCR.py @@ -25,7 +25,7 @@ class OCR: :return: """ self = cls() - if Config().AUTO_CODE_PLATFORM == 'free': + if Config().AUTO_CODE_PLATFORM == 'free' or Config().AUTO_CODE_PLATFORM == 'user': return self.get_image_by_free_site(img) return self.get_img_position_by_ruokuai(img) @@ -58,7 +58,10 @@ class OCR: data = { 'img': img } - response = self.session.post(API_FREE_CODE_QCR_API, data=data, timeout=30) + if Config().AUTO_CODE_PLATFORM == 'free': + response = self.session.post(API_FREE_CODE_QCR_API, data=data, timeout=30) + else: + response = self.session.post(Config().API_USER_CODE_QCR_API, data=data, timeout=30) result = response.json() if result.get('msg') == 'success': pos = result.get('result')