Merge branch 'master' of http://192.168.4.246:3000/zhangbr/elab_mvp into master

apscheduler_elab.py

@@ -77,79 +77,6 @@ class Config(object):
             'hour': 8,
             'minute': 30
         }
-        ,
-        {
-            'id': 'day_work_5',
-            'func': 'apscheduler_elab:Funcs.day_work_5',
-            'args': '',
-            'trigger': 'cron',
-            'day_of_week': '*',
-            'hour': jianye__house_hour,
-            'minute': jianye_house_minute
-        },
-        {
-            'id': 'day_work_6',
-            'func': 'apscheduler_elab:Funcs.day_work_6',
-            'args': '',
-            'trigger': 'cron',
-            'day_of_week': '*',
-            'hour': jianye__house_hour,
-            'minute': jianye_house_minute
-        },
-        {
-            'id': 'day_work_7',
-            'func': 'apscheduler_elab:Funcs.day_work_7',
-            'args': '',
-            'trigger': 'cron',
-            'day_of_week': '*',
-            'hour': jianye__house_hour,
-            'minute': jianye_house_minute
-        },
-        {
-            'id': 'day_work_8',
-            'func': 'apscheduler_elab:Funcs.day_work_8',
-            'args': '',
-            'trigger': 'cron',
-            'day_of_week': '*',
-            'hour': jianye__house_hour,
-            'minute': jianye_house_minute
-        },
-        {
-            'id': 'day_work_9',
-            'func': 'apscheduler_elab:Funcs.day_work_9',
-            'args': '',
-            'trigger': 'cron',
-            'day_of_week': '*',
-            'hour': jianye__house_hour,
-            'minute': jianye_house_minute
-        },
-        {
-            'id': 'day_work_10',
-            'func': 'apscheduler_elab:Funcs.day_work_10',
-            'args': '',
-            'trigger': 'cron',
-            'day_of_week': '*',
-            'hour': jianye__house_hour,
-            'minute': jianye_house_minute
-        },
-        {
-            'id': 'day_work_11',
-            'func': 'apscheduler_elab:Funcs.day_work_11',
-            'args': '',
-            'trigger': 'cron',
-            'day_of_week': '*',
-            'hour': jianye__house_hour,
-            'minute': jianye_house_minute
-        },
-        {
-            'id': 'day_work_12',
-            'func': 'apscheduler_elab:Funcs.day_work_12',
-            'args': '',
-            'trigger': 'cron',
-            'day_of_week': '*',
-            'hour': jianye_brand_hour,
-            'minute': jianye_brand_minute
-        }
     ]
 
     # 线程池配置

flask_app.py

@@ -16,7 +16,7 @@ def report_test():
     try:
         task_id = request.args.get('id', default=0, type=int)
         report_push = ReportPush('bi_report')
-        result = report_push.report_push_test(task_id)
+        result = report_push.report_push(task_id)
     except Exception as e:
         print(str(e))
         result['error'] = str(e)