From f50e5971929f843616a002d2ab96721665030a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=87=E8=B4=A4=E5=B9=B3?= <jim.wen@huolala.cn>
Date: Thu, 13 Jun 2019 11:37:16 +0800
Subject: [PATCH] 1. fix yaml error 2. fix model load path error

---
 README.md                 | 6 ++----
 config/ticketConf.py      | 6 ++----
 requirements.txt          | 4 ++--
 verify/localVerifyCode.py | 9 +++++++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 8aa2a6a..46b2e81 100755
--- a/README.md
+++ b/README.md
@@ -100,10 +100,8 @@
         ```
    - 自动更换ip软件目前已支持TPLINK和小米路由器，只限家庭网络[点我跳转](https://github.com/testerSunshine/AutoRouterIP)
    - 关于登录接口需要识别DEVICES_ID的情况，可以使用本地打开12306，在任意一接口里面抓取DEVICES_ID，填于login.py文件中的141行
-    ```
-       原来的 devicesId = eval(devicesIdRsp.split("(")[1].split(")")[0].replace("'", ""))["dfp"]
-       更换为 devicesId = 刚才抓取的DEVICES_ID填上即可
-    ```
+       - `原来的 devicesId = eval(devicesIdRsp.split("(")[1].split(")")[0].replace("'", ""))["dfp"]`
+       - `更换为 devicesId = 刚才抓取的DEVICES_ID填上即可`
     - 浏览器截图
     ![image](https://github.com/testerSunshine/12306/blob/master/uml/REIL_DEVICEID.png)
     
diff --git a/config/ticketConf.py b/config/ticketConf.py
index 14c272d..b84c89b 100755
--- a/config/ticketConf.py
+++ b/config/ticketConf.py
@@ -1,6 +1,4 @@
 # -*- coding: utf8 -*-
-from config import configCommon
-
 __author__ = 'MR.wen'
 import os
 import yaml
@@ -14,10 +12,10 @@ def _get_yaml():
     path = os.path.join(os.path.dirname(__file__) + '/ticket_config.yaml')
     try:  # 兼容2和3版本
         with open(path, encoding="utf-8") as f:
-            s = yaml.load(f, Loader=yaml.FullLoader)
+            s = yaml.load(f)
     except Exception:
         with open(path) as f:
-            s = yaml.load(f, Loader=yaml.FullLoader)
+            s = yaml.load(f)
     return s.decode() if isinstance(s, bytes) else s
 
 
diff --git a/requirements.txt b/requirements.txt
index 9b43d77..bbd6e22 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 beautifulsoup4==4.5.3
 bs4==0.0.1
-PyYAML==4.2b1
+PyYAML>5.1.1
 six==1.10.0
 requests==2.18.4
-Pillow==5.0.0
+Pillow
 wrapcache==1.0.8
 ntplib==0.3.3
 sklearn
diff --git a/verify/localVerifyCode.py b/verify/localVerifyCode.py
index 6909bdb..f1580f6 100644
--- a/verify/localVerifyCode.py
+++ b/verify/localVerifyCode.py
@@ -1,5 +1,7 @@
 # coding: utf-8
 import base64
+import os
+
 import cv2
 import numpy as np
 from keras import models
@@ -7,6 +9,9 @@ from keras import models
 
 from verify import pretreatment
 from verify.mlearn_for_image import preprocess_input
+PATH = lambda p: os.path.abspath(
+    os.path.join(os.path.dirname(__file__), p)
+)
 
 
 def get_text(img, offset=0):
@@ -38,7 +43,7 @@ def verify(fn):
     imgs = preprocess_input(imgs)
     text_list = []
     # 识别文字
-    model = models.load_model('model.v2.0.h5')
+    model = models.load_model(PATH('../model.v2.0.h5'))
     label = model.predict(text)
     label = label.argmax()
     text = verify_titles[label]
@@ -59,7 +64,7 @@ def verify(fn):
         text_list.append(text)
     print("题目为{}".format(text_list))
     # 加载图片分类器
-    model = models.load_model('12306.image.model.h5')
+    model = models.load_model(PATH('../12306.image.model.h5'))
     labels = model.predict(imgs)
     labels = labels.argmax(axis=1)
     results = []