diff --git a/common/Httpx.py b/common/Httpx.py index 208bc16..b79ea51 100644 --- a/common/Httpx.py +++ b/common/Httpx.py @@ -62,7 +62,13 @@ def log_plaintext(text): return text # 内置的UA列表 -ua_list = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36 Edg/112.0.1722.39||Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36 Edg/114.0.1788.0||Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36 Edg/114.0.1788.0 uacq||Mozilla/5.0 (Windows NT 10.0; WOW64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.5666.197 Safari/537.36||Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 uacq||Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36'.split('||') +ua_list = [ 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36 Edg/112.0.1722.39', + 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36 Edg/114.0.1788.0', + 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36 Edg/114.0.1788.0 uacq', + 'Mozilla/5.0 (Windows NT 10.0; WOW64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.5666.197 Safari/537.36', + 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36 uacq', + 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36' + ] # 日志记录器 logger = log.log('http_utils') @@ -177,7 +183,7 @@ def checkcn(): variable.iscn = bool(body.flag) if (not variable.iscn): variable.fakeip = config.read_config('common.fakeip') - logger.info("您在非中国大陆服务器上启动了项目,已自动开启ip伪装") + logger.info(f"您在非中国大陆服务器({body.country})上启动了项目,已自动开启ip伪装") logger.warning("此方式无法解决咪咕音乐的链接获取问题,您可以配置代理,服务器地址可在下方链接中找到\nhttps://hidemy.io/cn/proxy-list/?country=CN#list") except Exception as e: logger.warning('检查服务器位置失败,已忽略') diff --git a/common/config.py b/common/config.py index 855fb1e..c9670a5 100644 --- a/common/config.py +++ b/common/config.py @@ -51,7 +51,7 @@ class ConfigReadException(Exception): "host": "0.0.0.0", "_host-desc": "服务器启动时所使用的HOST地址", "port": "9763", - "_port_desc": "服务器启动时所使用的端口", + "_port-desc": "服务器启动时所使用的端口", "debug_mode": False, "_debug_mode-desc": "是否开启调试模式", "log_length_limit": 500, @@ -119,7 +119,7 @@ class ConfigReadException(Exception): "appid": "1005", "_appid-desc": "酷狗音乐的appid,官方安卓为1005,官方PC为1001", "signatureKey": "OIlwieks28dk2k092lksi2UIkp", - "_signatureKey": "客户端signature采用的key值,需要与appid对应", + "_signatureKey-desc": "客户端signature采用的key值,需要与appid对应", "clientver": "12029", "_clientver-desc": "客户端versioncode,pidversionsecret可能随此值而变化", "pidversionsecret": "57ae12eb6890223e355ccfcb74edf70d", diff --git a/common/log.py b/common/log.py index 4fe8dd5..5cc0b72 100644 --- a/common/log.py +++ b/common/log.py @@ -17,10 +17,11 @@ from .utils import sanitize_filename, add_to_global_namespace from .variable import debug_mode, log_length_limit -try: - os.mkdir("logs") -except: - pass +if not os.path.exists("logs"): + try: + os.mkdir("logs") + except: + pass def highlight_error(error): # 对堆栈跟踪进行语法高亮 diff --git a/common/lxsecurity.py b/common/lxsecurity.py index 7da9cbe..1c017f8 100644 --- a/common/lxsecurity.py +++ b/common/lxsecurity.py @@ -27,12 +27,10 @@ def checklxmheader(lxm, url): arr, outsideversion = tuple([cop.split(']')[0] + ']', cop.split(']')[1]]) arr = json.loads(arr) version = re.findall("\\d+", version)[0] - if (not outsideversion.startswith(version)): + + if not outsideversion.startswith(version): return False - if ( - (not (version) in ("".join(arr))) and - (not (retvalue) in "".join(arr)) - ): + if (not (version) in ("".join(arr))) and (not (retvalue) in "".join(arr)): return False return True except: