Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415

escheduler-common/src/main/java/cn/escheduler/common/utils/FileUtils.java

@@ -368,5 +368,61 @@ public class FileUtils {
         org.apache.commons.io.FileUtils.forceDelete(new File(filename));
     }
 
+    /**
+     * Gets all the parent subdirectories of the parentDir directory
+     * @param parentDir
+     * @return
+     */
+    public static File[] getAllDir(String parentDir){
+        if(parentDir == null || "".equals(parentDir)) {
+            throw new RuntimeException("parentDir can not be empty");
+        }
+
+        File file = new File(parentDir);
+        if(!file.exists() || !file.isDirectory()) {
+            throw new RuntimeException("parentDir not exist, or is not a directory:"+parentDir);
+        }
+
+        File[] schemaDirs = file.listFiles(new FileFilter() {
+
+            @Override
+            public boolean accept(File pathname) {
+                if (pathname.isDirectory()) {
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }
+        });
+
+        return schemaDirs;
+    }
+
+    /**
+     * Get Content
+     * @param inputStream
+     * @return
+     * @throws IOException
+     */
+    public static String readFile2Str(InputStream inputStream) throws IOException{
+        String all_content=null;
+        try {
+            all_content = new String();
+            InputStream ins = inputStream;
+            ByteArrayOutputStream outputstream = new ByteArrayOutputStream();
+            byte[] str_b = new byte[1024];
+            int i = -1;
+            while ((i=ins.read(str_b)) > 0) {
+                outputstream.write(str_b,0,i);
+            }
+            all_content = outputstream.toString();
+            return all_content;
+        } catch (Exception e) {
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e);
+        }
+    }
+
 
 }

escheduler-common/src/main/java/cn/escheduler/common/utils/MysqlUtil.java

@@ -0,0 +1,104 @@
+/*
+ * 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 cn.escheduler.common.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.*;
+
+public class MysqlUtil {
+
+	public static final Logger logger = LoggerFactory.getLogger(MysqlUtil.class);
+
+	private static MysqlUtil instance;
+
+	MysqlUtil() {
+	}
+
+	public static MysqlUtil getInstance() {
+		if (null == instance) {
+			syncInit();
+		}
+		return instance;
+	}
+
+	private static synchronized void syncInit() {
+		if (instance == null) {
+			instance = new MysqlUtil();
+		}
+	}
+
+	public void release(ResultSet rs, Statement stmt, Connection conn) {
+		try {
+			if (rs != null) {
+				rs.close();
+				rs = null;
+			}
+		} catch (SQLException e) {
+			logger.error(e.getMessage(),e);
+			throw new RuntimeException(e);
+		} finally {
+			try {
+				if (stmt != null) {
+					stmt.close();
+					stmt = null;
+				}
+			} catch (SQLException e) {
+				logger.error(e.getMessage(),e);
+				throw new RuntimeException(e);
+			} finally {
+				try {
+					if (conn != null) {
+						conn.close();
+						conn = null;
+					}
+				} catch (SQLException e) {
+					logger.error(e.getMessage(),e);
+					throw new RuntimeException(e);
+				}
+			}
+		}
+	}
+
+	public static void realeaseResource(ResultSet rs, PreparedStatement ps, Connection conn) {
+		MysqlUtil.getInstance().release(rs,ps,conn);
+		if (null != rs) {
+			try {
+				rs.close();
+			} catch (SQLException e) {
+				logger.error(e.getMessage(),e);
+			}
+		}
+
+		if (null != ps) {
+			try {
+				ps.close();
+			} catch (SQLException e) {
+				logger.error(e.getMessage(),e);
+			}
+		}
+
+		if (null != conn) {
+			try {
+				conn.close();
+			} catch (SQLException e) {
+				logger.error(e.getMessage(),e);
+			}
+		}
+	}
+}

escheduler-common/src/main/java/cn/escheduler/common/utils/SchemaUtils.java

@@ -0,0 +1,150 @@
+/*
+ * 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 cn.escheduler.common.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Metadata related common classes
+ *
+ */
+public class SchemaUtils {
+	
+	private static final Logger logger = LoggerFactory.getLogger(SchemaUtils.class);
+	private static Pattern p = Pattern.compile("\\s*|\t|\r|\n");
+
+	/**
+	 * 获取所有upgrade目录下的可升级的schema
+	 * Gets upgradable schemas for all upgrade directories
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public static List<String> getAllSchemaList() {
+		List<String> schemaDirList = new ArrayList<>();
+		File[] schemaDirArr = FileUtils.getAllDir("sql/upgrade");
+		if(schemaDirArr == null || schemaDirArr.length == 0) {
+			return null;
+		}
+		
+		for(File file : schemaDirArr) {
+			schemaDirList.add(file.getName());
+		}
+		
+		Collections.sort(schemaDirList , new Comparator() {
+			@Override
+			public int compare(Object o1 , Object o2){
+				try {
+					String dir1 = String.valueOf(o1);
+					String dir2 = String.valueOf(o2);
+					String version1 = dir1.split("_")[0];
+					String version2 = dir2.split("_")[0];
+					if(version1.equals(version2)) {
+						return 0;
+					}
+					
+					if(SchemaUtils.isAGreatVersion(version1, version2)) {
+						return 1;
+					}
+					
+					return -1;
+					
+				} catch (Exception e) {
+					logger.error(e.getMessage(),e);
+					throw new RuntimeException(e);
+				}
+			}
+		});
+		
+		return schemaDirList;
+	}
+	
+	/**
+	 * 判断schemaVersion是否比version版本高
+	 * Determine whether schemaVersion is higher than version
+	 * @param schemaVersion
+	 * @param version
+	 * @return
+	 */
+	public static boolean isAGreatVersion(String schemaVersion, String version) {
+		if(StringUtils.isEmpty(schemaVersion) || StringUtils.isEmpty(version)) {
+			throw new RuntimeException("schemaVersion or version is empty");
+		}
+		
+		String[] schemaVersionArr = schemaVersion.split("\\.");
+		String[] versionArr = version.split("\\.");
+		int arrLength = schemaVersionArr.length < versionArr.length ? schemaVersionArr.length : versionArr.length;
+		for(int i = 0 ; i < arrLength ; i++) {
+			if(Integer.valueOf(schemaVersionArr[i]) > Integer.valueOf(versionArr[i])) {
+				return true;
+			}else if(Integer.valueOf(schemaVersionArr[i]) < Integer.valueOf(versionArr[i])) {
+				return false;
+			}
+		}
+		
+		// 说明直到第arrLength-1个元素，两个版本号都一样，此时谁的arrLength大，谁的版本号就大
+		// If the version and schema version is the same from 0 up to the arrlength-1 element,whoever has a larger arrLength has a larger version number
+		return schemaVersionArr.length > versionArr.length;
+	}
+	
+	/**
+	 * Gets the current software version number of the system
+	 * @return
+	 */
+	public static String getSoftVersion() {
+		String soft_version;
+		try {
+			soft_version = FileUtils.readFile2Str(new FileInputStream(new File("sql/soft_version")));
+			soft_version = replaceBlank(soft_version);
+		} catch (FileNotFoundException e) {
+			logger.error(e.getMessage(),e);
+			throw new RuntimeException("Failed to get the product version description file. The file could not be found", e);
+		} catch (IOException e) {
+			logger.error(e.getMessage(),e);
+			throw new RuntimeException("Failed to get product version number description file, failed to read the file", e);
+		}
+		return soft_version;
+	}
+	
+	/**
+	 * 去掉字符串中的空格回车换行和制表符
+	 * Strips the string of space carriage returns and tabs
+	 * @param str
+	 * @return
+	 */
+	public static String replaceBlank(String str) {
+		String dest = "";
+		if (str!=null) {
+
+			Matcher m = p.matcher(str);
+			dest = m.replaceAll("");
+		}
+		return dest;
+	}
+}

escheduler-common/src/main/java/cn/escheduler/common/utils/ScriptRunner.java

@@ -0,0 +1,317 @@
+/*
+ * 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 cn.escheduler.common.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.io.Reader;
+import java.sql.*;
+
+/*
+ * Slightly modified version of the com.ibatis.common.jdbc.ScriptRunner class
+ * from the iBATIS Apache project. Only removed dependency on Resource class
+ * and a constructor
+ */
+/*
+ *  Copyright 2004 Clinton Begin
+ *
+ *  Licensed 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.
+ */
+
+/**
+ * Tool to run database scripts
+ */
+public class ScriptRunner {
+
+	public static final Logger logger = LoggerFactory.getLogger(ScriptRunner.class);
+
+	private static final String DEFAULT_DELIMITER = ";";
+
+	private Connection connection;
+
+	private boolean stopOnError;
+	private boolean autoCommit;
+
+	private String delimiter = DEFAULT_DELIMITER;
+	private boolean fullLineDelimiter = false;
+
+	/**
+	 * Default constructor
+	 */
+	public ScriptRunner(Connection connection, boolean autoCommit, boolean stopOnError) {
+		this.connection = connection;
+		this.autoCommit = autoCommit;
+		this.stopOnError = stopOnError;
+	}
+
+	public static void main(String[] args) {
+		String dbName = "db_mmu";
+		String appKey = dbName.substring(dbName.lastIndexOf("_")+1, dbName.length());
+		System.out.println(appKey);
+	}
+
+	public void setDelimiter(String delimiter, boolean fullLineDelimiter) {
+		this.delimiter = delimiter;
+		this.fullLineDelimiter = fullLineDelimiter;
+	}
+
+	/**
+	 * Runs an SQL script (read in using the Reader parameter)
+	 *
+	 * @param reader
+	 *            - the source of the script
+	 */
+	public void runScript(Reader reader) throws IOException, SQLException {
+		try {
+			boolean originalAutoCommit = connection.getAutoCommit();
+			try {
+				if (originalAutoCommit != this.autoCommit) {
+					connection.setAutoCommit(this.autoCommit);
+				}
+				runScript(connection, reader);
+			} finally {
+				connection.setAutoCommit(originalAutoCommit);
+			}
+		} catch (IOException e) {
+			throw e;
+		} catch (SQLException e) {
+			throw e;
+		} catch (Exception e) {
+			throw new RuntimeException("Error running script.  Cause: " + e, e);
+		}
+	}
+
+	public void runScript(Reader reader, String dbName) throws IOException, SQLException {
+		try {
+			boolean originalAutoCommit = connection.getAutoCommit();
+			try {
+				if (originalAutoCommit != this.autoCommit) {
+					connection.setAutoCommit(this.autoCommit);
+				}
+				runScript(connection, reader, dbName);
+			} finally {
+				connection.setAutoCommit(originalAutoCommit);
+			}
+		} catch (IOException e) {
+			throw e;
+		} catch (SQLException e) {
+			throw e;
+		} catch (Exception e) {
+			throw new RuntimeException("Error running script.  Cause: " + e, e);
+		}
+	}
+
+	/**
+	 * Runs an SQL script (read in using the Reader parameter) using the connection
+	 * passed in
+	 *
+	 * @param conn
+	 *            - the connection to use for the script
+	 * @param reader
+	 *            - the source of the script
+	 * @throws SQLException
+	 *             if any SQL errors occur
+	 * @throws IOException
+	 *             if there is an error reading from the Reader
+	 */
+	private void runScript(Connection conn, Reader reader) throws IOException, SQLException {
+		StringBuffer command = null;
+		try {
+			LineNumberReader lineReader = new LineNumberReader(reader);
+			String line = null;
+			while ((line = lineReader.readLine()) != null) {
+				if (command == null) {
+					command = new StringBuffer();
+				}
+				String trimmedLine = line.trim();
+				if (trimmedLine.startsWith("--")) {
+					logger.info(trimmedLine);
+				} else if (trimmedLine.length() < 1 || trimmedLine.startsWith("//")) {
+					// Do nothing
+				} else if (trimmedLine.length() < 1 || trimmedLine.startsWith("--")) {
+					// Do nothing
+
+				} else if (trimmedLine.startsWith("delimiter")) {
+					String newDelimiter = trimmedLine.split(" ")[1];
+					this.setDelimiter(newDelimiter, fullLineDelimiter);
+
+				} else if (!fullLineDelimiter && trimmedLine.endsWith(getDelimiter())
+						|| fullLineDelimiter && trimmedLine.equals(getDelimiter())) {
+					command.append(line.substring(0, line.lastIndexOf(getDelimiter())));
+					command.append(" ");
+					Statement statement = conn.createStatement();
+
+					// logger.info(command.toString());
+
+					boolean hasResults = false;
+					logger.info("sql:"+command.toString());
+					if (stopOnError) {
+						hasResults = statement.execute(command.toString());
+					} else {
+						try {
+							statement.execute(command.toString());
+						} catch (SQLException e) {
+							logger.error(e.getMessage(),e);
+							throw e;
+						}
+					}
+
+					ResultSet rs = statement.getResultSet();
+					if (hasResults && rs != null) {
+						ResultSetMetaData md = rs.getMetaData();
+						int cols = md.getColumnCount();
+						for (int i = 0; i < cols; i++) {
+							String name = md.getColumnLabel(i);
+							logger.info(name + "\t");
+						}
+						logger.info("");
+						while (rs.next()) {
+							for (int i = 0; i < cols; i++) {
+								String value = rs.getString(i);
+								logger.info(value + "\t");
+							}
+							logger.info("");
+						}
+					}
+
+					command = null;
+					try {
+						statement.close();
+					} catch (Exception e) {
+						// Ignore to workaround a bug in Jakarta DBCP
+					}
+					Thread.yield();
+				} else {
+					command.append(line);
+					command.append(" ");
+				}
+			}
+
+		} catch (SQLException e) {
+			logger.error("Error executing: " + command.toString());
+			throw e;
+		} catch (IOException e) {
+			e.fillInStackTrace();
+			logger.error("Error executing: " + command.toString());
+			throw e;
+		}
+	}
+
+	private void runScript(Connection conn, Reader reader , String dbName) throws IOException, SQLException {
+		StringBuffer command = null;
+		String sql = "";
+		String appKey = dbName.substring(dbName.lastIndexOf("_")+1, dbName.length());
+		try {
+			LineNumberReader lineReader = new LineNumberReader(reader);
+			String line = null;
+			while ((line = lineReader.readLine()) != null) {
+				if (command == null) {
+					command = new StringBuffer();
+				}
+				String trimmedLine = line.trim();
+				if (trimmedLine.startsWith("--")) {
+					logger.info(trimmedLine);
+				} else if (trimmedLine.length() < 1 || trimmedLine.startsWith("//")) {
+					// Do nothing
+				} else if (trimmedLine.length() < 1 || trimmedLine.startsWith("--")) {
+					// Do nothing
+
+				} else if (trimmedLine.startsWith("delimiter")) {
+					String newDelimiter = trimmedLine.split(" ")[1];
+					this.setDelimiter(newDelimiter, fullLineDelimiter);
+
+				} else if (!fullLineDelimiter && trimmedLine.endsWith(getDelimiter())
+						|| fullLineDelimiter && trimmedLine.equals(getDelimiter())) {
+					command.append(line.substring(0, line.lastIndexOf(getDelimiter())));
+					command.append(" ");
+					Statement statement = conn.createStatement();
+
+					// logger.info(command.toString());
+
+					sql = command.toString().replaceAll("\\{\\{APPDB\\}\\}", dbName);
+					boolean hasResults = false;
+					logger.info("sql:"+sql);
+					if (stopOnError) {
+						hasResults = statement.execute(sql);
+					} else {
+						try {
+							statement.execute(sql);
+						} catch (SQLException e) {
+							logger.error(e.getMessage(),e);
+							throw e;
+						}
+					}
+
+					ResultSet rs = statement.getResultSet();
+					if (hasResults && rs != null) {
+						ResultSetMetaData md = rs.getMetaData();
+						int cols = md.getColumnCount();
+						for (int i = 0; i < cols; i++) {
+							String name = md.getColumnLabel(i);
+							logger.info(name + "\t");
+						}
+						logger.info("");
+						while (rs.next()) {
+							for (int i = 0; i < cols; i++) {
+								String value = rs.getString(i);
+								logger.info(value + "\t");
+							}
+							logger.info("");
+						}
+					}
+
+					command = null;
+					try {
+						statement.close();
+					} catch (Exception e) {
+						// Ignore to workaround a bug in Jakarta DBCP
+					}
+					Thread.yield();
+				} else {
+					command.append(line);
+					command.append(" ");
+				}
+			}
+
+		} catch (SQLException e) {
+			logger.error("Error executing: " + sql);
+			throw e;
+		} catch (IOException e) {
+			e.fillInStackTrace();
+			logger.error("Error executing: " + sql);
+			throw e;
+		}
+	}
+
+	private String getDelimiter() {
+		return delimiter;
+	}
+	
+}

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/EschedulerManager.java

@@ -0,0 +1,82 @@
+/*
+ * 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 cn.escheduler.dao.upgrade;
+
+import cn.escheduler.common.utils.SchemaUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+/**
+ * upgrade manager
+ */
+public class EschedulerManager {
+    private static final Logger logger = LoggerFactory.getLogger(EschedulerManager.class);
+    UpgradeDao upgradeDao = UpgradeDao.getInstance();
+
+    public void initEscheduler() {
+        this.initEschedulerSchema();
+    }
+
+    public void initEschedulerSchema() {
+
+        logger.info("Start initializing the ark manager mysql table structure");
+        upgradeDao.initEschedulerSchema();
+    }
+
+
+    /**
+     * upgrade escheduler
+     */
+    public void upgradeEscheduler() throws Exception{
+
+        // Gets a list of all upgrades
+        List<String> schemaList = SchemaUtils.getAllSchemaList();
+        if(schemaList == null || schemaList.size() == 0) {
+            logger.info("There is no schema to upgrade!");
+        }else {
+
+            String version = "";
+            // The target version of the upgrade
+            String schemaVersion = "";
+            for(String schemaDir : schemaList) {
+                // Gets the version of the current system
+                if (upgradeDao.isExistsTable("t_escheduler_version")) {
+                    version = upgradeDao.getCurrentVersion();
+                }else {
+                    version = "1.0.0";
+                }
+
+                schemaVersion = schemaDir.split("_")[0];
+                if(SchemaUtils.isAGreatVersion(schemaVersion , version)) {
+
+                    logger.info("upgrade escheduler metadata version from " + version + " to " + schemaVersion);
+
+
+                    logger.info("Begin upgrading escheduler's mysql table structure");
+                    upgradeDao.upgradeEscheduler(schemaDir);
+
+                }
+
+            }
+        }
+
+        // Assign the value of the version field in the version table to the version of the product
+        upgradeDao.updateVersion(SchemaUtils.getSoftVersion());
+    }
+}

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/UpgradeDao.java

