From 84c3e9e5bcaa232a2905eb6ac765c4962dab6894 Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Thu, 10 Oct 2019 11:35:48 +0800
Subject: [PATCH] Add alertDao to spring management (#978)

* rename from DatasourceUserMapper to DataSourceUserMapper

* add unit test in UserMapper and WorkerGroupMapper

* change cn.escheduler to org.apache.dolphinscheduler

* add unit test in UdfFuncMapperTest

* add unit test in UdfFuncMapperTest

* remove DatabaseConfiguration

* add ConnectionFactoryTest

* cal duration in processInstancesList

* change desc to description

* change table name in mysql ddl

* change table name in mysql ddl

* change escheduler to dolphinscheduler

* change escheduler to dolphinscheduler

* change escheduler to dolphinscheduler

* remove log4j-1.2-api and modify AlertMapperTest

* remove log4j-1.2-api

* Add alertDao to spring management

* Add alertDao to spring management
---
 .../apache/dolphinscheduler/api/CombinedApplicationServer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java
index f0a6ada90..4a9f681ab 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java
@@ -42,7 +42,7 @@ public class CombinedApplicationServer extends SpringBootServletInitializer {
         ProcessDao processDao = context.getBean(ProcessDao.class);
         AlertDao alertDao = context.getBean(AlertDao.class);
 
-        MasterServer master = new MasterServer(processDao);
+        MasterServer master = new MasterServer(processDao,alertDao);
         master.run(processDao);
 
         WorkerServer workerServer = new WorkerServer(processDao, alertDao);
-- 
GitLab