From e95d174a1f0415f509ed86e6427b100cc6a46ccd Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Sun, 17 Apr 2022 16:37:47 +0200 Subject: [PATCH] configuration de porte --- main.py | 3 ++- params.py | 59 +++++++++++++++++++++++++------------------ reset_all_sim_card.py | 4 +-- scheduler.py | 16 ++++++------ wait_for_sms.py | 6 ++--- 5 files changed, 49 insertions(+), 39 deletions(-) diff --git a/main.py b/main.py index 91fd597..f8f811c 100644 --- a/main.py +++ b/main.py @@ -122,4 +122,5 @@ def get_proxy(phone_number): if __name__ == '__main__': - start_book(31, 31) + # 修改起始行，结束行 + start_book(1, 1) diff --git a/params.py b/params.py index 38dd564..a50328f 100644 --- a/params.py +++ b/params.py @@ -4,32 +4,41 @@ from db.DbManager import DataManager from logs.LogSender import LogSender MODEM_POOL_PORTS = [ - "/dev/tty.usbmodem1431101", - "/dev/tty.usbmodem1431103", - "/dev/tty.usbmodem1431105", - "/dev/tty.usbmodem1431107", - "/dev/tty.usbmodem1431201", - "/dev/tty.usbmodem1431203", - "/dev/tty.usbmodem1431205", - "/dev/tty.usbmodem1431207", - "/dev/tty.usbmodem1431301", - ## "/dev/tty.usbmodem1431303", - "/dev/tty.usbmodem1431305", - "/dev/tty.usbmodem1431307", - "/dev/tty.usbmodem1431401", - "/dev/tty.usbmodem1431403", - "/dev/tty.usbmodem1431405", - "/dev/tty.usbmodem1431407", - "/dev/tty.usbmodem1434101", - "/dev/tty.usbmodem1434103", - "/dev/tty.usbmodem1434105", - "/dev/tty.usbmodem1434107", - "/dev/tty.usbmodem1434201", - "/dev/tty.usbmodem1434203", - "/dev/tty.usbmodem1434205", - "/dev/tty.usbmodem1434207" + "/dev/tty.usbmodem1422101", + "/dev/tty.usbmodem1422103", + "/dev/tty.usbmodem1422105", + "/dev/tty.usbmodem1422107", + "/dev/tty.usbmodem1422201", + "/dev/tty.usbmodem1422203", + "/dev/tty.usbmodem1422205", + "/dev/tty.usbmodem1422207", + "/dev/tty.usbmodem1422301", + ## "/dev/tty.usbmodem1422303", + "/dev/tty.usbmodem1422305", + "/dev/tty.usbmodem1422307", + "/dev/tty.usbmodem1422401", + "/dev/tty.usbmodem1422403", + "/dev/tty.usbmodem1422405", + "/dev/tty.usbmodem1422407", + # modem 2 + "/dev/tty.usbmodem1423101", + "/dev/tty.usbmodem1423103", + "/dev/tty.usbmodem1423105", + "/dev/tty.usbmodem1423107", + "/dev/tty.usbmodem1423201", + "/dev/tty.usbmodem1423203", + "/dev/tty.usbmodem1423205", + "/dev/tty.usbmodem1423207", + "/dev/tty.usbmodem1423301", + "/dev/tty.usbmodem1423303", + "/dev/tty.usbmodem1423305", + "/dev/tty.usbmodem1423307", + "/dev/tty.usbmodem1423401", + "/dev/tty.usbmodem1423403", + "/dev/tty.usbmodem1423405", + "/dev/tty.usbmodem1423407", ] -CARD_POOL_PORT = ["/dev/tty.usbmodem1432101", "/dev/tty.usbmodem1434601"] +CARD_POOL_PORT = ["/dev/tty.usbmodem1422501", "/dev/tty.usbmodem1423601"] firebase_store_manager = DataManager() oracle_log_sender = LogSender() diff --git a/reset_all_sim_card.py b/reset_all_sim_card.py index 9047725..2289073 100644 --- a/reset_all_sim_card.py +++ b/reset_all_sim_card.py @@ -7,11 +7,11 @@ from logs.AppLogging import init_logger from logs.LogSender import LOG_SUBJECT_EVENT, TYPE_EVENT_RESET_ALL_SIM_CARDS from main import card_pool - +# def read_all_the_phone_number(): params.oracle_log_sender.send_log(msg="SIM卡自检开始", subject=LOG_SUBJECT_EVENT, type=TYPE_EVENT_RESET_ALL_SIM_CARDS) start_slot_number = 1 - end_slot_number = 31 + end_slot_number = 32 params.firebase_store_manager.clear_all_sim_info() for i in range(start_slot_number, end_slot_number + 1): card_pool.reset() diff --git a/scheduler.py b/scheduler.py index 3a82fc2..d00037f 100644 --- a/scheduler.py +++ b/scheduler.py @@ -6,20 +6,20 @@ from wait_for_sms import start_waiting_sms def waiting_for_sms_job(): - start_waiting_sms() + start_waiting_sms(1, 31) def start_book_appointment(): - start_book() + start_book(1, 31) def start_waiting_sms_job(sched): - sched.add_job(start_book_appointment, 'cron', day_of_week='mon-sat', hour='10', - minute='30', - misfire_grace_time=10, - second='0', timezone='Europe/Paris', max_instances=1) - sched.add_job(waiting_for_sms_job, 'cron', day_of_week='mon-sat', hour='20', - minute='30', + # sched.add_job(start_book_appointment, 'cron', day_of_week='mon-sat', hour='10', + # minute='30', + # misfire_grace_time=10, + # second='0', timezone='Europe/Paris', max_instances=1) + sched.add_job(waiting_for_sms_job, 'cron', day_of_week='mon-sat', hour='21', + minute='00', misfire_grace_time=10, second='0', timezone='Europe/Paris', max_instances=1) diff --git a/wait_for_sms.py b/wait_for_sms.py index 5eb9266..e77bba6 100644 --- a/wait_for_sms.py +++ b/wait_for_sms.py @@ -56,7 +56,7 @@ def init_modems() -> list: def start_waiting_sms(start_slot_number, end_slot_sum): params.oracle_log_sender.send_wait_sms_log() slot_list = list(range(start_slot_number, end_slot_sum + 1)) - for i in reversed(slot_list): + for i in slot_list: card_pool.reset() logger.info("will switch to " + str(i)) card_pool.switch_to_slot(i) @@ -94,6 +94,6 @@ def start_waiting_sms(start_slot_number, end_slot_sum): modem_pool.close() continue - +#等短信 if __name__ == '__main__': - start_waiting_sms(1, 3) + start_waiting_sms(1, 32)