diff --git a/commit.ref b/commit.ref
index b825b9c513..5c45f92f46 160000
--- a/commit.ref
+++ b/commit.ref
@@ -1 +1 @@
-Subproject commit b825b9c513fffc712aed5862709124b77be3dab8
+Subproject commit 5c45f92f463b5d6c4b811df1058cc712da67dd7e
diff --git a/commit.yml b/commit.yml
index 2d525c5fc6..b9c66a9ab2 100644
--- a/commit.yml
+++ b/commit.yml
@@ -2,379 +2,286 @@
 branches: {
   }
 fileChange:
-  /escheduler-dao:
-    newFile: !uuid '08afd4c61da842e83ecd1b69ac572f76630d14f1'
+  /escheduler-server:
+    newFile: !uuid '5ce53687c5ebd22cbaccda2a25fee362ba887953'
     oldFile: null
-  /escheduler-dao/pom.xml:
-    newFile: !uuid '4d5d0f09dc97118c1a2770e8526bb077a50e49a4'
+  /escheduler-server/pom.xml:
+    newFile: !uuid 'db51e56d7dffcd30bc5ea19b598c1ec5f12a59b8'
     oldFile: null
-  /escheduler-dao/src:
-    newFile: !uuid '7157a186186d293d6f4e5f70105ca3429d6690b5'
+  /escheduler-server/src:
+    newFile: !uuid '6e0447f0d13af3219f95577f0fdf2fee797daa4e'
     oldFile: null
-  /escheduler-dao/src/main:
-    newFile: !uuid '4b9021aab8d307b0104d825f39415fac5e7d01f3'
+  /escheduler-server/src/main:
+    newFile: !uuid '7eaf3a38ef9fe69c8381251cad1e722e7cd99506'
     oldFile: null
-  /escheduler-dao/src/main/java:
-    newFile: !uuid 'bd968aad2958a03f14b4c86f0d03fd937880e89f'
+  /escheduler-server/src/main/assembly:
+    newFile: !uuid '95a1790136107607abcf482d4041d146dde08a19'
     oldFile: null
-  /escheduler-dao/src/main/java/cn:
-    newFile: !uuid '72a898d5ba65ca084525a3c3fd6749fb8d355727'
+  /escheduler-server/src/main/assembly/package.xml:
+    newFile: !uuid '7a8188c05bbaf2b960fbc70ab53ac42da9ac4755'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler:
-    newFile: !uuid '75cdd15825c23f93ac54678df146ca6b3a060075'
+  /escheduler-server/src/main/java:
+    newFile: !uuid '0cb8a0424e120a8bc4bf94e3c72b3fe09a6b1fdf'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao:
-    newFile: !uuid 'a75b47b43577b403bd0ad033bdf145146ee6e163'
+  /escheduler-server/src/main/java/cn:
+    newFile: !uuid '2c6bce5ffccbc6bd37101eca14fab5e230dc02ca'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/AbstractBaseDao.java:
-    newFile: !uuid 'ce18b15528486941e4c9529a4112c4f4c10c74d3'
+  /escheduler-server/src/main/java/cn/escheduler:
+    newFile: !uuid 'a94f409bec2b71f3021f1301aa8b62ed1c76dbb5'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/AlertDao.java:
-    newFile: !uuid 'dcc87eee80caef6f4f0d671c9c7724721893b5de'
+  /escheduler-server/src/main/java/cn/escheduler/server:
+    newFile: !uuid 'b64586244976f115d7ab2e98f87e91f33e8c7ae6'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/DaoFactory.java:
-    newFile: !uuid '0a523e3b8bbd2dfb29db952d9c5585a0bf701eef'
+  /escheduler-server/src/main/java/cn/escheduler/server/BeanContext.java:
+    newFile: !uuid '7b653963fbea247ac4386b8058706a4eff0c2e59'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java:
-    newFile: !uuid 'e01150e20780fab73e3c17038271b9ecd237c5c1'
+  /escheduler-server/src/main/java/cn/escheduler/server/ResInfo.java:
+    newFile: !uuid '91d6021749e90b93f37fcf051129d20cbfd6f50f'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/ServerDao.java:
-    newFile: !uuid '82c71e2855bf0e0e179997b19e269aac13e9c1e7'
+  /escheduler-server/src/main/java/cn/escheduler/server/master:
+    newFile: !uuid 'ea7d518b02a27cf4cd7b12e2b01477ba555ab9af'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/TaskRecordDao.java:
-    newFile: !uuid 'ebc206f9ac6205a6764538ddac64834c7aaf8322'
+  /escheduler-server/src/main/java/cn/escheduler/server/master/MasterServer.java:
+    newFile: !uuid '95705dd017b95907d4a05023759e0c5b6e9d6184'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/datasource:
-    newFile: !uuid 'f3065422562e706e5b4225b80dbee9624676abf7'
+  /escheduler-server/src/main/java/cn/escheduler/server/master/log:
+    newFile: !uuid '581cb892a5f8989472383b55e361943100f51735'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/datasource/ConnectionFactory.java:
-    newFile: !uuid '9b0b1f629afcb0a917c6f1bb08019357527f8deb'
+  /escheduler-server/src/main/java/cn/escheduler/server/master/log/MasterLogFilter.java:
+    newFile: !uuid 'fdacd6d7fe54c6a1d27d1641ef36716f1e849cc7'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/datasource/DatabaseConfiguration.java:
-    newFile: !uuid '15760e5ddfac0160f0a43321e69d3604a8e8ae12'
+  /escheduler-server/src/main/java/cn/escheduler/server/master/runner:
+    newFile: !uuid 'c7ea80c1e58127e90130d489bb18c23ff4a60db9'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper:
-    newFile: !uuid '8265454d86dc823822520a32ed8a5490ccced131'
+  /escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterBaseTaskExecThread.java:
+    newFile: !uuid 'ed427992bfd277bc26ff22f34e7a5196fd520292'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AlertGroupMapper.java:
-    newFile: !uuid '20c37b452b8fd4c1ae2eaa0de0285d71493a9396'
+  /escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterExecThread.java:
+    newFile: !uuid '101e72e300b7b754c34f2ac7f051e854438f1ad4'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AlertGroupMapperProvider.java:
-    newFile: !uuid 'af75c159896cc6ffe62f1a83294740f4fa10f250'
+  /escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterSchedulerThread.java:
+    newFile: !uuid 'b845e19ae0030e5e43601662aee410b6101df869'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AlertMapper.java:
-    newFile: !uuid '0a7bb12ed993811037fccb45151a8cd3798fd698'
+  /escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterTaskExecThread.java:
+    newFile: !uuid '36b771ad340be7e9f750d9cdbb6c0701990b76d7'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AlertMapperProvider.java:
-    newFile: !uuid 'e739bdbf2683b39b747c0e9d3ae9aff7b86bfd8c'
+  /escheduler-server/src/main/java/cn/escheduler/server/master/runner/SubProcessTaskExecThread.java:
+    newFile: !uuid '4eb9ac711d5a1dc3d1640175b84f5f4a7bc3fad1'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/CommandMapper.java:
-    newFile: !uuid '4f5e371ed4ef06f16924693eb7d98cfe9231b637'
+  /escheduler-server/src/main/java/cn/escheduler/server/rpc:
+    newFile: !uuid '6707aff4afee43ffea4bf497f5d732ba3d2c9107'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/CommandMapperProvider.java:
-    newFile: !uuid '8f11c8af262b831aeb2fb94e6b59346a2906cab8'
+  /escheduler-server/src/main/java/cn/escheduler/server/rpc/LogClient.java:
+    newFile: !uuid '745bd323bf74d62921a10af9d8e4fc2bff32db66'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapper.java:
-    newFile: !uuid '149d15e662802379965763f46f0d37eb16901727'
+  /escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java:
+    newFile: !uuid '8913cdda06f95ce68d852b5986b352ba7890e3a4'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapperProvider.java:
-    newFile: !uuid '20203da5c6ce515d1e9862f8e940d2fd7c3deaa0'
+  /escheduler-server/src/main/java/cn/escheduler/server/utils:
+    newFile: !uuid 'db1980722172b951cb260d165e75532a3619d8a8'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DatasourceUserMapper.java:
-    newFile: !uuid '6d12ce6d970f393f77ab65c86f46466e2b420111'
+  /escheduler-server/src/main/java/cn/escheduler/server/utils/AlertManager.java:
+    newFile: !uuid 'ca478096bd5be6728cf09dffa58b764cc5cf93d0'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DatasourceUserMapperProvider.java:
-    newFile: !uuid '7010e26303bfe43a6afc56b5ab3f7b6493a3c101'
+  /escheduler-server/src/main/java/cn/escheduler/server/utils/LoggerUtils.java:
+    newFile: !uuid 'bbb404f536cd71900f68d372cf98764894e32d78'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/MasterServerMapper.java:
-    newFile: !uuid '4fec8092de5d0b1c873dadc1bd0bf540a2a294f8'
+  /escheduler-server/src/main/java/cn/escheduler/server/utils/ParamUtils.java:
+    newFile: !uuid 'e3041ffd9da0a5b30a236b4be246f7a93a7c0de0'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/MasterServerMapperProvider.java:
-    newFile: !uuid '768f1a32508c67cc19c3c3ced9494f0b54226aa5'
+  /escheduler-server/src/main/java/cn/escheduler/server/utils/ProcessUtils.java:
+    newFile: !uuid 'baf82de0dfdb745f0e4fbcc6ab18c4d53ced18f4'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapper.java:
-    newFile: !uuid '0484b7cebe9a49255b95b6b9665d365bf539d815'
+  /escheduler-server/src/main/java/cn/escheduler/server/utils/SparkArgsUtils.java:
+    newFile: !uuid 'b12c6ecef456ade5562da3d2ae8b04b26c34f9f6'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java:
-    newFile: !uuid 'cefbe14bbdbfa38d8c4edd3015a6ee792243601b'
+  /escheduler-server/src/main/java/cn/escheduler/server/utils/UDFUtils.java:
+    newFile: !uuid '710d50e1a602a1436b11e3231943361f7e85630a'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapMapper.java:
-    newFile: !uuid 'b6945b36f7249faf09bc28aff2310e6ae0799cb7'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker:
+    newFile: !uuid '73fbb898be1e1bb235c97ae00d7d6775035e02b8'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapMapperProvider.java:
-    newFile: !uuid '0f29a5104d77fdcea64787fe617123daf6f3f3dc'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/WorkerServer.java:
+    newFile: !uuid '05e3d21c45d25dd783a314634b1c86e3a8c987b3'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java:
-    newFile: !uuid '3eb77af92b6e3a64a30c869a8ffa916078850302'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/log:
+    newFile: !uuid 'e212a04c929ab5e2e75cfb2a2125014265b43d64'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapperProvider.java:
-    newFile: !uuid '05e1538c8da30b88c4e46584e251b4858822d514'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/log/TaskLogAppender.java:
+    newFile: !uuid '9e557127b5b13f5a476ebfca96608095b2abf6d4'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectMapper.java:
-    newFile: !uuid '0b044781a9414e3fa46c1fbae425159ff3fc3842'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/log/TaskLogFilter.java:
+    newFile: !uuid '7edc532f8e379371d25bb8ecc469e16268aada1b'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectMapperProvider.java:
-    newFile: !uuid '87d74cda4ef8aefdbfed2aa9f953834f31fab314'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/log/TaskLogger.java:
+    newFile: !uuid 'a72f0620ce74c81341727b8ed2f3508792a0a399'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectUserMapper.java:
-    newFile: !uuid '5805fbe6b19a798fac9d89542103ae56baee1f53'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/log/WorkerLogFilter.java:
+    newFile: !uuid 'ca8ea3fc641921befb5654649d7066a8fb1f967a'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectUserMapperProvider.java:
-    newFile: !uuid '1461bd89a734a564e2a445929d16b087dad91dc8'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/runner:
+    newFile: !uuid 'b22e2701692b03822fd26c5eff82b9ed884d7396'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapper.java:
-    newFile: !uuid '534666c463d2e347ddba8c9b57086c44d7bc8a7a'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java:
+    newFile: !uuid '50402d4a3b5f797de17f465ece2815fe589e0986'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapperProvider.java:
-    newFile: !uuid 'ee829f15574d43bb859ae8f1a59eb3db9bb1341a'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/runner/TaskScheduleThread.java:
+    newFile: !uuid '016607c79e75907ade59a6fb349b20aa31906cbb'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ResourceMapper.java:
-    newFile: !uuid '9d2ab80f215a8a4b794d0606f07d7988f617c9f7'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task:
+    newFile: !uuid '93eee206f7f01953e200e2868230bc6ad1a6b87d'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ResourceMapperProvider.java:
-    newFile: !uuid '4122c7722c9d32146f34a1d0a71b8fd754df5b11'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractCommandExecutor.java:
+    newFile: !uuid '9e617e65c0fcedea59dedf571b683031bdd7f2d9'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ResourcesUserMapper.java:
-    newFile: !uuid '6f26f1aa5751c1204def48b7eee42ddb07b0c6e0'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractTask.java:
+    newFile: !uuid '645a314a4cb173becdc184a25484d204b47567a2'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ResourcesUserMapperProvider.java:
-    newFile: !uuid '67d2eb47f3ae7ccf9542689588b68ded9c9586c4'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractYarnTask.java:
+    newFile: !uuid '7559864bab4b98930d121a946c3830301100b25c'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ScheduleMapper.java:
-    newFile: !uuid '2e6f3fc40b7bc70981bb73824c224cb2d236528d'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/PythonCommandExecutor.java:
+    newFile: !uuid '6e4d015734f929fbd5caec1dc9b6d924abc9b28a'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ScheduleMapperProvider.java:
-    newFile: !uuid 'af82318da26d64ad67b7831701d5ea48a54eb837'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/ShellCommandExecutor.java:
+    newFile: !uuid 'b5e803ae80111afbf83cc9d1a6eedb1b53c65ab8'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/SessionMapper.java:
-    newFile: !uuid 'bd67458d5f116579ff2af1a4943bd115d891ed68'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/TaskManager.java:
+    newFile: !uuid 'e23a29ae08c442aa9e44478e9d809f079335e90d'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/SessionMapperProvider.java:
-    newFile: !uuid '9bf9f8f9436ab90f4664ad4f628db7c7b92c7d5c'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/TaskProps.java:
+    newFile: !uuid '053b5bed2410673caed988afe075cd7256b8d1d3'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TaskInstanceMapper.java:
-    newFile: !uuid 'e7838e77307a5e86fb150d9b71705133c0749fc1'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/dependent:
+    newFile: !uuid '4b76715236cfc1ffe8f1c3f25ba6aa932b51351a'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TaskInstanceMapperProvider.java:
-    newFile: !uuid '09ffb0125bf2e503f4291f9f5b7df51e04b64e14'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/dependent/DependentExecute.java:
+    newFile: !uuid '1e46e3e38d8b56920e52a8f8fe8fa319c15076e9'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TenantMapper.java:
-    newFile: !uuid 'c451f6ce2072c69a40292ac4ebeb01b4844de113'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/dependent/DependentTask.java:
+    newFile: !uuid '21e596f55fc2a2545daa362747832743cdf2cce4'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TenantMapperProvider.java:
-    newFile: !uuid '8560fc950b1a9d521ebc2c4fe7532998be1acf54'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/mr:
+    newFile: !uuid '0a2d1de425d266eab6dbb58da7b67040a501c73c'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UDFUserMapper.java:
-    newFile: !uuid '5ad1f13a957a2d327920e62e625631e16cf7189a'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/mr/MapReduceTask.java:
+    newFile: !uuid '971ecd0b6dc912f229c3907598a478ce45891551'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UDFUserMapperProvider.java:
-    newFile: !uuid 'bacc0f585eb7f31121f30c5546704da6a5db006b'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/processdure:
+    newFile: !uuid 'a14ab1f89074dbbb89f8647e891c8817d59d520f'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UdfFuncMapper.java:
-    newFile: !uuid 'd37ab3a1f02f1e0869e96cde08c375e45c6d0de0'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/processdure/ProcedureTask.java:
+    newFile: !uuid '2efe8cbf54accfc7846bcea386ed4424fbf5e9cd'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UdfFuncMapperProvider.java:
-    newFile: !uuid '55ef65e3a2b4b235b0401341f94db490fe41a61d'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/python:
+    newFile: !uuid '52e5a72939a5d642908b1e53a282282951f64c0e'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserAlertGroupMapper.java:
-    newFile: !uuid '9e13aff997b3c13d978228dd5b7882b5443842ef'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/python/PythonTask.java:
+    newFile: !uuid '2b7ae29b96ab3a2617731e2159800f4f8a30f494'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserAlertGroupMapperProvider.java:
-    newFile: !uuid 'c9f917f6b16a8c007f2ec8252bb79c07e0d8892a'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/shell:
+    newFile: !uuid '1bc7eca4f5945c2241fbd945d8de9f83828239e8'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapper.java:
-    newFile: !uuid 'd33fb9ebfbb4c71963b976269888970941fa6998'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/shell/ShellTask.java:
+    newFile: !uuid 'b8564e8f958868a7e57c7af5372d9a0c3eacb686'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java:
-    newFile: !uuid 'd1cfc34ad9e223391913ab62fa4b7048aa98e5ec'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/spark:
+    newFile: !uuid 'bd5b95ab99f91b9ad0ecbfe8672abb3d425baabd'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/WorkerServerMapper.java:
-    newFile: !uuid 'b5ea3aa878a80895ab3da0765be8d38473a894dc'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/spark/SparkTask.java:
+    newFile: !uuid '4764a96a0cccfdef24d2639001073130e3768b0c'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/mapper/WorkerServerMapperProvider.java:
-    newFile: !uuid 'bd5af7dedaef6907c681869a9b0868ec8aad331f'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql:
+    newFile: !uuid '64c195ae4a321e5b97897aa02989ba7660114d28'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model:
-    newFile: !uuid '763cb868cf437db51b9e5f9dc7db442b59cfd3b2'
+  /escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java:
+    newFile: !uuid '36d92d71b5633d8d763d26d0b78f2bc2a910cbe4'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/Alert.java:
-    newFile: !uuid '57bcf60ecd3ba24a674e14ba6103944f20898691'
+  /escheduler-server/src/main/java/cn/escheduler/server/zk:
+    newFile: !uuid 'db220692d3441e0a5e2baebf751248f281438314'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/AlertGroup.java:
-    newFile: !uuid '21b24843cba4981129561f50e957a645fc8fac91'
+  /escheduler-server/src/main/java/cn/escheduler/server/zk/ZKMasterClient.java:
+    newFile: !uuid '113ef5de9fc280f11684dcadf0f9615fd79cd9c9'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/Command.java:
-    newFile: !uuid '399e378ae83a5c38610f911a4135d2b826d8a2c0'
+  /escheduler-server/src/main/java/cn/escheduler/server/zk/ZKWorkerClient.java:
+    newFile: !uuid '7cf899d832e5caefe91288d0b9e70320a433e934'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/CycleDependency.java:
-    newFile: !uuid '97b1297af369325fba2e57195f3d980b5ee7377e'
+  /escheduler-server/src/main/resources:
+    newFile: !uuid 'de34b1e8a7e375bd93c4fe936ba3189a48239027'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/DataSource.java:
-    newFile: !uuid '9506cd2f70a007e76b698ac1cdebfdab25ee5c05'
+  /escheduler-server/src/main/resources/application_master.properties:
+    newFile: !uuid 'cc4774ae94907fad28e3f3c2f69c0006dc833b5d'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/DatasourceUser.java:
-    newFile: !uuid '58d936f02ff9a7153bcca300e981f6af9ba6c8f1'
+  /escheduler-server/src/main/resources/master.properties:
+    newFile: !uuid '9080defc7b57480e2aafd4b3141d55eb92f10244'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/DefinitionGroupByUser.java:
-    newFile: !uuid 'b53462e27d42a9f9e700d743bff171f85c1b01be'
+  /escheduler-server/src/main/resources/master_logback.xml:
+    newFile: !uuid 'd93878218e05cc19b6de10fffa3fdc5925471c91'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/Dependency.java:
-    newFile: !uuid '30b1a9f79d8b726b3d71d70967a41b54552f96d5'
+  /escheduler-server/src/main/resources/worker.properties:
+    newFile: !uuid 'd1e1dca98ae0ad4e9724638de08dc10df220114e'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/ExecuteStatusCount.java:
-    newFile: !uuid 'e85af98bbb7e513f5773ae2208fdda1e5610c9c4'
+  /escheduler-server/src/main/resources/worker_logback.xml:
+    newFile: !uuid '32914ec84fa721eb0797b8597fc89d6f31bd765e'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/MasterServer.java:
-    newFile: !uuid '1ccb15b5ccec5123382810631f25af5906bb51c1'
+  /escheduler-server/src/test:
+    newFile: !uuid 'f2ed6edb4f1a7c20fe6f51b5762c99a13c450964'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/ProcessData.java:
-    newFile: !uuid 'ba967f8be4d81e87e5a8b3cc1f33b11c8c53fc3b'
+  /escheduler-server/src/test/java:
+    newFile: !uuid 'e2f92c71fe97533a7f98bf6e4c3846e7b3a3ab46'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/ProcessDefinition.java:
-    newFile: !uuid '51498f5ddf38c42a0ff2f1d06c72d13d40c204a8'
+  /escheduler-server/src/test/java/cn:
+    newFile: !uuid '6b354e9d98cfd18e0ba3996425132aa0c6df37f2'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/ProcessInstance.java:
-    newFile: !uuid '06656ebeba04d0b53688b4300a48c6824890f8ae'
+  /escheduler-server/src/test/java/cn/escheduler:
+    newFile: !uuid 'e24961a3a72b43622095a600d0768680977907c5'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/ProcessInstanceMap.java:
-    newFile: !uuid '863144eab25502cf3887ef23522b1ac0fb801d4e'
+  /escheduler-server/src/test/java/cn/escheduler/server:
+    newFile: !uuid 'ffdc8e409635cb85d41103df7fc4563a411d9fb1'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/Project.java:
-    newFile: !uuid '6d0a9bbdb764b2000c7382d7ddb10a763b865eac'
+  /escheduler-server/src/test/java/cn/escheduler/server/master:
+    newFile: !uuid 'b4c5c28593579f3e035e78483de4f866920c563d'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/ProjectUser.java:
-    newFile: !uuid 'f8d67ebf501e7e6583e3d9aa7767374924751da5'
+  /escheduler-server/src/test/java/cn/escheduler/server/master/AlertManagerTest.java:
+    newFile: !uuid 'e6881a3afc66f244de4bb62613c8ef67f09eb623'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/Queue.java:
-    newFile: !uuid 'd9a6f37b98fc3f60e9331568ace5d89d5368df88'
+  /escheduler-server/src/test/java/cn/escheduler/server/master/MasterCommandTest.java:
+    newFile: !uuid '3aed212618c18cd1bdd9a384fec524d1900d844d'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/Resource.java:
-    newFile: !uuid '5fbd098efd83191f5668fcf7ddf8f9a1a90fd263'
+  /escheduler-server/src/test/java/cn/escheduler/server/master/ParamsTest.java:
+    newFile: !uuid 'c3f8ab99e3ceecb6e44e6c0eb6ddea9d73561d98'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/ResourcesUser.java:
-    newFile: !uuid '14505ead5aabc5a373b2456903704ffbb85ec396'
+  /escheduler-server/src/test/java/cn/escheduler/server/worker:
+    newFile: !uuid '50c77b2936c17dec3cfc852fc9916a6ebb87f0e3'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/Schedule.java:
-    newFile: !uuid '40579a53ac862385c231b7abc7f9cd80d6999527'
+  /escheduler-server/src/test/java/cn/escheduler/server/worker/shell:
+    newFile: !uuid '74fc88739515a9e787066b4d4550a7ce164dc577'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/Session.java:
-    newFile: !uuid 'b52eb494eeb179c7bee4799c8c5ed8eab4309c97'
+  /escheduler-server/src/test/java/cn/escheduler/server/worker/shell/ShellCommandExecutorTest.java:
+    newFile: !uuid '0f947dac8a6a5536c497af741325d37a5f3a5096'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/TaskInstance.java:
-    newFile: !uuid '9d63f7cc7ecba1022faf2caca302f3c596dedb46'
+  /escheduler-server/src/test/java/cn/escheduler/server/worker/sql:
+    newFile: !uuid 'ef1f7edd4643b5fc339c4882c53495ffc01b1bb8'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/TaskRecord.java:
-    newFile: !uuid '17bd07336677811ddde4b29f25879338e0299d25'
+  /escheduler-server/src/test/java/cn/escheduler/server/worker/sql/SqlExecutorTest.java:
+    newFile: !uuid 'aecf3e9230a1fecf6fc790bbe177271e189d6590'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/Tenant.java:
-    newFile: !uuid 'a8cc94e1ab6d8a68e7eee4b4bafe7ccf990c96f8'
+  /escheduler-server/src/test/java/cn/escheduler/server/worker/task:
+    newFile: !uuid '989d0f2326b81516a6d1c5555bba0f0a57ff7e22'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/UDFUser.java:
-    newFile: !uuid 'fe49adc08e8e673b8839162ef1097b5ca2d08f10'
+  /escheduler-server/src/test/java/cn/escheduler/server/worker/task/dependent:
+    newFile: !uuid '9136545dc692ade0e7c5b0a012b01ee4d1fc5c55'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/UdfFunc.java:
-    newFile: !uuid '979b201ad3522aa63669f01674383398b6d774bc'
+  /escheduler-server/src/test/java/cn/escheduler/server/worker/task/dependent/DependentTaskTest.java:
+    newFile: !uuid 'fae7ccc5d0d58eff50ac9e73051c4ea89064e209'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/User.java:
-    newFile: !uuid '7fda405ef23803f971a25b28c814ade536e2d78f'
+  /escheduler-server/src/test/java/cn/escheduler/server/zk:
+    newFile: !uuid 'd9c62fa9294fafb06f264c8ece3d68dff19e443a'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/UserAlertGroup.java:
-    newFile: !uuid 'ffd5a9715eef415a7b828b046d5e2a993cf03870'
+  /escheduler-server/src/test/java/cn/escheduler/server/zk/ZKWorkerClientTest.java:
+    newFile: !uuid '04e8b8d606ba2b5c8b27e3b41edfd5fafd443243'
     oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/model/WorkerServer.java:
