变量重命名

Controller/DetectController.py

@@ -114,13 +114,15 @@ class NotificationView(View):
                 redisObj.set_data(key=pkey, val=1, expire=60)
             auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
             bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
-            kwag_args = {
+
+            # 推送相关参数
+            push_kwargs = {
                 'uid': uid,
                 'channel': channel,
                 'event_type': event_type,
                 'n_time': n_time,
             }
-            params = {'nickname': nickname, 'uid': uid, 'kwag_args': kwag_args, 'is_st': is_st,
+            params = {'nickname': nickname, 'uid': uid, 'push_kwargs': push_kwargs, 'is_st': is_st,
                       'is_sys_msg': is_sys_msg, 'channel': channel, 'event_type': event_type, 'n_time': n_time,
                       'electricity': '', 'bucket': bucket, 'app_push': have_dkey, 'storage_location': 1, 'ai_type': 0,
                       'dealings_type': 0, 'detection': 0, 'device_type': 1, 'app_push_config': '',

Controller/DetectControllerV2.py

@@ -113,13 +113,14 @@ class NotificationV2View(View):
                 aws_s3_client = DevicePushService.get_s3_client(region=region)
                 bucket = 'foreignpush' if region == 1 else 'push'
 
-            kwag_args = {
+            # 推送相关参数
+            push_kwargs = {
                 'uid': uid,
                 'channel': channel,
                 'event_type': event_type,
                 'n_time': n_time,
             }
-            params = {'nickname': nickname, 'uid': uid, 'kwag_args': kwag_args, 'is_st': is_st, 'region': region,
+            params = {'nickname': nickname, 'uid': uid, 'push_kwargs': push_kwargs, 'is_st': is_st, 'region': region,
                       'is_sys_msg': is_sys_msg, 'channel': channel, 'event_type': event_type, 'n_time': n_time,
                       'electricity': electricity, 'bucket': bucket, 'aws_s3_client': aws_s3_client,
                       'app_push': cache_app_push, 'storage_location': 2, 'ai_type': ai_type, 'device_type': device_type,

Service/DevicePushService.py

@@ -146,7 +146,7 @@ class DevicePushService:
         """
         sys_msg_list = []
         saved_user_id_list = []
-        kwag_args = params['kwag_args']
+        push_kwargs = params['push_kwargs']
         now_time = int(time.time())
         try:
             params['event_tag'] = cls.get_event_tag(params['ai_type'], params['event_type'], params['detection'])
@@ -183,10 +183,10 @@ class DevicePushService:
                 if is_app_push:
                     push_type = up['push_type']
                     if params['event_type'] in [606, 607] and push_type in [5, 6]:
-                        kwag_args['jg_token_val'] = up['jg_token_val']
+                        push_kwargs['jg_token_val'] = up['jg_token_val']
                     else:
-                        if 'jg_token_val' in kwag_args:
-                            kwag_args.pop('jg_token_val')
+                        if 'jg_token_val' in push_kwargs:
+                            push_kwargs.pop('jg_token_val')
 
                     appBundleId = up['appBundleId']
                     token_val = up['token_val']
@@ -199,11 +199,12 @@ class DevicePushService:
                                                 dealings_type=params['dealings_type'], event_tag=params['event_tag']
                                                 )
 
-                    kwag_args['appBundleId'] = appBundleId
-                    kwag_args['token_val'] = token_val
-                    kwag_args['msg_title'] = msg_title
-                    kwag_args['msg_text'] = msg_text
-                    params['kwag_args'] = kwag_args
+                    # 补齐推送参数
+                    push_kwargs['appBundleId'] = appBundleId
+                    push_kwargs['token_val'] = token_val
+                    push_kwargs['msg_title'] = msg_title
+                    push_kwargs['msg_text'] = msg_text
+                    params['push_kwargs'] = push_kwargs
                     params['appBundleId'] = appBundleId
                     params['token_val'] = token_val
                     params['lang'] = lang
@@ -283,7 +284,7 @@ class DevicePushService:
         @return push_result: bool
         """
         try:
-            kwargs = param['kwag_args']
+            push_kwargs = param['push_kwargs']
             push_result = False
 
             LOGGING.info('{}开始推送'.format(param['uid']))
@@ -299,51 +300,51 @@ class DevicePushService:
                 push_thread = threading.Thread(target=cls.async_send_picture_push, args=(
                     push_type, param['aws_s3_client'], param['bucket'], key,
                     param['uid'], param['appBundleId'], param['token_val'], param['event_type'], param['n_time'],
-                    param['kwag_args']['msg_title'], param['kwag_args']['msg_text'], param['channel']))
+                    push_kwargs['msg_title'], push_kwargs['msg_text'], param['channel']))
                 push_thread.start()
                 push_result = True
 
             # 不推图
             else:
                 if push_type in [0, 1, 2]:
-                    push_kwargs = {
+                    kwargs = {
                         'nickname': param['uid'],
                         'app_bundle_id': param['appBundleId'],
                         'token_val': param['token_val'],
                         'n_time': param['n_time'],
                         'event_type': param['event_type'],
-                        'msg_title': param['kwag_args']['msg_title'],
-                        'msg_text': param['kwag_args']['msg_text'],
+                        'msg_title': push_kwargs['msg_title'],
+                        'msg_text': push_kwargs['msg_text'],
                         'uid': param['uid'],
                         'channel': param['channel']
                     }
 
                     if push_type == 0:  # ios apns
-                        push_result = PushObject.ios_apns_push(**push_kwargs)
+                        push_result = PushObject.ios_apns_push(**kwargs)
                     elif push_type == 1:  # android gcm
-                        push_result = PushObject.android_fcm_push(**push_kwargs)
+                        push_result = PushObject.android_fcm_push(**kwargs)
                     elif push_type == 2:  # android jpush
-                        push_kwargs.pop('uid')
-                        push_result = PushObject.android_jpush(**push_kwargs)
+                        kwargs.pop('uid')
+                        push_result = PushObject.android_jpush(**kwargs)
 
                 elif push_type == 3:
                     huawei_push_object = HuaweiPushObject()
-                    huawei_push_object.send_push_notify_message(**kwargs)
+                    huawei_push_object.send_push_notify_message(**push_kwargs)
                 elif push_type == 4:  # android xmpush
                     if param['event_type'] in [606, 607]:
                         channel_id = 111934
                     else:
                         channel_id = 104551
-                    cls.do_xmpush(channel_id=channel_id, **kwargs)
+                    cls.do_xmpush(channel_id=channel_id, **push_kwargs)
                     push_result = True
                 elif push_type == 5:  # android vivopush
-                    push_result = PushObject.android_vivopush(**kwargs)
+                    push_result = PushObject.android_vivopush(**push_kwargs)
                 elif push_type == 6:  # android oppopush
                     channel_id = 'DEVICE_REMINDER'
-                    cls.do_oppopush(channel_id=channel_id, **kwargs)
+                    cls.do_oppopush(channel_id=channel_id, **push_kwargs)
                     push_result = True
                 elif push_type == 7:  # android meizupush
-                    push_result = PushObject.android_meizupush(**kwargs)
+                    push_result = PushObject.android_meizupush(**push_kwargs)
             return push_result
         except Exception as e:
             LOGGING.info('发送推送异常,error_line:{},error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))