diff --git a/flask-consul/units/cloud/alicloud.py b/flask-consul/units/cloud/alicloud.py index af76610..0dc4bee 100644 --- a/flask-consul/units/cloud/alicloud.py +++ b/flask-consul/units/cloud/alicloud.py @@ -88,11 +88,11 @@ def exp(account,collect_days,notify_days,notify_amount): if exp_config['switch'] and exp_config.get('wecom',False): notify.wecom(wecomwh,content) if exp_config['switch'] and exp_config.get('dingding',False): - notify.dingding(dingdingwh,content) + notify.dingding(dingdingwh,content,isatall) if exp_config['switch'] and exp_config.get('feishu',False): title = '阿里云资源到期通知' md = content - notify.feishu(feishuwh,title,md) + notify.feishu(feishuwh,title,md,isatall) #print(f"=====【阿里云:余额与到期日统计结束:{account}】", flush=True) def group(account): diff --git a/flask-consul/units/cloud/huaweicloud.py b/flask-consul/units/cloud/huaweicloud.py index 7084ef6..94af995 100644 --- a/flask-consul/units/cloud/huaweicloud.py +++ b/flask-consul/units/cloud/huaweicloud.py @@ -64,6 +64,7 @@ def exp(account,collect_days,notify_days,notify_amount): wecomwh = exp_config.get('wecomwh','') dingdingwh = exp_config.get('dingdingwh','') feishuwh = exp_config.get('feishuwh','') + isatall = exp_config.get('isatall', True) if notify_dict != {}: msg = [f'### 华为云账号 {account}:\n### 以下资源到期日小于 {notify_days} 天:'] for k,v in notify_dict.items(): @@ -72,21 +73,21 @@ def exp(account,collect_days,notify_days,notify_amount): if exp_config['switch'] and exp_config.get('wecom',False): notify.wecom(wecomwh,content) if exp_config['switch'] and exp_config.get('dingding',False): - notify.dingding(dingdingwh,content) + notify.dingding(dingdingwh,content,isatall) if exp_config['switch'] and exp_config.get('feishu',False): title = '华为云资源到期通知' md = content - notify.feishu(feishuwh,title,md) + notify.feishu(feishuwh,title,md,isatall) if amount_dict != {}: content = f'### 华为云账号 {account}:\n### 可用余额:{amount} 元' if exp_config['switch'] and exp_config.get('wecom',False): notify.wecom(wecomwh,content) if exp_config['switch'] and exp_config.get('dingding',False): - notify.dingding(dingdingwh,content) + notify.dingding(dingdingwh,content,isatall) if exp_config['switch'] and exp_config.get('feishu',False): title = '华为云余额不足通知' md = content - notify.feishu(feishuwh,title,md) + notify.feishu(feishuwh,title,md,isatall) except exceptions.ClientRequestException as e: print(e.status_code) diff --git a/flask-consul/units/cloud/tencent_cloud.py b/flask-consul/units/cloud/tencent_cloud.py index 1662830..be8941e 100644 --- a/flask-consul/units/cloud/tencent_cloud.py +++ b/flask-consul/units/cloud/tencent_cloud.py @@ -54,6 +54,7 @@ def exp(account,collect_days,notify_days,notify_amount): wecomwh = exp_config.get('wecomwh','') dingdingwh = exp_config.get('dingdingwh','') feishuwh = exp_config.get('feishuwh','') + isatall = exp_config.get('isatall', True) if notify_dict != {}: msg = [f'### 腾讯云账号 {account}:\n### 以下资源到期日小于 {notify_days} 天:'] for k,v in notify_dict.items(): @@ -62,21 +63,21 @@ def exp(account,collect_days,notify_days,notify_amount): if exp_config['switch'] and exp_config.get('wecom',False): notify.wecom(wecomwh,content) if exp_config['switch'] and exp_config.get('dingding',False): - notify.dingding(dingdingwh,content) + notify.dingding(dingdingwh,content,isatall) if exp_config['switch'] and exp_config.get('feishu',False): title = '腾讯云资源到期通知' md = content - notify.feishu(feishuwh,title,md) + notify.feishu(feishuwh,title,md,isatall) if amount_dict != {}: content = f'### 腾讯云账号 {account}:\n### 可用余额:{amount} 元' if exp_config['switch'] and exp_config.get('wecom',False): notify.wecom(wecomwh,content) if exp_config['switch'] and exp_config.get('dingding',False): - notify.dingding(dingdingwh,content) + notify.dingding(dingdingwh,content,isatall) if exp_config['switch'] and exp_config.get('feishu',False): title = '腾讯云余额不足通知' md = content - notify.feishu(feishuwh,title,md) + notify.feishu(feishuwh,title,md,isatall) except TencentCloudSDKException as err: print(err)