From 24462409dec7e850133ab2be950250f1ceecd6cc Mon Sep 17 00:00:00 2001 From: OpenTritium Date: Mon, 18 Nov 2024 22:21:15 +0800 Subject: [PATCH 1/7] replace gitee links with github links --- CHERWIN_TOOLS.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHERWIN_TOOLS.py b/CHERWIN_TOOLS.py index f528b51..0c3faf2 100755 --- a/CHERWIN_TOOLS.py +++ b/CHERWIN_TOOLS.py @@ -336,9 +336,9 @@ def RESTART_SCRIPT(RESTART_SCRIPT_NAME): def CHECK(): global CHERWIN_SCRIPT_CONFIG print('>>>>>>>开始获取版本信息...') - baseurl = 'https://gitee.com/cherwin/CHERWIN_SCRIPTS/raw/main/' + baseurl = 'https://raw.githubusercontent.com/CHERWING/CHERWIN_SCRIPTS/refs/heads/main/' TOOLS_NAME = 'CHERWIN_TOOLS.py' - server_script_url = f'https://gitee.com/cherwin/CHERWIN_SCRIPTS/raw/main/{TOOLS_NAME}' + server_script_url = f'https://raw.githubusercontent.com/CHERWING/CHERWIN_SCRIPTS/refs/heads/main/{TOOLS_NAME}' try: response = requests.get(f'{baseurl}CHERWIN_SCRIPT_CONFIG.json', verify=False) response.encoding = 'utf-8' @@ -497,7 +497,7 @@ def get_ip(): def main(APP_NAME, local_script_name, ENV_NAME, local_version, need_invite=False): global APP_INFO, TIPS, TIPS_HTML - git_url = f'https://gitee.com/cherwin/CHERWIN_SCRIPTS/raw/main/{local_script_name}' + git_url = f'https://raw.githubusercontent.com/CHERWING/CHERWIN_SCRIPTS/refs/heads/main/{local_script_name}' if CHECK(): APP_INFO = CHERWIN_SCRIPT_CONFIG.get("APP_CONFIG", {}).get(ENV_NAME, {}) # print(APP_INFO) From 68349619ff7d834c1509c9173a06385ac58c0bc1 Mon Sep 17 00:00:00 2001 From: OpenTritium Date: Mon, 18 Nov 2024 22:45:00 +0800 Subject: [PATCH 2/7] comment out 'self.superWelfare_receiveRedPacket()' --- SFSY.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SFSY.py b/SFSY.py index 3c3cca9..96a1adb 100755 --- a/SFSY.py +++ b/SFSY.py @@ -1591,7 +1591,7 @@ class RUN: if not self.login_res: return False # 执行签到任务 self.sign() - self.superWelfare_receiveRedPacket() + #self.superWelfare_receiveRedPacket() self.get_SignTaskList() self.get_SignTaskList(True) From 06d9f735281c4a2cf4bc605fd167ce1b5a22c2df Mon Sep 17 00:00:00 2001 From: OpenTritium Date: Mon, 18 Nov 2024 22:54:56 +0800 Subject: [PATCH 3/7] add reverse proxy --- CHERWIN_TOOLS.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHERWIN_TOOLS.py b/CHERWIN_TOOLS.py index 0c3faf2..9f23b2d 100755 --- a/CHERWIN_TOOLS.py +++ b/CHERWIN_TOOLS.py @@ -336,9 +336,9 @@ def RESTART_SCRIPT(RESTART_SCRIPT_NAME): def CHECK(): global CHERWIN_SCRIPT_CONFIG print('>>>>>>>开始获取版本信息...') - baseurl = 'https://raw.githubusercontent.com/CHERWING/CHERWIN_SCRIPTS/refs/heads/main/' + baseurl = 'https://github.moeyy.xyz/https://raw.githubusercontent.com/OpenTritium/CHERWIN_SCRIPTS/refs/heads/main/' TOOLS_NAME = 'CHERWIN_TOOLS.py' - server_script_url = f'https://raw.githubusercontent.com/CHERWING/CHERWIN_SCRIPTS/refs/heads/main/{TOOLS_NAME}' + server_script_url = f'https://github.moeyy.xyz/https://raw.githubusercontent.com/OpenTritium/CHERWIN_SCRIPTS/refs/heads/main/{TOOLS_NAME}' try: response = requests.get(f'{baseurl}CHERWIN_SCRIPT_CONFIG.json', verify=False) response.encoding = 'utf-8' @@ -497,7 +497,7 @@ def get_ip(): def main(APP_NAME, local_script_name, ENV_NAME, local_version, need_invite=False): global APP_INFO, TIPS, TIPS_HTML - git_url = f'https://raw.githubusercontent.com/CHERWING/CHERWIN_SCRIPTS/refs/heads/main/{local_script_name}' + git_url = f'https://github.moeyy.xyz/https://raw.githubusercontent.com/OpenTritium/CHERWIN_SCRIPTS/refs/heads/main/{local_script_name}' if CHECK(): APP_INFO = CHERWIN_SCRIPT_CONFIG.get("APP_CONFIG", {}).get(ENV_NAME, {}) # print(APP_INFO) From 581d8c803b86662c16addb6fd25f29729cc6fb19 Mon Sep 17 00:00:00 2001 From: OpenTritium Date: Tue, 19 Nov 2024 23:18:06 +0800 Subject: [PATCH 4/7] update ems activity id --- EMS.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/EMS.py b/EMS.py index e3771d6..74cdfc9 100755 --- a/EMS.py +++ b/EMS.py @@ -127,7 +127,7 @@ class RUN: "appId":"wx52872495fb375c4b", "userId":self.memberId, "openId":self.openId, - "activId":'c0c4a0a3ef8145f49f2e294741a3cd62' + "activId":'16f36f81f38f456a800ecafc85924700' } response = self.do_request('https://ump.ems.com.cn/activCenterApi/signActivInfo/sign',data=params) if response and response.get('code') == '000000': @@ -170,7 +170,7 @@ class RUN: Log(f"\n====== {act_name} ======") try: params = { - "activId": "c0c4a0a3ef8145f49f2e294741a3cd62", + "activId": "16f36f81f38f456a800ecafc85924700", "appId": "wx52872495fb375c4b", "openId": self.openId, "userId": self.memberId, @@ -192,7 +192,7 @@ class RUN: Log(f"\n====== {act_name} ======") try: params = { - "activId": "c0c4a0a3ef8145f49f2e294741a3cd62", + "activId": "16f36f81f38f456a800ecafc85924700", "appId": "wx52872495fb375c4b", "openId": self.openId, "userId": self.memberId @@ -228,7 +228,7 @@ class RUN: "appId": "wx52872495fb375c4b", "userId": self.memberId, "openId": self.openId, - "activId": 'c0c4a0a3ef8145f49f2e294741a3cd62' + "activId": '16f36f81f38f456a800ecafc85924700' } response = self.do_request('https://ump.ems.com.cn/activCenterApi/signActivInfo/querySignDetail',data=params) if response and response.get('code') == '000000': From f7445f652554f0530fc390f69c5ae5a842e0c002 Mon Sep 17 00:00:00 2001 From: OpenTritium Date: Tue, 19 Nov 2024 23:23:34 +0800 Subject: [PATCH 5/7] update ems signin url --- EMS.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/EMS.py b/EMS.py index 74cdfc9..31e9ec8 100755 --- a/EMS.py +++ b/EMS.py @@ -124,12 +124,9 @@ class RUN: Log(f"\n====== {act_name} ======") try: params = { - "appId":"wx52872495fb375c4b", - "userId":self.memberId, - "openId":self.openId, "activId":'16f36f81f38f456a800ecafc85924700' } - response = self.do_request('https://ump.ems.com.cn/activCenterApi/signActivInfo/sign',data=params) + response = self.do_request('https://ump.ems.com.cn/activCenterApi/eac/api/sign/joinSign',data=params) if response and response.get('code') == '000000': # print(response) info = response.get('info', {}) From 1fb60f4b41a832cd833be055b5088422c2f0811a Mon Sep 17 00:00:00 2001 From: OpenTritium Date: Tue, 19 Nov 2024 23:58:09 +0800 Subject: [PATCH 6/7] fix ems signin --- EMS.py | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/EMS.py b/EMS.py index 31e9ec8..48c6d66 100755 --- a/EMS.py +++ b/EMS.py @@ -51,16 +51,19 @@ class RUN: self.s.verify = False self.openId = token self.headers = { - 'Host': 'ump.ems.com.cn', - 'Upgrade-Insecure-Requests': '1', - 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36 MicroMessenger/7.0.20.1781(0x6700143B) NetType/WIFI MiniProgramEnv/Windows WindowsWechat/WMPF XWEB/6945', - 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9', - 'Sec-Fetch-Site': 'none', - 'Sec-Fetch-Mode': 'navigate', - 'Sec-Fetch-User': '?1', - 'Sec-Fetch-Dest': 'document', - 'Accept-Language': 'zh-CN,zh', - } + "Host": "ump.ems.com.cn", + "Connection": "keep-alive", + "Accept": "application/json, text/plain, */*", + "Atoken": "15a1d84ad5874bb994c54e8727556a45", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 MicroMessenger/7.0.20.1781(0x6700143B) NetType/WIFI MiniProgramEnv/Windows WindowsWechat/WMPF WindowsWechat(0x63090a13) UnifiedPCWindowsWechat(0xf2540020) XWEB/11503", + "Content-Type": "application/json", + "Origin": "https://ump.ems.com.cn", + "Sec-Fetch-Site": "same-origin", + "Sec-Fetch-Mode": "cors", + "Sec-Fetch-Dest": "empty", + "Accept-Encoding": "gzip, deflate, br", + "Accept-Language": "zh-CN,zh;q=0.9", + } def do_request(self, url, method="POST",params=None, data=None, headers=None): @@ -222,25 +225,17 @@ class RUN: Log(f"\n====== {act_name} ======") try: params = { - "appId": "wx52872495fb375c4b", - "userId": self.memberId, - "openId": self.openId, "activId": '16f36f81f38f456a800ecafc85924700' } - response = self.do_request('https://ump.ems.com.cn/activCenterApi/signActivInfo/querySignDetail',data=params) + + response = self.do_request('https://ump.ems.com.cn/activCenterApi/eac/api/sign/querySignActivInfo',data=params) if response and response.get('code') == '000000': Log(f'{act_name}成功✅') info = response.get('info', {}) - signDay = info.get('signDay', '') - maxContiSignDay = info.get('maxContiSignDay', '') - signDayList = info.get('signDayList', {}) + signDay = info.get('isContinueSign', '') + coins = info.get('dailySignInCoins','') Log(f'>累计签到：【{signDay}】天') - Log(f'>已连续签到：【{maxContiSignDay}】天') - if date.today().strftime("%Y-%m-%d") not in signDayList: - Log(f'>今日未签到') - self.sign() - else: - Log(f'>今日已签到✅') + Log(f'>：金币: {coins}') return True else: @@ -256,6 +251,7 @@ class RUN: if self.findByOpenIdAppId(): self.details() + self.sign() self.querySignDetail() self.queryPrizeIsReceive() self.memberGoldsInfo() From 4ce619ecd81c3b2914c82bc1cfa40cf0c291088f Mon Sep 17 00:00:00 2001 From: OpenTritium Date: Wed, 20 Nov 2024 13:21:31 +0800 Subject: [PATCH 7/7] fill ems userinfo --- EMS.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/EMS.py b/EMS.py index 48c6d66..5821736 100755 --- a/EMS.py +++ b/EMS.py @@ -54,7 +54,6 @@ class RUN: "Host": "ump.ems.com.cn", "Connection": "keep-alive", "Accept": "application/json, text/plain, */*", - "Atoken": "15a1d84ad5874bb994c54e8727556a45", "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 MicroMessenger/7.0.20.1781(0x6700143B) NetType/WIFI MiniProgramEnv/Windows WindowsWechat/WMPF WindowsWechat(0x63090a13) UnifiedPCWindowsWechat(0xf2540020) XWEB/11503", "Content-Type": "application/json", "Origin": "https://ump.ems.com.cn", @@ -127,7 +126,10 @@ class RUN: Log(f"\n====== {act_name} ======") try: params = { - "activId":'16f36f81f38f456a800ecafc85924700' + "activId":'16f36f81f38f456a800ecafc85924700', + "appId": "wx52872495fb375c4b", + "openId": self.openId, + "userId": self.memberId } response = self.do_request('https://ump.ems.com.cn/activCenterApi/eac/api/sign/joinSign',data=params) if response and response.get('code') == '000000': @@ -225,7 +227,10 @@ class RUN: Log(f"\n====== {act_name} ======") try: params = { - "activId": '16f36f81f38f456a800ecafc85924700' + "activId": '16f36f81f38f456a800ecafc85924700', + "appId": "wx52872495fb375c4b", + "openId": self.openId, + "userId": self.memberId } response = self.do_request('https://ump.ems.com.cn/activCenterApi/eac/api/sign/querySignActivInfo',data=params)