From 1c5ba95ff879154e9e8d75a6e54b3a02099be5a5 Mon Sep 17 00:00:00 2001
From: kongkongyzt <kongkongyzt@gmail.com>
Date: Fri, 11 Jan 2019 00:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=EF=BC=8C=20=E5=AE=8C=E5=96=84pushbear=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UnitTest/TestAll.py         |   8 ++++++++
 config/pushbearConf.py      |  26 ++++++++++++++++++++++++++
 config/ticket_config.yaml   |   5 +++++
 inter/QueryOrderWaitTime.py |   3 +++
 tkcode.png                  | Bin 0 -> 1492 bytes
 5 files changed, 42 insertions(+)
 create mode 100644 tkcode.png

diff --git a/UnitTest/TestAll.py b/UnitTest/TestAll.py
index 17eb608..3943e70 100644
--- a/UnitTest/TestAll.py
+++ b/UnitTest/TestAll.py
@@ -6,6 +6,7 @@ import requests
 
 from agency.agency_tools import proxy
 from config.emailConf import sendEmail
+from config.pushbearConf import sendPushBear
 
 
 def _set_header_default():
@@ -38,6 +39,13 @@ class testAll(unittest.TestCase):
         :return:
         """
         sendEmail("订票小助手测试一下")
+    
+    def testPushbear(self):
+        """
+        实测pushbear是否可用
+        :return:
+        """
+        sendPushBear("pushbear 微信通知测试一下")
 
     # def testConfig(self):
     #     """
diff --git a/config/pushbearConf.py b/config/pushbearConf.py
index e69de29..2f3a496 100644
--- a/config/pushbearConf.py
+++ b/config/pushbearConf.py
@@ -0,0 +1,26 @@
+# -*- coding: utf8 -*-
+__author__ = 'kongkongyzt'
+import requests
+from config.ticketConf import _get_yaml
+
+PUSH_BEAR_API_PATH = "https://pushbear.ftqq.com/sub" 
+
+def sendPushBear(msg):
+    """
+    pushBear微信通知
+    :param str: 通知内容 content
+    :return:
+    """
+    conf = _get_yaml()
+    if conf["pushbear_conf"]["is_pushbear"] and conf["pushbear_conf"]["send_key"].strip() != "":
+        try:
+            requests.get("{}?sendkey={}&text=来自12306抢票助手的通知&desp={}".format(PUSH_BEAR_API_PATH, conf["pushbear_conf"]["send_key"].strip(), msg))
+            print(u"已下发 pushbear 微信通知, 请查收")
+        except Exception as e:
+            print(u"pushbear 配置有误 {}".format(e))
+    else:
+        pass
+
+
+if __name__ == '__main__':
+    sendPushBear(1)
\ No newline at end of file
diff --git a/config/ticket_config.yaml b/config/ticket_config.yaml
index 5738135..80d0509 100755
--- a/config/ticket_config.yaml
+++ b/config/ticket_config.yaml
@@ -103,6 +103,11 @@ email_conf:
   password: ""
   host: "smtp.qq.com"
 
+# 是否开启 pushbear 微信提醒， 使用前需要前往 http://pushbear.ftqq.com 扫码绑定获取 send_key 并关注获得抢票结果通知的公众号
+pushbear_conf:
+  is_pushbear: False
+  send_key: ""
+
 # 是否开启cdn查询，可以更快的检测票票 1为开启，2为关闭
 is_cdn: 1
 
diff --git a/inter/QueryOrderWaitTime.py b/inter/QueryOrderWaitTime.py
index 9dbc888..2e457ac 100644
--- a/inter/QueryOrderWaitTime.py
+++ b/inter/QueryOrderWaitTime.py
@@ -4,6 +4,7 @@ import time
 
 from config.TicketEnmu import ticket
 from config.emailConf import sendEmail
+from config.pushbearConf import sendPushBear
 from myException.ticketIsExitsException import ticketIsExitsException
 from myException.ticketNumOutException import ticketNumOutException
 
@@ -42,6 +43,8 @@ class queryOrderWaitTime:
                     if data and data.get("orderId", ""):
                         sendEmail(ticket.WAIT_ORDER_SUCCESS.format(
                             data.get("orderId", "")))
