From 06a765857563de4725a13abf36a66b6c9dcbafa3 Mon Sep 17 00:00:00 2001 From: thsrite Date: Thu, 10 Aug 2023 10:55:59 +0800 Subject: [PATCH 01/11] Update checkin.yml --- .github/workflows/checkin.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/checkin.yml b/.github/workflows/checkin.yml index db3b345c..906ceb36 100644 --- a/.github/workflows/checkin.yml +++ b/.github/workflows/checkin.yml @@ -1,7 +1,7 @@ name: aliyundrive-checkin on: schedule: - - cron: 0 16 * * * + - cron: 0 9 * * * workflow_dispatch: jobs: build: @@ -17,6 +17,7 @@ jobs: env: PUSHPLUS_TOKEN: ${{ secrets.PUSHPLUS_TOKEN }} SERVERCHAN_SENDKEY: ${{ secrets.SCKEY }} + WECOM_TOKENS: ${{ secrets.WECOM_TOKENS }} WECOM_WEBHOOK: ${{ secrets.WECOM_WEBHOOK }} BARK_DEVICEKEY: ${{ secrets.BARK_DEVICEKEY }} FEISHU_DEVICEKEY: ${{ secrets.FEISHU_DEVICEKEY }} From a8eadc7d16048d56b34918f0ac5f7a7609fdaa38 Mon Sep 17 00:00:00 2001 From: thsrite Date: Thu, 10 Aug 2023 10:57:12 +0800 Subject: [PATCH 02/11] Update main.py --- main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.py b/main.py index 8f33d89a..f2bede9f 100644 --- a/main.py +++ b/main.py @@ -12,6 +12,7 @@ def main(): token_string = args.token_string pushplus_token = os.environ.get('PUSHPLUS_TOKEN') serverChan_sendkey = os.environ.get('SERVERCHAN_SENDKEY') + weCom_tokens = os.environ.get('WECOM_TOKENS') weCom_webhook = os.environ.get('WECOM_WEBHOOK') bark_deviceKey = os.environ.get('BARK_DEVICEKEY') feishu_deviceKey = os.environ.get('FEISHU_DEVICEKEY') @@ -19,6 +20,7 @@ def main(): message_tokens = { 'pushplus_token': pushplus_token, 'serverChan_token': serverChan_sendkey, + 'weCom_tokens': weCom_tokens, 'weCom_webhook': weCom_webhook, 'bark_deviceKey': bark_deviceKey, 'feishu_deviceKey': feishu_deviceKey, From 348830d01302ced6508ae5bd43461c8791d92cbf Mon Sep 17 00:00:00 2001 From: thsrite Date: Thu, 10 Aug 2023 10:58:18 +0800 Subject: [PATCH 03/11] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b1e64e82..1bea4f74 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ | TOKEN * | 阿里云盘Token 可以添加多个用英文逗号(,)分割 无需空格 | | SCKEY | Server酱 推送密钥 | | PUSHPLUS_TOKEN | pushplus 推送Token | + | WECOM_TOKENS | 企业微信 tokens | | WECOM_WEBHOOK | 企业微信 WEBHOOK | | BARK_DEVICEKEY | IOS应用Bark 推送密钥 | | FEISHU_DEVICEKEY | 飞书 推送密钥 | From c48119a949a0238ea675d3c6217ebc65c1b77ba5 Mon Sep 17 00:00:00 2001 From: thsrite Date: Thu, 10 Aug 2023 11:21:06 +0800 Subject: [PATCH 04/11] png --- aliyunpan.jpg | Bin 0 -> 11552 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 aliyunpan.jpg diff --git a/aliyunpan.jpg b/aliyunpan.jpg new file mode 100644 index 0000000000000000000000000000000000000000..82777e278c397167dff17cb444b8bb00402bf70a GIT binary patch literal 11552 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 OX)Ty*tFcV__TK<)9((Zs literal 0 HcmV?d00001 From 3cc39b1dc8ffee8f2168300c0973e5f4fced1dcf Mon Sep 17 00:00:00 2001 From: thsrite Date: Thu, 10 Aug 2023 12:03:24 +0800 Subject: [PATCH 05/11] =?UTF-8?q?feat=20=E6=94=AF=E6=8C=81=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=BE=AE=E4=BF=A1=E5=BA=94=E7=94=A8=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E3=80=81=E6=94=AF=E6=8C=81=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=AF=8F=E6=97=A5=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aliyundrive.py | 91 ++++++++++++++++++++++++++++++++++++++------- aliyundrive_info.py | 22 ++++++----- main.py | 5 +++ message_send.py | 46 ++++++++++++++++------- 4 files changed, 128 insertions(+), 36 deletions(-) diff --git a/aliyundrive.py b/aliyundrive.py index a38d9755..cdab73f6 100644 --- a/aliyundrive.py +++ b/aliyundrive.py @@ -1,8 +1,12 @@ +import datetime import json +import time + import requests from aliyundrive_info import AliyundriveInfo from tenacity import retry, stop_after_attempt, wait_fixed, RetryError + class Aliyundrive: """ 阿里云盘签到（自动领取奖励） @@ -10,42 +14,49 @@ class Aliyundrive: :param token: 阿里云盘token :return AliyundriveInfo: """ + def aliyundrive_check_in(self, token: str) -> AliyundriveInfo: info = AliyundriveInfo( - success=False, - user_name='', - signin_count=-1, - message='', - reward_notice='' + success=False, + user_name='', + signin_count=-1, + message='', + reward_notice='', + task='' ) def handle_error(error_message: str) -> AliyundriveInfo: info.message = error_message return info - + try: flag, user_name, access_token, message = self._get_access_token(token) if not flag: return handle_error(f'get_access_token error: {message}') - + flag, signin_count, message = self._check_in(access_token) if not flag: return handle_error(f'check_in error: {message}') - + flag, message = self._get_reward(access_token, signin_count) if not flag: return handle_error(f'get_reward error: {message}') - + + flag, task = self._get_task(access_token) + if not flag: + return handle_error(f'get_task error: {task}') + info.success = True info.user_name = user_name info.signin_count = signin_count info.reward_notice = message + info.task = task return info except RetryError as e: return handle_error(f'Unexpected error occurred: {str(e)}') - + """ 获取access_token @@ -55,6 +66,7 @@ def handle_error(error_message: str) -> AliyundriveInfo: :return tuple[2]: access_token :return tuple[3]: message """ + @retry(stop=stop_after_attempt(3), wait=wait_fixed(1)) def _get_access_token(self, token: str) -> tuple[bool, str, str, str]: url = 'https://auth.aliyundrive.com/v2/account/token' @@ -70,7 +82,7 @@ def _get_access_token(self, token: str) -> tuple[bool, str, str, str]: name = nick_name if nick_name else user_name access_token = data['access_token'] return True, name, access_token, '成功获取access_token' - + """ 执行签到操作 @@ -79,6 +91,7 @@ def _get_access_token(self, token: str) -> tuple[bool, str, str, str]: :return tuple[1]: 签到次数 :return tuple[2]: message """ + @retry(stop=stop_after_attempt(3), wait=wait_fixed(1)) def _check_in(self, access_token: str) -> tuple[bool, int, str]: url = 'https://member.aliyundrive.com/v1/activity/sign_in_list' @@ -96,7 +109,7 @@ def _check_in(self, access_token: str) -> tuple[bool, int, str]: signin_count = data['result']['signInCount'] return success, signin_count, '签到成功' - + """ 获得奖励 @@ -105,6 +118,7 @@ def _check_in(self, access_token: str) -> tuple[bool, int, str]: :return tuple[0]: 是否成功 :return tuple[1]: message 奖励信息或者出错信息 """ + @retry(stop=stop_after_attempt(3), wait=wait_fixed(1)) def _get_reward(self, access_token: str, sign_day: int) -> tuple[bool, str]: url = 'https://member.aliyundrive.com/v1/activity/sign_in_reward' @@ -117,7 +131,58 @@ def _get_reward(self, access_token: str, sign_day: int) -> tuple[bool, str]: if 'result' not in data: return False, data['message'] - + success = data['success'] notice = data['result']['notice'] return success, notice + + """ + 今日任务 + + :param token: 调用_get_access_token方法返回的access_token + :param sign_day: 领取第几天 + :return tuple[0]: 是否成功 + :return tuple[1]: message 奖励信息或者出错信息 + """ + + @retry(stop=stop_after_attempt(3), wait=wait_fixed(1)) + def _get_task(self, access_token: str) -> tuple[bool, str]: + url = 'https://member.aliyundrive.com/v2/activity/sign_in_list' + payload = {} + params = {'_rx-s': 'mobile'} + headers = {'Authorization': f'Bearer {access_token}'} + + response = requests.post(url, json=payload, params=params, headers=headers, timeout=5) + data = response.json() + + if 'result' not in data: + return False, data['message'] + + success = data['success'] + signInInfos = data['result']['signInInfos'] + year, month, day = time.localtime()[:3] + + # signInStaus = False + # signinReward = None + task_str = "" + for info in signInInfos: + if int(info['day']) == day: + # status = info['status'] + # if status == 'normal': + # signInStaus = True + # subtitle = info['subtitle'] + rewards = info['rewards'] + + for reward in rewards: + name = reward['name'] + remind = reward['remind'] + type = reward['type'] + if type == "dailySignIn": + task_str += f' 类型：签到\n' \ + f' 要求：{remind}\n' \ + f' 奖励：{name}\n' + if type == "dailyTask": + task_str += f' 类型：任务\n' \ + f' 要求：{remind}\n' \ + f' 奖励：{name}\n' + return success, task_str diff --git a/aliyundrive_info.py b/aliyundrive_info.py index add1c9ec..549ad9ad 100644 --- a/aliyundrive_info.py +++ b/aliyundrive_info.py @@ -1,23 +1,27 @@ class AliyundriveInfo: def __init__( - self, - success: bool, - user_name: str, - signin_count: int, - message: str, - reward_notice: str): + self, + success: bool, + user_name: str, + signin_count: int, + message: str, + reward_notice: str, + task: str): self.success = success self.user_name = user_name self.signin_count = signin_count self.message = message self.reward_notice = reward_notice + self.task = task def __str__(self) -> str: message_all = '' if self.success: - message_all = f'用户：{self.user_name}\n'\ - f'签到：本月已签到{self.signin_count}次\n'\ - f'备注：{self.reward_notice}' + message_all = f'用户：{self.user_name}\n' \ + f'签到：本月已签到{self.signin_count}次\n' \ + f'奖励：{self.reward_notice}\n' \ + f'任务：\n' \ + f'{self.task}' else: message_all = f'签到失败\n错误信息：{self.message}' diff --git a/main.py b/main.py index f2bede9f..e992b34f 100644 --- a/main.py +++ b/main.py @@ -1,9 +1,11 @@ +import logging import os import re import argparse from aliyundrive import Aliyundrive from message_send import MessageSend + def main(): parser = argparse.ArgumentParser() parser.add_argument('--token_string', type=str, required=True) @@ -41,10 +43,13 @@ def main(): message_all = '\n'.join(message_all) message_all = re.sub('\n+', '\n', message_all).rstrip('\n') + logging.info(message_all) + message_send = MessageSend() message_send.send_all(message_tokens, title, message_all) print('finish') + if __name__ == '__main__': main() diff --git a/message_send.py b/message_send.py index 2fe223fc..a004e859 100644 --- a/message_send.py +++ b/message_send.py @@ -1,6 +1,7 @@ import requests import json + class MessageSend: def __init__(self): self.sender = {} @@ -70,10 +71,20 @@ def serverChan(self, sendkey, title, content): return 0 def weCom(self, tokens, title, content): - assert len(tokens) == 3 and tokens.count(None) == 0 and tokens.count("") == 0 - weCom_corpId, weCom_corpSecret, weCom_agentId = tokens + proxy_url = None + to_user = None + tokens = tokens.split(",") + if len(tokens) == 3: + weCom_corpId, weCom_corpSecret, weCom_agentId = tokens + elif len(tokens) == 4: + weCom_corpId, weCom_corpSecret, weCom_agentId, to_user = tokens + elif len(tokens) == 5: + weCom_corpId, weCom_corpSecret, weCom_agentId, to_user, proxy_url = tokens + else: + return -1 - get_token_url = f"https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid={weCom_corpId}&corpsecret={weCom_corpSecret}" + qy_url = proxy_url or "https://qyapi.weixin.qq.com" + get_token_url = f"{qy_url}/cgi-bin/gettoken?corpid={weCom_corpId}&corpsecret={weCom_corpSecret}" resp = requests.get(get_token_url) resp_json = resp.json() if resp_json["errcode"] != 0: @@ -81,13 +92,20 @@ def weCom(self, tokens, title, content): access_token = resp_json.get('access_token') if access_token is None or len(access_token) == 0: return -1 - send_msg_url = f'https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token={access_token}' + send_msg_url = f'{qy_url}/cgi-bin/message/send?access_token={access_token}' data = { - "touser": "@all", + "touser": to_user or "@all", "agentid": weCom_agentId, - "msgtype": "markdown", - "markdown": { - "content": content + "msgtype": "news", + "news": { + "articles": [ + { + "title": title, + "description": content, + "picurl": "https://raw.githubusercontent.com/thsrite/aliyundrive-checkin/main/aliyunpan.jpg", + "url": '' + } + ] }, "duplicate_check_interval": 600 } @@ -160,12 +178,12 @@ def feishu(self, device_key, title, content): "zh_cn": { "title": title, "content": [ - [ - { - "tag": "text", - "text": content, - } - ] + [ + { + "tag": "text", + "text": content, + } + ] ] } } From c5064a7f254c7ba05f41f01742c8468c8e575ca1 Mon Sep 17 00:00:00 2001 From: thsrite Date: Thu, 10 Aug 2023 12:09:26 +0800 Subject: [PATCH 06/11] wecom_tokens --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1bea4f74..cd5756b9 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,8 @@ 以上TOKEN为阿里云盘签到必填项 推送项选择其中一个即可 也可多渠道推送 +WECOM_TOKENS: weCom_corpId, weCom_corpSecret, weCom_agentId, to_user, proxy_url （, to_user, proxy_url可选） + 3. 点击Actions -> 选择aliyundrive-checkin -> 点击Run workflow 运行即可 ### 其它设置 From f2eceb85149a2860d5455ca86d29c5337c1aaf6a Mon Sep 17 00:00:00 2001 From: thsrite Date: Thu, 10 Aug 2023 12:10:33 +0800 Subject: [PATCH 07/11] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cd5756b9..7ab8af8e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # aliyundrive-checkin - aliyundrive-checkin是一个定时自动签到的python程序 +- 2023/8/10： 推送支持微信应用图文消息，支持获取每日任务 - 2023/8/02： 采用linux构建，外加飞书推送支持 [[@bequt](https://github.com/bequt)] - 2023/6/12： 增加requests出错重试，使用chatgpt优化代码结构 - 2023/5/17： 增加自动领取签到奖励，显示本月签到次数 From 69c0ea40ca675c41736a87a9e47c00679b366464 Mon Sep 17 00:00:00 2001 From: thsrite Date: Thu, 10 Aug 2023 12:12:00 +0800 Subject: [PATCH 08/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7ab8af8e..dadfd5db 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # aliyundrive-checkin - aliyundrive-checkin是一个定时自动签到的python程序 -- 2023/8/10： 推送支持微信应用图文消息，支持获取每日任务 +- 2023/8/10： 推送支持微信应用图文消息、消息代理，支持获取每日任务[[@bequt](https://github.com/thsrite)] - 2023/8/02： 采用linux构建，外加飞书推送支持 [[@bequt](https://github.com/bequt)] - 2023/6/12： 增加requests出错重试，使用chatgpt优化代码结构 - 2023/5/17： 增加自动领取签到奖励，显示本月签到次数 From 9204579ebde72e78820a99ea02ed3c5049371bb6 Mon Sep 17 00:00:00 2001 From: thsrite Date: Thu, 10 Aug 2023 12:12:18 +0800 Subject: [PATCH 09/11] =?UTF-8?q?fix=20=E6=9B=B4=E6=96=B0=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dadfd5db..a3af3abf 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # aliyundrive-checkin - aliyundrive-checkin是一个定时自动签到的python程序 -- 2023/8/10： 推送支持微信应用图文消息、消息代理，支持获取每日任务[[@bequt](https://github.com/thsrite)] +- 2023/8/10： 推送支持微信应用图文消息、消息代理，支持获取每日任务[[@thsrite](https://github.com/thsrite)] - 2023/8/02： 采用linux构建，外加飞书推送支持 [[@bequt](https://github.com/bequt)] - 2023/6/12： 增加requests出错重试，使用chatgpt优化代码结构 - 2023/5/17： 增加自动领取签到奖励，显示本月签到次数 From de1021b5d4d32e4045299da9a0b5e717457ddf49 Mon Sep 17 00:00:00 2001 From: thsrite Date: Thu, 10 Aug 2023 12:13:45 +0800 Subject: [PATCH 10/11] =?UTF-8?q?fix=20=E7=B2=BE=E7=AE=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aliyundrive.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/aliyundrive.py b/aliyundrive.py index cdab73f6..ddf9b029 100644 --- a/aliyundrive.py +++ b/aliyundrive.py @@ -1,5 +1,3 @@ -import datetime -import json import time import requests @@ -162,15 +160,9 @@ def _get_task(self, access_token: str) -> tuple[bool, str]: signInInfos = data['result']['signInInfos'] year, month, day = time.localtime()[:3] - # signInStaus = False - # signinReward = None task_str = "" for info in signInInfos: if int(info['day']) == day: - # status = info['status'] - # if status == 'normal': - # signInStaus = True - # subtitle = info['subtitle'] rewards = info['rewards'] for reward in rewards: From 9e9f5655a6164dec8fd196c9b25361bcd1586f57 Mon Sep 17 00:00:00 2001 From: thsrite Date: Thu, 10 Aug 2023 12:15:05 +0800 Subject: [PATCH 11/11] fix cron --- .github/workflows/checkin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checkin.yml b/.github/workflows/checkin.yml index 906ceb36..570f0690 100644 --- a/.github/workflows/checkin.yml +++ b/.github/workflows/checkin.yml @@ -1,7 +1,7 @@ name: aliyundrive-checkin on: schedule: - - cron: 0 9 * * * + - cron: 0 16 * * * workflow_dispatch: jobs: build: