Add alert server into standalone-server as well and some minor polish (#6087)

.asf.yaml

@@ -16,10 +16,7 @@
 #
 
 github:
-  description: >
-    Apache DolphinScheduler is a distributed and extensible workflow scheduler platform with powerful DAG
-    visual interfaces, dedicated to solving complex job dependencies in the data pipeline and providing
-    various types of jobs available out of box.
+  description: Apache DolphinScheduler is a distributed and extensible workflow scheduler platform with powerful DAG visual interfaces, dedicated to solving complex job dependencies in the data pipeline and providing various types of jobs available out of box.
   homepage: https://dolphinscheduler.apache.org/
   labels:
     - airflow

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java

@@ -24,8 +24,6 @@ import org.apache.dolphinscheduler.alert.plugin.AlertPluginManager;
 import org.apache.dolphinscheduler.alert.processor.AlertRequestProcessor;
 import org.apache.dolphinscheduler.alert.runner.AlertSender;
 import org.apache.dolphinscheduler.alert.utils.Constants;
-import org.apache.dolphinscheduler.spi.plugin.DolphinPluginLoader;
-import org.apache.dolphinscheduler.spi.plugin.DolphinPluginManagerConfig;
 import org.apache.dolphinscheduler.common.thread.Stopper;
 import org.apache.dolphinscheduler.common.utils.PropertyUtils;
 import org.apache.dolphinscheduler.dao.AlertDao;
@@ -35,6 +33,8 @@ import org.apache.dolphinscheduler.dao.entity.Alert;
 import org.apache.dolphinscheduler.remote.NettyRemotingServer;
 import org.apache.dolphinscheduler.remote.command.CommandType;
 import org.apache.dolphinscheduler.remote.config.NettyServerConfig;
+import org.apache.dolphinscheduler.spi.plugin.DolphinPluginLoader;
+import org.apache.dolphinscheduler.spi.plugin.DolphinPluginManagerConfig;
 import org.apache.dolphinscheduler.spi.utils.StringUtils;
 
 import java.util.List;
@@ -44,45 +44,29 @@ import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableList;
 
-/**
- * alert of start
- */
 public class AlertServer {
 
     private static final Logger logger = LoggerFactory.getLogger(AlertServer.class);
 
-    /**
-     * Plugin Dao
-     */
-    private PluginDao pluginDao = DaoFactory.getDaoInstance(PluginDao.class);
+    private final PluginDao pluginDao = DaoFactory.getDaoInstance(PluginDao.class);
 
-    /**
-     * Alert Dao
-     */
-    private AlertDao alertDao = DaoFactory.getDaoInstance(AlertDao.class);
-
-    private AlertSender alertSender;
+    private final AlertDao alertDao = DaoFactory.getDaoInstance(AlertDao.class);
 
     private AlertPluginManager alertPluginManager;
 
-    private DolphinPluginManagerConfig alertPluginManagerConfig;
-
     public static final String ALERT_PLUGIN_BINDING = "alert.plugin.binding";
 
     public static final String ALERT_PLUGIN_DIR = "alert.plugin.dir";
 
     public static final String MAVEN_LOCAL_REPOSITORY = "maven.local.repository";
 
-    /**
-     * netty server
-     */
     private NettyRemotingServer server;
 
     private static class AlertServerHolder {
         private static final AlertServer INSTANCE = new AlertServer();
     }
 
-    public static final AlertServer getInstance() {
+    public static AlertServer getInstance() {
         return AlertServerHolder.INSTANCE;
     }
 
@@ -98,8 +82,7 @@ public class AlertServer {
     }
 
     private void initPlugin() {
-        alertPluginManager = new AlertPluginManager();
-        alertPluginManagerConfig = new DolphinPluginManagerConfig();
+        DolphinPluginManagerConfig alertPluginManagerConfig = new DolphinPluginManagerConfig();
         alertPluginManagerConfig.setPlugins(PropertyUtils.getString(ALERT_PLUGIN_BINDING));
         if (StringUtils.isNotBlank(PropertyUtils.getString(ALERT_PLUGIN_DIR))) {
             alertPluginManagerConfig.setInstalledPluginsDir(PropertyUtils.getString(ALERT_PLUGIN_DIR, Constants.ALERT_PLUGIN_PATH).trim());
@@ -109,6 +92,7 @@ public class AlertServer {
             alertPluginManagerConfig.setMavenLocalRepository(PropertyUtils.getString(MAVEN_LOCAL_REPOSITORY).trim());
         }
 
+        alertPluginManager = new AlertPluginManager();
         DolphinPluginLoader alertPluginLoader = new DolphinPluginLoader(alertPluginManagerConfig, ImmutableList.of(alertPluginManager));
         try {
             alertPluginLoader.loadPlugins();
@@ -117,9 +101,6 @@ public class AlertServer {
         }
     }
 
-    /**
-     * init netty remoting server
-     */
     private void initRemoteServer() {
         NettyServerConfig serverConfig = new NettyServerConfig();
         serverConfig.setListenPort(ALERT_RPC_PORT);
@@ -128,30 +109,10 @@ public class AlertServer {
         this.server.start();
     }
 
-    /**
-     * Cyclic alert info sending alert
-     */
     private void runSender() {
-        while (Stopper.isRunning()) {
-            try {
-                Thread.sleep(Constants.ALERT_SCAN_INTERVAL);
-            } catch (InterruptedException e) {
-                logger.error(e.getMessage(), e);
-                Thread.currentThread().interrupt();
-            }
-            if (alertPluginManager == null || alertPluginManager.getAlertChannelMap().size() == 0) {
-                logger.warn("No Alert Plugin . Cannot send alert info. ");
-            } else {
-                List<Alert> alerts = alertDao.listWaitExecutionAlert();
-                alertSender = new AlertSender(alerts, alertDao, alertPluginManager);
-                alertSender.run();
-            }
-        }
+        new Thread(new Sender()).start();
     }
 
-    /**
-     * start
-     */
     public void start() {
         PropertyUtils.loadPropertyFile(ALERT_PROPERTIES_PATH);
         checkTable();
@@ -161,23 +122,35 @@ public class AlertServer {
         runSender();
     }
 
-    /**
-     * stop
-     */
     public void stop() {
         this.server.close();
         logger.info("alert server shut down");
     }
 
-    public static void main(String[] args) {
-        AlertServer alertServer = AlertServer.getInstance();
-        alertServer.start();
-        Runtime.getRuntime().addShutdownHook(new Thread() {
+    final class Sender implements Runnable {
         @Override
         public void run() {
-                alertServer.stop();
+            while (Stopper.isRunning()) {
+                try {
+                    Thread.sleep(Constants.ALERT_SCAN_INTERVAL);
+                } catch (InterruptedException e) {
+                    logger.error(e.getMessage(), e);
+                    Thread.currentThread().interrupt();
                 }
-        });
+                if (alertPluginManager == null || alertPluginManager.getAlertChannelMap().size() == 0) {
+                    logger.warn("No Alert Plugin . Cannot send alert info. ");
+                } else {
+                    List<Alert> alerts = alertDao.listWaitExecutionAlert();
+                    new AlertSender(alerts, alertDao, alertPluginManager).run();
+                }
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        AlertServer alertServer = AlertServer.getInstance();
+        alertServer.start();
+        Runtime.getRuntime().addShutdownHook(new Thread(alertServer::stop));
     }
 
 }

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java

@@ -56,7 +56,7 @@ public class AlertPluginManager extends AbstractDolphinPluginManager {
      */
     private final Map<Integer, String> pluginDefineMap = new HashMap<>();
 
-    private PluginDao pluginDao = DaoFactory.getDaoInstance(PluginDao.class);
+    private final PluginDao pluginDao = DaoFactory.getDaoInstance(PluginDao.class);
 
     private void addAlertChannelFactory(AlertChannelFactory alertChannelFactory) {
         requireNonNull(alertChannelFactory, "alertChannelFactory is null");

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessor.java

@@ -33,14 +33,11 @@ import org.slf4j.LoggerFactory;
 
 import io.netty.channel.Channel;
 
-/**
- * alert request processor
- */
 public class AlertRequestProcessor implements NettyRequestProcessor {
 
     private final Logger logger = LoggerFactory.getLogger(AlertRequestProcessor.class);
-    private AlertDao alertDao;
-    private AlertPluginManager alertPluginManager;
+    private final AlertDao alertDao;
+    private final AlertPluginManager alertPluginManager;
 
     public AlertRequestProcessor(AlertDao alertDao, AlertPluginManager alertPluginManager) {
         this.alertDao = alertDao;

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java

@@ -38,16 +38,13 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * alert sender
- */
 public class AlertSender {
 
     private static final Logger logger = LoggerFactory.getLogger(AlertSender.class);
 
     private List<Alert> alertList;
     private AlertDao alertDao;
-    private AlertPluginManager alertPluginManager;
+    private final AlertPluginManager alertPluginManager;
 
     public AlertSender(AlertPluginManager alertPluginManager) {
         this.alertPluginManager = alertPluginManager;

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/FuncUtils.java

@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.dolphinscheduler.alert.utils;
-
-import org.apache.dolphinscheduler.common.utils.StringUtils;
-
-public class FuncUtils {
-
-    private FuncUtils() {
-        throw new IllegalStateException(FuncUtils.class.getName());
-    }
-
-    public static String mkString(Iterable<String> list, String split) {
-
-        if (null == list || StringUtils.isEmpty(split)) {
-            return null;
-        }
-
-        StringBuilder sb = new StringBuilder();
-        boolean first = true;
-        for (String item : list) {
-            if (first) {
-                first = false;
-            } else {
-                sb.append(split);
-            }
-            sb.append(item);
-        }
-        return sb.toString();
-    }
-
-}

dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/FuncUtilsTest.java

@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.dolphinscheduler.alert.utils;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class FuncUtilsTest {
-
-    private static final Logger logger = LoggerFactory.getLogger(FuncUtilsTest.class);
-
-    /**
-     * Test mkString
-     */
-    @Test
-    public void testMKString() {
-
-        //Define users list
-        Iterable<String> users = Arrays.asList("user1", "user2", "user3");
-        //Define split
-        String split = "|";
-
-        //Invoke mkString with correctParams
-        String result = FuncUtils.mkString(users, split);
-        logger.info(result);
-
-        //Expected result string
-        assertEquals("user1|user2|user3", result);
-
-        //Null list expected return null
-        result = FuncUtils.mkString(null, split);
-        assertNull(result);
-
-        //Null split expected return null
-        result = FuncUtils.mkString(users, null);
-        assertNull(result);
-
-    }
-}

dolphinscheduler-standalone-server/pom.xml

@@ -47,6 +47,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dolphinscheduler</groupId>
+            <artifactId>dolphinscheduler-alert</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

dolphinscheduler-standalone-server/src/main/java/org/apache/dolphinscheduler/server/StandaloneServer.java

@@ -22,6 +22,7 @@ import static org.apache.dolphinscheduler.common.Constants.SPRING_DATASOURCE_PAS
 import static org.apache.dolphinscheduler.common.Constants.SPRING_DATASOURCE_URL;
 import static org.apache.dolphinscheduler.common.Constants.SPRING_DATASOURCE_USERNAME;
 
+import org.apache.dolphinscheduler.alert.AlertServer;
 import org.apache.dolphinscheduler.api.ApiApplicationServer;
 import org.apache.dolphinscheduler.common.utils.ScriptRunner;
 import org.apache.dolphinscheduler.dao.datasource.ConnectionFactory;
@@ -31,9 +32,11 @@ import org.apache.dolphinscheduler.server.worker.WorkerServer;
 import org.apache.curator.test.TestingServer;
 
 import java.io.FileReader;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.sql.SQLException;
 
 import javax.sql.DataSource;
 
@@ -48,8 +51,50 @@ public class StandaloneServer {
     private static final Logger LOGGER = LoggerFactory.getLogger(StandaloneServer.class);
 
     public static void main(String[] args) throws Exception {
+        Thread.currentThread().setName("Standalone-Server");
+
         System.setProperty("spring.profiles.active", "api");
 
+        startDatabase();
+
+        startRegistry();
+
+        startAlertServer();
+
+        new SpringApplicationBuilder(
+                ApiApplicationServer.class,
+                MasterServer.class,
+                WorkerServer.class
+        ).run(args);
+    }
+
+    private static void startAlertServer() {
+        final Path alertPluginPath = Paths.get(
+                StandaloneServer.class.getProtectionDomain().getCodeSource().getLocation().getPath(),
+                "../../../dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml"
+        ).toAbsolutePath();
+        if (Files.exists(alertPluginPath)) {
+            System.setProperty("alert.plugin.binding", alertPluginPath.toString());
+            System.setProperty("alert.plugin.dir", "");
+        }
+        AlertServer.getInstance().start();
+    }
+
+    private static void startRegistry() throws Exception {
+        final TestingServer server = new TestingServer(true);
+        System.setProperty("registry.servers", server.getConnectString());
+
+        final Path registryPath = Paths.get(
+                StandaloneServer.class.getProtectionDomain().getCodeSource().getLocation().getPath(),
+                "../../../dolphinscheduler-registry-plugin/dolphinscheduler-registry-zookeeper/pom.xml"
+        ).toAbsolutePath();
+        if (Files.exists(registryPath)) {
+            System.setProperty("registry.plugin.binding", registryPath.toString());
+            System.setProperty("registry.plugin.dir", "");
+        }
+    }
+
+    private static void startDatabase() throws IOException, SQLException {
         final Path temp = Files.createTempDirectory("dolphinscheduler_");
         LOGGER.info("H2 database directory: {}", temp);
         System.setProperty(
@@ -58,7 +103,7 @@ public class StandaloneServer {
         );
         System.setProperty(
                 SPRING_DATASOURCE_URL,
-                String.format("jdbc:h2:tcp://localhost/%s", temp.toAbsolutePath())
+                String.format("jdbc:h2:tcp://localhost/%s;MODE=MySQL;DATABASE_TO_LOWER=true", temp.toAbsolutePath())
         );
         System.setProperty(SPRING_DATASOURCE_USERNAME, "sa");
         System.setProperty(SPRING_DATASOURCE_PASSWORD, "");
@@ -68,25 +113,5 @@ public class StandaloneServer {
         final DataSource ds = ConnectionFactory.getInstance().getDataSource();
         final ScriptRunner runner = new ScriptRunner(ds.getConnection(), true, true);
         runner.runScript(new FileReader("sql/dolphinscheduler_h2.sql"));
-
-        final TestingServer server = new TestingServer(true);
-        System.setProperty("registry.servers", server.getConnectString());
-
-        final Path registryPath = Paths.get(
-                StandaloneServer.class.getProtectionDomain().getCodeSource().getLocation().getPath(),
-                "../../../dolphinscheduler-registry-plugin/dolphinscheduler-registry-zookeeper/pom.xml"
-        ).toAbsolutePath();
-        if (Files.exists(registryPath)) {
-            System.setProperty("registry.plugin.binding", registryPath.toString());
-            System.setProperty("registry.plugin.dir", "");
-        }
-
-        Thread.currentThread().setName("Standalone-Server");
-
-        new SpringApplicationBuilder(
-                ApiApplicationServer.class,
-                MasterServer.class,
-                WorkerServer.class
-        ).run(args);
     }
 }

sql/dolphinscheduler_h2.sql

@@ -15,13 +15,15 @@
  * limitations under the License.
 */
 
-SET FOREIGN_KEY_CHECKS=0;
+SET
+FOREIGN_KEY_CHECKS=0;
 
 -- ----------------------------
 -- Table structure for QRTZ_JOB_DETAILS
 -- ----------------------------
 DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
-CREATE TABLE QRTZ_JOB_DETAILS (
+CREATE TABLE QRTZ_JOB_DETAILS
+(
     SCHED_NAME        varchar(120) NOT NULL,
     JOB_NAME          varchar(200) NOT NULL,
     JOB_GROUP         varchar(200) NOT NULL,
@@ -39,7 +41,8 @@ CREATE TABLE QRTZ_JOB_DETAILS (
 -- Table structure for QRTZ_TRIGGERS
 -- ----------------------------
 DROP TABLE IF EXISTS QRTZ_TRIGGERS;
-CREATE TABLE QRTZ_TRIGGERS (
+CREATE TABLE QRTZ_TRIGGERS
+(
     SCHED_NAME     varchar(120) NOT NULL,
     TRIGGER_NAME   varchar(200) NOT NULL,
     TRIGGER_GROUP  varchar(200) NOT NULL,
@@ -64,7 +67,8 @@ CREATE TABLE QRTZ_TRIGGERS (
 -- Table structure for QRTZ_BLOB_TRIGGERS
 -- ----------------------------
 DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS;
-CREATE TABLE QRTZ_BLOB_TRIGGERS (
+CREATE TABLE QRTZ_BLOB_TRIGGERS
+(
     SCHED_NAME    varchar(120) NOT NULL,
     TRIGGER_NAME  varchar(200) NOT NULL,
     TRIGGER_GROUP varchar(200) NOT NULL,
@@ -81,7 +85,8 @@ CREATE TABLE QRTZ_BLOB_TRIGGERS (
 -- Table structure for QRTZ_CALENDARS
 -- ----------------------------
 DROP TABLE IF EXISTS QRTZ_CALENDARS;
-CREATE TABLE QRTZ_CALENDARS (
+CREATE TABLE QRTZ_CALENDARS
+(
     SCHED_NAME    varchar(120) NOT NULL,
     CALENDAR_NAME varchar(200) NOT NULL,
     CALENDAR      blob         NOT NULL,
@@ -96,7 +101,8 @@ CREATE TABLE QRTZ_CALENDARS (
 -- Table structure for QRTZ_CRON_TRIGGERS
 -- ----------------------------
 DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS;
-CREATE TABLE QRTZ_CRON_TRIGGERS (
+CREATE TABLE QRTZ_CRON_TRIGGERS
+(
     SCHED_NAME      varchar(120) NOT NULL,
     TRIGGER_NAME    varchar(200) NOT NULL,
     TRIGGER_GROUP   varchar(200) NOT NULL,
@@ -114,7 +120,8 @@ CREATE TABLE QRTZ_CRON_TRIGGERS (
 -- Table structure for QRTZ_FIRED_TRIGGERS
 -- ----------------------------
 DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;
-CREATE TABLE QRTZ_FIRED_TRIGGERS (
+CREATE TABLE QRTZ_FIRED_TRIGGERS
+(
     SCHED_NAME        varchar(120) NOT NULL,
     ENTRY_ID          varchar(200) NOT NULL,
     TRIGGER_NAME      varchar(200) NOT NULL,
@@ -143,7 +150,8 @@ CREATE TABLE QRTZ_FIRED_TRIGGERS (
 -- Table structure for QRTZ_LOCKS
 -- ----------------------------
 DROP TABLE IF EXISTS QRTZ_LOCKS;
-CREATE TABLE QRTZ_LOCKS (
+CREATE TABLE QRTZ_LOCKS
+(
     SCHED_NAME varchar(120) NOT NULL,
     LOCK_NAME  varchar(40)  NOT NULL,
     PRIMARY KEY (SCHED_NAME, LOCK_NAME)
@@ -157,7 +165,8 @@ CREATE TABLE QRTZ_LOCKS (
 -- Table structure for QRTZ_PAUSED_TRIGGER_GRPS
 -- ----------------------------
 DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;
-CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS (
+CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS
+(
     SCHED_NAME    varchar(120) NOT NULL,
     TRIGGER_GROUP varchar(200) NOT NULL,
     PRIMARY KEY (SCHED_NAME, TRIGGER_GROUP)
@@ -171,7 +180,8 @@ CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS (
 -- Table structure for QRTZ_SCHEDULER_STATE
 -- ----------------------------
 DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE;
-CREATE TABLE QRTZ_SCHEDULER_STATE (
+CREATE TABLE QRTZ_SCHEDULER_STATE
+(
     SCHED_NAME        varchar(120) NOT NULL,
     INSTANCE_NAME     varchar(200) NOT NULL,
     LAST_CHECKIN_TIME bigint(13) NOT NULL,
@@ -187,7 +197,8 @@ CREATE TABLE QRTZ_SCHEDULER_STATE (
 -- Table structure for QRTZ_SIMPLE_TRIGGERS
 -- ----------------------------
 DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS;
-CREATE TABLE QRTZ_SIMPLE_TRIGGERS (
+CREATE TABLE QRTZ_SIMPLE_TRIGGERS
+(
     SCHED_NAME      varchar(120) NOT NULL,
     TRIGGER_NAME    varchar(200) NOT NULL,
     TRIGGER_GROUP   varchar(200) NOT NULL,
@@ -206,7 +217,8 @@ CREATE TABLE QRTZ_SIMPLE_TRIGGERS (
 -- Table structure for QRTZ_SIMPROP_TRIGGERS
 -- ----------------------------
 DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS;
-CREATE TABLE QRTZ_SIMPROP_TRIGGERS (
+CREATE TABLE QRTZ_SIMPROP_TRIGGERS
+(
     SCHED_NAME    varchar(120) NOT NULL,
     TRIGGER_NAME  varchar(200) NOT NULL,
     TRIGGER_GROUP varchar(200) NOT NULL,
@@ -237,7 +249,8 @@ CREATE TABLE QRTZ_SIMPROP_TRIGGERS (
 -- Table structure for t_ds_access_token
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_access_token;
-CREATE TABLE t_ds_access_token (
+CREATE TABLE t_ds_access_token
+(
     id          int(11) NOT NULL AUTO_INCREMENT,
     user_id     int(11) DEFAULT NULL,
     token       varchar(64) DEFAULT NULL,
@@ -255,7 +268,8 @@ CREATE TABLE t_ds_access_token (
 -- Table structure for t_ds_alert
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_alert;
-CREATE TABLE t_ds_alert (
+CREATE TABLE t_ds_alert
+(
     id            int(11) NOT NULL AUTO_INCREMENT,
     title         varchar(64) DEFAULT NULL,
     content       text,
@@ -275,7 +289,8 @@ CREATE TABLE t_ds_alert (
 -- Table structure for t_ds_alertgroup
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_alertgroup;
-CREATE TABLE t_ds_alertgroup(
+CREATE TABLE t_ds_alertgroup
+(
     id                 int(11) NOT NULL AUTO_INCREMENT,
     alert_instance_ids varchar(255) DEFAULT NULL,
     create_user_id     int(11) DEFAULT NULL,
@@ -295,7 +310,8 @@ CREATE TABLE t_ds_alertgroup(
 -- Table structure for t_ds_command
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_command;
-CREATE TABLE t_ds_command (
+CREATE TABLE t_ds_command
+(
     id                        int(11) NOT NULL AUTO_INCREMENT,
     command_type              tinyint(4) DEFAULT NULL,
     process_definition_id     int(11) DEFAULT NULL,
@@ -321,7 +337,8 @@ CREATE TABLE t_ds_command (
 -- Table structure for t_ds_datasource
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_datasource;
-CREATE TABLE t_ds_datasource (
+CREATE TABLE t_ds_datasource
+(
     id                int(11) NOT NULL AUTO_INCREMENT,
     name              varchar(64) NOT NULL,
     note              varchar(255) DEFAULT NULL,
@@ -342,7 +359,8 @@ CREATE TABLE t_ds_datasource (
 -- Table structure for t_ds_error_command
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_error_command;
-CREATE TABLE t_ds_error_command (
+CREATE TABLE t_ds_error_command
+(
     id                        int(11) NOT NULL,
     command_type              tinyint(4) DEFAULT NULL,
     executor_id               int(11) DEFAULT NULL,
@@ -369,7 +387,8 @@ CREATE TABLE t_ds_error_command (
 -- Table structure for t_ds_process_definition
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_process_definition;
-CREATE TABLE t_ds_process_definition (
+CREATE TABLE t_ds_process_definition
+(
     id               int(11) NOT NULL AUTO_INCREMENT,
     code             bigint(20) NOT NULL,
     name             varchar(255) DEFAULT NULL,
@@ -400,7 +419,8 @@ CREATE TABLE t_ds_process_definition (
 -- Table structure for t_ds_process_definition_log
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_process_definition_log;
-CREATE TABLE t_ds_process_definition_log (
+CREATE TABLE t_ds_process_definition_log
+(
     id               int(11) NOT NULL AUTO_INCREMENT,
     code             bigint(20) NOT NULL,
     name             varchar(200) DEFAULT NULL,
@@ -427,7 +447,8 @@ CREATE TABLE t_ds_process_definition_log (
 -- Table structure for t_ds_task_definition
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_task_definition;
-CREATE TABLE t_ds_task_definition (
+CREATE TABLE t_ds_task_definition
+(
     id                      int(11) NOT NULL AUTO_INCREMENT,
     code                    bigint(20) NOT NULL,
     name                    varchar(200) DEFAULT NULL,
@@ -457,7 +478,8 @@ CREATE TABLE t_ds_task_definition (
 -- Table structure for t_ds_task_definition_log
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_task_definition_log;
-CREATE TABLE t_ds_task_definition_log (
+CREATE TABLE t_ds_task_definition_log
+(
     id                      int(11) NOT NULL AUTO_INCREMENT,
     code                    bigint(20) NOT NULL,
     name                    varchar(200) DEFAULT NULL,
@@ -488,7 +510,8 @@ CREATE TABLE t_ds_task_definition_log (
 -- Table structure for t_ds_process_task_relation
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_process_task_relation;
-CREATE TABLE t_ds_process_task_relation (
+CREATE TABLE t_ds_process_task_relation
+(
     id                         int(11) NOT NULL AUTO_INCREMENT,
     name                       varchar(200) DEFAULT NULL,
     process_definition_version int(11) DEFAULT NULL,
@@ -509,7 +532,8 @@ CREATE TABLE t_ds_process_task_relation (
 -- Table structure for t_ds_process_task_relation_log
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_process_task_relation_log;
-CREATE TABLE t_ds_process_task_relation_log (
+CREATE TABLE t_ds_process_task_relation_log
+(
     id                         int(11) NOT NULL AUTO_INCREMENT,
     name                       varchar(200) DEFAULT NULL,
     process_definition_version int(11) DEFAULT NULL,
@@ -532,7 +556,8 @@ CREATE TABLE t_ds_process_task_relation_log (
 -- Table structure for t_ds_process_instance
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_process_instance;
-CREATE TABLE t_ds_process_instance (
+CREATE TABLE t_ds_process_instance
+(
     id                         int(11) NOT NULL AUTO_INCREMENT,
     name                       varchar(255) DEFAULT NULL,
     process_definition_version int(11) DEFAULT NULL,
@@ -574,7 +599,8 @@ CREATE TABLE t_ds_process_instance (
 -- Table structure for t_ds_project
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_project;
-CREATE TABLE t_ds_project (
+CREATE TABLE t_ds_project
+(
     id          int(11) NOT NULL AUTO_INCREMENT,
     name        varchar(100) DEFAULT NULL,
     code        bigint(20) NOT NULL,
@@ -594,7 +620,8 @@ CREATE TABLE t_ds_project (
 -- Table structure for t_ds_queue
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_queue;
-CREATE TABLE t_ds_queue (
+CREATE TABLE t_ds_queue
+(
     id          int(11) NOT NULL AUTO_INCREMENT,
     queue_name  varchar(64) DEFAULT NULL,
     queue       varchar(64) DEFAULT NULL,
@@ -606,13 +633,15 @@ CREATE TABLE t_ds_queue (
 -- ----------------------------
 -- Records of t_ds_queue
 -- ----------------------------
-INSERT INTO t_ds_queue VALUES ('1', 'default', 'default', null, null);
+INSERT INTO t_ds_queue
+VALUES ('1', 'default', 'default', null, null);
 
 -- ----------------------------
 -- Table structure for t_ds_relation_datasource_user
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_relation_datasource_user;
-CREATE TABLE t_ds_relation_datasource_user (
+CREATE TABLE t_ds_relation_datasource_user
+(
     id            int(11) NOT NULL AUTO_INCREMENT,
     user_id       int(11) NOT NULL,
     datasource_id int(11) DEFAULT NULL,
@@ -630,7 +659,8 @@ CREATE TABLE t_ds_relation_datasource_user (
 -- Table structure for t_ds_relation_process_instance
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_relation_process_instance;
-CREATE TABLE t_ds_relation_process_instance (
+CREATE TABLE t_ds_relation_process_instance
+(
     id                         int(11) NOT NULL AUTO_INCREMENT,
     parent_process_instance_id int(11) DEFAULT NULL,
     parent_task_instance_id    int(11) DEFAULT NULL,
@@ -646,7 +676,8 @@ CREATE TABLE t_ds_relation_process_instance (
 -- Table structure for t_ds_relation_project_user
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_relation_project_user;
-CREATE TABLE t_ds_relation_project_user (
+CREATE TABLE t_ds_relation_project_user
+(
     id          int(11) NOT NULL AUTO_INCREMENT,
     user_id     int(11) NOT NULL,
     project_id  int(11) DEFAULT NULL,
@@ -664,7 +695,8 @@ CREATE TABLE t_ds_relation_project_user (
 -- Table structure for t_ds_relation_resources_user
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_relation_resources_user;
-CREATE TABLE t_ds_relation_resources_user (
+CREATE TABLE t_ds_relation_resources_user
+(
     id           int(11) NOT NULL AUTO_INCREMENT,
     user_id      int(11) NOT NULL,
     resources_id int(11) DEFAULT NULL,
@@ -682,7 +714,8 @@ CREATE TABLE t_ds_relation_resources_user (
 -- Table structure for t_ds_relation_udfs_user
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_relation_udfs_user;
-CREATE TABLE t_ds_relation_udfs_user (
+CREATE TABLE t_ds_relation_udfs_user
+(
     id          int(11) NOT NULL AUTO_INCREMENT,
     user_id     int(11) NOT NULL,
     udf_id      int(11) DEFAULT NULL,
@@ -696,7 +729,8 @@ CREATE TABLE t_ds_relation_udfs_user (
 -- Table structure for t_ds_resources
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_resources;
-CREATE TABLE t_ds_resources (
+CREATE TABLE t_ds_resources
+(
     id           int(11) NOT NULL AUTO_INCREMENT,
     alias        varchar(64)  DEFAULT NULL,
     file_name    varchar(64)  DEFAULT NULL,
@@ -721,7 +755,8 @@ CREATE TABLE t_ds_resources (
 -- Table structure for t_ds_schedules
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_schedules;
-CREATE TABLE t_ds_schedules (
+CREATE TABLE t_ds_schedules
+(
     id                        int(11) NOT NULL AUTO_INCREMENT,
     process_definition_id     int(11) NOT NULL,
     start_time                datetime     NOT NULL,
@@ -748,7 +783,8 @@ CREATE TABLE t_ds_schedules (
 -- Table structure for t_ds_session
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_session;
-CREATE TABLE t_ds_session (
+CREATE TABLE t_ds_session
+(
     id              varchar(64) NOT NULL,
     user_id         int(11) DEFAULT NULL,
     ip              varchar(45) DEFAULT NULL,
@@ -764,7 +800,8 @@ CREATE TABLE t_ds_session (
 -- Table structure for t_ds_task_instance
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_task_instance;
-CREATE TABLE t_ds_task_instance (
+CREATE TABLE t_ds_task_instance
+(
     id                      int(11) NOT NULL AUTO_INCREMENT,
     name                    varchar(255) DEFAULT NULL,
     task_type               varchar(50) NOT NULL,
@@ -804,7 +841,8 @@ CREATE TABLE t_ds_task_instance (
 -- Table structure for t_ds_tenant
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_tenant;
-CREATE TABLE t_ds_tenant (
+CREATE TABLE t_ds_tenant
+(
     id          int(11) NOT NULL AUTO_INCREMENT,
     tenant_code varchar(64)  DEFAULT NULL,
     description varchar(255) DEFAULT NULL,
@@ -822,7 +860,8 @@ CREATE TABLE t_ds_tenant (
 -- Table structure for t_ds_udfs
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_udfs;
-CREATE TABLE t_ds_udfs (
+CREATE TABLE t_ds_udfs
+(
     id            int(11) NOT NULL AUTO_INCREMENT,
     user_id       int(11) NOT NULL,
     func_name     varchar(100) NOT NULL,
@@ -846,7 +885,8 @@ CREATE TABLE t_ds_udfs (
 -- Table structure for t_ds_user
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_user;
-CREATE TABLE t_ds_user (
+CREATE TABLE t_ds_user
+(
     id            int(11) NOT NULL AUTO_INCREMENT,
     user_name     varchar(64) DEFAULT NULL,
     user_password varchar(64) DEFAULT NULL,
@@ -870,7 +910,8 @@ CREATE TABLE t_ds_user (
 -- Table structure for t_ds_worker_group
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_worker_group;
-CREATE TABLE t_ds_worker_group (
+CREATE TABLE t_ds_worker_group
+(
     id          bigint(11) NOT NULL AUTO_INCREMENT,
     name        varchar(255) NOT NULL,
     addr_list   text NULL DEFAULT NULL,
@@ -888,7 +929,8 @@ CREATE TABLE t_ds_worker_group (
 -- Table structure for t_ds_version
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_version;
-CREATE TABLE t_ds_version (
+CREATE TABLE t_ds_version
+(
     id      int(11) NOT NULL AUTO_INCREMENT,
     version varchar(200) NOT NULL,
     PRIMARY KEY (id),
@@ -898,26 +940,30 @@ CREATE TABLE t_ds_version (
 -- ----------------------------
 -- Records of t_ds_version
 -- ----------------------------
-INSERT INTO t_ds_version VALUES ('1', '1.4.0');
+INSERT INTO t_ds_version
+VALUES ('1', '1.4.0');
 
 
 -- ----------------------------
 -- Records of t_ds_alertgroup
 -- ----------------------------
 INSERT INTO t_ds_alertgroup(alert_instance_ids, create_user_id, group_name, description, create_time, update_time)
-VALUES ('1,2', 1, 'default admin warning group', 'default admin warning group', '2018-11-29 10:20:39', '2018-11-29 10:20:39');
+VALUES ('1,2', 1, 'default admin warning group', 'default admin warning group', '2018-11-29 10:20:39',
+        '2018-11-29 10:20:39');
 
 -- ----------------------------
 -- Records of t_ds_user
 -- ----------------------------
 INSERT INTO t_ds_user
-VALUES ('1', 'admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', '', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22', null, 1);
+VALUES ('1', 'admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', '', '0', '2018-03-27 15:48:50',
+        '2018-10-24 17:40:22', null, 1);
 
 -- ----------------------------
 -- Table structure for t_ds_plugin_define
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_plugin_define;
-CREATE TABLE t_ds_plugin_define (
+CREATE TABLE t_ds_plugin_define
+(
     id            int          NOT NULL AUTO_INCREMENT,
     plugin_name   varchar(100) NOT NULL,
     plugin_type   varchar(100) NOT NULL,
@@ -932,7 +978,8 @@ CREATE TABLE t_ds_plugin_define (
 -- Table structure for t_ds_alert_plugin_instance
 -- ----------------------------
 DROP TABLE IF EXISTS t_ds_alert_plugin_instance;
-CREATE TABLE t_ds_alert_plugin_instance (
+CREATE TABLE t_ds_alert_plugin_instance
+(
     id                     int NOT NULL AUTO_INCREMENT,
     plugin_define_id       int NOT NULL,
     plugin_instance_params text,