新增测试定时任务

Signed-off-by: Binren Zhnag <zhangbr@elab-plus.com>

apscheduler_elab.py

@@ -48,6 +48,15 @@ class Config(object):
             'day_of_week': '*',
             'hour': 8,
             'minute': 00
+        },
+        {
+            'id': 'day_work_three',
+            'func': 'apscheduler_elab:Funcs.day_work_three',
+            'args': '',
+            'trigger': 'cron',
+            'day_of_week': '*',
+            'hour': 21,
+            'minute': 20
         }
     ]
 
@@ -87,6 +96,11 @@ class Funcs(object):
         rp = ReportPush('bi_report')
         rp.report_push(4)
 
+    @staticmethod
+    def day_work_three():
+        rp = ReportPush('bi_report')
+        rp.report_push_test(4)
+
     @staticmethod
     def minute_push_elab():
         # pdu = PandaUtil('linshi')

report_push.py

@@ -501,7 +501,6 @@ class ReportPush(object):
                 log_data = []
                 try:
                     if value[2]:
-                        # for mail in self.mails:
                         result = email_util.send_mail_by_admin(title, content, value[1], value[2], value[3], self.url_online, self.headers_online)
                         if result:
                             log_data = [value[0], value[1], value[2], 1, 'success!!!']
@@ -544,19 +543,16 @@ class ReportPush(object):
                 log_data = []
                 try:
                     if value[2]:
-                        # for mail in self.mails:
-                        result = email_util.send_mail_by_admin(title, content, value[1], value[2], value[3], self.url_online, self.headers_online)
-                        if result:
-                            log_data = [value[0], value[1], value[2], 1, 'success!!!']
-                        else:
-                            result = email_util.send_mail_by_admin(title, content, value[1], value[2], value[3], self.url_dev, self.headers_dev)
-                            if not result:
-                                log_data = [value[0], value[1], value[2], -1, '第二次发送失败']
+                        for mail in self.mails:
+                            result = email_util.send_mail_by_admin(title, content, mail, value[2], value[3], self.url_dev, self.headers_dev)
+                            if result:
+                                log_data = [value[0], value[1], value[2], 1, 'success!!!']
+                            else:
+                                result = email_util.send_mail_by_admin(title, content, mail, value[2], value[3], self.url_online, self.headers_online)
+                                if not result:
+                                    log_data = [value[0], value[1], value[2], -1, '第二次发送失败']
                 except Exception as e:
-                    result = email_util.send_mail_by_admin(title, content, value[1], value[2], value[3], self.url_dev,
-                                                           self.headers_dev)
-                    if not result:
-                        log_data = [value[0], value[1], value[2], -1, str(e)]
+                    log_data = [value[0], value[1], value[2], -1, str(e)]
                     print(str(e))
                 logs.append(log_data)
             message[3] = '邮件发送成功'