From 4a5c2b4b0ec39771b25ea03a0ed47bc07414ed59 Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Wed, 27 Mar 2024 11:10:41 +0100 Subject: [PATCH] update cfpfe and stcfp data to 4.24.3 --- models/jsdata_pojo.py | 4 ++-- queue_message/CookiesPublisher.py | 1 + request_sender.py | 8 ++++---- workers/proxies_constants.py | 7 ++++++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/models/jsdata_pojo.py b/models/jsdata_pojo.py index 08a55d0..5e399f9 100644 --- a/models/jsdata_pojo.py +++ b/models/jsdata_pojo.py @@ -265,8 +265,8 @@ class JsDataPojo: self.emt = False self.bfr = False self.dbov = False - self.cfpfe = "ZnVuY3Rpb24oKXt2YXIgbj10LG89ZG9jdW1lbnRbbigzODYpXSgnXHg2Mlx4NzJceDZmXHg3N1x4NzNceDY1XHg3Mlx4NjZceDZjXHg2Zlx4NzdceDJkXHg2M1x4NmZceDZlXHg3NFx4NjFceDY5XHg2ZVx4NjVceDcyJyk7aWYobyl7IWZ1bmN0aW9uIHQoKXt2YXIg" # 4.24.4 - self.stcfp = "dy5oZXJtZXMuY29tL2ZyL2ZyL3BvbHlmaWxscy43ZTFjYzMyM2Y3OWMwNjZlLmpzOjE6ODI2MykKICAgIGF0IG0uYXJncy48Y29tcHV0ZWQ+IChodHRwczovL3d3dy5oZXJtZXMuY29tL2ZyL2ZyL3BvbHlmaWxscy43ZTFjYzMyM2Y3OWMwNjZlLmpzOjE6Mjc5NTEp" # 4.24.4 + self.cfpfe = "ZnVuY3Rpb24oKXt2YXIgbj10LG89ZG9jdW1lbnRbbigzODYpXSgnXHg2Mlx4NzJceDZmXHg3N1x4NzNceDY1XHg3Mlx4NjZceDZjXHg2Zlx4NzdceDJkXHg2M1x4NmZceDZlXHg3NFx4NjFceDY5XHg2ZVx4NjVceDcyJyk7aWYobyl7IWZ1bmN0aW9uIHQoKXt2YXIg" # 4.24.3 + self.stcfp = "dy5oZXJtZXMuY29tL2ZyL2ZyL3BvbHlmaWxscy43ZTFjYzMyM2Y3OWMwNjZlLmpzOjE6ODI2MykKICAgIGF0IG0uYXJncy48Y29tcHV0ZWQ+IChodHRwczovL3d3dy5oZXJtZXMuY29tL2ZyL2ZyL3BvbHlmaWxscy43ZTFjYzMyM2Y3OWMwNjZlLmpzOjE6Mjc5NTEp" # 4.24.3 self.ckwa = True def to_url_encoded_json(self): diff --git a/queue_message/CookiesPublisher.py b/queue_message/CookiesPublisher.py index 7162eb5..5b1dcd3 100644 --- a/queue_message/CookiesPublisher.py +++ b/queue_message/CookiesPublisher.py @@ -5,6 +5,7 @@ REQUEST_DATA_QUEUE = 'REQUEST_DATA' # REQUEST_DATA_QUEUE_TEST = 'REQUEST_DATA_TEST' REQUEST_DATA_QUEUE_TEST = 'REQUEST_DATA_TEST' TEST_QUEUE = 'TEST_QUEUE' +SHARED_OBJECT = 'SHARED_OBJECT' REQUEST_DATA_QUEUE_DE = 'REQUEST_DATA_DE' REQUEST_DATA_OBJECT = 'REQUEST_DATA_OBJECT' REGISTER_QUEUE = 'REGISTER_QUEUE' diff --git a/request_sender.py b/request_sender.py index dac772e..27bff36 100644 --- a/request_sender.py +++ b/request_sender.py @@ -6,7 +6,7 @@ from threading import Thread from db.mongo_manager import MONGO_STORE_MANAGER from excel_reader import read_contacts from models.contact_pojo import ContactPojo -from queue_message.CookiesPublisher import CookiesPublisher, TEST_QUEUE +from queue_message.CookiesPublisher import CookiesPublisher, SHARED_OBJECT, TEST_QUEUE from queue_message.appointmentrequestsender import AppointmentRequestSender from utiles import is_time_between from utils.AppLogging import init_logger @@ -64,17 +64,17 @@ def send_appointment_request(message_queue_name, _contact_list): if __name__ == '__main__': - contacts_file_path = '~/Desktop/contact_list_2024-03-19.xlsx' + contacts_file_path = '~/Desktop/contact_list_2024-03-26-2.xlsx' _contact_list = read_contacts(contacts_file_path) _contact_list_to_book = filter_contacts(_contact_list) - _segment_number = 1 + _segment_number = 5 logger.info("{} contacts to book".format(len(_contact_list_to_book))) last_thread = None for i in range(0, _segment_number): logger.info("segment is {}".format(i)) _step = int(len(_contact_list_to_book) / _segment_number) _sublist = _contact_list_to_book[i * _step:_step * (i + 1)] - _thread1 = Thread(target=send_appointment_request, args=(TEST_QUEUE, _sublist)) + _thread1 = Thread(target=send_appointment_request, args=(SHARED_OBJECT, _sublist)) last_thread = _thread1 _thread1.start() last_thread.join() diff --git a/workers/proxies_constants.py b/workers/proxies_constants.py index 9e08c1b..fbdaa74 100644 --- a/workers/proxies_constants.py +++ b/workers/proxies_constants.py @@ -52,6 +52,11 @@ FR_PROXY_MOB_OXY_STICKY = { 'https': 'http://customer-rendezvousmob-cc-FR:Rdv202220212023@fr-pr.oxylabs.io:{}' } +FR_PROXY_RES_OXY_STICKY = { + 'http': 'http://customer-rendezvous-cc-FR:Rdv202220212023@fr-pr.oxylabs.io:{}', + 'https': 'http://customer-rendezvous-cc-FR:Rdv202220212023@fr-pr.oxylabs.io:{}' +} + DE_PROXY_MOBILE = { 'http': 'http://8153587-mobile-country-DE:jp50x9jmo@194.88.106.169:11842', 'https': 'http://8153587-mobile-country-DE:jp50x9jmo@194.88.106.169:11842' @@ -66,7 +71,7 @@ DE_PROXY_RES = { # PROXY_LIST = [FR_PROXY_MOBILE, FR_PROXY_RES, DE_PROXY_RES, DE_PROXY_MOBILE, ES_PROXY_MOBILE, IT_PROXY_MOBILE] # PROXY_LIST_FR = [FR_PROXY_MOBILE_2, FR_PROXY_MOBILE, FR_PROXY_RES, FR_PROXY_RES_4, FR_PROXY_RES_2] # PROXY_LIST_FR = [FR_PROXY_RES_OXY, FR_PROXY_MOBILE_3] -PROXY_LIST_FR = [FR_PROXY_RES_OXY] +PROXY_LIST_FR = [FR_PROXY_MOB_OXY] MOBILE_PROXY_LIST_FR = [FR_PROXY_MOB_OXY_STICKY] # PROXY_LIST = [FR_PROXY_MOBILE, FR_ # PROXY_RES]