Genshin-bots/GenshinUID
1
0
Fork 0
mirror of https://github.com/KimigaiiWuyi/GenshinUID.git synced 2025-05-31 04:30:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

👽️ 修复开始获取米游币

Browse Source
This commit is contained in:
KimgiaiiWuyi 2022-08-05 00:37:53 +08:00
parent 6c63d87e28
commit 3bfc5d1d19
1 changed files with 342 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

591
mihoyo_libs/get_data.py
View File

@ -27,13 +27,18 @@ INDEX_PATH = os.path.join(BASE2_PATH, 'index')
async def config_check(func, mode='CHECK'): async def config_check(func, mode='CHECK'):
conn = sqlite3.connect('ID_DATA.db') conn = sqlite3.connect('ID_DATA.db')
c = conn.cursor() c = conn.cursor()
c.execute("""CREATE TABLE IF NOT EXISTS Config c.execute(
"""CREATE TABLE IF NOT EXISTS Config
(Name TEXT PRIMARY KEY NOT NULL, (Name TEXT PRIMARY KEY NOT NULL,
Status TEXT, Status TEXT,
GroupList TEXT, GroupList TEXT,
Extra TEXT);""") Extra TEXT);"""
c.execute('INSERT OR IGNORE INTO Config (Name,Status) \ )
VALUES (?, ?)', (func, 'on')) c.execute(
'INSERT OR IGNORE INTO Config (Name,Status) \
VALUES (?, ?)',
(func, 'on'),
)
if mode == 'CHECK': if mode == 'CHECK':
cursor = c.execute('SELECT * from Config WHERE Name = ?', (func,)) cursor = c.execute('SELECT * from Config WHERE Name = ?', (func,))
c_data = cursor.fetchall() c_data = cursor.fetchall()
@ -57,14 +62,16 @@ async def config_check(func, mode='CHECK'):
async def get_a_lots(qid): async def get_a_lots(qid):
conn = sqlite3.connect('ID_DATA.db') conn = sqlite3.connect('ID_DATA.db')
c = conn.cursor() c = conn.cursor()
c.execute("""CREATE TABLE IF NOT EXISTS UseridDict c.execute(
"""CREATE TABLE IF NOT EXISTS UseridDict
(QID INT PRIMARY KEY NOT NULL, (QID INT PRIMARY KEY NOT NULL,
lots TEXT, lots TEXT,
cache TEXT, cache TEXT,
permission TEXT, permission TEXT,
Status TEXT, Status TEXT,
Subscribe TEXT, Subscribe TEXT,
Extra TEXT);""") Extra TEXT);"""
)
cursor = c.execute('SELECT * from UseridDict WHERE QID = ?', (qid,)) cursor = c.execute('SELECT * from UseridDict WHERE QID = ?', (qid,))
c_data = cursor.fetchall() c_data = cursor.fetchall()
with open(os.path.join(INDEX_PATH, 'lots.txt'), 'r') as f: with open(os.path.join(INDEX_PATH, 'lots.txt'), 'r') as f:
@ -74,8 +81,11 @@ async def get_a_lots(qid):
if len(c_data) == 0: if len(c_data) == 0:
num = random.randint(1, len(raw_data) - 1) num = random.randint(1, len(raw_data) - 1)
data = raw_data[num] data = raw_data[num]
c.execute('INSERT OR IGNORE INTO UseridDict (QID,lots) \ c.execute(
VALUES (?, ?)', (qid, str(num))) 'INSERT OR IGNORE INTO UseridDict (QID,lots) \
VALUES (?, ?)',
(qid, str(num)),
)
else: else:
if c_data[0][1] is None: if c_data[0][1] is None:
num = random.randint(0, len(raw_data) - 1) num = random.randint(0, len(raw_data) - 1)
@ -96,7 +106,10 @@ async def open_push(uid, qid, status, mode):
c_data = cursor.fetchall() c_data = cursor.fetchall()
if len(c_data) != 0: if len(c_data) != 0:
try: try:
c.execute('UPDATE NewCookiesTable SET {s} = ?,QID = ? WHERE UID=?'.format(s=mode), (status, qid, uid)) c.execute(
'UPDATE NewCookiesTable SET {s} = ?,QID = ? WHERE UID=?'.format(s=mode),
(status, qid, uid),
)
conn.commit() conn.commit()
conn.close() conn.close()
return '成功！' return '成功！'
@ -138,8 +151,10 @@ async def check_db():
pass pass
logger.info(f'uid{row[0]}的Cookies是异常的！已删除该条Cookies！') logger.info(f'uid{row[0]}的Cookies是异常的！已删除该条Cookies！')
if len(c_data) > 9: if len(c_data) > 9:
return_str = '正常Cookies数量：{}\n{}'.format(str(normal_num), return_str = '正常Cookies数量：{}\n{}'.format(
'失效cookies:\n' + invalid_str if invalid_str else '无失效Cookies') str(normal_num),
'失效cookies:\n' + invalid_str if invalid_str else '无失效Cookies',
)
conn.commit() conn.commit()
conn.close() conn.close()
logger.info('已完成Cookies检查！') logger.info('已完成Cookies检查！')
@ -151,6 +166,7 @@ async def check_db():
async def check_stoken_db(): async def check_stoken_db():
def random_text(num: int) -> str: def random_text(num: int) -> str:
return ''.join(random.sample(string.ascii_lowercase + string.digits, num)) return ''.join(random.sample(string.ascii_lowercase + string.digits, num))
return_str = str() return_str = str()
normal_num = 0 normal_num = 0
invalid_str = '' invalid_str = ''
@ -163,35 +179,40 @@ async def check_stoken_db():
if row[1] is None: if row[1] is None:
continue continue
async with AsyncClient() as client: async with AsyncClient() as client:
req = await client.get(url=bbs_Taskslist, req = await client.get(
headers = { url=bbs_Taskslist,
'DS' : old_version_get_ds_token(True), headers={
'cookie' : row[1], 'DS': old_version_get_ds_token(True),
'x-rpc-client_type' : '2', 'cookie': row[1],
'x-rpc-app_version' : '2.7.0', 'x-rpc-client_type': '2',
'x-rpc-sys_version' : '6.0.1', 'x-rpc-app_version': '2.7.0',
'x-rpc-channel' : 'mihoyo', 'x-rpc-sys_version': '6.0.1',
'x-rpc-device_id' : random_hex(32), 'x-rpc-channel': 'mihoyo',
'x-rpc-device_name' : random_text(random.randint(1, 10)), 'x-rpc-device_id': random_hex(32),
'x-rpc-device_model': 'Mi 10', 'x-rpc-device_name': random_text(random.randint(1, 10)),
'Referer' : 'https://app.mihoyo.com', 'x-rpc-device_model': 'Mi 10',
'Host' : 'bbs-api.mihoyo.com', 'Referer': 'https://app.mihoyo.com',
'User-Agent' : 'okhttp/4.8.0' 'Host': 'bbs-api.mihoyo.com',
}) 'User-Agent': 'okhttp/4.8.0',
},
)
data = req.json() data = req.json()
if 'err' in data['message'] or data['retcode'] == -100: if 'err' in data['message'] or data['retcode'] == -100:
invalid_str = invalid_str + f'uid{row[0]}的Stoken是异常的！已删除该条Stoken！\n' invalid_str = invalid_str + f'uid{row[0]}的Stoken是异常的！已删除该条Stoken！\n'
return_str = return_str + f'uid{row[0]}的Stoken是异常的！已删除该条Stoken！\n' return_str = return_str + f'uid{row[0]}的Stoken是异常的！已删除该条Stoken！\n'
invalid_list.append([row[2], row[0]]) invalid_list.append([row[2], row[0]])
c.execute('UPDATE NewCookiesTable SET Stoken = ? WHERE UID=?', (None, row[0])) c.execute(
'UPDATE NewCookiesTable SET Stoken = ? WHERE UID=?', (None, row[0])
)
logger.info(f'uid{row[0]}的Stoken是异常的！已删除该条Stoken！') logger.info(f'uid{row[0]}的Stoken是异常的！已删除该条Stoken！')
else: else:
return_str = return_str + f'uid{row[0]}的Stoken是正常的！\n' return_str = return_str + f'uid{row[0]}的Stoken是正常的！\n'
logger.info(f'uid{row[0]}的Stoken是正常的！') logger.info(f'uid{row[0]}的Stoken是正常的！')
normal_num += 1 normal_num += 1
if len(c_data) > 9: if len(c_data) > 9:
return_str = '正常Stoken数量：{}\n{}'.format(str(normal_num), return_str = '正常Stoken数量：{}\n{}'.format(
'失效Stoken:\n' + invalid_str if invalid_str else '无失效Stoken') str(normal_num), '失效Stoken:\n' + invalid_str if invalid_str else '无失效Stoken'
)
conn.commit() conn.commit()
conn.close() conn.close()
logger.info('已完成Stoken检查!') logger.info('已完成Stoken检查!')
@ -203,13 +224,18 @@ async def check_stoken_db():
async def connect_db(userid, uid=None, mys=None): async def connect_db(userid, uid=None, mys=None):
conn = sqlite3.connect('ID_DATA.db') conn = sqlite3.connect('ID_DATA.db')
c = conn.cursor() c = conn.cursor()
c.execute("""CREATE TABLE IF NOT EXISTS UIDDATA c.execute(
"""CREATE TABLE IF NOT EXISTS UIDDATA
(USERID INT PRIMARY KEY NOT NULL, (USERID INT PRIMARY KEY NOT NULL,
UID TEXT, UID TEXT,
MYSID TEXT);""") MYSID TEXT);"""
)
c.execute('INSERT OR IGNORE INTO UIDDATA (USERID,UID,MYSID) \ c.execute(
VALUES (?, ?,?)', (userid, uid, mys)) 'INSERT OR IGNORE INTO UIDDATA (USERID,UID,MYSID) \
VALUES (?, ?,?)',
(userid, uid, mys),
)
if uid: if uid:
c.execute('UPDATE UIDDATA SET UID = ? WHERE USERID=?', (uid, userid)) c.execute('UPDATE UIDDATA SET UID = ? WHERE USERID=?', (uid, userid))
@ -259,11 +285,15 @@ async def delete_cache():
conn = sqlite3.connect('ID_DATA.db') conn = sqlite3.connect('ID_DATA.db')
c = conn.cursor() c = conn.cursor()
c.execute('DROP TABLE CookiesCache') c.execute('DROP TABLE CookiesCache')
c.execute('UPDATE NewCookiesTable SET Extra = ? WHERE Extra=?', (None, 'limit30')) c.execute(
c.execute("""CREATE TABLE IF NOT EXISTS CookiesCache 'UPDATE NewCookiesTable SET Extra = ? WHERE Extra=?', (None, 'limit30')
)
c.execute(
"""CREATE TABLE IF NOT EXISTS CookiesCache
(UID TEXT PRIMARY KEY, (UID TEXT PRIMARY KEY,
MYSID TEXT, MYSID TEXT,
Cookies TEXT);""") Cookies TEXT);"""
)
conn.commit() conn.commit()
conn.close() conn.close()
logger.info('————UID查询缓存已清空————') logger.info('————UID查询缓存已清空————')
@ -287,16 +317,20 @@ def error_db(ck, err):
if err == 'error': if err == 'error':
c.execute('UPDATE NewCookiesTable SET Extra = ? WHERE Cookies=?', ('error', ck)) c.execute('UPDATE NewCookiesTable SET Extra = ? WHERE Cookies=?', ('error', ck))
elif err == 'limit30': elif err == 'limit30':
c.execute('UPDATE NewCookiesTable SET Extra = ? WHERE Cookies=?', ('limit30', ck)) c.execute(
'UPDATE NewCookiesTable SET Extra = ? WHERE Cookies=?', ('limit30', ck)
)
def cache_db(uid, mode=1, mys=None): def cache_db(uid, mode=1, mys=None):
conn = sqlite3.connect('ID_DATA.db') conn = sqlite3.connect('ID_DATA.db')
c = conn.cursor() c = conn.cursor()
c.execute("""CREATE TABLE IF NOT EXISTS CookiesCache c.execute(
"""CREATE TABLE IF NOT EXISTS CookiesCache
(UID TEXT PRIMARY KEY, (UID TEXT PRIMARY KEY,
MYSID TEXT, MYSID TEXT,
Cookies TEXT);""") Cookies TEXT);"""
)
if mode == 1: if mode == 1:
if mys: if mys:
@ -310,7 +344,9 @@ def cache_db(uid, mode=1, mys=None):
if len(c_data) == 0: if len(c_data) == 0:
if mode == 2: if mode == 2:
conn.create_function('REGEXP', 2, regex_func) conn.create_function('REGEXP', 2, regex_func)
cursor = c.execute('SELECT * FROM NewCookiesTable WHERE REGEXP(Cookies, ?)', (uid,)) cursor = c.execute(
'SELECT * FROM NewCookiesTable WHERE REGEXP(Cookies, ?)', (uid,)
)
d_data = cursor.fetchall() d_data = cursor.fetchall()
else: else:
@ -321,34 +357,56 @@ def cache_db(uid, mode=1, mys=None):
if d_data[0][7] != 'error': if d_data[0][7] != 'error':
use = d_data[0][1] use = d_data[0][1]
if mode == 1: if mode == 1:
c.execute('INSERT OR IGNORE INTO CookiesCache (Cookies,UID) \ c.execute(
VALUES (?, ?)', (use, uid)) 'INSERT OR IGNORE INTO CookiesCache (Cookies,UID) \
VALUES (?, ?)',
(use, uid),
)
elif mode == 2: elif mode == 2:
c.execute('INSERT OR IGNORE INTO CookiesCache (Cookies,MYSID) \ c.execute(
VALUES (?, ?)', (use, uid)) 'INSERT OR IGNORE INTO CookiesCache (Cookies,MYSID) \
VALUES (?, ?)',
(use, uid),
)
else: else:
cookies_row = c.execute('SELECT * FROM NewCookiesTable WHERE Extra IS NULL ORDER BY RANDOM() LIMIT 1') cookies_row = c.execute(
'SELECT * FROM NewCookiesTable WHERE Extra IS NULL ORDER BY RANDOM() LIMIT 1'
)
e_data = cookies_row.fetchall() e_data = cookies_row.fetchall()
if len(e_data) != 0: if len(e_data) != 0:
if mode == 1: if mode == 1:
c.execute('INSERT OR IGNORE INTO CookiesCache (Cookies,UID) \ c.execute(
VALUES (?, ?)', (e_data[0][1], uid)) 'INSERT OR IGNORE INTO CookiesCache (Cookies,UID) \
VALUES (?, ?)',
(e_data[0][1], uid),
)
elif mode == 2: elif mode == 2:
c.execute('INSERT OR IGNORE INTO CookiesCache (Cookies,MYSID) \ c.execute(
VALUES (?, ?)', (e_data[0][1], uid)) 'INSERT OR IGNORE INTO CookiesCache (Cookies,MYSID) \
VALUES (?, ?)',
(e_data[0][1], uid),
)
use = e_data[0][1] use = e_data[0][1]
else: else:
return '没有可以使用的Cookies！' return '没有可以使用的Cookies！'
else: else:
cookies_row = c.execute('SELECT * FROM NewCookiesTable WHERE Extra IS NULL ORDER BY RANDOM() LIMIT 1') cookies_row = c.execute(
'SELECT * FROM NewCookiesTable WHERE Extra IS NULL ORDER BY RANDOM() LIMIT 1'
)
e_data = cookies_row.fetchall() e_data = cookies_row.fetchall()
if len(e_data) != 0: if len(e_data) != 0:
if mode == 1: if mode == 1:
c.execute('INSERT OR IGNORE INTO CookiesCache (Cookies,UID) \ c.execute(
VALUES (?, ?)', (e_data[0][1], uid)) 'INSERT OR IGNORE INTO CookiesCache (Cookies,UID) \
VALUES (?, ?)',
(e_data[0][1], uid),
)
elif mode == 2: elif mode == 2:
c.execute('INSERT OR IGNORE INTO CookiesCache (Cookies,MYSID) \ c.execute(
VALUES (?, ?)', (e_data[0][1], uid)) 'INSERT OR IGNORE INTO CookiesCache (Cookies,MYSID) \
VALUES (?, ?)',
(e_data[0][1], uid),
)
use = e_data[0][1] use = e_data[0][1]
else: else:
return '没有可以使用的Cookies！' return '没有可以使用的Cookies！'
@ -374,7 +432,8 @@ async def cookies_db(uid, cookies, qid):
conn = sqlite3.connect('ID_DATA.db') conn = sqlite3.connect('ID_DATA.db')
c = conn.cursor() c = conn.cursor()
c.execute("""CREATE TABLE IF NOT EXISTS NewCookiesTable c.execute(
"""CREATE TABLE IF NOT EXISTS NewCookiesTable
(UID INT PRIMARY KEY NOT NULL, (UID INT PRIMARY KEY NOT NULL,
Cookies TEXT, Cookies TEXT,
QID INT, QID INT,
@ -382,13 +441,17 @@ async def cookies_db(uid, cookies, qid):
StatusB TEXT, StatusB TEXT,
StatusC TEXT, StatusC TEXT,
NUM INT, NUM INT,
Extra TEXT);""") Extra TEXT);"""
)
cursor = c.execute('SELECT * from NewCookiesTable WHERE UID = ?', (uid,)) cursor = c.execute('SELECT * from NewCookiesTable WHERE UID = ?', (uid,))
c_data = cursor.fetchall() c_data = cursor.fetchall()
if len(c_data) == 0: if len(c_data) == 0:
c.execute('INSERT OR IGNORE INTO NewCookiesTable (Cookies,UID,StatusA,StatusB,StatusC,NUM,QID) \ c.execute(
VALUES (?, ?,?,?,?,?,?)', (cookies, uid, 'off', 'off', 'off', 140, qid)) 'INSERT OR IGNORE INTO NewCookiesTable (Cookies,UID,StatusA,StatusB,StatusC,NUM,QID) \
VALUES (?, ?,?,?,?,?,?)',
(cookies, uid, 'off', 'off', 'off', 140, qid),
)
else: else:
c.execute('UPDATE NewCookiesTable SET Cookies = ? WHERE UID=?', (cookies, uid)) c.execute('UPDATE NewCookiesTable SET Cookies = ? WHERE UID=?', (cookies, uid))
@ -404,7 +467,9 @@ async def stoken_db(s_cookies, uid):
if 'Stoken' not in columns: if 'Stoken' not in columns:
c.execute('ALTER TABLE NewCookiesTable ADD COLUMN Stoken TEXT') c.execute('ALTER TABLE NewCookiesTable ADD COLUMN Stoken TEXT')
c.execute('UPDATE NewCookiesTable SET Stoken = ? WHERE UID=?', (s_cookies, int(uid))) c.execute(
'UPDATE NewCookiesTable SET Stoken = ? WHERE UID=?', (s_cookies, int(uid))
)
conn.commit() conn.commit()
conn.close() conn.close()
@ -437,7 +502,7 @@ async def owner_cookies(uid):
def random_hex(length): def random_hex(length):
result = hex(random.randint(0, 16 ** length)).replace('0x', '').upper() result = hex(random.randint(0, 16**length)).replace('0x', '').upper()
if len(result) < length: if len(result) < length:
result = '0' * (length - len(result)) + result result = '0' * (length - len(result)) + result
return result return result
@ -451,7 +516,7 @@ def md5(text):
def old_version_get_ds_token(mysbbs=False): def old_version_get_ds_token(mysbbs=False):
if mysbbs: if mysbbs:
n = 'fd3ykrh7o1j54g581upo1tvpam0dsgtf' n = 'dWCcD2FsOUXEstC5f9xubswZxEeoBOTc'
else: else:
n = 'h8w582wxwgqvahcdkpvdhbh2w9casgfl' n = 'h8w582wxwgqvahcdkpvdhbh2w9casgfl'
i = str(int(time.time())) i = str(int(time.time()))
@ -475,12 +540,8 @@ def get_ds_token(q='', b=None):
async def get_stoken_by_login_ticket(loginticket, mys_id): async def get_stoken_by_login_ticket(loginticket, mys_id):
async with AsyncClient() as client: async with AsyncClient() as client:
req = await client.get( req = await client.get(
url= o_url + '/auth/api/getMultiTokenByLoginTicket', url=o_url + '/auth/api/getMultiTokenByLoginTicket',
params={ params={'login_ticket': loginticket, 'token_types': '3', 'uid': mys_id},
'login_ticket': loginticket,
'token_types' : '3',
'uid' : mys_id
}
) )
return req.json() return req.json()
@ -491,19 +552,17 @@ async def get_daily_data(uid, server_id='cn_gf01'):
try: try:
async with AsyncClient() as client: async with AsyncClient() as client:
req = await client.get( req = await client.get(
url= n_url + '/game_record/app/genshin/api/dailyNote', url=n_url + '/game_record/app/genshin/api/dailyNote',
headers={ headers={
'DS' : get_ds_token('role_id=' + uid + '&server=' + server_id), 'DS': get_ds_token('role_id=' + uid + '&server=' + server_id),
'x-rpc-app_version': mhyVersion, 'x-rpc-app_version': mhyVersion,
'User-Agent' : 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 ('
'KHTML, like Gecko) miHoYoBBS/2.11.1', 'KHTML, like Gecko) miHoYoBBS/2.11.1',
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/', 'Referer': 'https://webstatic.mihoyo.com/',
'Cookie' : await owner_cookies(uid)}, 'Cookie': await owner_cookies(uid),
params={ },
'server' : server_id, params={'server': server_id, 'role_id': uid},
'role_id': uid
}
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data
@ -513,17 +572,15 @@ async def get_daily_data(uid, server_id='cn_gf01'):
req = await client.get( req = await client.get(
url='https://api-takumi-record.mihoyo.com/game_record/app/genshin/api/dailyNote', url='https://api-takumi-record.mihoyo.com/game_record/app/genshin/api/dailyNote',
headers={ headers={
'DS' : get_ds_token('role_id=' + uid + '&server=' + server_id), 'DS': get_ds_token('role_id=' + uid + '&server=' + server_id),
'x-rpc-app_version': mhyVersion, 'x-rpc-app_version': mhyVersion,
'User-Agent' : 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 ' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 '
'(KHTML, like Gecko) miHoYoBBS/2.11.1', '(KHTML, like Gecko) miHoYoBBS/2.11.1',
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/', 'Referer': 'https://webstatic.mihoyo.com/',
'Cookie' : await owner_cookies(uid)}, 'Cookie': await owner_cookies(uid),
params={ },
'server' : server_id, params={'server': server_id, 'role_id': uid},
'role_id': uid
}
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data
@ -538,16 +595,15 @@ async def get_sign_list():
try: try:
async with AsyncClient() as client: async with AsyncClient() as client:
req = await client.get( req = await client.get(
url = o_url + '/event/bbs_sign_reward/home', url=o_url + '/event/bbs_sign_reward/home',
headers={ headers={
'x-rpc-app_version': mhyVersion, 'x-rpc-app_version': mhyVersion,
'User-Agent' : 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 ('
'KHTML, like Gecko) miHoYoBBS/2.11.1', 'KHTML, like Gecko) miHoYoBBS/2.11.1',
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/'}, 'Referer': 'https://webstatic.mihoyo.com/',
params={ },
'act_id': 'e202009291139501' params={'act_id': 'e202009291139501'},
}
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data
@ -561,19 +617,16 @@ async def get_sign_info(uid, server_id='cn_gf01'):
try: try:
async with AsyncClient() as client: async with AsyncClient() as client:
req = await client.get( req = await client.get(
url= o_url + '/event/bbs_sign_reward/info', url=o_url + '/event/bbs_sign_reward/info',
headers={ headers={
'x-rpc-app_version': mhyVersion, 'x-rpc-app_version': mhyVersion,
'Cookie' : await owner_cookies(uid), 'Cookie': await owner_cookies(uid),
'User-Agent' : 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 ('
'KHTML, like Gecko) miHoYoBBS/2.11.1', 'KHTML, like Gecko) miHoYoBBS/2.11.1',
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/'}, 'Referer': 'https://webstatic.mihoyo.com/',
params={ },
'act_id': 'e202009291139501', params={'act_id': 'e202009291139501', 'region': server_id, 'uid': uid},
'region': server_id,
'uid' : uid
}
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data
@ -586,22 +639,22 @@ async def mihoyo_bbs_sign(uid, server_id='cn_gf01'):
server_id = 'cn_qd01' server_id = 'cn_qd01'
try: try:
req = requests.post( req = requests.post(
url= o_url + '/event/bbs_sign_reward/sign', url=o_url + '/event/bbs_sign_reward/sign',
headers={ headers={
'User_Agent' : 'Mozilla/5.0 (Linux; Android 10; MIX 2 Build/QKQ1.190825.002; wv) AppleWebKit/537.36 (' 'User_Agent': 'Mozilla/5.0 (Linux; Android 10; MIX 2 Build/QKQ1.190825.002; wv) AppleWebKit/537.36 ('
'KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.101 Mobile Safari/537.36 ' 'KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.101 Mobile Safari/537.36 '
'miHoYoBBS/2.3.0', 'miHoYoBBS/2.3.0',
'Cookie' : await owner_cookies(uid), 'Cookie': await owner_cookies(uid),
'x-rpc-device_id' : random_hex(32), 'x-rpc-device_id': random_hex(32),
'Origin' : 'https://webstatic.mihoyo.com', 'Origin': 'https://webstatic.mihoyo.com',
'X_Requested_With' : 'com.mihoyo.hyperion', 'X_Requested_With': 'com.mihoyo.hyperion',
'DS' : old_version_get_ds_token(), 'DS': old_version_get_ds_token(),
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/bbs/event/signin-ys/index.html?bbs_auth_required=true&act_id' 'Referer': 'https://webstatic.mihoyo.com/bbs/event/signin-ys/index.html?bbs_auth_required=true&act_id'
'=e202009291139501&utm_source=bbs&utm_medium=mys&utm_campaign=icon', '=e202009291139501&utm_source=bbs&utm_medium=mys&utm_campaign=icon',
'x-rpc-app_version': '2.3.0' 'x-rpc-app_version': '2.3.0',
}, },
json={'act_id': 'e202009291139501', 'uid': uid, 'region': server_id} json={'act_id': 'e202009291139501', 'uid': uid, 'region': server_id},
) )
data2 = json.loads(req.text) data2 = json.loads(req.text)
return data2 return data2
@ -618,24 +671,25 @@ async def get_award(uid, server_id='cn_gf01'):
url='https://hk4e-api.mihoyo.com/event/ys_ledger/monthInfo', url='https://hk4e-api.mihoyo.com/event/ys_ledger/monthInfo',
headers={ headers={
'x-rpc-app_version': mhyVersion, 'x-rpc-app_version': mhyVersion,
'Cookie' : await owner_cookies(uid), 'Cookie': await owner_cookies(uid),
'DS' : old_version_get_ds_token(), 'DS': old_version_get_ds_token(),
'x-rpc-device_id' : random_hex(32), 'x-rpc-device_id': random_hex(32),
'User-Agent' : 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 ('
'KHTML, like Gecko) miHoYoBBS/2.11.1', 'KHTML, like Gecko) miHoYoBBS/2.11.1',
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/'}, 'Referer': 'https://webstatic.mihoyo.com/',
},
params={ params={
'act_id' : 'e202009291139501', 'act_id': 'e202009291139501',
'bind_region' : server_id, 'bind_region': server_id,
'bind_uid' : uid, 'bind_uid': uid,
'month' : '0', 'month': '0',
'bbs_presentation_style': 'fullscreen', 'bbs_presentation_style': 'fullscreen',
'bbs_auth_required' : True, 'bbs_auth_required': True,
'utm_source' : 'bbs', 'utm_source': 'bbs',
'utm_medium' : 'mys', 'utm_medium': 'mys',
'utm_campaign' : 'icon' 'utm_campaign': 'icon',
} },
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data
@ -650,19 +704,17 @@ async def get_info(uid, ck, server_id='cn_gf01'):
try: try:
async with AsyncClient() as client: async with AsyncClient() as client:
req = await client.get( req = await client.get(
url= n_url + '/game_record/app/genshin/api/index', url=n_url + '/game_record/app/genshin/api/index',
headers={ headers={
'DS' : get_ds_token('role_id=' + uid + '&server=' + server_id), 'DS': get_ds_token('role_id=' + uid + '&server=' + server_id),
'x-rpc-app_version': mhyVersion, 'x-rpc-app_version': mhyVersion,
'User-Agent' : 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 ('
'KHTML, like Gecko) miHoYoBBS/2.11.1', 'KHTML, like Gecko) miHoYoBBS/2.11.1',
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/', 'Referer': 'https://webstatic.mihoyo.com/',
'Cookie' : ck}, 'Cookie': ck,
params={ },
'role_id': uid, params={'role_id': uid, 'server': server_id},
'server' : server_id
}
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data
@ -672,17 +724,15 @@ async def get_info(uid, ck, server_id='cn_gf01'):
req = await client.get( req = await client.get(
url='https://api-takumi-record.mihoyo.com/game_record/app/genshin/api/index', url='https://api-takumi-record.mihoyo.com/game_record/app/genshin/api/index',
headers={ headers={
'DS' : get_ds_token('role_id=' + uid + '&server=' + server_id), 'DS': get_ds_token('role_id=' + uid + '&server=' + server_id),
'x-rpc-app_version': mhyVersion, 'x-rpc-app_version': mhyVersion,
'User-Agent' : 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 ' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 '
'(KHTML, like Gecko) miHoYoBBS/2.11.1', '(KHTML, like Gecko) miHoYoBBS/2.11.1',
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/', 'Referer': 'https://webstatic.mihoyo.com/',
'Cookie' : ck}, 'Cookie': ck,
params={ },
'role_id': uid, params={'role_id': uid, 'server': server_id},
'server' : server_id
}
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data
@ -699,23 +749,29 @@ async def get_spiral_abyss_info(uid, ck, schedule_type='1', server_id='cn_gf01')
try: try:
async with AsyncClient() as client: async with AsyncClient() as client:
req = await client.get( req = await client.get(
url= n_url + '/game_record/app/genshin/api/spiralAbyss', url=n_url + '/game_record/app/genshin/api/spiralAbyss',
headers={ headers={
'DS' : get_ds_token( 'DS': get_ds_token(
'role_id=' + uid + '&schedule_type=' + schedule_type + '&server=' + server_id), 'role_id='
'Origin' : 'https://webstatic.mihoyo.com', + uid
'Cookie' : ck, + '&schedule_type='
+ schedule_type
+ '&server='
+ server_id
),
'Origin': 'https://webstatic.mihoyo.com',
'Cookie': ck,
'x-rpc-app_version': mhyVersion, 'x-rpc-app_version': mhyVersion,
'User-Agent' : 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS ' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS '
'X) AppleWebKit/605.1.15 (KHTML, like Gecko) miHoYoBBS/2.11.1', 'X) AppleWebKit/605.1.15 (KHTML, like Gecko) miHoYoBBS/2.11.1',
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/' 'Referer': 'https://webstatic.mihoyo.com/',
}, },
params={ params={
'schedule_type': schedule_type, 'schedule_type': schedule_type,
'role_id' : uid, 'role_id': uid,
'server' : server_id 'server': server_id,
} },
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data
@ -725,25 +781,31 @@ async def get_spiral_abyss_info(uid, ck, schedule_type='1', server_id='cn_gf01')
req = await client.get( req = await client.get(
url='https://api-takumi-record.mihoyo.com/game_record/app/genshin/api/spiralAbyss', url='https://api-takumi-record.mihoyo.com/game_record/app/genshin/api/spiralAbyss',
headers={ headers={
'DS' : get_ds_token( 'DS': get_ds_token(
'role_id=' + uid + '&schedule_type=' + schedule_type + '&server=' + server_id), 'role_id='
'Origin' : 'https://webstatic.mihoyo.com', + uid
'Cookie' : ck, + '&schedule_type='
+ schedule_type
+ '&server='
+ server_id
),
'Origin': 'https://webstatic.mihoyo.com',
'Cookie': ck,
'x-rpc-app_version': mhyVersion, 'x-rpc-app_version': mhyVersion,
'User-Agent' : 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 ' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 '
'(KHTML, like Gecko) miHoYoBBS/2.11.1', '(KHTML, like Gecko) miHoYoBBS/2.11.1',
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/' 'Referer': 'https://webstatic.mihoyo.com/',
}, },
params={ params={
'role_id' : uid, 'role_id': uid,
'server' : server_id, 'server': server_id,
'bbs_presentation_style': 'fullscreen', 'bbs_presentation_style': 'fullscreen',
'bbs_auth_required' : 'true', 'bbs_auth_required': 'true',
'utm_source' : 'bbs', 'utm_source': 'bbs',
'utm_medium' : 'mys', 'utm_medium': 'mys',
'utm_campaign' : 'icon' 'utm_campaign': 'icon',
} },
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data
@ -759,19 +821,25 @@ def get_character(uid, character_ids, ck, server_id='cn_gf01'):
server_id = 'cn_qd01' server_id = 'cn_qd01'
try: try:
req = requests.post( req = requests.post(
url= n_url + '/game_record/app/genshin/api/character', url=n_url + '/game_record/app/genshin/api/character',
headers={ headers={
'DS' : get_ds_token('', {'character_ids': character_ids, 'role_id': uid, 'DS': get_ds_token(
'server' : server_id}), '',
'Origin' : 'https://webstatic.mihoyo.com', {
'Cookie' : ck, 'character_ids': character_ids,
'role_id': uid,
'server': server_id,
},
),
'Origin': 'https://webstatic.mihoyo.com',
'Cookie': ck,
'x-rpc-app_version': mhyVersion, 'x-rpc-app_version': mhyVersion,
'User-Agent' : 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, ' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, '
'like Gecko) miHoYoBBS/2.11.1', 'like Gecko) miHoYoBBS/2.11.1',
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/' 'Referer': 'https://webstatic.mihoyo.com/',
}, },
json={'character_ids': character_ids, 'role_id': uid, 'server': server_id} json={'character_ids': character_ids, 'role_id': uid, 'server': server_id},
) )
data2 = json.loads(req.text) data2 = json.loads(req.text)
return data2 return data2
@ -780,17 +848,27 @@ def get_character(uid, character_ids, ck, server_id='cn_gf01'):
req = requests.post( req = requests.post(
url='https://api-takumi-record.mihoyo.com/game_record/app/genshin/api/character', url='https://api-takumi-record.mihoyo.com/game_record/app/genshin/api/character',
headers={ headers={
'DS' : get_ds_token('', {'character_ids': character_ids, 'role_id': uid, 'DS': get_ds_token(
'server' : server_id}), '',
'Origin' : 'https://webstatic.mihoyo.com', {
'Cookie' : ck, 'character_ids': character_ids,
'role_id': uid,
'server': server_id,
},
),
'Origin': 'https://webstatic.mihoyo.com',
'Cookie': ck,
'x-rpc-app_version': mhyVersion, 'x-rpc-app_version': mhyVersion,
'User-Agent' : 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 ('
'KHTML, like Gecko) miHoYoBBS/2.11.1', 'KHTML, like Gecko) miHoYoBBS/2.11.1',
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/' 'Referer': 'https://webstatic.mihoyo.com/',
},
json={
'character_ids': character_ids,
'role_id': uid,
'server': server_id,
}, },
json={'character_ids': character_ids, 'role_id': uid, 'server': server_id}
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data
@ -801,25 +879,26 @@ def get_character(uid, character_ids, ck, server_id='cn_gf01'):
logger.info(e.with_traceback) logger.info(e.with_traceback)
async def get_calculate_info(client: ClientSession, uid, char_id, ck, name, server_id='cn_gf01'): async def get_calculate_info(
client: ClientSession, uid, char_id, ck, name, server_id='cn_gf01'
):
if uid[0] == '5': if uid[0] == '5':
server_id = 'cn_qd01' server_id = 'cn_qd01'
url = o_url + '/event/e20200928calculate/v1/sync/avatar/detail' url = o_url + '/event/e20200928calculate/v1/sync/avatar/detail'
req = await client.get( req = await client.get(
url=url, url=url,
headers={ headers={
'DS' : get_ds_token('uid={}&avatar_id={}&region={}'.format(uid, char_id, server_id)), 'DS': get_ds_token(
'uid={}&avatar_id={}&region={}'.format(uid, char_id, server_id)
),
'x-rpc-app_version': mhyVersion, 'x-rpc-app_version': mhyVersion,
'User-Agent' : 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 ('
'KHTML, like Gecko) miHoYoBBS/2.11.1', 'KHTML, like Gecko) miHoYoBBS/2.11.1',
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/', 'Referer': 'https://webstatic.mihoyo.com/',
'Cookie' : ck}, 'Cookie': ck,
params={ },
'avatar_id': char_id, params={'avatar_id': char_id, 'uid': uid, 'region': server_id},
'uid' : uid,
'region' : server_id
}
) )
data = await req.json() data = await req.json()
data.update({'name': name}) data.update({'name': name})
@ -830,16 +909,17 @@ async def get_mihoyo_bbs_info(mysid, ck):
try: try:
async with AsyncClient() as client: async with AsyncClient() as client:
req = await client.get( req = await client.get(
url = n_url + '/game_record/card/wapi/getGameRecordCard', url=n_url + '/game_record/card/wapi/getGameRecordCard',
headers={ headers={
'DS' : get_ds_token('uid=' + mysid), 'DS': get_ds_token('uid=' + mysid),
'x-rpc-app_version': mhyVersion, 'x-rpc-app_version': mhyVersion,
'User-Agent' : 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 ('
'KHTML, like Gecko) miHoYoBBS/2.11.1', 'KHTML, like Gecko) miHoYoBBS/2.11.1',
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/', 'Referer': 'https://webstatic.mihoyo.com/',
'Cookie' : ck}, 'Cookie': ck,
params={'uid': mysid} },
params={'uid': mysid},
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data
@ -847,16 +927,18 @@ async def get_mihoyo_bbs_info(mysid, ck):
try: try:
async with AsyncClient() as client: async with AsyncClient() as client:
req = await client.get( req = await client.get(
url='https://api-takumi-record.mihoyo.com/game_record/card/wapi/getGameRecordCard?uid=' + mysid, url='https://api-takumi-record.mihoyo.com/game_record/card/wapi/getGameRecordCard?uid='
+ mysid,
headers={ headers={
'DS' : get_ds_token('uid=' + mysid), 'DS': get_ds_token('uid=' + mysid),
'x-rpc-app_version': mhyVersion, 'x-rpc-app_version': mhyVersion,
'User-Agent' : 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 ' 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 '
'(KHTML, like Gecko) miHoYoBBS/2.11.1', '(KHTML, like Gecko) miHoYoBBS/2.11.1',
'x-rpc-client_type': '5', 'x-rpc-client_type': '5',
'Referer' : 'https://webstatic.mihoyo.com/', 'Referer': 'https://webstatic.mihoyo.com/',
'Cookie' : ck}, 'Cookie': ck,
params={'uid': mysid} },
params={'uid': mysid},
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data
@ -874,9 +956,10 @@ async def get_audio_info(name, audioid, language='cn'):
url=url, url=url,
headers={ headers={
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) ' 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) '
'Chrome/95.0.4638.69 Safari/537.36', 'Chrome/95.0.4638.69 Safari/537.36',
'Referer' : 'https://genshin.minigg.cn/index.html'}, 'Referer': 'https://genshin.minigg.cn/index.html',
params={'characters': name, 'audioid': audioid, 'language': language} },
params={'characters': name, 'audioid': audioid, 'language': language},
) )
return req.text return req.text
@ -891,8 +974,9 @@ async def get_weapon_info(name, level=None):
url='https://info.minigg.cn/weapons', url='https://info.minigg.cn/weapons',
headers={ headers={
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) ' 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) '
'Chrome/95.0.4638.69 Safari/537.36'}, 'Chrome/95.0.4638.69 Safari/537.36'
params=params },
params=params,
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data
@ -905,8 +989,9 @@ async def get_misc_info(mode, name):
url=url, url=url,
headers={ headers={
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) ' 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) '
'Chrome/97.0.4692.71 Safari/537.36'}, 'Chrome/97.0.4692.71 Safari/537.36'
params={'query': name} },
params={'query': name},
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data
@ -936,8 +1021,10 @@ async def get_char_info(name, mode='char', level=None):
url=url2, url=url2,
headers={ headers={
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) ' 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) '
'Chrome/95.0.4638.69 Safari/537.36', 'Chrome/95.0.4638.69 Safari/537.36',
'Referer' : 'https://genshin.minigg.cn/index.html'}) 'Referer': 'https://genshin.minigg.cn/index.html',
},
)
data2 = json.loads(req.text) data2 = json.loads(req.text)
if 'errcode' in data2: if 'errcode' in data2:
async with AsyncClient() as client_: async with AsyncClient() as client_:
@ -945,8 +1032,10 @@ async def get_char_info(name, mode='char', level=None):
url=url3, url=url3,
headers={ headers={
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, ' 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, '
'like Gecko) Chrome/95.0.4638.69 Safari/537.36', 'like Gecko) Chrome/95.0.4638.69 Safari/537.36',
'Referer' : 'https://genshin.minigg.cn/index.html'}) 'Referer': 'https://genshin.minigg.cn/index.html',
},
)
data2 = json.loads(req.text) data2 = json.loads(req.text)
async with AsyncClient() as client: async with AsyncClient() as client:
@ -954,8 +1043,10 @@ async def get_char_info(name, mode='char', level=None):
url=url, url=url,
headers={ headers={
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) ' 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) '
'Chrome/95.0.4638.69 Safari/537.36', 'Chrome/95.0.4638.69 Safari/537.36',
'Referer' : 'https://genshin.minigg.cn/index.html'}) 'Referer': 'https://genshin.minigg.cn/index.html',
},
)
try: try:
data = json.loads(req.text) data = json.loads(req.text)
if 'errcode' in data: if 'errcode' in data:
@ -964,8 +1055,10 @@ async def get_char_info(name, mode='char', level=None):
url=url + '&matchCategories=true', url=url + '&matchCategories=true',
headers={ headers={
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, ' 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, '
'like Gecko) Chrome/95.0.4638.69 Safari/537.36', 'like Gecko) Chrome/95.0.4638.69 Safari/537.36',
'Referer' : 'https://genshin.minigg.cn/index.html'}) 'Referer': 'https://genshin.minigg.cn/index.html',
},
)
data = json.loads(req.text) data = json.loads(req.text)
except: except:
data = None data = None
@ -975,24 +1068,23 @@ async def get_char_info(name, mode='char', level=None):
async def get_genshin_events(mode='List'): async def get_genshin_events(mode='List'):
if mode == 'Calendar': if mode == 'Calendar':
now_time = datetime.datetime.now().strftime('%Y-%m-%d') now_time = datetime.datetime.now().strftime('%Y-%m-%d')
base_url = 'https://api-takumi.mihoyo.com/event/bbs_activity_calendar/getActList' base_url = (
params = { 'https://api-takumi.mihoyo.com/event/bbs_activity_calendar/getActList'
'time' : now_time, )
'game_biz': 'ys_cn', params = {'time': now_time, 'game_biz': 'ys_cn', 'page': 1, 'tag_id': 0}
'page' : 1,
'tag_id' : 0
}
else: else:
base_url = 'https://hk4e-api.mihoyo.com/common/hk4e_cn/announcement/api/getAnn{}'.format(mode) base_url = 'https://hk4e-api.mihoyo.com/common/hk4e_cn/announcement/api/getAnn{}'.format(
mode
)
params = { params = {
'game' : 'hk4e', 'game': 'hk4e',
'game_biz' : 'hk4e_cn', 'game_biz': 'hk4e_cn',
'lang' : 'zh-cn', 'lang': 'zh-cn',
'bundle_id': 'hk4e_cn', 'bundle_id': 'hk4e_cn',
'platform' : 'pc', 'platform': 'pc',
'region' : 'cn_gf01', 'region': 'cn_gf01',
'level' : 55, 'level': 55,
'uid' : 100000000 'uid': 100000000,
} }
async with AsyncClient() as client: async with AsyncClient() as client:
@ -1000,8 +1092,9 @@ async def get_genshin_events(mode='List'):
url=base_url, url=base_url,
headers={ headers={
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) ' 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) '
'Chrome/95.0.4638.69 Safari/537.36'}, 'Chrome/95.0.4638.69 Safari/537.36'
params=params },
params=params,
) )
data = json.loads(req.text) data = json.loads(req.text)
return data return data