@@ -0,0 +1,299 @@
+/*
+ * 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 cn.escheduler.dao.upgrade;
+
+import cn.escheduler.common.utils.MysqlUtil;
+import cn.escheduler.common.utils.ScriptRunner;
+import cn.escheduler.dao.AbstractBaseDao;
+import cn.escheduler.dao.datasource.ConnectionFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class UpgradeDao extends AbstractBaseDao {
+
+    public static final Logger logger = LoggerFactory.getLogger(UpgradeDao.class);
+    private static final String T_VERSION_NAME = "t_escheduler_version";
+
+    @Override
+    protected void init() {
+
+    }
+
+    private static class UpgradeDaoHolder {
+        private static final UpgradeDao INSTANCE = new UpgradeDao();
+    }
+
+    private UpgradeDao() {
+    }
+
+    public static final UpgradeDao getInstance() {
+        return UpgradeDaoHolder.INSTANCE;
+    }
+
+
+
+    public void initEschedulerSchema() {
+
+        // Execute the escheduler DDL, it cannot be rolled back
+        runInitEschedulerDDL();
+
+        // Execute the escheduler DML, it can be rolled back
+        runInitEschedulerDML();
+
+    }
+
+    private void runInitEschedulerDML() {
+        Connection conn = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            conn.setAutoCommit(false);
+            // 执行escheduler_dml.sql脚本，导入escheduler相关的数据
+            // Execute the ark_manager_dml.sql script to import the data related to escheduler
+
+            ScriptRunner initScriptRunner = new ScriptRunner(conn, false, true);
+            Reader initSqlReader = new FileReader(new File("sql/create/release-1.0.0_schema/mysql/escheduler_dml.sql"));
+            initScriptRunner.runScript(initSqlReader);
+
+            conn.commit();
+        } catch (IOException e) {
+            try {
+                conn.rollback();
+            } catch (SQLException e1) {
+                logger.error(e1.getMessage(),e1);
+            }
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } catch (Exception e) {
+            try {
+                conn.rollback();
+            } catch (SQLException e1) {
+                logger.error(e1.getMessage(),e1);
+            }
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } finally {
+            MysqlUtil.realeaseResource(null, null, conn);
+
+        }
+
+    }
+
+    private void runInitEschedulerDDL() {
+        Connection conn = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            // Execute the escheduler_ddl.sql script to create the table structure of escheduler
+            ScriptRunner initScriptRunner = new ScriptRunner(conn, true, true);
+            Reader initSqlReader = new FileReader(new File("sql/create/release-1.0.0_schema/mysql/escheduler_ddl.sql"));
+            initScriptRunner.runScript(initSqlReader);
+
+        } catch (IOException e) {
+
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } catch (Exception e) {
+
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } finally {
+            MysqlUtil.realeaseResource(null, null, conn);
+
+        }
+
+    }
+
+
+    public boolean isExistsTable(String tableName) {
+        Connection conn = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            ResultSet rs = conn.getMetaData().getTables(null, null, tableName, null);
+            if (rs.next()) {
+                return true;
+            } else {
+                return false;
+            }
+
+        } catch (SQLException e) {
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } finally {
+            MysqlUtil.realeaseResource(null, null, conn);
+
+        }
+
+    }
+
+
+    public String getCurrentVersion() {
+        String sql = String.format("select version from %s",T_VERSION_NAME);
+        Connection conn = null;
+        ResultSet rs = null;
+        PreparedStatement pstmt = null;
+        String version = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            pstmt = conn.prepareStatement(sql);
+            rs = pstmt.executeQuery();
+
+            if (rs.next()) {
+                version = rs.getString(1);
+            }
+
+            return version;
+
+        } catch (SQLException e) {
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException("sql: " + sql, e);
+        } finally {
+            MysqlUtil.realeaseResource(rs, pstmt, conn);
+
+        }
+    }
+
+
+    public void upgradeEscheduler(String schemaDir) {
+
+        upgradeEschedulerDDL(schemaDir);
+
+        upgradeEschedulerDML(schemaDir);
+
+    }
+
+    private void upgradeEschedulerDML(String schemaDir) {
+        String schemaVersion = schemaDir.split("_")[0];
+        String mysqlSQLFilePath = "sql/upgrade/" + schemaDir + "/mysql/escheduler_dml.sql";
+        Connection conn = null;
+        PreparedStatement pstmt = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            conn.setAutoCommit(false);
+            // Execute the upgraded escheduler dml
+            ScriptRunner scriptRunner = new ScriptRunner(conn, false, true);
+            Reader sqlReader = new FileReader(new File(mysqlSQLFilePath));
+            scriptRunner.runScript(sqlReader);
+            if (isExistsTable(T_VERSION_NAME)) {
+                // Change version in the version table to the new version
+                String upgradeSQL = String.format("update %s set version = ?",T_VERSION_NAME);
+                pstmt = conn.prepareStatement(upgradeSQL);
+                pstmt.setString(1, schemaVersion);
+                pstmt.executeUpdate();
+            }
+            conn.commit();
+        } catch (FileNotFoundException e) {
+            try {
+                conn.rollback();
+            } catch (SQLException e1) {
+                logger.error(e1.getMessage(),e1);
+            }
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException("sql file not found ", e);
+        } catch (IOException e) {
+            try {
+                conn.rollback();
+            } catch (SQLException e1) {
+                logger.error(e1.getMessage(),e1);
+            }
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } catch (SQLException e) {
+            try {
+                conn.rollback();
+            } catch (SQLException e1) {
+                logger.error(e1.getMessage(),e1);
+            }
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } catch (Exception e) {
+            try {
+                conn.rollback();
+            } catch (SQLException e1) {
+                logger.error(e1.getMessage(),e1);
+            }
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } finally {
+            MysqlUtil.realeaseResource(null, pstmt, conn);
+        }
+
+    }
+
+    private void upgradeEschedulerDDL(String schemaDir) {
+        String mysqlSQLFilePath = "sql/upgrade/" + schemaDir + "/mysql/escheduler_ddl.sql";
+        Connection conn = null;
+        PreparedStatement pstmt = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            String dbName = conn.getCatalog();
+            logger.info(dbName);
+            conn.setAutoCommit(true);
+            // Execute the escheduler ddl.sql for the upgrade
+            ScriptRunner scriptRunner = new ScriptRunner(conn, true, true);
+            Reader sqlReader = new FileReader(new File(mysqlSQLFilePath));
+            scriptRunner.runScript(sqlReader);
+
+        } catch (FileNotFoundException e) {
+
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException("sql file not found ", e);
+        } catch (IOException e) {
+
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } catch (SQLException e) {
+
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } catch (Exception e) {
+
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } finally {
+            MysqlUtil.realeaseResource(null, pstmt, conn);
+        }
+
+    }
+
+
+
+    public void updateVersion(String version) {
+        // Change version in the version table to the new version
+        String upgradeSQL = String.format("update %s set version = ?",T_VERSION_NAME);
+        PreparedStatement pstmt = null;
+        Connection conn = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            pstmt = conn.prepareStatement(upgradeSQL);
+            pstmt.setString(1, version);
+            pstmt.executeUpdate();
+
+        } catch (SQLException e) {
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException("sql: " + upgradeSQL, e);
+        } finally {
+            MysqlUtil.realeaseResource(null, pstmt, conn);
+        }
+
+    }
+
+}

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/CreateEscheduler.java

@@ -0,0 +1,44 @@
+/*
+ * 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 cn.escheduler.dao.upgrade.shell;
+
+import cn.escheduler.dao.upgrade.EschedulerManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * init escheduler
+ *
+ */
+public class CreateEscheduler {
+
+	private static final Logger logger = LoggerFactory.getLogger(CreateEscheduler.class);
+
+	public static void main(String[] args) {
+		Thread.currentThread().setName("manager-CreateEscheduler");
+		EschedulerManager eschedulerManager = new EschedulerManager();
+		eschedulerManager.initEscheduler();
+		logger.info("init escheduler finished");
+		try {
+			eschedulerManager.upgradeEscheduler();
+			logger.info("upgrade escheduler finished");
+		} catch (Exception e) {
+			logger.error("upgrade escheduler failed",e);
+		}
+
+	}
+}

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/InitEscheduler.java

@@ -0,0 +1,38 @@
+/*
+ * 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 cn.escheduler.dao.upgrade.shell;
+
+import cn.escheduler.dao.upgrade.EschedulerManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * init escheduler
+ *
+ */
+public class InitEscheduler {
+
+	private static final Logger logger = LoggerFactory.getLogger(InitEscheduler.class);
+
+	public static void main(String[] args) {
+		Thread.currentThread().setName("manager-InitEscheduler");
+		EschedulerManager eschedulerManager = new EschedulerManager();
+		eschedulerManager.initEscheduler();
+		logger.info("init escheduler finished");
+		
+	}
+}

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/UpgradeEscheduler.java

@@ -0,0 +1,47 @@
+/*
+ * 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 cn.escheduler.dao.upgrade.shell;
+
+import cn.escheduler.dao.upgrade.EschedulerManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * upgrade escheduler database
+ */
+public class UpgradeEscheduler {
+	private static final Logger logger = LoggerFactory.getLogger(UpgradeEscheduler.class);
+
+	public static void main(String[] args) {
+		Thread.currentThread().setName("manager-UpgradeEscheduler");
+		
+		EschedulerManager eschedulerManager = new EschedulerManager();
+		try {
+			eschedulerManager.upgradeEscheduler();
+			logger.info("upgrade escheduler finished");
+		} catch (Exception e) {
+			logger.error(e.getMessage(),e);
+			logger.info("Upgrade escheduler failed");
+			throw new RuntimeException(e);
+		}
+
+		
+	}
+	
+	
+	
+}

escheduler-ui/.env

@@ -1,6 +1,6 @@
 
 # 后端接口地址
-API_BASE = http://192.168.220.154:12345
+API_BASE = http://192.168.220.247:12345
 
 # 本地开发如需ip访问项目把"#"号去掉
 #DEV_HOST = 192.168.xx.xx

escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue

@@ -9,9 +9,9 @@
     </template>
     <template slot="content">
       <template v-if="datasourcesList.length">
-        <m-list :datasources-list="datasourcesList" :page-no="pageNo" :page-size="pageSize"></m-list>
+        <m-list :datasources-list="datasourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
         <div class="page-box">
-          <x-page :current="pageNo" :total="total" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
         </div>
       </template>
       <template v-if="!datasourcesList.length">
@@ -23,11 +23,13 @@
   </m-list-construction>
 </template>
 <script>
+  import _ from 'lodash'
   import { mapActions } from 'vuex'
   import mList from './_source/list'
   import mSpin from '@/module/components/spin/spin'
   import mNoData from '@/module/components/noData/noData'
   import mCreateDataSource from './_source/createDataSource'
+  import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
   import mConditions from '@/module/components/conditions/conditions'
   import mListConstruction from '@/module/components/listConstruction/listConstruction'
 
@@ -37,18 +39,21 @@
       return {
         // loading
         isLoading: true,
-        // Number of pages per page
-        pageSize: 10,
-        // Number of pages
-        pageNo: 1,
         // Total number of articles
         total: 20,
-        // Search value
-        searchVal: '',
         // data sources(List)
-        datasourcesList: []
+        datasourcesList: [],
+        searchParams: {
+          // Number of pages per page
+          pageSize: 10,
+          // Number of pages
+          pageNo: 1,
+          // Search value
+          searchVal: ''
+        }
       }
     },
