|
@@ -84,7 +84,6 @@ class CustomizedPushObject:
|
|
|
'n_time': n_time,
|
|
|
'title': title,
|
|
|
'msg': msg,
|
|
|
- 'link': link,
|
|
|
'icon_link': icon_link
|
|
|
}
|
|
|
|
|
@@ -95,7 +94,8 @@ class CustomizedPushObject:
|
|
|
app_bundle_id_list = ['com.ansjer.zccloud_ab', 'com.ansjer.customizede']
|
|
|
|
|
|
try:
|
|
|
- gateway_push_qs = GatewayPush.objects.filter(user_id__in=user_id_list, app_bundle_id__in=app_bundle_id_list).\
|
|
|
+ gateway_push_qs = GatewayPush.objects.filter(
|
|
|
+ user_id__in=user_id_list, app_bundle_id__in=app_bundle_id_list).\
|
|
|
values('user_id', 'app_bundle_id', 'push_type', 'token_val')
|
|
|
if gateway_push_qs.exists():
|
|
|
sys_msg_list = []
|
|
@@ -129,27 +129,21 @@ class CustomizedPushObject:
|
|
|
CUSTOMIZED_PUSH_LOGGER.info('线程池推送开始')
|
|
|
push_kwargs = kwargs['push_kwargs']
|
|
|
gateway_push_list = kwargs['gateway_push_list']
|
|
|
- push_kwargs_list = []
|
|
|
- for gateway_push in gateway_push_list:
|
|
|
- push_kwargs['gateway_push'] = gateway_push
|
|
|
- push_kwargs_list.append(push_kwargs)
|
|
|
with ThreadPoolExecutor() as executor:
|
|
|
- executor.map(cls.start_push, push_kwargs_list)
|
|
|
- CUSTOMIZED_PUSH_LOGGER.info('线程池推送完成')
|
|
|
+ executor.map(
|
|
|
+ lambda gateway_push_kwargs: cls.start_push(push_kwargs, gateway_push_kwargs), gateway_push_list)
|
|
|
|
|
|
@classmethod
|
|
|
- def start_push(cls, **kwargs):
|
|
|
- gateway_push = kwargs['gateway_push']
|
|
|
- title = kwargs['title']
|
|
|
- n_time = kwargs['n_time']
|
|
|
- msg = kwargs['msg']
|
|
|
- link = kwargs['link']
|
|
|
- icon_link = kwargs['icon_link']
|
|
|
+ def start_push(cls, push_kwargs, gateway_push_kwargs):
|
|
|
+ title = push_kwargs['title']
|
|
|
+ n_time = push_kwargs['n_time']
|
|
|
+ msg = push_kwargs['msg']
|
|
|
+ icon_link = push_kwargs['icon_link']
|
|
|
|
|
|
- push_type = gateway_push['push_type']
|
|
|
- user_id = gateway_push['user_id']
|
|
|
- app_bundle_id = gateway_push['app_bundle_id']
|
|
|
- token_val = gateway_push['token_val']
|
|
|
+ push_type = gateway_push_kwargs['push_type']
|
|
|
+ user_id = gateway_push_kwargs['user_id']
|
|
|
+ app_bundle_id = gateway_push_kwargs['app_bundle_id']
|
|
|
+ token_val = gateway_push_kwargs['token_val']
|
|
|
|
|
|
push_succeed = cls.push_msg(push_type, app_bundle_id, token_val, n_time, title, msg, icon_link)
|
|
|
|
|
@@ -180,7 +174,7 @@ class CustomizedPushObject:
|
|
|
return PushObject.android_fcm_push(**push_kwargs)
|
|
|
# 极光
|
|
|
elif push_type == 2:
|
|
|
- push_succeed = PushObject.android_jpush(**push_kwargs)
|
|
|
+ return PushObject.android_jpush(**push_kwargs)
|
|
|
# 华为
|
|
|
elif push_type == 3:
|
|
|
push_kwargs['image_url'] = icon_link
|