diff --git a/CHERWIN_TOOLS.py b/CHERWIN_TOOLS.py index fc98336..4d2f809 100755 --- a/CHERWIN_TOOLS.py +++ b/CHERWIN_TOOLS.py @@ -11,7 +11,7 @@ import requests from http import HTTPStatus from datetime import datetime -NOW_TOOLS_VERSION = '2024.05.23' +NOW_TOOLS_VERSION = '2024.05.26' if os.path.isfile('DEV_ENV.py'): import DEV_ENV IS_DEV = True @@ -351,7 +351,7 @@ def CHECK(): if 'code' in CHERWIN_SCRIPT_CONFIG: CHERWIN_SCRIPT_CONFIG = None TOOLS_VERSION = CHERWIN_SCRIPT_CONFIG.get('TOOLS_VERSION', NOW_TOOLS_VERSION) - + if CHECK_UPDATE_NEW(NOW_TOOLS_VERSION, TOOLS_VERSION, server_script_url, TOOLS_NAME): print('更新脚本完成') # print(f'重新检测[{TOOLS_NAME}]版本') @@ -433,8 +433,9 @@ def YDXQ_SIGN(): sign_hash = hashlib.md5(sign_string.encode()).hexdigest() return sign_hash, n -def HXEK_SIGN(memberId): - appid = "wxa1f1fa3785a47c7d" +def HXEK_SIGN(memberId,appid): + + # appid = "wxa1f1fa3785a47c7d" secret = 'damogic8888' # 获取GMT+8的当前时间戳 timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) diff --git a/HXEK.py b/HXEK.py index 32a8e42..732dfcc 100644 --- a/HXEK.py +++ b/HXEK.py @@ -89,7 +89,6 @@ class RUN: self.use_power_max = False def make_request(self, url, method='post', headers={}, data={}, params=None): - if headers == {}: headers = self.headers try: @@ -108,7 +107,7 @@ class RUN: print("发生了未知错误❌:", e) def gen_sign(self): - sign, random_int, timestamp = CHERWIN_TOOLS.HXEK_SIGN(self.memberId) + sign, random_int, timestamp = CHERWIN_TOOLS.HXEK_SIGN(self.memberId,self.appid) self.defualt_parmas['random'] = random_int self.defualt_parmas['sign'] = sign self.defualt_parmas['timestamp'] = timestamp @@ -252,7 +251,7 @@ export SCRIPT_UPDATE = 'False' 关闭脚本自动更新,默认开启 ✨✨✨ @Author CHERWIN✨✨✨ ''') local_script_name = os.path.basename(__file__) - local_version = '2024.05.22' + local_version = '2024.05.26' if IS_DEV: import_Tools() else: @@ -280,4 +279,4 @@ export SCRIPT_UPDATE = 'False' 关闭脚本自动更新,默认开启 for index, infos in enumerate(tokens): run_result = RUN(infos, index).main() if not run_result: continue - if send: send(f'{APP_NAME}挂机通知', send_msg + TIPS_HTML) + # if send: send(f'{APP_NAME}挂机通知', send_msg + TIPS_HTML)