补全华为推送图片传参,优化华为推送服务类日志配置

AnsjerPush/config.py

@@ -4,6 +4,10 @@
 
 import os
 import datetime
+import logging
+
+# 日志配置
+LOGGER = logging.getLogger('info')
 
 # 配置信息
 CONFIG_TEST = 'test'

Service/DevicePushService.py

@@ -639,10 +639,10 @@ class DevicePushService:
             elif push_type == 3:
                 huawei_push_object = HuaweiPushObject()
                 huawei_push_object.send_push_notify_message(token_val=token_val, msg_title=msg_title, msg_text=msg_text,
+                                                            uid=uid, event_type=event_type, n_time=n_time,
                                                             image_url=image_url)
-
         except Exception as e:
-            LOGGING.info('异常详情,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
+            LOGGING.info('图片推送异常,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     @staticmethod
     def get_push_url(**params):

Service/HuaweiPushService/HuaweiPushService.py

@@ -1,6 +1,6 @@
 import json
-import logging
 
+from AnsjerPush.config import LOGGER
 from Service.HuaweiPushService import push_admin
 from Service.HuaweiPushService.push_admin import messaging
 
@@ -34,16 +34,15 @@ class HuaweiPushObject:
         @param appBundleId: APP包id
         @return:
         """
-        logger = logging.getLogger('info')
-        logger.info(
+        LOGGER.info(
             '华为推送参数: token_val:{}, msg_title:{}, msg_text:{}, image_url:{}, uid:{}, event_type:{}, n_time:{}'.format(
                 token_val, msg_title, msg_text, image_url, uid, event_type, n_time))
 
-        self.send_notify_message(msg_title, msg_text, image_url, uid, nickname, event_type, n_time, token_val, logger)
+        self.send_notify_message(msg_title, msg_text, image_url, uid, nickname, event_type, n_time, token_val)
         if event_type == '606':
-            self.send_data_message(uid, event_type, n_time, token_val, logger)
+            self.send_data_message(uid, event_type, n_time, token_val)
 
-    def send_notify_message(self, msg_title, msg_text, image_url, uid, nickname, event_type, n_time, token_val, logger):
+    def send_notify_message(self, msg_title, msg_text, image_url, uid, nickname, event_type, n_time, token_val):
         """
         发送通知推送
         @param msg_title:
@@ -54,7 +53,6 @@ class HuaweiPushObject:
         @param event_type:
         @param n_time:
         @param token_val:
-        @param logger:
         @return: None
         """
         msg_title = '设备昵称: {}'.format(msg_title)
@@ -93,20 +91,19 @@ class HuaweiPushObject:
         try:
             import certifi
             response = messaging.send_message(message, verify_peer=certifi.where())
-            logger.info('华为通知推送响应: {}'.format(json.dumps(vars(response))))
+            LOGGER.info('华为通知推送响应: {}'.format(json.dumps(vars(response))))
             assert (response.code == '80000000')
         except Exception as e:
-            logger.info('华为通知推送异常: {}'.format(repr(e)))
+            LOGGER.info('华为通知推送异常: {}'.format(repr(e)))
 
     @staticmethod
-    def send_data_message(uid, event_type, n_time, token_val, logger):
+    def send_data_message(uid, event_type, n_time, token_val):
         """
         发送透传推送
         @param uid:
         @param event_type:
         @param n_time:
         @param token_val:
-        @param logger:
         @return: None
         """
         data = {'uid': uid, 'event_type': event_type, 'event_time': n_time}
@@ -127,10 +124,10 @@ class HuaweiPushObject:
         try:
             import certifi
             response = messaging.send_message(message, verify_peer=certifi.where())
-            logger.info('华为透传推送响应: {}'.format(json.dumps(vars(response))))
+            LOGGER.info('华为透传推送响应: {}'.format(json.dumps(vars(response))))
             assert (response.code == '80000000')
         except Exception as e:
-            logger.info('华为透传推送异常: {}'.format(repr(e)))
+            LOGGER.info('华为透传推送异常: {}'.format(repr(e)))
 
     @staticmethod
     def android_notification(msg_title, msg_text, intent):