From 8eeb34ba27fecad8f59c90df27eb660c77d2fb60 Mon Sep 17 00:00:00 2001 From: GamerNoTitle Date: Tue, 30 Jan 2024 00:20:14 +0800 Subject: [PATCH] Compatible with web version #12 & removed SCF version --- SCF/config.json | 11 ---- SCF/index-new.py | 155 --------------------------------------------- SCF/index.py | 126 ------------------------------------ SCF/preinstall.sh | 1 - config.example.yml | 6 +- 5 files changed, 3 insertions(+), 296 deletions(-) delete mode 100644 SCF/config.json delete mode 100644 SCF/index-new.py delete mode 100644 SCF/index.py delete mode 100644 SCF/preinstall.sh diff --git a/SCF/config.json b/SCF/config.json deleted file mode 100644 index 8516191..0000000 --- a/SCF/config.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "token": "", - "type": 0, - "version": "2.2.0", - "android": "", - "deviceid": "", - "devicename": "", - "devicemodel": "", - "appid": 0, - "analytics": true -} \ No newline at end of file diff --git a/SCF/index-new.py b/SCF/index-new.py deleted file mode 100644 index ee036d3..0000000 --- a/SCF/index-new.py +++ /dev/null @@ -1,155 +0,0 @@ -# WARNING: THIS IS AN OUTDATED VERSION -# SERVERLESS CLOUD FUNCTION IN TENCENT OR ALIYUN IS NOT SUPPORTED -# YOU SHOULD MOVE TO QINGLONG PANEL FOR A BETTER EXPERIENCE -# IF U STILL NEED TO USE SERVERLESS CLOUD FUNCTION, U NEED TO EDIT THE FILE ON THE ROOT DICTIONARY TO MAKE IT SUITABLE TO THE FUNCTION -# THIS VERSION WILL NOT GET ANY SUPPORT FROM THE DEVELOPER - -import requests as r -import json -import os -import re -import urllib3 -import sentry_sdk -import random -import time - -with open('./config.json', 'rt') as f: - config = json.loads(f.read()) - f.close() - -sentry_sdk.init( - "https://425d7b4536f94c9fa540fe34dd6609a2@o361988.ingest.sentry.io/6352584", - - # Set traces_sample_rate to 1.0 to capture 100% - # of transactions for performance monitoring. - # We recommend adjusting this value in production. - traces_sample_rate=1.0 -) - -if type(conf) == type(list()): - pass -elif type(conf) == type(dict()): - ls = [] - ls.append(conf) - conf = ls -print(f'检测到 {len(conf)} 个账号，正在进行任务……') - - -# Options -sct_status = os.environ.get('sct') # https://sct.ftqq.com/ -sct_key = os.environ.get('sct_key') -sct_url = f'https://sctapi.ftqq.com/{sct_key}.send?title=MHYY-AutoCheckin 自动推送' - -sct_msg = '' - - -class RunError(Exception): - pass - - -try: - ver_info = r.get('https://sdk-static.mihoyo.com/hk4e_cn/mdk/launcher/api/resource?key=eYd89JmJ&launcher_id=18', timeout=60).text - version = json.loads(ver_info)['data']['game']['latest']['version'] - print(f'从官方API获取到云·原神最新版本号：{version}') -except: - version = '3.0.0' - -NotificationURL = 'https://api-cloudgame.mihoyo.com/hk4e_cg_cn/gamer/api/listNotifications?status=NotificationStatusUnread&type=NotificationTypePopup&is_sort=true' -WalletURL = 'https://api-cloudgame.mihoyo.com/hk4e_cg_cn/wallet/wallet/get' -AnnouncementURL = 'https://api-cloudgame.mihoyo.com/hk4e_cg_cn/gamer/api/getAnnouncementInfo' - -def handler(*args): - for config in conf: - if config == '': - # Verify config - raise RunError( - f"请在Settings->Secrets->Actions页面中新建名为config的变量，并将你的配置填入后再运行！") - else: - token = config['token'] - client_type = config['type'] - android = config['android'] - deviceid = config['deviceid'] - devicename = config['devicename'] - devicemodel = config['devicemodel'] - appid = config['appid'] - if token == '' or android == 0 or deviceid == '' or devicemodel == '' or appid == 0: - raise RunError(f'请确认您的配置文件配置正确再运行本程序！') - headers = { - 'x-rpc-combo_token': token, - 'x-rpc-client_type': str(client_type), - 'x-rpc-app_version': str(version), - 'x-rpc-sys_version': str(android), # Previous version need to convert the type of this var - 'x-rpc-channel': 'cyydmihoyo', - 'x-rpc-device_id': deviceid, - 'x-rpc-device_name': devicename, - 'x-rpc-device_model': devicemodel, - 'x-rpc-app_id': '1953439974', - 'x-rpc-vendor_id': '1', # 2023/8/31更新，不知道作用 - 'x-rpc-cg_game_biz': 'hk4e_cn', # 游戏频道，国服就是这个 - 'x-rpc-op_biz': 'clgm_cn', # 2023/8/31更新，不知道作用 - 'x-rpc-language': 'zh-cn', - # 'Referer': 'https://app.mihoyo.com', - 'Host': 'api-cloudgame.mihoyo.com', - 'Connection': 'Keep-Alive', - 'Accept-Encoding': 'gzip', - 'User-Agent': 'okhttp/4.9.0' - } - bbsid = re.findall(r'oi=[0-9]+', token)[0].replace('oi=', '') - wait_time = random.randint(1, 120) # Random Sleep to Avoid Ban - print(f'为了避免同一时间签到人数太多导致被官方怀疑，开始休眠 {wait_time} 秒') - time.sleep(wait_time) - wallet = r.get(WalletURL, headers=headers, timeout=60) - if json.loads(wallet.text) == {"data": None,"message":"登录已失效，请重新登录","retcode":-100}: - print(f'当前登录已过期，请重新登陆！返回为：{wallet.text}') - sct_msg += f'当前登录已过期，请重新登陆！返回为：{wallet.text}' - else: - print( - f"你当前拥有免费时长 {json.loads(wallet.text)['data']['free_time']['free_time']} 分钟，畅玩卡状态为 {json.loads(wallet.text)['data']['play_card']['short_msg']}，拥有米云币 {json.loads(wallet.text)['data']['coin']['coin_num']} 枚") - sct_msg += f"你当前拥有免费时长 {json.loads(wallet.text)['data']['free_time']['free_time']} 分钟，畅玩卡状态为 {json.loads(wallet.text)['data']['play_card']['short_msg']}，拥有米云币 {json.loads(wallet.text)['data']['coin']['coin_num']} 枚" - announcement = r.get(AnnouncementURL, headers=headers, timeout=60) - print(f'获取到公告列表：{json.loads(announcement.text)["data"]}') - res = r.get(NotificationURL, headers=headers, timeout=60) - success,Signed = False,False - try: - if list(json.loads(res.text)['data']['list']) == []: - success = True - Signed = True - Over = False - elif json.loads(json.loads(res.text)['data']['list'][0]['msg']) == {"num": 15, "over_num": 0, "type": 2, "msg": "每日登录奖励", "func_type": 1}: - success = True - Signed = False - Over = False - elif json.loads(json.loads(res.text)['data']['list'][0]['msg'])['over_num'] > 0: - success = True - Signed = False - Over = True - else: - success = False - except IndexError: - success = False - if success: - if Signed: - print( - f'获取签到情况成功！今天是否已经签到过了呢？') - sct_msg += f'获取签到情况成功！今天是否已经签到过了呢？' - print(f'完整返回体为：{res.text}') - elif not Signed and Over: - print( - f'获取签到情况成功！当前免费时长已经达到上限！签到情况为{json.loads(res.text)["data"]["list"][0]["msg"]}') - sct_msg += f'获取签到情况成功！当前免费时长已经达到上限！签到情况为{json.loads(res.text)["data"]["list"][0]["msg"]}' - print(f'完整返回体为：{res.text}') - else: - print( - f'获取签到情况成功！当前签到情况为{json.loads(res.text)["data"]["list"][0]["msg"]}') - sct_msg += f'获取签到情况成功！当前签到情况为{json.loads(res.text)["data"]["list"][0]["msg"]}' - print(f'完整返回体为：{res.text}') - else: - raise RunError( - f"签到失败！请带着本次运行的所有log内容到 https://github.com/ElainaMoe/MHYY-AutoCheckin/issues 发起issue解决（或者自行解决）。签到出错，返回信息如下：{res.text}") - if sct_status: - res = r.post(sct_url, json={'title': '', 'short': 'MHYY-AutoCheckin 签到情况报告', 'desp': sct_msg}, timeout=30) - if res.status_code == 200: - print('sct推送完成！') - else: - print('sct无法推送') - print(res.text) diff --git a/SCF/index.py b/SCF/index.py deleted file mode 100644 index f47fe60..0000000 --- a/SCF/index.py +++ /dev/null @@ -1,126 +0,0 @@ -# WARNING: THIS IS AN OUTDATED VERSION -# SERVERLESS CLOUD FUNCTION IN TENCENT OR ALIYUN IS NOT SUPPORTED -# YOU SHOULD MOVE TO QINGLONG PANEL FOR A BETTER EXPERIENCE -# IF U STILL NEED TO USE SERVERLESS CLOUD FUNCTION, U NEED TO EDIT THE FILE ON THE ROOT DICTIONARY TO MAKE IT SUITABLE TO THE FUNCTION -# THIS VERSION WILL NOT GET ANY SUPPORT FROM THE DEVELOPER - -import requests as r -import json -import os -import re -import urllib3 -import sentry_sdk -import random -import time - -with open('./config.json', 'rt') as f: # Local debugging - config = json.loads(f.read()) - f.close() - -sentry_sdk.init( - "https://425d7b4536f94c9fa540fe34dd6609a2@o361988.ingest.sentry.io/6352584", - - # Set traces_sample_rate to 1.0 to capture 100% - # of transactions for performance monitoring. - # We recommend adjusting this value in production. - traces_sample_rate=1.0 -) - -# Running in Github Action, use this to get the config -# config = json.loads(os.environ.get('config')) - - -class RunError(Exception): - pass - - -token = config['token'] -client_type = config['type'] -try: - ver_info = r.get('https://sdk-static.mihoyo.com/hk4e_cn/mdk/launcher/api/resource?key=eYd89JmJ&launcher_id=18', timeout=60).text - version = json.loads(ver_info)['data']['game']['latest']['version'] - print(f'从官方API获取到云·原神最新版本号：{version}') -except: - version = config['version'] -android = config['android'] -deviceid = config['deviceid'] -devicename = config['devicename'] -devicemodel = config['devicemodel'] -appid = config['appid'] - -bbsid = re.findall(r'oi=[0-9]+', token)[0].replace('oi=', '') - -NotificationURL = 'https://api-cloudgame.mihoyo.com/hk4e_cg_cn/gamer/api/listNotifications?status=NotificationStatusUnread&type=NotificationTypePopup&is_sort=true' -WalletURL = 'https://api-cloudgame.mihoyo.com/hk4e_cg_cn/wallet/wallet/get' -AnnouncementURL = 'https://api-cloudgame.mihoyo.com/hk4e_cg_cn/gamer/api/getAnnouncementInfo' -headers = { - 'x-rpc-combo_token': token, - 'x-rpc-client_type': str(client_type), - 'x-rpc-app_version': str(version), - 'x-rpc-sys_version': str(android), # Previous version need to convert the type of this var - 'x-rpc-channel': 'mihoyo', - 'x-rpc-device_id': deviceid, - 'x-rpc-device_name': devicename, - 'x-rpc-device_model': devicemodel, - 'x-rpc-app_id': str(appid), - 'Referer': 'https://app.mihoyo.com', - 'Host': 'api-cloudgame.mihoyo.com', - 'Connection': 'Keep-Alive', - 'Accept-Encoding': 'gzip', - 'User-Agent': 'okhttp/4.9.0' -} - -def handler(*args): - if config == '': - # Verify config - raise RunError( - f"请在Settings->Secrets->Actions页面中新建名为config的变量，并将你的配置填入后再运行！") - else: - if token == '' or android == 0 or deviceid == '' or devicemodel == '' or appid == 0: - raise RunError(f'请确认您的配置文件配置正确再运行本程序！') - wait_time = random.randint(1, 120) # Random Sleep to Avoid Ban - print(f'为了避免同一时间签到人数太多导致被官方怀疑，开始休眠 {wait_time} 秒') - time.sleep(wait_time) - wallet = r.get(WalletURL, headers=headers, timeout=60) - if json.loads(wallet.text) == {"data": None,"message":"登录已失效，请重新登录","retcode":-100}: - print(f'当前登录已过期，请重新登陆！返回为：{wallet.text}') - else: - print( - f"你当前拥有免费时长 {json.loads(wallet.text)['data']['free_time']['free_time']} 分钟，畅玩卡状态为 {json.loads(wallet.text)['data']['play_card']['short_msg']}，拥有米云币 {json.loads(wallet.text)['data']['coin']['coin_num']} 枚") - announcement = r.get(AnnouncementURL, headers=headers, timeout=60) - print(f'获取到公告列表：{json.loads(announcement.text)["data"]}') - res = r.get(NotificationURL, headers=headers, timeout=60) - success,Signed = False,False - try: - if list(json.loads(res.text)['data']['list']) == []: - success = True - Signed = True - Over = False - elif json.loads(json.loads(res.text)['data']['list'][0]['msg']) == {"num": 15, "over_num": 0, "type": 2, "msg": "每日登录奖励", "func_type": 1}: - success = True - Signed = False - Over = False - elif json.loads(json.loads(res.text)['data']['list'][0]['msg'])['over_num'] > 0: - success = True - Signed = False - Over = True - else: - success = False - except IndexError: - success = False - if success: - if Signed: - print( - f'获取签到情况成功！今天是否已经签到过了呢？') - print(f'完整返回体为：{res.text}') - elif not Signed and Over: - print( - f'获取签到情况成功！当前免费时长已经达到上限！签到情况为{json.loads(res.text)["data"]["list"][0]["msg"]}') - print(f'完整返回体为：{res.text}') - else: - print( - f'获取签到情况成功！当前签到情况为{json.loads(res.text)["data"]["list"][0]["msg"]}') - print(f'完整返回体为：{res.text}') - else: - raise RunError( - f"签到失败！请带着本次运行的所有log内容到 https://github.com/ElainaMoe/MHYY-AutoCheckin/issues 发起issue解决（或者自行解决）。签到出错，返回信息如下：{res.text}") diff --git a/SCF/preinstall.sh b/SCF/preinstall.sh deleted file mode 100644 index 565c5ea..0000000 --- a/SCF/preinstall.sh +++ /dev/null @@ -1 +0,0 @@ -pip3 install -r requirements.txt --target . diff --git a/config.example.yml b/config.example.yml index 83366ae..a6daeae 100644 --- a/config.example.yml +++ b/config.example.yml @@ -1,4 +1,4 @@ -# 使用前请阅读文档：https://bili33.top/posts/MHYY-AutoCheckin-Manual/ +# 使用前请阅读文档：https://bili33.top/posts/MHYY-AutoCheckin-Manual-Gen2/ # 有问题请前往Github开启issue：https://github.com/GamerNoTitle/MHYY/issues ######## 以下为账号配置项，可以多账号，详情请参考文档 ######## @@ -13,7 +13,7 @@ accounts: # 如果你是网页版抓的，这个应该是你的系统版本（注：Windows 10和Windows 11都是写的Windows 10） sysver: # deviceid：手机抓的会有这个，抓到什么填什么 - # 如果是网页版抓的，直接留空 + # 如果是网页版抓的，那也是抓到什么填什么 deviceid: # devicename: 手机抓的话就是手机的入网型号，如红米K40为M2012K11AC，红米K50为22021211RC # 如果是网页版抓的，填Unknown @@ -33,7 +33,7 @@ accounts: # 如果你是网页版抓的，这个应该是你的系统版本（注：Windows 10和Windows 11都是写的Windows 10） sysver: # deviceid：手机抓的会有这个，抓到什么填什么 - # 如果是网页版抓的，直接留空 + # 如果是网页版抓的，那也是抓到什么填什么 deviceid: # devicename: 手机抓的话就是手机的入网型号，如红米K40为M2012K11AC，红米K50为22021211RC # 如果是网页版抓的，填Unknown