From 675a8c0cc4b4876c07829ec9ba30f96f15b14234 Mon Sep 17 00:00:00 2001 From: clover420 <748883120@qq.com> Date: Sun, 28 Aug 2022 18:08:36 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud_genshin.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cloud_genshin.py b/cloud_genshin.py index 2643122..bbfd267 100644 --- a/cloud_genshin.py +++ b/cloud_genshin.py @@ -24,7 +24,13 @@ class CloudGenshin: 'User-Agent': 'okhttp/4.9.0' } - def sign_account(self): + # 分钟转小时 + def Time_Conversion(self,minute : int) -> str: + h = minute//60 + s = minute%60 + return f"{h}小时{s}分钟" + + def sign_account(self) -> str: ret_msg = "云原神:\r\n" req = http.get(url=setting.cloud_genshin_Inquire, headers=self.headers) data = req.json() @@ -33,7 +39,7 @@ class CloudGenshin: log.info('签到失败，未获得免费时长，可能是已经签到过了或者超出免费时长上线') else: log.info(f'签到成功，已获得{data["data"]["free_time"]["free_time"]}分钟免费时长') - ret_msg = f'你当前拥有免费时长 {data["data"]["free_time"]["free_time"]} 分钟，' \ + ret_msg = f'你当前拥有免费时长 {self.Time_Conversion(int(data["data"]["free_time"]["free_time"]))} ,' \ f'畅玩卡状态为 {data["data"]["play_card"]["short_msg"]}，拥有米云币 {data["data"]["coin"]["coin_num"]} 枚' log.info(ret_msg) elif data['retcode'] == -100: From 010fe7d988b0a91b0455dd64b3c73e4a9dd92e61 Mon Sep 17 00:00:00 2001 From: clover420 <748883120@qq.com> Date: Sun, 28 Aug 2022 18:41:23 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=AD=BE=E5=88=B0=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud_genshin.py | 14 +++++++++----- main.py | 2 +- setting.py | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/cloud_genshin.py b/cloud_genshin.py index bbfd267..4324724 100644 --- a/cloud_genshin.py +++ b/cloud_genshin.py @@ -1,3 +1,4 @@ +import json import tools import config import setting @@ -32,14 +33,17 @@ class CloudGenshin: def sign_account(self) -> str: ret_msg = "云原神:\r\n" - req = http.get(url=setting.cloud_genshin_Inquire, headers=self.headers) + req = http.get(url=setting.cloud_genshin_sgin, headers=self.headers) data = req.json() + data2 = http.get(url=setting.cloud_genshin_inquire, headers=self.headers).json() if data['retcode'] == 0: - if req["data"]["free_time"]['free_time'] == '0': - log.info('签到失败，未获得免费时长，可能是已经签到过了或者超出免费时长上线') + if len(data2['data']['list']) >= 1: + log.info('签到成功，已获得15分钟免费时长') + ret_msg = f'签到成功，已获得15分钟免费时长\n' else: - log.info(f'签到成功，已获得{data["data"]["free_time"]["free_time"]}分钟免费时长') - ret_msg = f'你当前拥有免费时长 {self.Time_Conversion(int(data["data"]["free_time"]["free_time"]))} ,' \ + log.info('签到失败，未获得免费时长，可能是已经签到过了或者超出免费时长上线') + ret_msg = '签到失败，未获得免费时长，可能是已经签到过了或者超出免费时长上线\n' + ret_msg += f'你当前拥有免费时长 {self.Time_Conversion(int(data["data"]["free_time"]["free_time"]))} ,' \ f'畅玩卡状态为 {data["data"]["play_card"]["short_msg"]}，拥有米云币 {data["data"]["coin"]["coin_num"]} 枚' log.info(ret_msg) elif data['retcode'] == -100: diff --git a/main.py b/main.py index eba661b..3d72a91 100644 --- a/main.py +++ b/main.py @@ -103,7 +103,7 @@ def main(): else: cloud_ys = cloud_genshin.CloudGenshin() data = cloud_ys.sign_account() - return_data += "\n\n" + data + return_data += "\n\n云原神:\n" + data return ret_code, return_data elif config.config["account"]["cookie"] == "CookieError": raise CookieError('Cookie expires') diff --git a/setting.py b/setting.py index cdbebcc..18d8d04 100644 --- a/setting.py +++ b/setting.py @@ -116,4 +116,5 @@ genshin_Signurl = web_Api + "/event/bbs_sign_reward/sign" # 云原神相关api cloud_genshin_Api = "https://api-cloudgame.mihoyo.com" -cloud_genshin_Inquire = cloud_genshin_Api + "/hk4e_cg_cn/wallet/wallet/get" +cloud_genshin_sgin = cloud_genshin_Api + "/hk4e_cg_cn/wallet/wallet/get" +cloud_genshin_inquire = cloud_genshin_Api + "/hk4e_cg_cn/gamer/api/listNotifications?status=NotificationStatusUnread&type=NotificationTypePopup&is_sort=true" From dfd3ac996ceeb72948534f2047652fa206123c0b Mon Sep 17 00:00:00 2001 From: clover420 <748883120@qq.com> Date: Sun, 28 Aug 2022 18:48:36 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=9B=E5=B0=8F?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud_genshin.py | 4 ++-- main.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cloud_genshin.py b/cloud_genshin.py index 4324724..aacc477 100644 --- a/cloud_genshin.py +++ b/cloud_genshin.py @@ -39,10 +39,10 @@ class CloudGenshin: if data['retcode'] == 0: if len(data2['data']['list']) >= 1: log.info('签到成功，已获得15分钟免费时长') - ret_msg = f'签到成功，已获得15分钟免费时长\n' + ret_msg += f'签到成功，已获得15分钟免费时长\n' else: log.info('签到失败，未获得免费时长，可能是已经签到过了或者超出免费时长上线') - ret_msg = '签到失败，未获得免费时长，可能是已经签到过了或者超出免费时长上线\n' + ret_msg += '签到失败，未获得免费时长，可能是已经签到过了或者超出免费时长上线\n' ret_msg += f'你当前拥有免费时长 {self.Time_Conversion(int(data["data"]["free_time"]["free_time"]))} ,' \ f'畅玩卡状态为 {data["data"]["play_card"]["short_msg"]}，拥有米云币 {data["data"]["coin"]["coin_num"]} 枚' log.info(ret_msg) diff --git a/main.py b/main.py index 3d72a91..eba661b 100644 --- a/main.py +++ b/main.py @@ -103,7 +103,7 @@ def main(): else: cloud_ys = cloud_genshin.CloudGenshin() data = cloud_ys.sign_account() - return_data += "\n\n云原神:\n" + data + return_data += "\n\n" + data return ret_code, return_data elif config.config["account"]["cookie"] == "CookieError": raise CookieError('Cookie expires') From a99eb07f6bcbd70bd99dfd548d6b5fb701246109 Mon Sep 17 00:00:00 2001 From: clover420 <748883120@qq.com> Date: Tue, 30 Aug 2022 08:55:37 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BA=91=E5=8E=9F=E7=A5=9E=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + cloud_genshin.py | 7 +++---- setting.py | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 09b23d0..00d6609 100644 --- a/.gitignore +++ b/.gitignore @@ -141,3 +141,4 @@ config/*.yaml # push配置 config/push.ini .DS_Store +yaml/ diff --git a/cloud_genshin.py b/cloud_genshin.py index aacc477..c1a0db2 100644 --- a/cloud_genshin.py +++ b/cloud_genshin.py @@ -35,11 +35,10 @@ class CloudGenshin: ret_msg = "云原神:\r\n" req = http.get(url=setting.cloud_genshin_sgin, headers=self.headers) data = req.json() - data2 = http.get(url=setting.cloud_genshin_inquire, headers=self.headers).json() if data['retcode'] == 0: - if len(data2['data']['list']) >= 1: - log.info('签到成功，已获得15分钟免费时长') - ret_msg += f'签到成功，已获得15分钟免费时长\n' + if int(data["data"]["free_time"]["send_freetime"]) > 0: + log.info(f'签到成功，已获得{data["data"]["free_time"]["send_freetime"]}分钟免费时长') + ret_msg += f'签到成功，已获得{data["data"]["free_time"]["send_freetime"]}分钟免费时长\n' else: log.info('签到失败，未获得免费时长，可能是已经签到过了或者超出免费时长上线') ret_msg += '签到失败，未获得免费时长，可能是已经签到过了或者超出免费时长上线\n' diff --git a/setting.py b/setting.py index 18d8d04..c43ab88 100644 --- a/setting.py +++ b/setting.py @@ -117,4 +117,3 @@ genshin_Signurl = web_Api + "/event/bbs_sign_reward/sign" # 云原神相关api cloud_genshin_Api = "https://api-cloudgame.mihoyo.com" cloud_genshin_sgin = cloud_genshin_Api + "/hk4e_cg_cn/wallet/wallet/get" -cloud_genshin_inquire = cloud_genshin_Api + "/hk4e_cg_cn/gamer/api/listNotifications?status=NotificationStatusUnread&type=NotificationTypePopup&is_sort=true" From ee0cdb06d8cd7a173baed847049ae12366f58e36 Mon Sep 17 00:00:00 2001 From: clover420 <748883120@qq.com> Date: Tue, 30 Aug 2022 09:15:12 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud_genshin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud_genshin.py b/cloud_genshin.py index c1a0db2..1ddbc77 100644 --- a/cloud_genshin.py +++ b/cloud_genshin.py @@ -26,7 +26,7 @@ class CloudGenshin: } # 分钟转小时 - def Time_Conversion(self,minute : int) -> str: + def time_conversion(self,minute : int) -> str: h = minute//60 s = minute%60 return f"{h}小时{s}分钟" @@ -42,7 +42,7 @@ class CloudGenshin: else: log.info('签到失败，未获得免费时长，可能是已经签到过了或者超出免费时长上线') ret_msg += '签到失败，未获得免费时长，可能是已经签到过了或者超出免费时长上线\n' - ret_msg += f'你当前拥有免费时长 {self.Time_Conversion(int(data["data"]["free_time"]["free_time"]))} ,' \ + ret_msg += f'你当前拥有免费时长 {self.time_conversion(int(data["data"]["free_time"]["free_time"]))} ,' \ f'畅玩卡状态为 {data["data"]["play_card"]["short_msg"]}，拥有米云币 {data["data"]["coin"]["coin_num"]} 枚' log.info(ret_msg) elif data['retcode'] == -100: From c941ff9f8cf60991acf5f23c59f194103761089d Mon Sep 17 00:00:00 2001 From: clover420 <748883120@qq.com> Date: Tue, 30 Aug 2022 09:18:40 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=8D=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud_genshin.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cloud_genshin.py b/cloud_genshin.py index 1ddbc77..4e718ce 100644 --- a/cloud_genshin.py +++ b/cloud_genshin.py @@ -1,4 +1,3 @@ -import json import tools import config import setting