diff --git a/logs/LogSender.py b/logs/LogSender.py index 1c9d977..a9740a5 100644 --- a/logs/LogSender.py +++ b/logs/LogSender.py @@ -7,7 +7,6 @@ from oci.loggingingestion import LoggingClient from oci.loggingingestion.models import PutLogsDetails, LogEntryBatch, LogEntry import definitions -import params from logs.AppLogging import init_logger from pojo import ReserveResultPojo from pojo.ReserveResultPojo import PublishType diff --git a/main.py b/main.py index 5c0fbfe..d371c14 100644 --- a/main.py +++ b/main.py @@ -60,7 +60,7 @@ def init_modems() -> list: return modems -def start_book(start_slot_number, end_slot_number): +def start_book(start_slot_number, end_slot_number, store=0): slot_list = list(range(start_slot_number, end_slot_number + 1)) random.shuffle(slot_list) for i in slot_list: @@ -101,7 +101,7 @@ def start_book(start_slot_number, end_slot_number): logger.info("信号强度: " + str(signal)) proxy = get_proxy(modem.phone_number) commandor = CommandorPage(modem, sim_position=current_sim_position, - slot_position=current_card_pool_slot) + slot_position=current_card_pool_slot, store_type=store) # start the task in thread executor.submit(commandor.start_page, proxy) except Exception as error: @@ -123,4 +123,5 @@ def get_proxy(phone_number): if __name__ == '__main__': # 修改起始行,结束行 - start_book(32, 32) + # 第三个参数store等于0的时候是随机,传入1的时候是总店 + start_book(32, 32, store=0) diff --git a/workers/commandor_page.py b/workers/commandor_page.py index 1d92735..1a22584 100644 --- a/workers/commandor_page.py +++ b/workers/commandor_page.py @@ -47,7 +47,7 @@ class Tls(threading.local): class CommandorPage: tls = Tls() - def __init__(self, serial_modem: SerialModem, slot_position, sim_position): + def __init__(self, serial_modem: SerialModem, slot_position, sim_position, store_type=0): self.otp_value = None self.logger = logging.getLogger("CommandorPage") self.is_finished = False @@ -55,6 +55,7 @@ class CommandorPage: self.slot_position = slot_position self.sim_position = sim_position self.contact = serial_modem.contact + self.store_type = store_type def on_success(self, result: ReserveResultPojo): self.logger.info("on_success called.") @@ -71,7 +72,7 @@ class CommandorPage: u'== SMS message received ==\nFrom: {0}\nTime: {1}\nMessage:\n{2}\n'.format(sms.number, sms.time, sms.text)) # extract the otp number date = str(sms.time)[0:10] - params.oracle_log_sender.send_sms_reception_log(sms.number, sms.text,self.current_gsm_modem.ccid) + params.oracle_log_sender.send_sms_reception_log(sms.number, sms.text, self.current_gsm_modem.ccid) if date == str(datetime.date.today()): self.logger.info("this sms is for today") if "rendez-vous" in sms.text or "appointment" in sms.text: @@ -89,8 +90,8 @@ class CommandorPage: # time.sleep(2) self.is_finished = True # if self.current_gsm_modem: - # self.logger.info("will close used modem") - # self.current_gsm_modem.modem.close() + # self.logger.info("will close used modem") + # self.current_gsm_modem.modem.close() else: self.logger.info("The sms is not for RDV") else: @@ -217,10 +218,15 @@ class CommandorPage: def _setPhoneCountryAndStore(self): # document.getElementById("prefer").value = \"faubourg\"; - self.page.evaluate("""()=>{ - document.getElementById("prefer").value = \"faubourg\"; - document.getElementById("phone_country").focus(); - document.getElementById("phone_country").value = \"FR\" }""") + if self.store_type == 0: + self.page.evaluate("""()=>{ + document.getElementById("phone_country").focus(); + document.getElementById("phone_country").value = \"FR\" }""") + else: + self.page.evaluate("""()=>{ + document.getElementById("prefer").value = \"faubourg\"; + document.getElementById("phone_country").focus(); + document.getElementById("phone_country").value = \"FR\" }""") def _setPhoneNumber(self, phoneNumber): time.sleep(get_random_wait_time()) @@ -312,7 +318,7 @@ def on_success(result: ReserveResultPojo): pass -def launch_page() : +def launch_page(): PROXY_USERNAME = "panleicim-res-fr-" + get_random_id_number_for_proxy() print("proxy_username is " + PROXY_USERNAME) proxy = { @@ -329,7 +335,7 @@ def launch_page() : serial_modem = SerialModem(modem) serial_modem.contact = contact serial_modem.phone_number = contact.phone - page = CommandorPage(serial_modem, 1,1) + page = CommandorPage(serial_modem, slot_position=1, sim_position=1, store_type=1) return page.start_page(None)