|
|
@@ -160,7 +160,7 @@ class DevicePushService:
|
|
|
"""
|
|
|
try:
|
|
|
kwag_args = param['kwag_args']
|
|
|
- result = {'do_apns_code': '', 'do_fcm_code': '', 'do_jpush_code': ''}
|
|
|
+ result = {'do_apns_code': '', 'do_fcm_code': '', 'do_jpush_code': '', 'do_xmpush_code': ''}
|
|
|
# 判断是否进行APP消息推送，如app_push不为空，则不进行推送
|
|
|
if not param['app_push']:
|
|
|
LOGGING.info('APP准备推送:{}, {}'.format(param['uid'], param))
|
|
|
@@ -425,11 +425,13 @@ class DevicePushService:
|
|
|
re_data['msg'] = 'success 0 or 2'
|
|
|
for up in params['uid_set_push_list']:
|
|
|
if up['push_type'] == 0: # ios apns
|
|
|
- up['do_apns_code'] = params['code_dict']['do_apns_code']
|
|
|
+ up['do_apns_code'] = params['code_dict']['code_date']['do_apns_code']
|
|
|
elif up['push_type'] == 1: # android gcm
|
|
|
- up['do_fcm_code'] = params['code_dict']['do_fcm_code']
|
|
|
+ up['do_fcm_code'] = params['code_dict']['code_date']['do_fcm_code']
|
|
|
elif up['push_type'] == 2: # android jpush
|
|
|
- up['do_jpush_code'] = params['code_dict']['do_jpush_code']
|
|
|
+ up['do_jpush_code'] = params['code_dict']['code_date']['do_jpush_code']
|
|
|
+ elif up['push_type'] == 4: # android jpush
|
|
|
+ up['do_xmpush_code'] = params['code_dict']['code_date']['do_xmpush_code']
|
|
|
del up['push_type']
|
|
|
del up['userID_id']
|
|
|
del up['userID__NickName']
|
peng