diff --git a/contact.xlsx b/contact.xlsx index 9ed34e7..a6d9670 100644 Binary files a/contact.xlsx and b/contact.xlsx differ diff --git a/main.py b/main.py index 978f38e..0fe92f7 100644 --- a/main.py +++ b/main.py @@ -210,14 +210,7 @@ def start_book(): logger.info("contact found for this ccid") signal = modem.modem.signalStrength logger.info("信号强度: " + str(signal)) - random_id_number = str(modem.phone_number)[1:len(str(modem.phone_number))] - PROXY_USERNAME = "panleicim-cc-fr-sid-" + random_id_number - logger.info("proxy_username is " + PROXY_USERNAME) - proxy = { - "server": params.PROXY_SERVER, - "username": PROXY_USERNAME, - "password": params.PROXY_PASSWORD - } + proxy = get_proxy(modem.phone_number) commandor.start_page(proxy=proxy, contact=modem.contact, on_ready_for_otp=on_ready_for_otp, on_sucess=on_success) start_to_handle_sms(modem) @@ -226,6 +219,18 @@ def start_book(): continue +def get_proxy(phone_number): + random_id_number = str(phone_number)[1:len(str(phone_number))] + proxy_username = "panleicim-cc-fr-sid-" + random_id_number + logger.info("proxy_username is " + proxy_username) + proxy = { + "server": params.PROXY_SERVER, + "username": proxy_username, + "password": params.PROXY_PASSWORD + } + return proxy + + if __name__ == '__main__': init_logger() logger = logging.getLogger()