+    mixins: [listUrlParamHandle],
     props: {},
     methods: {
       ...mapActions('datasource', ['getDatasourcesListP']),
@@ -67,7 +72,7 @@
             return h(mCreateDataSource, {
               on: {
                 onUpdate () {
-                  self._getDatasourcesListP('false')
+                  self._debounceGET('false')
                   modal.remove()
                 },
                 close () {
@@ -85,27 +90,22 @@
        * page
        */
       _page (val) {
-        this.pageNo = val
+        this.searchParams.pageNo = val
-        this._getDatasourcesListP()
       },
       /**
        * conditions event
        */
       _onConditions (o) {
-        this.searchVal = o.searchVal
+        this.searchParams = _.assign(this.searchParams, o)
-        this.pageNo = 1
+        this.searchParams.pageNo = 1
-        this._getDatasourcesListP('false')
       },
       /**
        * get data(List)
        */
-      _getDatasourcesListP (flag) {
+      _getList (flag) {
         this.isLoading = !flag
-        this.getDatasourcesListP({
+        this.getDatasourcesListP(this.searchParams).then(res => {
-          pageSize: this.pageSize,
+          this.datasourcesList = []
-          pageNo: this.pageNo,
-          searchVal: this.searchVal
-        }).then(res => {
           this.datasourcesList = res.totalList
           this.total = res.total
           this.isLoading = false
@@ -114,9 +114,14 @@
         })
       }
     },
-    watch: {},
+    watch: {
+      // router
+      '$route' (a) {
+        // url no params get instance list
+        this.searchParams.pageNo = _.isEmpty(a.query) ? 1 : a.query.pageNo
+      }
+    },
     created () {
-      this._getDatasourcesListP()
     },
     mounted () {
     },

escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue

@@ -27,7 +27,6 @@
   import store from '@/conf/home/store'
   import mConditions from './_source/conditions'
   import mSpin from '@/module/components/spin/spin'
-  import { setUrlParams } from '@/module/util/routerUtil'
   import mNoData from '@/module/components/noData/noData'
   import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
   import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
@@ -61,13 +60,10 @@
     methods: {
       _onQuery (o) {
         this.searchParams = _.assign(this.searchParams, o)
-        setUrlParams(this.searchParams)
+        this.searchParams.pageNo = 1
-        this._debounceGET()
       },
       _page (val) {
         this.searchParams.pageNo = val
-        setUrlParams(this.searchParams)
-        this._debounceGET()
       },
       /**
        * get list data

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue

@@ -30,7 +30,6 @@
   import mList from './_source/list'
   import mSpin from '@/module/components/spin/spin'
   import localStore from '@/module/util/localStorage'
-  import { setUrlParams } from '@/module/util/routerUtil'
   import mNoData from '@/module/components/noData/noData'
   import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
   import mConditions from '@/module/components/conditions/conditions'
@@ -62,8 +61,6 @@
        */
       _page (val) {
         this.searchParams.pageNo = val
-        setUrlParams(this.searchParams)
-        this._debounceGET()
       },
       /**
        * conditions
@@ -71,8 +68,6 @@
       _onConditions (o) {
         this.searchParams.searchVal = o.searchVal
         this.searchParams.pageNo = 1
-        setUrlParams(this.searchParams)
-        this._debounceGET()
       },
       /**
        * get data list

escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue

@@ -162,3 +162,6 @@
     components: { mList, mInstanceConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
   }
 </script>
+
+<style lang="scss" rel="stylesheet/scss">
+</style>

escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue

@@ -28,7 +28,6 @@
   import mSpin from '@/module/components/spin/spin'
   import mCreateProject from './_source/createProject'
   import mNoData from '@/module/components/noData/noData'
-  import { setUrlParams } from '@/module/util/routerUtil'
   import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
   import mConditions from '@/module/components/conditions/conditions'
   import mListConstruction from '@/module/components/listConstruction/listConstruction'
@@ -57,8 +56,11 @@
        */
       _onConditions (o) {
         this.searchParams = _.assign(this.searchParams, o)
-        setUrlParams(this.searchParams)
+        this.searchParams.pageNo = 1
-        this._debounceGET()
+      },
+
+      _page (val) {
+        this.searchParams.pageNo = val
       },
       _create (item) {
         let self = this
@@ -86,11 +88,6 @@
       _onUpdate () {
         this._debounceGET()
       },
-      _page (val) {
-        this.searchParams.pageNo = val
-        setUrlParams(this.searchParams)
-        this._debounceGET()
-      },
       _getList (flag) {
         this.isLoading = !flag
         this.getProjectsList(this.searchParams).then(res => {

escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue

@@ -26,7 +26,6 @@
   import { mapActions } from 'vuex'
   import mList from './_source/list'
   import mSpin from '@/module/components/spin/spin'
-  import { setUrlParams } from '@/module/util/routerUtil'
   import mNoData from '@/module/components/noData/noData'
   import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
   import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
@@ -72,13 +71,10 @@
         if (this.searchParams.taskName) {
           this.searchParams.taskName = ''
         }
-        setUrlParams(this.searchParams)
+        this.searchParams.pageNo = 1
-        this._debounceGET()
       },
       _page (val) {
         this.searchParams.pageNo = val
-        setUrlParams(this.searchParams)
-        this._debounceGET()
       },
       /**
        * get list data

escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue

@@ -36,7 +36,6 @@
   import mSpin from '@/module/components/spin/spin'
   import { findComponentDownward } from '@/module/util/'
   import mNoData from '@/module/components/noData/noData'
-  import { setUrlParams } from '@/module/util/routerUtil'
   import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
   import mConditions from '@/module/components/conditions/conditions'
   import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
@@ -70,17 +69,12 @@
       _onConditions (o) {
         this.searchParams = _.assign(this.searchParams, o)
         this.searchParams.pageNo = 1
-        setUrlParams(this.searchParams)
-        this._debounceGET()
       },
       _page (val) {
         this.searchParams.pageNo = val
-        setUrlParams(this.searchParams)
-        this._debounceGET()
       },
       _getList (flag) {
         this.isLoading = !flag
-        this.fileResourcesList = []
         this.getResourcesListP(this.searchParams).then(res => {
           this.fileResourcesList = res.totalList
           this.total = res.total
@@ -92,7 +86,6 @@
       _updateList () {
         this.searchParams.pageNo = 1
         this.searchParams.searchVal = ''
-        setUrlParams(this.searchParams)
         this._debounceGET()
       }
     },

escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue

@@ -33,7 +33,6 @@
   import mCreateUdf from './_source/createUdf'
   import mSpin from '@/module/components/spin/spin'
   import mNoData from '@/module/components/noData/noData'
-  import { setUrlParams } from '@/module/util/routerUtil'
   import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
   import mConditions from '@/module/components/conditions/conditions'
   import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
@@ -60,13 +59,9 @@
       _onConditions (o) {
         this.searchParams = _.assign(this.searchParams, o)
         this.searchParams.pageNo = 1
-        setUrlParams(this.searchParams)
-        this._debounceGET()
       },
       _page (val) {
         this.searchParams.pageNo = val
-        setUrlParams(this.searchParams)
-        this._debounceGET()
       },
       _create () {
         let self = this
@@ -96,13 +91,12 @@
       _updateList () {
         this.searchParams.pageNo = 1
         this.searchParams.searchVal = ''
-        setUrlParams(this.searchParams)
         this._debounceGET()
       },
       _getList (flag) {
         this.isLoading = !flag
-        this.udfFuncList = []
         this.getUdfFuncListP(this.searchParams).then(res => {
+          this.udfFuncList = []
           this.udfFuncList = res.totalList
           this.total = res.total
           this.isLoading = false

escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue

@@ -33,7 +33,6 @@
   import mSpin from '@/module/components/spin/spin'
   import { findComponentDownward } from '@/module/util/'
   import mNoData from '@/module/components/noData/noData'
-  import { setUrlParams } from '@/module/util/routerUtil'
   import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
   import mConditions from '@/module/components/conditions/conditions'
   import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
@@ -67,24 +66,19 @@
       _onConditions (o) {
         this.searchParams = _.assign(this.searchParams, o)
         this.searchParams.pageNo = 1
-        setUrlParams(this.searchParams)
-        this._debounceGET()
       },
       _page (val) {
         this.searchParams.pageNo = val
-        setUrlParams(this.searchParams)
-        this._debounceGET()
       },
       _updateList () {
         this.searchParams.pageNo = 1
         this.searchParams.searchVal = ''
-        setUrlParams(this.searchParams)
         this._debounceGET()
       },
       _getList (flag) {
         this.isLoading = !flag
-        this.udfResourcesList = []
         this.getResourcesListP(this.searchParams).then(res => {
+          this.udfResourcesList = []
           this.udfResourcesList = res.totalList
           this.total = res.total
           this.isLoading = false

escheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue

@@ -12,18 +12,18 @@
             <x-input
                     type="input"
                     v-model="queueName"
-                    placeholder="Please enter name"
+                    :placeholder="$t('Please enter name')"
                     autocomplete="off">
             </x-input>
           </template>
         </m-list-box-f>
         <m-list-box-f>
-          <template slot="name"><b>*</b>队列值</template>
+          <template slot="name"><b>*</b>{{$t('Queue value')}}</template>
           <template slot="content">
             <x-input
                     type="input"
                     v-model="queue"
-                    placeholder="请输入队列值"
+                    :placeholder="$t('Please enter queue value')"
                     autocomplete="off">
             </x-input>
           </template>

escheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue

@@ -12,9 +12,9 @@
         </template>
         <template slot="content">
           <template v-if="queueList.length">
-            <m-list :queue-list="queueList" :page-no="pageNo" :page-size="pageSize"></m-list>
+            <m-list :queue-list="queueList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
             <div class="page-box">
-              <x-page :current="pageNo" :total="total" show-elevator @on-change="_page"></x-page>
+              <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
             </div>
           </template>
           <template v-if="!queueList.length">
@@ -27,11 +27,13 @@
   </div>
 </template>
 <script>
+  import _ from 'lodash'
   import { mapActions } from 'vuex'
   import mList from './_source/list'
   import mSpin from '@/module/components/spin/spin'
   import mCreateQueue from './_source/createQueue'
   import mNoData from '@/module/components/noData/noData'
+  import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
   import mConditions from '@/module/components/conditions/conditions'
   import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
   import mListConstruction from '@/module/components/listConstruction/listConstruction'
@@ -40,14 +42,17 @@
     name: 'queue-index',
     data () {
       return {
-        pageSize: 10,
-        pageNo: 1,
         total: null,
-        searchVal: '',
         isLoading: true,
-        queueList: []
+        queueList: [],
+        searchParams: {
+          pageSize: 10,
+          pageNo: 1,
+          searchVal: ''
+        }
       }
     },
+    mixins: [listUrlParamHandle],
     props: {},
     methods: {
       ...mapActions('security', ['getQueueListP']),
@@ -55,13 +60,11 @@
        * Query
        */
       _onConditions (o) {
-        this.searchVal = o.searchVal
+        this.searchParams = _.assign(this.searchParams, o)
-        this.pageNo = 1
+        this.searchParams.pageNo = 1
-        this._getQueueListP()
       },
       _page (val) {
-        this.pageNo = val
+        this.searchParams.pageNo = val
-        this._getQueueListP()
       },
       _create (item) {
         let self = this
@@ -75,7 +78,7 @@
             return h(mCreateQueue, {
               on: {
                 onUpdate () {
-                  self._getQueueListP('false')
+                  self._debounceGET('false')
                   modal.remove()
                 },
                 close () {
@@ -89,13 +92,10 @@
           }
         })
       },
-      _getQueueListP (flag) {
+      _getList (flag) {
         this.isLoading = !flag
-        this.getQueueListP({
+        this.getQueueListP(this.searchParams).then(res => {
-          pageSize: this.pageSize,
+          this.queueList = []
-          pageNo: this.pageNo,
-          searchVal: this.searchVal
-        }).then(res => {
           this.queueList = res.totalList
           this.total = res.total
           this.isLoading = false
@@ -104,9 +104,14 @@
         })
       }
     },
-    watch: {},
+    watch: {
+      // router
+      '$route' (a) {
+        // url no params get instance list
+        this.searchParams.pageNo = _.isEmpty(a.query) ? 1 : a.query.pageNo
+      }
+    },
     created () {
-      this._getQueueListP()
     },
     mounted () {
 

escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue

@@ -157,19 +157,19 @@
     watch: {
     },
     created () {
-
-    },
-    mounted () {
       this._getQueueList().then(res => {
         if (this.item) {
           this.$nextTick(() => {
-            this.queueId = _.filter(this.queueList, v => v.id === this.item.queueId)[0]
+            this.queueId = _.find(this.queueList, ['id', this.item.queueId])
           })
           this.tenantCode = this.item.tenantCode
           this.tenantName = this.item.tenantName
           this.desc = this.item.desc
         }
       })
+    },
+    mounted () {
+
     },
     components: { mPopup, mListBoxF }
   }

escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue

@@ -12,9 +12,9 @@
         </template>
         <template slot="content">
           <template v-if="tenementList.length">
-            <m-list :tenement-list="tenementList" :page-no="pageNo" :page-size="pageSize"></m-list>
+            <m-list :tenement-list="tenementList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
             <div class="page-box">
-              <x-page :current="pageNo" :total="total" show-elevator @on-change="_page"></x-page>
+              <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
             </div>
           </template>
           <template v-if="!tenementList.length">
@@ -27,11 +27,13 @@
   </div>
 </template>
 <script>
+  import _ from 'lodash'
   import { mapActions } from 'vuex'
   import mList from './_source/list'
   import mSpin from '@/module/components/spin/spin'
   import mCreateTenement from './_source/createTenement'
   import mNoData from '@/module/components/noData/noData'
+  import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
   import mConditions from '@/module/components/conditions/conditions'
   import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
   import mListConstruction from '@/module/components/listConstruction/listConstruction'
@@ -40,14 +42,17 @@
     name: 'tenement-index',
     data () {
       return {
-        pageSize: 10,
-        pageNo: 1,
         total: null,
-        searchVal: '',
         isLoading: true,
-        tenementList: []
+        tenementList: [],
+        searchParams: {
+          pageSize: 10,
+          pageNo: 1,
+          searchVal: ''
+        }
       }
     },
+    mixins: [listUrlParamHandle],
     props: {},
     methods: {
       ...mapActions('security', ['getTenantListP']),
@@ -55,13 +60,11 @@
        * Query
        */
       _onConditions (o) {
-        this.searchVal = o.searchVal
+        this.searchParams = _.assign(this.searchParams, o)
-        this.pageNo = 1
+        this.searchParams.pageNo = 1
-        this._getTenantListP()
       },
       _page (val) {
-        this.pageNo = val
+        this.searchParams.pageNo = val
-        this._getTenantListP()
       },
       _create (item) {
         let self = this
@@ -75,7 +78,7 @@
             return h(mCreateTenement, {
               on: {
                 onUpdate () {
-                  self._getTenantListP('false')
+                  self._debounceGET('false')
                   modal.remove()
                 },
                 close () {
@@ -89,13 +92,10 @@
           }
         })
       },
-      _getTenantListP (flag) {
+      _getList (flag) {
         this.isLoading = !flag
-        this.getTenantListP({
+        this.getTenantListP(this.searchParams).then(res => {
-          pageSize: this.pageSize,
+          this.tenementList = []
-          pageNo: this.pageNo,
-          searchVal: this.searchVal
-        }).then(res => {
           this.tenementList = res.totalList
           this.total = res.total
           this.isLoading = false
@@ -104,12 +104,16 @@
         })
       }
     },
-    watch: {},
+    watch: {
+      // router
+      '$route' (a) {
+        // url no params get instance list
+        this.searchParams.pageNo = _.isEmpty(a.query) ? 1 : a.query.pageNo
+      }
+    },
     created () {
-      this._getTenantListP()
     },
     mounted () {
-
     },
     components: { mSecondaryMenu, mList, mListConstruction, mConditions, mSpin, mNoData }
   }

escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

@@ -39,6 +39,19 @@
             </x-select>
           </template>
         </m-list-box-f>
+        <m-list-box-f>
+          <template slot="name"><b>*</b>{{$t('Queue')}}</template>
+          <template slot="content">
+            <x-select v-model="queueName">
+              <x-option
+                      v-for="city in queueList"
+                      :key="city.id"
+                      :value="city"
+                      :label="city.code">
+              </x-option>
+            </x-select>
+          </template>
+        </m-list-box-f>
         <m-list-box-f>
           <template slot="name"><b>*</b>{{$t('Email')}}</template>
           <template slot="content">
@@ -77,9 +90,11 @@
       return {
         store,
         router,
+        queueList: [],
         userName: '',
         userPassword: '',
         tenantId: {},
+        queueName: {},
         email: '',
         phone: '',
         tenantList: [],
@@ -144,6 +159,22 @@
 
         return true
       },
+      _getQueueList () {
+        return new Promise((resolve, reject) => {
+          this.store.dispatch('security/getQueueList').then(res => {
+            this.queueList = _.map(res, v => {
+              return {
+                id: v.id,
+                code: v.queueName
+              }
+            })
+            this.$nextTick(() => {
+              this.queueName = this.queueList[0]
+            })
+            resolve()
+          })
+        })
+      },
       _getTenantList () {
         return new Promise((resolve, reject) => {
           this.store.dispatch('security/getTenantList').then(res => {
@@ -167,6 +198,7 @@
           userPassword: this.userPassword,
           tenantId: this.tenantId.id,
           email: this.email,
+          queue: this.queueName.code,
           phone: this.phone
         }
         if (this.item) {
@@ -188,13 +220,16 @@
     created () {
       // Administrator gets tenant list
       if (this.isADMIN) {
-        this._getTenantList().then(res => {
+        Promise.all([this._getQueueList(), this._getTenantList()]).then(() => {
           if (this.item) {
             this.userName = this.item.userName
             this.userPassword = ''
             this.email = this.item.email
             this.phone = this.item.phone
-            this.tenantId = _.filter(this.tenantList, v => v.id === this.item.tenantId)[0]
+            this.tenantId = _.find(this.tenantList, ['id', this.item.tenantId])
+            this.$nextTick(() => {
+              this.queueName = _.find(this.queueList, ['code', this.item.queue])
+            })
           }
         })
       } else {
@@ -204,10 +239,12 @@
           this.email = this.item.email
           this.phone = this.item.phone
           this.tenantId.id = this.item.tenantId
+          this.queueName = { queue: this.item.queue }
         }
       }
     },
     mounted () {
+
     },
     components: { mPopup, mListBoxF }
   }

escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue

@@ -12,6 +12,9 @@
           <th>
             <span>{{$t('Tenant')}}</span>
           </th>
+          <th>
+            <span>{{$t('Queue')}}</span>
+          </th>
           <th>
             <span>{{$t('Email')}}</span>
           </th>
@@ -38,6 +41,7 @@
             </span>
           </td>
           <td><span>{{item.tenantName || '-'}}</span></td>
+          <td><span>{{item.queue || '-'}}</span></td>
           <td>
             <span>{{item.email || '-'}}</span>
           </td>

escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue

@@ -12,9 +12,9 @@
         </template>
         <template slot="content">
           <template v-if="userList.length">
-            <m-list :user-list="userList" :page-no="pageNo" :page-size="pageSize"></m-list>
+            <m-list :user-list="userList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
             <div class="page-box">
-              <x-page :current="pageNo" :total="total" show-elevator @on-change="_page"></x-page>
+              <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
             </div>
           </template>
           <template v-if="!userList.length">
@@ -27,11 +27,13 @@
   </div>
 </template>
 <script>
+  import _ from 'lodash'
   import { mapActions } from 'vuex'
   import mList from './_source/list'
   import mCreateUser from './_source/createUser'
   import mSpin from '@/module/components/spin/spin'
   import mNoData from '@/module/components/noData/noData'
+  import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
   import mConditions from '@/module/components/conditions/conditions'
   import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
   import mListConstruction from '@/module/components/listConstruction/listConstruction'
@@ -40,14 +42,17 @@
     name: 'users-index',
     data () {
       return {
-        pageSize: 10,
-        pageNo: 1,
         total: null,
-        searchVal: '',
         isLoading: true,
-        userList: []
+        userList: [],
+        searchParams: {
+          pageSize: 10,
+          pageNo: 1,
+          searchVal: ''
+        }
       }
     },
+    mixins: [listUrlParamHandle],
     props: {},
     methods: {
       ...mapActions('security', ['getUsersList']),
@@ -55,13 +60,11 @@
        * Query
        */
       _onConditions (o) {
-        this.searchVal = o.searchVal
+        this.searchParams = _.assign(this.searchParams, o)
-        this.pageNo = 1
+        this.searchParams.pageNo = 1
-        this._getUsersListP()
       },
       _page (val) {
-        this.pageNo = val
+        this.searchParams.pageNo = val
-        this._getUsersListP()
       },
       _create (item) {
         let self = this
@@ -75,7 +78,7 @@
             return h(mCreateUser, {
               on: {
                 onUpdate () {
-                  self._getUsersListP('false')
+                  self._debounceGET('false')
                   modal.remove()
                 },
                 close () {
@@ -89,13 +92,10 @@
           }
         })
       },
-      _getUsersListP (flag) {
+      _getList (flag) {
         this.isLoading = !flag
-        this.getUsersList({
+        this.getUsersList(this.searchParams).then(res => {
-          pageSize: this.pageSize,
+          this.userList = []
-          pageNo: this.pageNo,
-          searchVal: this.searchVal
-        }).then(res => {
           this.userList = res.totalList
           this.total = res.total
           this.isLoading = false
@@ -104,9 +104,14 @@
         })
       }
     },
-    watch: {},
+    watch: {
+      // router
+      '$route' (a) {
+        // url no params get instance list
+        this.searchParams.pageNo = _.isEmpty(a.query) ? 1 : a.query.pageNo
+      }
+    },
     created () {
-      this._getUsersListP()
     },
     mounted () {
     },

escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue

@@ -12,10 +12,9 @@
         </template>
         <template slot="content">
           <template v-if="alertgroupList.length">
-            <m-list :alertgroup-list="alertgroupList" :page-no="pageNo" :page-size="pageSize"></m-list>
+            <m-list :alertgroup-list="alertgroupList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
             <div class="page-box">
-              <x-page :current="pageNo" :total="total" show-elevator @on-change="_page"></x-page>
+              <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
-
             </div>
           </template>
           <template v-if="!alertgroupList.length">
@@ -28,11 +27,13 @@
   </div>
 </template>
 <script>
+  import _ from 'lodash'
   import { mapActions } from 'vuex'
   import mList from './_source/list'
   import mSpin from '@/module/components/spin/spin'
   import mCreateWarning from './_source/createWarning'
   import mNoData from '@/module/components/noData/noData'
+  import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
   import mConditions from '@/module/components/conditions/conditions'
   import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
   import mListConstruction from '@/module/components/listConstruction/listConstruction'
@@ -41,14 +42,17 @@
     name: 'warning-groups-index',
     data () {
       return {
-        pageSize: 10,
-        pageNo: 1,
         total: null,
-        searchVal: '',
         isLoading: false,
-        alertgroupList: []
+        alertgroupList: [],
+        searchParams: {
+          pageSize: 10,
+          pageNo: 1,
+          searchVal: ''
+        }
       }
     },
+    mixins: [listUrlParamHandle],
     props: {},
     methods: {
       ...mapActions('security', ['getAlertgroupP']),
@@ -56,13 +60,11 @@
        * Inquire
        */
       _onConditions (o) {
-        this.searchVal = o.searchVal
+        this.searchParams = _.assign(this.searchParams, o)
-        this.pageNo = 1
+        this.searchParams.pageNo = 1
-        this._getAlertgroupP()
       },
       _page (val) {
-        this.pageNo = val
+        this.searchParams.pageNo = val
-        this._getAlertgroupP()
       },
       _create (item) {
         let self = this
@@ -76,7 +78,7 @@
             return h(mCreateWarning, {
               on: {
                 onUpdate () {
-                  self._getAlertgroupP('false')
+                  self._debounceGET('false')
                   modal.remove()
                 },
                 close () {
@@ -90,13 +92,10 @@
           }
         })
       },
-      _getAlertgroupP (flag) {
+      _getList (flag) {
         this.isLoading = !flag
-        this.getAlertgroupP({
+        this.getAlertgroupP(this.searchParams).then(res => {
-          pageSize: this.pageSize,
+          this.alertgroupList = []
-          pageNo: this.pageNo,
-          searchVal: this.searchVal
-        }).then(res => {
           this.alertgroupList = res.totalList
           this.total = res.total
           this.isLoading = false
@@ -105,9 +104,14 @@
         })
       }
     },
-    watch: {},
+    watch: {
+      // router
+      '$route' (a) {
+        // url no params get instance list
+        this.searchParams.pageNo = _.isEmpty(a.query) ? 1 : a.query.pageNo
+      }
+    },
     created () {
-      this._getAlertgroupP()
     },
     mounted () {
     },

escheduler-ui/src/js/module/i18n/locale/en_US.js

@@ -409,5 +409,7 @@ export default {
   'Edit queue': 'Edit queue',
   'Datasource manage': 'Datasource',
   'History task record': 'History task record',
-  'Please go online': 'Please go online'
+  'Please go online': 'Please go online',
+  'Queue value': 'Queue value',
+  'Please enter queue value': 'Please enter queue value'
 }

escheduler-ui/src/js/module/i18n/locale/zh_CN.js

@@ -408,5 +408,7 @@ export default {
   'Edit queue': '编辑队列',
   'Datasource manage': '数据源中心',
   'History task record': '历史任务记录',
-  'Please go online': '不要忘记上线'
+  'Please go online': '不要忘记上线',
+  'Queue value': '队列值',
+  'Please enter queue value': '请输入队列值',
 }

escheduler-ui/src/js/module/mixin/listUrlParamHandle.js

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 import _ from 'lodash'
+import { setUrlParams } from '@/module/util/routerUtil'
 /**
  * Mainly used for data list paging url param handle
  * @param _getList => api function(required)
@@ -22,9 +23,10 @@ import _ from 'lodash'
 export default {
   watch: {
     // watch pageNo
-    'searchParams.pageNo': {
+    'searchParams': {
       deep: true,
       handler () {
+        setUrlParams(this.searchParams)
         this._debounceGET()
       }
     }

sql/create/release-1.0.0_schema/mysql/escheduler_ddl.sql

@@ -0,0 +1,601 @@
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : xx.xx
+Source Server Version : 50725
+Source Host           : 192.168.xx.xx:3306
+Source Database       : escheduler
+
+Target Server Type    : MYSQL
+Target Server Version : 50725
+File Encoding         : 65001
+
+Date: 2019-03-23 11:47:30
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for t_escheduler_alert
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_alert`;
+CREATE TABLE `t_escheduler_alert` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `title` varchar(64) DEFAULT NULL COMMENT '消息标题',
+  `show_type` tinyint(4) DEFAULT NULL COMMENT '发送格式，0是TABLE,1是TEXT',
+  `content` text COMMENT '消息内容（可以是邮件，可以是短信。邮件是JSON Map存放，短信是字符串）',
+  `alert_type` tinyint(4) DEFAULT NULL COMMENT '0是邮件，1是短信',
+  `alert_status` tinyint(4) DEFAULT '0' COMMENT '0是待执行，1是执行成功，2执行失败',
+  `log` text COMMENT '执行日志',
+  `alertgroup_id` int(11) DEFAULT NULL COMMENT '发送组',
+  `receivers` text COMMENT '收件人',
+  `receivers_cc` text COMMENT '抄送人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_alertgroup
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_alertgroup`;
+CREATE TABLE `t_escheduler_alertgroup` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `group_name` varchar(255) DEFAULT NULL COMMENT '组名称',
+  `group_type` tinyint(4) DEFAULT NULL COMMENT '组类型(邮件0，短信1...)',
+  `desc` varchar(255) DEFAULT NULL COMMENT '备注',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_command
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_command`;
+CREATE TABLE `t_escheduler_command` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `command_type` tinyint(4) DEFAULT NULL COMMENT '命令类型：0 启动工作流,1 从当前节点开始执行,2 恢复被容错的工作流,3 恢复暂停流程,4 从失败节点开始执行,5 补数,6 调度,7 重跑,8 暂停,9 停止,10 恢复等待线程',
+  `process_definition_id` int(11) DEFAULT NULL COMMENT '流程定义id',
+  `command_param` text COMMENT '命令的参数（json格式）',
+  `task_depend_type` tinyint(4) DEFAULT NULL COMMENT '节点依赖类型：0 当前节点,1 向前执行,2 向后执行',
+  `failure_strategy` tinyint(4) DEFAULT '0' COMMENT '失败策略：0结束，1继续',
+  `warning_type` tinyint(4) DEFAULT '0' COMMENT '告警类型：0 不发,1 流程成功发,2 流程失败发,3 成功失败都发',
+  `warning_group_id` int(11) DEFAULT NULL COMMENT '告警组',
+  `schedule_time` datetime DEFAULT NULL COMMENT '预期运行时间',
+  `start_time` datetime DEFAULT NULL COMMENT '开始时间',
+  `executor_id` int(11) DEFAULT NULL COMMENT '执行用户id',
+  `dependence` varchar(255) DEFAULT NULL COMMENT '依赖字段',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `process_instance_priority` int(11) DEFAULT NULL COMMENT '流程实例优先级：0 Highest,1 High,2 Medium,3 Low,4 Lowest',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_datasource
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_datasource`;
+CREATE TABLE `t_escheduler_datasource` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `name` varchar(64) NOT NULL COMMENT '数据源名称',
+  `note` varchar(256) DEFAULT NULL COMMENT '描述',
+  `type` tinyint(4) NOT NULL COMMENT '数据源类型：0 mysql,1 postgresql,2 hive,3 spark',
+  `user_id` int(11) NOT NULL COMMENT '创建用户id',
+  `connection_params` text NOT NULL COMMENT '连接参数(json格式)',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_master_server
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_master_server`;
+CREATE TABLE `t_escheduler_master_server` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `host` varchar(45) DEFAULT NULL COMMENT 'ip',
+  `port` int(11) DEFAULT NULL COMMENT '进程号',
+  `zk_directory` varchar(64) DEFAULT NULL COMMENT 'zk注册目录',
+  `res_info` varchar(256) DEFAULT NULL COMMENT '集群资源信息：json格式{"cpu":xxx,"memroy":xxx}',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `last_heartbeat_time` datetime DEFAULT NULL COMMENT '最后心跳时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_process_definition
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_process_definition`;
+CREATE TABLE `t_escheduler_process_definition` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `name` varchar(255) DEFAULT NULL COMMENT '流程定义名称',
+  `version` int(11) DEFAULT NULL COMMENT '流程定义版本',
+  `release_state` tinyint(4) DEFAULT NULL COMMENT '流程定义的发布状态：0 未上线  1已上线',
+  `project_id` int(11) DEFAULT NULL COMMENT '项目id',
+  `user_id` int(11) DEFAULT NULL COMMENT '流程定义所属用户id',
+  `process_definition_json` longtext COMMENT '流程定义json串',
+  `desc` text COMMENT '流程定义描述',
+  `global_params` text COMMENT '全局参数',
+  `flag` tinyint(4) DEFAULT NULL COMMENT '流程是否可用\r\n：0 不可用\r\n，1 可用',
+  `locations` text COMMENT '节点坐标信息',
+  `connects` text COMMENT '节点连线信息',
+  `receivers` text COMMENT '收件人',
+  `receivers_cc` text COMMENT '抄送人',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `process_definition_index` (`project_id`,`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_process_instance
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_process_instance`;
+CREATE TABLE `t_escheduler_process_instance` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `name` varchar(255) DEFAULT NULL COMMENT '流程实例名称',
+  `process_definition_id` int(11) DEFAULT NULL COMMENT '流程定义id',
+  `state` tinyint(4) DEFAULT NULL COMMENT '流程实例状态：0 提交成功,1 正在运行,2 准备暂停,3 暂停,4 准备停止,5 停止,6 失败,7 成功,8 需要容错,9 kill,10 等待线程,11 等待依赖完成',
+  `recovery` tinyint(4) DEFAULT NULL COMMENT '流程实例容错标识：0 正常,1 需要被容错重启',
+  `start_time` datetime DEFAULT NULL COMMENT '流程实例开始时间',
+  `end_time` datetime DEFAULT NULL COMMENT '流程实例结束时间',
+  `run_times` int(11) DEFAULT NULL COMMENT '流程实例运行次数',
+  `host` varchar(45) DEFAULT NULL COMMENT '流程实例所在的机器',
+  `command_type` tinyint(4) DEFAULT NULL COMMENT '命令类型：0 启动工作流,1 从当前节点开始执行,2 恢复被容错的工作流,3 恢复暂停流程,4 从失败节点开始执行,5 补数,6 调度,7 重跑,8 暂停,9 停止,10 恢复等待线程',
+  `command_param` text COMMENT '命令的参数（json格式）',
+  `task_depend_type` tinyint(4) DEFAULT NULL COMMENT '节点依赖类型：0 当前节点,1 向前执行,2 向后执行',
+  `max_try_times` tinyint(4) DEFAULT '0' COMMENT '最大重试次数',
+  `failure_strategy` tinyint(4) DEFAULT '0' COMMENT '失败策略 0 失败后结束，1 失败后继续',
+  `warning_type` tinyint(4) DEFAULT '0' COMMENT '告警类型：0 不发,1 流程成功发,2 流程失败发,3 成功失败都发',
+  `warning_group_id` int(11) DEFAULT NULL COMMENT '告警组id',
+  `schedule_time` datetime DEFAULT NULL COMMENT '预期运行时间',
+  `command_start_time` datetime DEFAULT NULL COMMENT '开始命令时间',
+  `global_params` text COMMENT '全局参数（固化流程定义的参数）',
+  `process_instance_json` longtext COMMENT '流程实例json(copy的流程定义的json)',
+  `flag` tinyint(4) DEFAULT '1' COMMENT '是否可用，1 可用，0不可用',
+  `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `is_sub_process` int(11) DEFAULT '0' COMMENT '是否是子工作流 1 是，0 不是',
+  `executor_id` int(11) NOT NULL COMMENT '命令执行者',
+  `locations` text COMMENT '节点坐标信息',
+  `connects` text COMMENT '节点连线信息',
+  `history_cmd` text COMMENT '历史命令，记录所有对流程实例的操作',
+  `dependence_schedule_times` text COMMENT '依赖节点的预估时间',
+  `process_instance_priority` int(11) DEFAULT NULL COMMENT '流程实例优先级：0 Highest,1 High,2 Medium,3 Low,4 Lowest',
+  PRIMARY KEY (`id`),
+  KEY `process_instance_index` (`process_definition_id`,`id`) USING BTREE,
+  KEY `start_time_index` (`start_time`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_project
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_project`;
+CREATE TABLE `t_escheduler_project` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `name` varchar(100) DEFAULT NULL COMMENT '项目名称',
+  `desc` varchar(200) DEFAULT NULL COMMENT '项目描述',
+  `user_id` int(11) DEFAULT NULL COMMENT '所属用户',
+  `flag` tinyint(4) DEFAULT '1' COMMENT '是否可用  1 可用,0 不可用',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+  PRIMARY KEY (`id`),
+  KEY `user_id_index` (`user_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_queue
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_queue`;
+CREATE TABLE `t_escheduler_queue` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `queue_name` varchar(64) DEFAULT NULL COMMENT '队列名称',
+  `queue` varchar(64) DEFAULT NULL COMMENT 'yarn队列名称',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_relation_datasource_user
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_relation_datasource_user`;
+CREATE TABLE `t_escheduler_relation_datasource_user` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` int(11) NOT NULL COMMENT '用户id',
+  `datasource_id` int(11) DEFAULT NULL COMMENT '数据源id',
+  `perm` int(11) DEFAULT '1' COMMENT '权限',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_relation_process_instance
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_relation_process_instance`;
+CREATE TABLE `t_escheduler_relation_process_instance` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `parent_process_instance_id` int(11) DEFAULT NULL COMMENT '父流程实例id',
+  `parent_task_instance_id` int(11) DEFAULT NULL COMMENT '父任务实例id',
+  `process_instance_id` int(11) DEFAULT NULL COMMENT '子流程实例id',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_relation_project_user
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_relation_project_user`;
+CREATE TABLE `t_escheduler_relation_project_user` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` int(11) NOT NULL COMMENT '用户id',
+  `project_id` int(11) DEFAULT NULL COMMENT '项目id',
+  `perm` int(11) DEFAULT '1' COMMENT '权限',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `user_id_index` (`user_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_relation_resources_user
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_relation_resources_user`;
+CREATE TABLE `t_escheduler_relation_resources_user` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `user_id` int(11) NOT NULL COMMENT '用户id',
+  `resources_id` int(11) DEFAULT NULL COMMENT '资源id',
+  `perm` int(11) DEFAULT '1' COMMENT '权限',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_relation_udfs_user
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_relation_udfs_user`;
+CREATE TABLE `t_escheduler_relation_udfs_user` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` int(11) NOT NULL COMMENT '用户id',
+  `udf_id` int(11) DEFAULT NULL COMMENT 'udf id',
+  `perm` int(11) DEFAULT '1' COMMENT '权限',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_relation_user_alertgroup
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_relation_user_alertgroup`;
+CREATE TABLE `t_escheduler_relation_user_alertgroup` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `alertgroup_id` int(11) DEFAULT NULL COMMENT '组消息id',
+  `user_id` int(11) DEFAULT NULL COMMENT '用户id',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_resources
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_resources`;
+CREATE TABLE `t_escheduler_resources` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `alias` varchar(64) DEFAULT NULL COMMENT '别名',
+  `file_name` varchar(64) DEFAULT NULL COMMENT '文件名',
+  `desc` varchar(256) DEFAULT NULL COMMENT '描述',
+  `user_id` int(11) DEFAULT NULL COMMENT '用户id',
+  `type` tinyint(4) DEFAULT NULL COMMENT '资源类型，0 FILE，1 UDF',
+  `size` bigint(20) DEFAULT NULL COMMENT '资源大小',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_schedules
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_schedules`;
+CREATE TABLE `t_escheduler_schedules` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `process_definition_id` int(11) NOT NULL COMMENT '流程定义id',
+  `start_time` datetime NOT NULL COMMENT '调度开始时间',
+  `end_time` datetime NOT NULL COMMENT '调度结束时间',
+  `crontab` varchar(256) NOT NULL COMMENT 'crontab 表达式',
+  `failure_strategy` tinyint(4) NOT NULL COMMENT '失败策略： 0 结束，1 继续',
+  `user_id` int(11) NOT NULL COMMENT '用户id',
+  `release_state` tinyint(4) NOT NULL COMMENT '状态：0 未上线，1 上线',
+  `warning_type` tinyint(4) NOT NULL COMMENT '告警类型：0 不发,1 流程成功发,2 流程失败发,3 成功失败都发',
+  `warning_group_id` int(11) DEFAULT NULL COMMENT '告警组id',
+  `process_instance_priority` int(11) DEFAULT NULL COMMENT '流程实例优先级：0 Highest,1 High,2 Medium,3 Low,4 Lowest',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_session
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_session`;
+CREATE TABLE `t_escheduler_session` (
+  `id` varchar(64) NOT NULL COMMENT '主键',
+  `user_id` int(11) DEFAULT NULL COMMENT '用户id',
+  `ip` varchar(45) DEFAULT NULL COMMENT '登录ip',
+  `last_login_time` datetime DEFAULT NULL COMMENT '最后登录时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_task_instance
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_task_instance`;
+CREATE TABLE `t_escheduler_task_instance` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `name` varchar(255) DEFAULT NULL COMMENT '任务名称',
+  `task_type` varchar(64) DEFAULT NULL COMMENT '任务类型',
+  `process_definition_id` int(11) DEFAULT NULL COMMENT '流程定义id',
+  `process_instance_id` int(11) DEFAULT NULL COMMENT '流程实例id',
+  `task_json` longtext COMMENT '任务节点json',
+  `state` tinyint(4) DEFAULT NULL COMMENT '任务实例状态：0 提交成功,1 正在运行,2 准备暂停,3 暂停,4 准备停止,5 停止,6 失败,7 成功,8 需要容错,9 kill,10 等待线程,11 等待依赖完成',
+  `submit_time` datetime DEFAULT NULL COMMENT '任务提交时间',
+  `start_time` datetime DEFAULT NULL COMMENT '任务开始时间',
+  `end_time` datetime DEFAULT NULL COMMENT '任务结束时间',
+  `host` varchar(45) DEFAULT NULL COMMENT '执行任务的机器',
+  `execute_path` varchar(200) DEFAULT NULL COMMENT '任务执行路径',
+  `log_path` varchar(200) DEFAULT NULL COMMENT '任务日志路径',
+  `alert_flag` tinyint(4) DEFAULT NULL COMMENT '是否告警',
+  `retry_times` int(4) DEFAULT '0' COMMENT '重试次数',
+  `pid` int(4) DEFAULT NULL COMMENT '进程pid',
+  `app_link` varchar(255) DEFAULT NULL COMMENT 'yarn app id',
+  `flag` tinyint(4) DEFAULT '1' COMMENT '是否可用：0 不可用，1 可用',
+  `retry_interval` int(4) DEFAULT NULL COMMENT '重试间隔',
+  `max_retry_times` int(2) DEFAULT NULL COMMENT '最大重试次数',
+  `task_instance_priority` int(11) DEFAULT NULL COMMENT '任务实例优先级：0 Highest,1 High,2 Medium,3 Low,4 Lowest',
+  PRIMARY KEY (`id`),
+  KEY `process_instance_id` (`process_instance_id`) USING BTREE,
+  KEY `task_instance_index` (`process_definition_id`,`process_instance_id`) USING BTREE,
+  CONSTRAINT `foreign_key_instance_id` FOREIGN KEY (`process_instance_id`) REFERENCES `t_escheduler_process_instance` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_tenant
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_tenant`;
+CREATE TABLE `t_escheduler_tenant` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `tenant_code` varchar(64) DEFAULT NULL COMMENT '租户编码',
+  `tenant_name` varchar(64) DEFAULT NULL COMMENT '租户名称',
+  `desc` varchar(256) DEFAULT NULL COMMENT '描述',
+  `queue_id` int(11) DEFAULT NULL COMMENT '队列id',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_udfs
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_udfs`;
+CREATE TABLE `t_escheduler_udfs` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` int(11) NOT NULL COMMENT '用户id',
+  `func_name` varchar(100) NOT NULL COMMENT 'UDF函数名',
+  `class_name` varchar(255) NOT NULL COMMENT '类名',
+  `type` tinyint(4) NOT NULL COMMENT 'Udf函数类型',
+  `arg_types` varchar(255) DEFAULT NULL COMMENT '参数',
+  `database` varchar(255) DEFAULT NULL COMMENT '库名',
+  `desc` varchar(255) DEFAULT NULL COMMENT '描述',
+  `resource_id` int(11) NOT NULL COMMENT '资源id',
+  `resource_name` varchar(255) NOT NULL COMMENT '资源名称',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_user
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_user`;
+CREATE TABLE `t_escheduler_user` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '用户id',
+  `user_name` varchar(64) DEFAULT NULL COMMENT '用户名',
+  `user_password` varchar(64) DEFAULT NULL COMMENT '用户密码',
+  `user_type` tinyint(4) DEFAULT NULL COMMENT '用户类型：0 管理员，1 普通用户',
+  `email` varchar(64) DEFAULT NULL COMMENT '邮箱',
+  `phone` varchar(11) DEFAULT NULL COMMENT '手机',
+  `tenant_id` int(11) DEFAULT NULL COMMENT '管理员0,普通用户所属租户id',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `user_name_unique` (`user_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Table structure for t_escheduler_worker_server
+-- ----------------------------
+DROP TABLE IF EXISTS `t_escheduler_worker_server`;
+CREATE TABLE `t_escheduler_worker_server` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `host` varchar(45) DEFAULT NULL COMMENT 'ip',
+  `port` int(11) DEFAULT NULL COMMENT '进程号',
+  `zk_directory` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT 'zk注册目录',
+  `res_info` varchar(255) DEFAULT NULL COMMENT '集群资源信息：json格式{"cpu":xxx,"memroy":xxx}',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `last_heartbeat_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ /*drop table first */
+ DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;
+ DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;
+ DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE;
+ DROP TABLE IF EXISTS QRTZ_LOCKS;
+ DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS;
+ DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS;
+ DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS;
+ DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS;
+ DROP TABLE IF EXISTS QRTZ_TRIGGERS;
+ DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
+ DROP TABLE IF EXISTS QRTZ_CALENDARS;
+
+ CREATE TABLE QRTZ_JOB_DETAILS(
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ JOB_NAME VARCHAR(200) NOT NULL,
+ JOB_GROUP VARCHAR(200) NOT NULL,
+ DESCRIPTION VARCHAR(250) NULL,
+ JOB_CLASS_NAME VARCHAR(250) NOT NULL,
+ IS_DURABLE VARCHAR(1) NOT NULL,
+ IS_NONCONCURRENT VARCHAR(1) NOT NULL,
+ IS_UPDATE_DATA VARCHAR(1) NOT NULL,
+ REQUESTS_RECOVERY VARCHAR(1) NOT NULL,
+ JOB_DATA BLOB NULL,
+ PRIMARY KEY (SCHED_NAME,JOB_NAME,JOB_GROUP))
+ ENGINE=InnoDB;
+
+ CREATE TABLE QRTZ_TRIGGERS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ TRIGGER_NAME VARCHAR(200) NOT NULL,
+ TRIGGER_GROUP VARCHAR(200) NOT NULL,
+ JOB_NAME VARCHAR(200) NOT NULL,
+ JOB_GROUP VARCHAR(200) NOT NULL,
+ DESCRIPTION VARCHAR(250) NULL,
+ NEXT_FIRE_TIME BIGINT(13) NULL,
+ PREV_FIRE_TIME BIGINT(13) NULL,
+ PRIORITY INTEGER NULL,
+ TRIGGER_STATE VARCHAR(16) NOT NULL,
+ TRIGGER_TYPE VARCHAR(8) NOT NULL,
+ START_TIME BIGINT(13) NOT NULL,
+ END_TIME BIGINT(13) NULL,
+ CALENDAR_NAME VARCHAR(200) NULL,
+ MISFIRE_INSTR SMALLINT(2) NULL,
+ JOB_DATA BLOB NULL,
+ PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+ FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
+ REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP))
+ ENGINE=InnoDB;
+
+ CREATE TABLE QRTZ_SIMPLE_TRIGGERS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ TRIGGER_NAME VARCHAR(200) NOT NULL,
+ TRIGGER_GROUP VARCHAR(200) NOT NULL,
+ REPEAT_COUNT BIGINT(7) NOT NULL,
+ REPEAT_INTERVAL BIGINT(12) NOT NULL,
+ TIMES_TRIGGERED BIGINT(10) NOT NULL,
+ PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+ FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+ REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
+ ENGINE=InnoDB;
+
+ CREATE TABLE QRTZ_CRON_TRIGGERS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ TRIGGER_NAME VARCHAR(200) NOT NULL,
+ TRIGGER_GROUP VARCHAR(200) NOT NULL,
+ CRON_EXPRESSION VARCHAR(120) NOT NULL,
+ TIME_ZONE_ID VARCHAR(80),
+ PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+ FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+ REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
+ ENGINE=InnoDB;
+
+ CREATE TABLE QRTZ_SIMPROP_TRIGGERS
+   (
+     SCHED_NAME VARCHAR(120) NOT NULL,
+     TRIGGER_NAME VARCHAR(200) NOT NULL,
+     TRIGGER_GROUP VARCHAR(200) NOT NULL,
+     STR_PROP_1 VARCHAR(512) NULL,
+     STR_PROP_2 VARCHAR(512) NULL,
+     STR_PROP_3 VARCHAR(512) NULL,
+     INT_PROP_1 INT NULL,
+     INT_PROP_2 INT NULL,
+     LONG_PROP_1 BIGINT NULL,
+     LONG_PROP_2 BIGINT NULL,
+     DEC_PROP_1 NUMERIC(13,4) NULL,
+     DEC_PROP_2 NUMERIC(13,4) NULL,
+     BOOL_PROP_1 VARCHAR(1) NULL,
+     BOOL_PROP_2 VARCHAR(1) NULL,
+     PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+     FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+     REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
+ ENGINE=InnoDB;
+
+ CREATE TABLE QRTZ_BLOB_TRIGGERS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ TRIGGER_NAME VARCHAR(200) NOT NULL,
+ TRIGGER_GROUP VARCHAR(200) NOT NULL,
+ BLOB_DATA BLOB NULL,
+ PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+ INDEX (SCHED_NAME,TRIGGER_NAME, TRIGGER_GROUP),
+ FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+ REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
+ ENGINE=InnoDB;
+
+ CREATE TABLE QRTZ_CALENDARS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ CALENDAR_NAME VARCHAR(200) NOT NULL,
+ CALENDAR BLOB NOT NULL,
+ PRIMARY KEY (SCHED_NAME,CALENDAR_NAME))
+ ENGINE=InnoDB;
+
+ CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ TRIGGER_GROUP VARCHAR(200) NOT NULL,
+ PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP))
+ ENGINE=InnoDB;
+
+ CREATE TABLE QRTZ_FIRED_TRIGGERS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ ENTRY_ID VARCHAR(95) NOT NULL,
+ TRIGGER_NAME VARCHAR(200) NOT NULL,
+ TRIGGER_GROUP VARCHAR(200) NOT NULL,
+ INSTANCE_NAME VARCHAR(200) NOT NULL,
+ FIRED_TIME BIGINT(13) NOT NULL,
+ SCHED_TIME BIGINT(13) NOT NULL,
+ PRIORITY INTEGER NOT NULL,
+ STATE VARCHAR(16) NOT NULL,
+ JOB_NAME VARCHAR(200) NULL,
+ JOB_GROUP VARCHAR(200) NULL,
+ IS_NONCONCURRENT VARCHAR(1) NULL,
+ REQUESTS_RECOVERY VARCHAR(1) NULL,
+ PRIMARY KEY (SCHED_NAME,ENTRY_ID))
+ ENGINE=InnoDB;
+
+ CREATE TABLE QRTZ_SCHEDULER_STATE (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ INSTANCE_NAME VARCHAR(200) NOT NULL,
+ LAST_CHECKIN_TIME BIGINT(13) NOT NULL,
+ CHECKIN_INTERVAL BIGINT(13) NOT NULL,
+ PRIMARY KEY (SCHED_NAME,INSTANCE_NAME))
+ ENGINE=InnoDB;
+
+ CREATE TABLE QRTZ_LOCKS (
+ SCHED_NAME VARCHAR(120) NOT NULL,
+ LOCK_NAME VARCHAR(40) NOT NULL,
+ PRIMARY KEY (SCHED_NAME,LOCK_NAME))
+ ENGINE=InnoDB;
+
+ CREATE INDEX IDX_QRTZ_J_REQ_RECOVERY ON QRTZ_JOB_DETAILS(SCHED_NAME,REQUESTS_RECOVERY);
+ CREATE INDEX IDX_QRTZ_J_GRP ON QRTZ_JOB_DETAILS(SCHED_NAME,JOB_GROUP);
+
+ CREATE INDEX IDX_QRTZ_T_J ON QRTZ_TRIGGERS(SCHED_NAME,JOB_NAME,JOB_GROUP);
+ CREATE INDEX IDX_QRTZ_T_JG ON QRTZ_TRIGGERS(SCHED_NAME,JOB_GROUP);
+ CREATE INDEX IDX_QRTZ_T_C ON QRTZ_TRIGGERS(SCHED_NAME,CALENDAR_NAME);
+ CREATE INDEX IDX_QRTZ_T_G ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_GROUP);
+ CREATE INDEX IDX_QRTZ_T_STATE ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_STATE);
+ CREATE INDEX IDX_QRTZ_T_N_STATE ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_STATE);
+ CREATE INDEX IDX_QRTZ_T_N_G_STATE ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_GROUP,TRIGGER_STATE);
+ CREATE INDEX IDX_QRTZ_T_NEXT_FIRE_TIME ON QRTZ_TRIGGERS(SCHED_NAME,NEXT_FIRE_TIME);
+ CREATE INDEX IDX_QRTZ_T_NFT_ST ON QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_STATE,NEXT_FIRE_TIME);
+ CREATE INDEX IDX_QRTZ_T_NFT_MISFIRE ON QRTZ_TRIGGERS(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME);
+ CREATE INDEX IDX_QRTZ_T_NFT_ST_MISFIRE ON QRTZ_TRIGGERS(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME,TRIGGER_STATE);
+ CREATE INDEX IDX_QRTZ_T_NFT_ST_MISFIRE_GRP ON QRTZ_TRIGGERS(SCHED_NAME,MISFIRE_INSTR,NEXT_FIRE_TIME,TRIGGER_GROUP,TRIGGER_STATE);
+
+ CREATE INDEX IDX_QRTZ_FT_TRIG_INST_NAME ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,INSTANCE_NAME);
+ CREATE INDEX IDX_QRTZ_FT_INST_JOB_REQ_RCVRY ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,INSTANCE_NAME,REQUESTS_RECOVERY);
+ CREATE INDEX IDX_QRTZ_FT_J_G ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,JOB_NAME,JOB_GROUP);
+ CREATE INDEX IDX_QRTZ_FT_JG ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,JOB_GROUP);
+ CREATE INDEX IDX_QRTZ_FT_T_G ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP);
+ CREATE INDEX IDX_QRTZ_FT_TG ON QRTZ_FIRED_TRIGGERS(SCHED_NAME,TRIGGER_GROUP);
+
+ commit;
+
+

sql/create/release-1.0.0_schema/mysql/escheduler_dml.sql

@@ -0,0 +1,7 @@
+-- Records of t_escheduler_user,user : admin , password : escheduler123
+INSERT INTO `t_escheduler_user` VALUES ('1', 'admin', '055a97b5fcd6d120372ad1976518f371', '0', '825193156@qq.com', '15001335629', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');
+INSERT INTO `t_escheduler_alertgroup` VALUES (1, 'escheduler管理员告警组', '0', 'escheduler管理员告警组','2018-11-29 10:20:39', '2018-11-29 10:20:39');
+INSERT INTO `t_escheduler_relation_user_alertgroup` VALUES ('1', '1', '1', '2018-11-29 10:22:33', '2018-11-29 10:22:33');
+
+-- Records of t_escheduler_queue,default queue name : default
+INSERT INTO `t_escheduler_queue` VALUES ('1', 'default', 'default');

sql/soft_version

@@ -0,0 +1 @@
+1.0.2

sql/upgrade/1.0.1_schema/mysql/escheduler_ddl.sql

@@ -6,10 +6,10 @@ CREATE PROCEDURE ac_escheduler_T_t_escheduler_queue_C_create_time()
    BEGIN
        IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
            WHERE TABLE_NAME='t_escheduler_queue'
-           AND TABLE_SCHEMA='escheduler'
+           AND TABLE_SCHEMA=(SELECT DATABASE())
            AND COLUMN_NAME='create_time')
    THEN
-         ALTER TABLE escheduler.t_escheduler_queue ADD COLUMN create_time datetime DEFAULT NULL COMMENT '创建时间' AFTER queue;
+         ALTER TABLE t_escheduler_queue ADD COLUMN create_time datetime DEFAULT NULL COMMENT '创建时间' AFTER queue;
        END IF;
  END;
 
@@ -27,10 +27,10 @@ CREATE PROCEDURE ac_escheduler_T_t_escheduler_queue_C_update_time()
    BEGIN
        IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
            WHERE TABLE_NAME='t_escheduler_queue'
-           AND TABLE_SCHEMA='escheduler'
+           AND TABLE_SCHEMA=(SELECT DATABASE())
            AND COLUMN_NAME='update_time')
    THEN
-         ALTER TABLE escheduler.t_escheduler_queue ADD COLUMN update_time datetime DEFAULT NULL COMMENT '更新时间' AFTER create_time;
+         ALTER TABLE t_escheduler_queue ADD COLUMN update_time datetime DEFAULT NULL COMMENT '更新时间' AFTER create_time;
        END IF;
  END;
 

sql/upgrade/1.0.2_schema/mysql/escheduler_ddl.sql

@@ -0,0 +1,21 @@
+SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));
+-- ac_escheduler_T_t_escheduler_version
+drop PROCEDURE if EXISTS ac_escheduler_T_t_escheduler_version;
+delimiter d//
+CREATE PROCEDURE ac_escheduler_T_t_escheduler_version()
+   BEGIN
+       drop table if exists t_escheduler_version;
+       CREATE TABLE  IF NOT EXISTS  `t_escheduler_version` (
+         `id` int(11) NOT NULL AUTO_INCREMENT,
+         `version` varchar(200) NOT NULL,
+         PRIMARY KEY (`id`),
+         UNIQUE KEY `version_UNIQUE` (`version`)
+       ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='版本表';
+
+ END;
+
+d//
+
+delimiter ;
+CALL ac_escheduler_T_t_escheduler_version;
+DROP PROCEDURE ac_escheduler_T_t_escheduler_version;

sql/upgrade/1.0.2_schema/mysql/escheduler_dml.sql

@@ -0,0 +1 @@
+INSERT INTO `t_escheduler_version` (`version`) VALUES ('1.0.0');