Merge pull request #72 from lgcareer/dev-20190415

Dev 20190415 add upgrade function

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

+/*
+ * 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

+/*
+ * 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

+/*
+ * 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;
+	}
+	
+}
\ No newline at end of file

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

+/*
+ * 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

+/*
+ * 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

+/*
+ * 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

+/*
+ * 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

+/*
+ * 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);
+		}
+
+		
+	}
+	
+	
+	
+}

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

+-- 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');
\ No newline at end of file

sql/soft_version

+1.0.2
\ No newline at end of file

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

+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;
\ No newline at end of file

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

+INSERT INTO `t_escheduler_version` (`version`) VALUES ('1.0.0');
\ No newline at end of file