Browse Source

mvp: 定时任务修改

Signed-off-by: Binren Zhnag <zhangbr@elab-plus.com>
Binren Zhnag 4 years ago
parent
commit
833559786b
2 changed files with 7 additions and 16 deletions
  1. 0 9
      apscheduler_elab.py
  2. 7 7
      report_push.py

+ 0 - 9
apscheduler_elab.py

@@ -48,15 +48,6 @@ 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
         }
     ]
 

+ 7 - 7
report_push.py

@@ -501,13 +501,13 @@ class ReportPush(object):
                 log_data = []
                 try:
                     if value[2]:
-                        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, '第二次发送失败']
+                        # 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, '第二次发送失败']
                 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)