定时任务修改

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

apscheduler_elab.py

@@ -46,8 +46,8 @@ class Config(object):
             'args': '',
             'trigger': 'cron',
             'day_of_week': '*',
-            'hour': 8,
-            'minute': 50
+            'hour': 10,
+            'minute': 30
         }
     ]
 
@@ -90,7 +90,7 @@ class Funcs(object):
     @staticmethod
     def day_work_three():
         rp = ReportPush('bi_report')
-        rp.report_push(4)
+        rp.report_push_test(4)
 
     @staticmethod
     def minute_push_elab():

email_util.py

@@ -21,7 +21,8 @@ class EmailUtil(object):
     receiver = ['1285211525@qq.com', 'lijm@elab-plus.com', 'xuanxc@elab-plus.com']
 
     # 线上
-    url_online = "http://dm-api.elab-plus.cn/elab-marketing-sms//mail/sendEmailForReport"
+    # url_online = "http://dm-api.elab-plus.cn/elab-marketing-sms//mail/sendEmailForReport"
+    url_online = "http://101.132.43.32:5303/mail/sendEmailForReport"
 
     # 开发环境
     url_dev = "http://43.254.221.77:5555/elab-marketing-sms//mail/sendEmailForReport"  # 接口地址
@@ -29,7 +30,7 @@ class EmailUtil(object):
     # 测试环境
     url_test = "http://gatewaytest.elab-plus.com/elab-marketing-sms//mail/sendEmailForReport"
 
-    url = url_dev
+    url = url_online
 
     # 消息头数据
     headers = {
@@ -84,9 +85,7 @@ class EmailUtil(object):
                             content,
                             receiver,
                             mail_excel,
-                            file_name,
-                            url,
-                            header
+                            file_name
                            ):
 
         with open(mail_excel, 'rb') as f:
@@ -101,8 +100,8 @@ class EmailUtil(object):
                     "time": ""
                 }
             )
-            header['Content-Type'] = m.content_type
-            r = requests.post(url, data=m, verify=False, headers=header)
+            self.headers['Content-Type'] = m.content_type
+            r = requests.post(self.url, data=m, verify=False, headers=self.headers)
             if r and r.json()['success']:
                 return True
 
@@ -114,5 +113,5 @@ class EmailUtil(object):
 
 if __name__ == '__main__':
     send_email = EmailUtil()
-    result = send_email.send_mail_by_admin('移动案场订阅日报', '的数据报告已经准备完成', '15773153135@163.com', r'D:\elab-code\elab_mvp\resources\module.xlsx', 'module.xlsx', send_email.url_dev,send_email.headers)
+    result = send_email.send_mail_by_admin('移动案场订阅日报', '的数据报告已经准备完成', '15773153135@163.com', r'D:\elab\elab_mvp\resources\report_data\2020-04-14\移动案场订阅周报_庞凌飞_单项目_2020-03-12至2020-03-13.xls', '移动案场订阅周报_庞凌飞_单项目_2020-03-12至2020-03-13.xls', send_email.url_online,send_email.headers)
     print(result)

report_push.py

@@ -460,30 +460,7 @@ class ReportPush(object):
         self.db = MysqlDB(db_name)
         pass
 
-    mails = ['1285211525@qq.com', 'liutt@elab-plus.com']
-
-    # 线上
-    url_online = "http://dm-api.elab-plus.cn/elab-marketing-sms//mail/sendEmailForReport"
-
-    # 开发环境
-    url_dev = "http://43.254.221.77:5555/elab-marketing-sms//mail/sendEmailForReport"  # 接口地址
-
-    # 测试环境
-    url_test = "http://gatewaytest.elab-plus.com/elab-marketing-sms//mail/sendEmailForReport"
-
-    url = url_dev
-
-    # 消息头数据线上
-    headers_online = {
-        'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.94 Safari/537.36',
-        'Referer': url_online,
-    }
-
-    # 开发环境
-    headers_dev = {
-        'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.94 Safari/537.36',
-        'Referer': url_dev,
-    }
+    mails = ['1285211525@qq.com']
 
     def report_push(self, task_key):
         message = {}
@@ -501,18 +478,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])
+                        if result:
+                            log_data = [value[0], value[1], value[2], 1, 'success!!!']
+                        else:
+                            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] = '邮件发送成功'
@@ -544,13 +516,11 @@ class ReportPush(object):
                 try:
                     if value[2]:
                         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)
+                            result = email_util.send_mail_by_admin(title, content, mail, value[2], value[3])
                             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, '第二次发送失败']
+                                log_data = [value[0], value[1], value[2], -1, '第二次发送失败']
                 except Exception as e:
                     log_data = [value[0], value[1], value[2], -1, str(e)]
                     print(str(e))