add option for proxy

main.py

@@ -13,7 +13,7 @@ logger = logging.getLogger()
 logger.addHandler(logging.StreamHandler(stream=sys.stdout))
 
 
-def start_book(start_number, end_number, store_choose_state=0, max_workers=10):
+def start_book(start_number, end_number, store_choose_state=0, max_workers=10, proxy_type=0):
     # read the contact, and contact the 2 objects together
     excel_reader = ExcelHelper()
     all_contacts = excel_reader.read_contacts()
@@ -23,14 +23,16 @@ def start_book(start_number, end_number, store_choose_state=0, max_workers=10):
     logger.info(contacts)
     with ThreadPoolExecutor(max_workers=max_workers) as executor:
         for contact in contacts:
-            proxy = get_proxy(contact.phone)
+            proxy = get_proxy(contact.phone, proxy_type)
             # start the task in thread
-            executor.submit(CommandorPage(contact, store_type=store_choose_state).start_page, proxy)
+            executor.submit(CommandorPage(contact, store_type=store_choose_state, proxy_type=proxy_type).start_page,
+                            proxy)
 
 
-def get_proxy(phone_number):
-    random_id_number = str(phone_number)[1:len(str(phone_number))]
-    proxy_username = "panleicim-res-fr-" + random_id_number
+def get_proxy(phone_number, proxy_type=0):
+    # random_id_number = str(phone_number)[1:len(str(phone_number))]
+    random_id_number = params.get_random_id_number_for_proxy()
+    proxy_username = params.get_proxy_name_prefix(proxy_type) + random_id_number
     logger.info("proxy_username is " + proxy_username)
     proxy = {
         "server": params.PROXY_SERVER,
@@ -42,4 +44,4 @@ def get_proxy(phone_number):
 
 if __name__ == '__main__':
     # 修改联系人行,结束联系人行 第三个参数store等于0的时候是随机，传入1的时候是总店
-    start_book(16, 16, store_choose_state=0)
+    start_book(16, 16, store_choose_state=0, proxy_type=0)