From 71b73f71106e070be8cfe8e5e6305c1708c3eb22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87?= <31683427+qq674197141@users.noreply.github.com>
Date: Thu, 25 Apr 2019 17:23:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=98=BF=E9=87=8C=E4=BA=91?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E8=A7=A3=E8=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                  |  1 -
 config/emailConf.py         | 37 ++++++++++++++++++++++++++++++++++++-
 config/ticket_config.yaml   |  8 ++++++++
 inter/QueryOrderWaitTime.py |  2 ++
 4 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index d78a6d5..41838a2 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 *.html
 *.pyc
-*.yaml
 *.log
 .idea/
diff --git a/config/emailConf.py b/config/emailConf.py
index 514f1c8..04365ab 100755
--- a/config/emailConf.py
+++ b/config/emailConf.py
@@ -5,7 +5,10 @@ __author__ = 'MR.wen'
 from email.header import Header
 from email.mime.text import MIMEText
 from config.ticketConf import _get_yaml
+# from ticketConf import _get_yaml
 import smtplib
+from aliyunsdkcore.client import AcsClient
+from aliyunsdkcore.request import CommonRequest
 
 
 def sendEmail(msg):
@@ -47,6 +50,38 @@ def sendEmail(msg):
     else:
         pass
 
+def sendmessage(ticketmseeage:str):
+    '''
+    短信通知，调用阿里云接口
+    '''
+    message_conf = _get_yaml()
+    is_email = message_conf["message_conf"]["is_massage"]
+    if is_email:
+        accessKeyId = message_conf["message_conf"]["aliyunkeyid"]
+        aliyunsecret = message_conf["message_conf"]["aliyunsecret"]
+        phonenumbers = message_conf["message_conf"]["phone"]
+        trcket = '{"code":"'+ticketmseeage+'"}'
+        client = AcsClient(accessKeyId,aliyunsecret, 'cn-hangzhou')
+        request = CommonRequest()
+        request.set_accept_format('json')
+        request.set_domain('dysmsapi.aliyuncs.com')
+        request.set_method('POST')
+        request.set_protocol_type('https') # https | http
+        request.set_version('2017-05-25')
+        request.set_action_name('SendSms')
+        request.add_query_param('RegionId', 'cn-hangzhou')
+        request.add_query_param('PhoneNumbers', phonenumbers)
+        request.add_query_param('SignName', '抢票小助手')
+        request.add_query_param('TemplateCode', 'SMS_164266405')
+        request.add_query_param('TemplateParam', trcket)
+        response = client.do_action(request)
+        # python2:  print(response) 
+        print(str(response, encoding = 'utf-8'))
+        try:
+            pass
+        except Exception as identifier:
+            print(u"短信发送失败{}".format(identifier))
 
 if __name__ == '__main__':
-    sendEmail(1)
\ No newline at end of file
+    # sendEmail(1)
+    sendmessage("Z50")
\ No newline at end of file
diff --git a/config/ticket_config.yaml b/config/ticket_config.yaml
index 63f415b..887932b 100755
--- a/config/ticket_config.yaml
+++ b/config/ticket_config.yaml
@@ -102,6 +102,14 @@ email_conf:
   password: ""
   host: "smtp.qq.com"
 
+#短信接口，用的是阿里云的短信接口
+message_conf:
+  is_massage: True
+  aliyunkeyid: "aliyunkeyid"
+  aliyunsecret: "aliyunsecret"
+  phone: 'phone'
+
+
 # 是否开启 pushbear 微信提醒， 使用前需要前往 http://pushbear.ftqq.com 扫码绑定获取 send_key 并关注获得抢票结果通知的公众号
 pushbear_conf:
   is_pushbear: False
diff --git a/inter/QueryOrderWaitTime.py b/inter/QueryOrderWaitTime.py
index 2e457ac..c6c34df 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.emailConf import sendmessage
 from config.pushbearConf import sendPushBear
 from myException.ticketIsExitsException import ticketIsExitsException
 from myException.ticketNumOutException import ticketNumOutException
@@ -45,6 +46,7 @@ class queryOrderWaitTime:
                             data.get("orderId", "")))
                         sendPushBear(ticket.WAIT_ORDER_SUCCESS.format(
                             data.get("orderId", "")))
+                        sendmessage(str(data.get("orderId", "")))
                         raise ticketIsExitsException(ticket.WAIT_ORDER_SUCCESS.format(
                             data.get("orderId")))
                     elif data.get("msg", False):