diff --git a/check_results.py b/check_results.py index 7aea08e..a5ce6c1 100644 --- a/check_results.py +++ b/check_results.py @@ -60,7 +60,7 @@ class Worker: print("url is " + url_to_check) content = None random_id_number = str(phone_number)[1:len(str(phone_number))] - proxy_username = "panleicim-stc-fr-" + random_id_number + proxy_username = "panleicim-res-fr-" + random_id_number print("proxy_username is " + proxy_username) proxy = { "server": params.PROXY_SERVER, @@ -70,7 +70,7 @@ class Worker: while content is None: content = self.load_page(browser, url_to_check, proxy) random_id_number = get_random_id_number_for_proxy() - proxy_username = "panleicim-stc-fr-" + random_id_number + proxy_username = "panleicim-res-fr-" + random_id_number print("proxy_username is " + proxy_username) proxy = { "server": params.PROXY_SERVER, diff --git a/commandor_page.py b/commandor_page.py index 532ad78..01975b1 100644 --- a/commandor_page.py +++ b/commandor_page.py @@ -47,7 +47,7 @@ class CommandorPage: first_page = None while first_page is None: first_page = self.start_brower(proxy, pwright, user_agent) - proxy_username = "panleicim-stc-fr-" + get_random_id_number_for_proxy() + proxy_username = "panleicim-res-fr-" + get_random_id_number_for_proxy() self.logger.info("proxy_username is " + proxy_username) proxy = { "server": params.PROXY_SERVER, @@ -190,7 +190,7 @@ def on_success(result: ReserveResultPojo): def launch_page(ready_for_otp) -> threading.Event: - PROXY_USERNAME = "panleicim-stc-fr-" + get_random_id_number_for_proxy() + PROXY_USERNAME = "panleicim-res-fr-" + get_random_id_number_for_proxy() print("proxy_username is " + PROXY_USERNAME) proxy = { "server": PROXY_SERVER, @@ -217,7 +217,7 @@ if __name__ == '__main__': # event = launch_page(wait_for_otp) import urllib.request - proxy = urllib.request.ProxyHandler({'https': 'http://panleicim-stc-fr-121:94sY7zwBG13i@gw.ntnt.io:5959'}) + proxy = urllib.request.ProxyHandler({'https': 'http://panleicim-res-fr-121:94sY7zwBG13i@gw.ntnt.io:5959'}) opener = urllib.request.build_opener(proxy) urllib.request.install_opener(opener) content = urllib.request.urlopen('https://api.ipify.org').read() diff --git a/main.py b/main.py index 4a34522..712413a 100644 --- a/main.py +++ b/main.py @@ -17,7 +17,6 @@ from params import MODEM_POOL_PORTS, CARD_POOL_PORT, firebase_store_manager, ora from pojo.ReserveResultPojo import ReserveResultPojo from pojo.serial_modem import SerialModem from utils.excel_reader import ExcelHelper -from utils.message_receiver import MessageReceiver from utils.operator import check_operator, Operator OTP_TIMEOUT = 180 @@ -161,12 +160,6 @@ def on_success(result: ReserveResultPojo): is_finished = True -def start_listen(): - logger.info("start to listen to message queue") - receiver = MessageReceiver() - receiver.start_listener(on_message_received) - - def on_ready_for_otp(e: Event, commandor: CommandorPage): logger.info("on_ready_for_otp() called.") global thread_event @@ -174,8 +167,8 @@ def on_ready_for_otp(e: Event, commandor: CommandorPage): def start_book(): - start_slot_number = 1 - end_slot_number = 32 + start_slot_number = 18 + end_slot_number = 21 for i in range(start_slot_number, end_slot_number + 1): card_pool.reset() logger.info("will switch to " + str(i)) @@ -221,7 +214,7 @@ def start_book(): def get_proxy(phone_number): random_id_number = str(phone_number)[1:len(str(phone_number))] - proxy_username = "panleicim-stc-fr-" + random_id_number + proxy_username = "panleicim-res-fr-" + random_id_number logger.info("proxy_username is " + proxy_username) proxy = { "server": params.PROXY_SERVER, diff --git a/params.py b/params.py index cb6d5a1..ef31008 100644 --- a/params.py +++ b/params.py @@ -27,5 +27,5 @@ oracle_log_sender = LogSender() # proxy PROXY_SERVER = "http://gw.ntnt.io:5959" -PROXY_USERNAME = "panleicim-stc-fr-192012" +PROXY_USERNAME = "panleicim-res-fr-192012" PROXY_PASSWORD = "94sY7zwBG13i" \ No newline at end of file diff --git a/wait_for_sms.py b/wait_for_sms.py index 3eaacf4..a2f9af3 100644 --- a/wait_for_sms.py +++ b/wait_for_sms.py @@ -85,7 +85,7 @@ def init_modems() -> list: def start_waiting_sms(): params.oracle_log_sender.send_wait_sms_log() slot_number = 1 - slot_sum = 32 + slot_sum = 21 for i in range(slot_number, slot_sum + 1): card_pool.reset() logger.info("will switch to " + str(i))