Merge remote-tracking branch 'remotes/origin/peng' into test

Ansjer/urls.py

@@ -29,6 +29,7 @@ from Controller.MessagePush import EquipmentMessagePush
 from Controller.SensorGateway import SensorGatewayController, EquipmentFamilyController
 from Controller.Surveys import CloudStorageController
 from Controller.UserDevice import UserDeviceShareController
+from Model import views  # 定时任务，不要删除该行代码
 
 urlpatterns = [
     re_path(r'init/(?P<operation>.*)', InitController.InitView.as_view()),

Model/apps.py

@@ -3,7 +3,3 @@ from django.apps import AppConfig
 
 class UsermanagerConfig(AppConfig):
     name = 'Model'
-
-    def ready(self):
-        from Model import views
-        views.start()

Model/views.py

@@ -12,9 +12,8 @@ def auto_hello():
     print('hello world:[{}]'.format(now_time))
 
 
-def start():
-    scheduler = BackgroundScheduler()
-    scheduler.add_jobstore(DjangoJobStore(), 'default')
+scheduler = BackgroundScheduler()
+scheduler.add_jobstore(DjangoJobStore(), 'default')
 
-    scheduler.add_job(auto_hello, 'cron', day='*', hour=15, minute=30, replace_existing=True, id='test_job')
-    scheduler.start()
+scheduler.add_job(auto_hello, 'cron', day='*', hour=15, minute=30, replace_existing=True, id='test_job')
+scheduler.start()