-    newFile: !uuid '4ee158b2e46928f00ded4c80d75de85c9d8ea1c8'
-    oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/utils:
-    newFile: !uuid '59bbf13298565dedbbf0c7259d0d6b389a0ba95f'
-    oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/utils/DagHelper.java:
-    newFile: !uuid 'bc52e850622951065436273f33c869853ee52fb0'
-    oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/utils/PropertyUtils.java:
-    newFile: !uuid '0b17fe9b2f4c7578d6f39e0baaa80a67dcfd0975'
-    oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron:
-    newFile: !uuid 'fec487b5e285f1654b2f3832c94a430d2ad105f6'
-    oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/AbstractCycle.java:
-    newFile: !uuid '3d7525673783f388153b654374825876aff520a7'
-    oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/CronUtils.java:
-    newFile: !uuid '7579ac15a0ab27faa63113f6883d784744ef360e'
-    oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/CycleFactory.java:
-    newFile: !uuid 'fabf289b96227302e27aca447ab9f5573d71ec1a'
-    oldFile: null
-  /escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/CycleLinks.java:
-    newFile: !uuid '3447e267cacdd1915c492343682ab92f1b729f65'
-    oldFile: null
-  /escheduler-dao/src/main/resources:
-    newFile: !uuid '99acb90a30a20ca2435d22f87341827b4a0ec09f'
-    oldFile: null
-  /escheduler-dao/src/main/resources/dao:
-    newFile: !uuid 'f45a9f26c58333eac3c4765d030b1651047bcce5'
-    oldFile: null
-  /escheduler-dao/src/main/resources/dao/data_source.properties:
-    newFile: !uuid 'cac3aa5e201c56bbffe8ead05140a34f44d23544'
-    oldFile: null
-  /escheduler-dao/src/test:
-    newFile: !uuid '4c72f86354ad6d775ce7f29db45305c55a634368'
-    oldFile: null
-  /escheduler-dao/src/test/java:
-    newFile: !uuid '61ca68c4d090b001f3d19b2d0397683658b2bb35'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn:
-    newFile: !uuid 'e85867e7ce92885f6dce6914fefcf828ad98aee9'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler:
-    newFile: !uuid '19a614f084368f7bf9bccb0f01e0f4dd1a36ebb5'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao:
-    newFile: !uuid '320357d2c013d280dd9d52d67301ae147720084a'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao/ProcessDaoTest.java:
-    newFile: !uuid 'c5c9f1ba18958c3a760d0b5da993036bcbd75434'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao/cron:
-    newFile: !uuid '03ffd794354b78545de5b653cb9d0295fca02a5a'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao/cron/CronUtilsTest.java:
-    newFile: !uuid '3c1ff978f1757bb436ffd70a0704f605e7915b4f'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao/mapper:
-    newFile: !uuid '0ef62d982e85e80d5e4eb9784cd162a7f51fb114'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AlertGroupMapperTest.java:
-    newFile: !uuid '1ef3d8e5d7b3b7c5b39d1612290773614d96d1a3'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AlertMapperTest.java:
-    newFile: !uuid 'fc5c82fda12f7634146822cce4d0af26ed403e02'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao/mapper/CommandMapperTest.java:
-    newFile: !uuid 'cb02321e32f3619ca7a7c32fddfa4e251b726d97'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao/mapper/DataSourceMapperTest.java:
-    newFile: !uuid 'c49b776bbdb6b4f1bc5253a285ddeab9dbaeb049'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao/mapper/MasterServerMapperTest.java:
-    newFile: !uuid '9f66069eeb0fe3c3a650c48f79d98031bdce22be'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperTest.java:
-    newFile: !uuid 'fb0a8421f5455dc45fcb0ced989386c7119c8712'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java:
-    newFile: !uuid '7fd791efa2bb9043b73c54c335566becc7801115'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UdfFuncMapperTest.java:
-    newFile: !uuid 'ef1ce3106d2c6e847a6668d8881736c7ec16972f'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserAlertGroupMapperTest.java:
-    newFile: !uuid '8e4c59c2e565cc80dd7d5140eb5f066f920e4acb'
-    oldFile: null
-  /escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserMapperTest.java:
-    newFile: !uuid '94ae0ca175736b83532988e428efe0de3bcc8a99'
-    oldFile: null
-gitCommitId: !uuid 'b825b9c513fffc712aed5862709124b77be3dab8'
+gitCommitId: !uuid '5c45f92f463b5d6c4b811df1058cc712da67dd7e'
 renames: {
   }
-revisionId: 53
+revisionId: 54