diff --git a/UnitTest/TestAll.py b/UnitTest/TestAll.py index 05134f2cd79aac9d716ed2d45506f2a0f1082a64..beef09585d2cab59c7bc4d554a868b2f3963df25 100644 --- a/UnitTest/TestAll.py +++ b/UnitTest/TestAll.py @@ -7,6 +7,7 @@ import requests from agency.agency_tools import proxy from config.emailConf import sendEmail from config.pushbearConf import sendPushBear +from config.serverchanConf import sendServerChan def _set_header_default(): @@ -58,8 +59,6 @@ class testAll(unittest.TestCase): 实测server酱是否可用 :return: """ - from config.serverchanConf import sendServerChan - sendServerChan(u"server酱 微信通知测试一下") diff --git a/inter/GetQueueCount.py b/inter/GetQueueCount.py index f878347842e7f54eb07750be351b78d8a94ad1a3..3e7535aa2290be0633b83b285d807ac42b1e89ca 100644 --- a/inter/GetQueueCount.py +++ b/inter/GetQueueCount.py @@ -9,6 +9,7 @@ import TickerConfig from config.TicketEnmu import ticket from config.emailConf import sendEmail from config.pushbearConf import sendPushBear +from config.serverchanConf import sendServerChan from config.urlConf import urls from inter.ConfirmSingleForQueue import confirmSingleForQueue from myException.ticketIsExitsException import ticketIsExitsException @@ -130,6 +131,7 @@ class queryQueueByAfterNate: else: sendEmail(ticket.WAIT_ORDER_SUCCESS) sendPushBear(ticket.WAIT_ORDER_SUCCESS) + sendServerChan(ticket.WAIT_ORDER_SUCCESS) raise ticketIsExitsException(ticket.WAIT_AFTER_NATE_SUCCESS) diff --git a/inter/QueryOrderWaitTime.py b/inter/QueryOrderWaitTime.py index 2e457ac87157eb4c200524465b46415f583e4b36..a9131f21789c5d9a2f99383b85156d52ca95637a 100644 --- a/inter/QueryOrderWaitTime.py +++ b/inter/QueryOrderWaitTime.py @@ -5,6 +5,7 @@ import time from config.TicketEnmu import ticket from config.emailConf import sendEmail from config.pushbearConf import sendPushBear +from config.serverchanConf import sendServerChan from myException.ticketIsExitsException import ticketIsExitsException from myException.ticketNumOutException import ticketNumOutException @@ -45,6 +46,8 @@ class queryOrderWaitTime: data.get("orderId", ""))) sendPushBear(ticket.WAIT_ORDER_SUCCESS.format( data.get("orderId", ""))) + sendServerChan(ticket.WAIT_ORDER_SUCCESS.format( + data.get("orderId", ""))) raise ticketIsExitsException(ticket.WAIT_ORDER_SUCCESS.format( data.get("orderId"))) elif data.get("msg", False):