Update CHERWIN_TOOLS.py

git代理
This commit is contained in:
CHERWING 2024-07-23 11:30:32 +08:00 committed by GitHub
parent fc0b1539cb
commit 573e6601d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -142,9 +142,6 @@ def CHECK_UPDATE_NEW(local_version, server_version, server_script_url, script_fi
return False return False
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
print(f'发生网络错误:{e}') print(f'发生网络错误:{e}')
# server_base_url = f"https://py.cherwin.cn/{APP_NAME}/"
# server_script_url = f"{server_base_url}{script_filename}"
# CHECK_UPDATE_NEW(local_version, server_version, server_script_url, script_filename, APP_NAME=APP_NAME)
except Exception as e: except Exception as e:
print(f'发生未知错误:{e}') print(f'发生未知错误:{e}')
return False # 返回 False 表示没有进行更新操作 return False # 返回 False 表示没有进行更新操作
@ -339,9 +336,9 @@ def RESTART_SCRIPT(RESTART_SCRIPT_NAME):
def CHECK(): def CHECK():
global CHERWIN_SCRIPT_CONFIG global CHERWIN_SCRIPT_CONFIG
print('>>>>>>>开始获取版本信息...') print('>>>>>>>开始获取版本信息...')
baseurl = 'https://github.com/CHERWING/CHERWIN_SCRIPTS/raw/main/' baseurl = 'https://ghproxy.com/https://github.com/CHERWING/CHERWIN_SCRIPTS/raw/main/'
TOOLS_NAME = 'CHERWIN_TOOLS.py' TOOLS_NAME = 'CHERWIN_TOOLS.py'
server_script_url = f'https://github.com/CHERWING/CHERWIN_SCRIPTS/raw/main/{TOOLS_NAME}' server_script_url = f'https://ghproxy.com/https://github.com/CHERWING/CHERWIN_SCRIPTS/raw/main/{TOOLS_NAME}'
try: try:
response = requests.get(f'{baseurl}CHERWIN_SCRIPT_CONFIG.json', verify=False) response = requests.get(f'{baseurl}CHERWIN_SCRIPT_CONFIG.json', verify=False)
response.encoding = 'utf-8' response.encoding = 'utf-8'
@ -500,7 +497,7 @@ def get_ip():
def main(APP_NAME, local_script_name, ENV_NAME, local_version, need_invite=False): def main(APP_NAME, local_script_name, ENV_NAME, local_version, need_invite=False):
global APP_INFO, TIPS, TIPS_HTML global APP_INFO, TIPS, TIPS_HTML
git_url = f'https://github.com/CHERWING/CHERWIN_SCRIPTS/raw/main/{local_script_name}' git_url = f'https://ghproxy.com/https://github.com/CHERWING/CHERWIN_SCRIPTS/raw/main/{local_script_name}'
if CHECK(): if CHECK():
APP_INFO = CHERWIN_SCRIPT_CONFIG.get("APP_CONFIG", {}).get(ENV_NAME, {}) APP_INFO = CHERWIN_SCRIPT_CONFIG.get("APP_CONFIG", {}).get(ENV_NAME, {})
# print(APP_INFO) # print(APP_INFO)