+                        sendPushBear(ticket.WAIT_ORDER_SUCCESS.format(
+                            data.get("orderId", "")))
                         raise ticketIsExitsException(ticket.WAIT_ORDER_SUCCESS.format(
                             data.get("orderId")))
                     elif data.get("msg", False):
diff --git a/tkcode.png b/tkcode.png
new file mode 100644
index 0000000000000000000000000000000000000000..35a70ff2c5d30380b1e9b32deaba0d5795f9afd1
GIT binary patch
literal 1492
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsug)C@jao@c$hHpJPgXQYu5r
z0iX!u|Jw{L3<BKT+&tU@JUjy8{Ji|)(jo!^BGU5WARsR%E(HYQa&pS5>Z;0e`ufJk
z`uYy2fKia2Ur<<3R7glvL=Xt2M8w2Iq|~IOWTd3j43y=7K-oZBPhDMIPutYgz`)eh
z!NDHci2nx|1UVS?F{&~%Dlsq#GBOJ?{y)Ny1#~tuBO}5;K=(2+v#_HIfusc(8JL)u
z7@3)vxR@cz8JPr`6@^#~9fbpxL|79G8z*iwa!T5yys$`A5XD50^8dFOc$k4k2r>&Y
z*fV^Am@ueF8RO?~I=V}GeC}T>JZfK6FI#!tyerJmv}4}Q{@t&SB=dQnP1`6eo0eU<
z#&?mj**5iSwhx!x^7s9?YDd?fV8PdN^Dgi{KYKg6bjH#hoo988Wo~JI3IF*0N9lc$
z?wq%OE*r|{{9A5Ym+{tf&Z{-gE*pyWT>E&g@Qa%6k64qwi`gz8<-b3^AshJo>@uZ|
z>o#`Gx%Hzj{dR}%p4-=JE-x$n-dnr*d}h)0_jAtpCEa>FFTLBZc44-AzFv}A+Qog7
zum4W6oKO;e`gU~G?5$t6N5}2??S6GmU2^4hv#x7uR*%%uif5ct7SuYc{rODR{)%<G
zkFKvg6Lxuin7z!G+ZB6!H7jP!`p*z@Ci?Q1&kS#t&#t_BFFSI3#+vJ9>x|`ouA2Ji
zaLU<dnLfe4e?Go`d#cH$dVWLOWw}{LUwfQgyd){9K2Gw|=G@uY|4y9wdpWB3yx~im
z1lez&vb~O1Y>7(V@@U(P{@blK`9`}}MsD$myWDv+ef|3D7yY$U->;izx9897<aeEq
zk~YfxTeI@<J(HYuN|}qx1*7X-AK(7gbnDOC-DXi!uFl(N{JP)s_?q>PewN)gj1FG&
z_3ey#>T@jq{SDh!9rQV}%caoRY|kU<A6ENxr>{FXe|Ajry5u$2Dtij}zEzh+P4-yh
z@@<>Cai87BuO_)ax4NC%9Cz>1;d4i#k8k;%yWW0*$ow;A$L`G+mpEtl=08KT@4VQR
zyG&hz=fB$e@$J0in+Hv{A2r{aq;}cX?$+n?+xP!5yZ@=?V~$_8=y7?E&I$R;&&}PP
z9H%WgqyJgwxB32e*4i8FeSJ%N-Og{@PIUg`vB@p({P--Xa?WwfM@q%VEP{{jagWNm
z`7wCOZHu1g+h2CF*Hni0hTY80`kkiycFURKuQNJR|1&Ji`|K0kaX#m^{KIL|)wkV#
zT}n^eccm*@Q1bhHkLOd~th*bno_6k{*g7TMO~w}g4ERob($83OO}p-*v7y-WexI^K
z(>|NmOt~H#IQzMLY3<JWp3|frY1)ar>D$~p(Xv0Y&uHE3to4U0jwF{ZD*Up2f%W5(
z^OLQrK8n1({q5mqiMjQiGtU3Ea!VF|IrDoCJhyTfOc3mt%*iMr#AML7@k<0t!XXDY
imWCdeUo-mSOBxy#6u|suPDUmNCkME;!NZXMe-i+XX$A)X

literal 0
HcmV?d00001