Merge branch 'master' of http://192.168.136.45:3000/SERVER/AnsjerPush

# Conflicts:
#	Controller/DetectController.py

Controller/DetectController.py

@@ -90,7 +90,7 @@ class NotificationView(View):
         else:
             # 从数据库查询出来
             uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid,uid_set__detect_status=1). \
-                values('token_val', 'app_type', 'appBundleId',
+                values('token_val', 'app_type', 'appBundleId','m_code',
                        'push_type', 'userID_id', 'userID__NickName',
                        'lang', 'm_code', 'tz', 'uid_set__nickname', 'uid_set__detect_interval', 'uid_set__detect_group')
             # 新建一个list接收数据
@@ -166,7 +166,6 @@ class NotificationView(View):
         do_apns_code = ''
         do_fcm_code = ''
         do_jpush_code = ''
-
         for up in redis_list:
             push_type = up['push_type']
             appBundleId = up['appBundleId']
@@ -230,7 +229,14 @@ class NotificationView(View):
                 up['do_fcm_code'] = do_fcm_code
                 up['do_jpush_code'] = do_jpush_code
                 up['test_or_www'] = SERVER_TYPE
-
+                del up['push_type']
+                del up['userID_id']
+                del up['userID__NickName']
+                del up['lang']
+                del up['tz']
+                del up['uid_set__nickname']
+                del up['uid_set__detect_interval']
+                del up['uid_set__detect_group']
             return JsonResponse(status=200, data={'code': 0, 'msg': 'success 0 or 2' ,'re_list':redis_list})
 
         elif is_st == '1':
@@ -244,6 +250,14 @@ class NotificationView(View):
                 up['do_fcm_code'] = do_fcm_code
                 up['do_jpush_code'] = do_jpush_code
                 up['test_or_www'] = SERVER_TYPE
+                del up['push_type']
+                del up['userID_id']
+                del up['userID__NickName']
+                del up['lang']
+                del up['tz']
+                del up['uid_set__nickname']
+                del up['uid_set__detect_interval']
+                del up['uid_set__detect_group']
             res_data = {'code': 0, 'img_push': url, 'msg': 'success 1','re_list':redis_list}
             return JsonResponse(status=200, data=res_data)
 
@@ -258,12 +272,20 @@ class NotificationView(View):
                 # 设置此签名URL在60秒内有效。
                 url = bucket.sign_url('PUT', obj, 7200)
                 img_url_list.append(url)
+
             for up in redis_list:
                 up['do_apns_code'] = do_apns_code
                 up['do_fcm_code'] = do_fcm_code
                 up['do_jpush_code'] = do_jpush_code
                 up['test_or_www'] = SERVER_TYPE
-
+                del up['push_type']
+                del up['userID_id']
+                del up['userID__NickName']
+                del up['lang']
+                del up['tz']
+                del up['uid_set__nickname']
+                del up['uid_set__detect_interval']
+                del up['uid_set__detect_group']
             res_data = {'code': 0, 'img_url_list': img_url_list, 'msg': 'success 3','re_list':redis_list}
             return JsonResponse(status=200, data=res_data)