merge from upstream

docs/zh_CN/前端开发文档.md

@@ -21,6 +21,7 @@ Lodash 高性能的 JavaScript 实用工具库
 - #### Node安装
 Node包下载 (注意版本 8.9.4) `https://nodejs.org/download/release/v8.9.4/` 
 
+
 - #### 前端项目构建
 用命令行模式 `cd`  进入 `escheduler-ui`项目目录并执行 `npm install` 拉取项目依赖包
 
@@ -31,6 +32,16 @@ Node包下载 (注意版本 8.9.4) `https://nodejs.org/download/release/v8.9.4/`
 > 运行 `cnpm install` 
 
 
+- 新建一个`.env`文件，用于跟后端交互的接口
+
+在`escheduler-ui`目录下新建一个`.env`文件，在文件里添加后端服务的ip地址和端口，用于跟后端交互，`.env`文件内容如下：
+```
+# 代理的接口地址（自行修改）
+API_BASE = http://192.168.xx.xx:12345
+
+# 如果您需要用ip访问项目可以把 "#" 号去掉（例）
+#DEV_HOST = 192.168.xx.xx
+```
 
 > #####  ！！！这里特别注意 项目如果在拉取依赖包的过程中报 " node-sass error " 错误，请在执行完后再次执行以下命令
 ```
@@ -49,6 +60,7 @@ npm install node-sass --unsafe-perm //单独安装node-sass依赖
 
 再拷贝到服务器对应的目录下（前端服务静态页面存放目录）
 
+
 访问地址 `http://localhost:8888/#/` 
 
 

docs/zh_CN/前端部署文档.md

@@ -3,23 +3,14 @@
 前端有3种部署方式，分别为自动化部署，手动部署和编译源码部署
 
 ## 1、准备工作
-#### 准备一：下载安装包
+#### 下载安装包
 
 目前最新安装包版本是1.0.1，下载地址： [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files/)
 
 下载escheduler-ui-1.0.1.tar.gz后，解压后会产生dist目录,进入dist目录
 > cd dist  
 
-#### 准备二：新建一个`.env`文件
 
-在dist目录下新建一个`.env`文件，在文件里添加后端服务的ip地址和端口，用于跟后端交互，`.env`文件内容如下：
-```
-# 代理的接口地址（自行修改）
-API_BASE = http://192.168.xx.xx:12345
-
-# 如果您需要用ip访问项目可以把 "#" 号去掉（例）
-#DEV_HOST = 192.168.xx.xx
-```
 
 ## 2、部署
 以下两种方式任选其一部署即可，推荐自动化部署

docs/zh_CN/后端部署文档.md

@@ -148,11 +148,11 @@ install.sh : 一键部署脚本
 
 * 一键停止集群所有服务
    
-   ` sh ./script/stop_all.sh`
+   ` sh ./bin/stop_all.sh`
    
 * 一键开启集群所有服务
    
-   ` sh ./script/start_all.sh`
+   ` sh ./bin/start_all.sh`
 
 * 启停Master
 
@@ -186,3 +186,7 @@ sh ./bin/escheduler-daemon.sh stop logger-server
 sh ./bin/escheduler-daemon.sh start alert-server
 sh ./bin/escheduler-daemon.sh stop alert-server
 ```
+
+## 3、数据库升级
+数据库升级是在1.0.2版本增加的功能,执行以下命令即可自动升级数据库。
+sh ./script/upgrade_escheduler.sh

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

@@ -30,12 +30,17 @@ public class EschedulerManager {
     UpgradeDao upgradeDao = UpgradeDao.getInstance();
 
     public void initEscheduler() {
+        // Determines whether the escheduler table structure has been init
+        if(upgradeDao.isExistsTable("t_escheduler_version") || upgradeDao.isExistsTable("t_escheduler_queue")) {
+            logger.info("The database has been initialized. Skip the initialization step");
+            return;
+        }
         this.initEschedulerSchema();
     }
 
     public void initEschedulerSchema() {
 
-        logger.info("Start initializing the ark manager mysql table structure");
+        logger.info("Start initializing the escheduler manager mysql table structure");
         upgradeDao.initEschedulerSchema();
     }
 
@@ -52,15 +57,20 @@ public class EschedulerManager {
         }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 {
+            }else if(upgradeDao.isExistsColumn("t_escheduler_queue","create_time")){
+                version = "1.0.1";
+            }else if(upgradeDao.isExistsTable("t_escheduler_queue")){
                 version = "1.0.0";
+            }else{
+                logger.error("Unable to determine current software version, so cannot upgrade");
             }
+            // The target version of the upgrade
+            String schemaVersion = "";
+            for(String schemaDir : schemaList) {
+
 
                 schemaVersion = schemaDir.split("_")[0];
                 if(SchemaUtils.isAGreatVersion(schemaVersion , version)) {
@@ -70,7 +80,11 @@ public class EschedulerManager {
 
                     logger.info("Begin upgrading escheduler's mysql table structure");
                     upgradeDao.upgradeEscheduler(schemaDir);
-
+                    if(SchemaUtils.isAGreatVersion(version,"1.0.1")){
+                        version = upgradeDao.getCurrentVersion();
+                    }else {
+                        version = schemaVersion;
+                    }
                 }
 
             }

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

@@ -20,6 +20,7 @@ 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.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,6 +34,7 @@ public class UpgradeDao extends AbstractBaseDao {
 
     public static final Logger logger = LoggerFactory.getLogger(UpgradeDao.class);
     private static final String T_VERSION_NAME = "t_escheduler_version";
+    private static final String rootDir = System.getProperty("user.dir");
 
     @Override
     protected void init() {
@@ -64,6 +66,10 @@ public class UpgradeDao extends AbstractBaseDao {
 
     private void runInitEschedulerDML() {
         Connection conn = null;
+        if (StringUtils.isEmpty(rootDir)) {
+            throw new RuntimeException("Environment variable user.dir not found");
+        }
+        String mysqlSQLFilePath = rootDir + "/sql/create/release-1.0.0_schema/mysql/escheduler_dml.sql";
         try {
             conn = ConnectionFactory.getDataSource().getConnection();
             conn.setAutoCommit(false);
@@ -71,7 +77,7 @@ public class UpgradeDao extends AbstractBaseDao {
             // 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"));
+            Reader initSqlReader = new FileReader(new File(mysqlSQLFilePath));
             initScriptRunner.runScript(initSqlReader);
 
             conn.commit();
@@ -100,11 +106,15 @@ public class UpgradeDao extends AbstractBaseDao {
 
     private void runInitEschedulerDDL() {
         Connection conn = null;
+        if (StringUtils.isEmpty(rootDir)) {
+            throw new RuntimeException("Environment variable user.dir not found");
+        }
+        String mysqlSQLFilePath = rootDir + "/sql/create/release-1.0.0_schema/mysql/escheduler_ddl.sql";
         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"));
+            Reader initSqlReader = new FileReader(new File(mysqlSQLFilePath));
             initScriptRunner.runScript(initSqlReader);
 
         } catch (IOException e) {
@@ -122,7 +132,11 @@ public class UpgradeDao extends AbstractBaseDao {
 
     }
 
-
+    /**
+     * Determines whether a table exists
+     * @param tableName
+     * @return
+     */
     public boolean isExistsTable(String tableName) {
         Connection conn = null;
         try {
@@ -144,6 +158,33 @@ public class UpgradeDao extends AbstractBaseDao {
 
     }
 
+    /**
+     * Determines whether a field exists in the specified table
+     * @param tableName
+     * @param columnName
+     * @return
+     */
+    public boolean isExistsColumn(String tableName,String columnName) {
+        Connection conn = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            ResultSet rs = conn.getMetaData().getColumns(null,null,tableName,columnName);
+            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);
@@ -182,7 +223,10 @@ public class UpgradeDao extends AbstractBaseDao {
 
     private void upgradeEschedulerDML(String schemaDir) {
         String schemaVersion = schemaDir.split("_")[0];
-        String mysqlSQLFilePath = "sql/upgrade/" + schemaDir + "/mysql/escheduler_dml.sql";
+        if (StringUtils.isEmpty(rootDir)) {
+            throw new RuntimeException("Environment variable user.dir not found");
+        }
+        String mysqlSQLFilePath = rootDir + "/sql/upgrade/" + schemaDir + "/mysql/escheduler_dml.sql";
         Connection conn = null;
         PreparedStatement pstmt = null;
         try {
@@ -239,7 +283,10 @@ public class UpgradeDao extends AbstractBaseDao {
     }
 
     private void upgradeEschedulerDDL(String schemaDir) {
-        String mysqlSQLFilePath = "sql/upgrade/" + schemaDir + "/mysql/escheduler_ddl.sql";
+        if (StringUtils.isEmpty(rootDir)) {
+            throw new RuntimeException("Environment variable user.dir not found");
+        }
+        String mysqlSQLFilePath = rootDir + "/sql/upgrade/" + schemaDir + "/mysql/escheduler_ddl.sql";
         Connection conn = null;
         PreparedStatement pstmt = null;
         try {

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

@@ -29,7 +29,6 @@ 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");

escheduler-server/src/main/resources/worker.properties

@@ -9,7 +9,7 @@ worker.fetch.task.num = 3
 
 
 # only less than cpu avg load, worker server can work. default value : the number of cpu cores * 2
-worker.max.cpuload.avg=10
+#worker.max.cpuload.avg=10
 
 # only larger than reserved memory, worker server can work. default value : physical memory * 1/6, unit is G.
 worker.reserved.memory=1

escheduler-ui/dist/index.html

@@ -1,7 +1,7 @@
 <!doctype html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><meta http-equiv="Cache-Control" content="no-siteapp"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-title" content="标题"><meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"><meta name="format-detection" content="telphone=no, email=no"><meta name="screen-orientation" content="portrait"><meta name="x5-orientation" content="portrait"><meta name="theme-color" content="#4a8dee"><meta name="msapplication-navbutton-color" content="#4a8dee"><meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><link rel="shortcut icon" href="/images/favicon.ico"><link href="/combo/1.0.0/base.css?v1.0.0.1" rel="stylesheet"><link href="/combo/1.0.0/3rd.css?v1.0.0.1" rel="stylesheet"><!--[if lt IE 9]>
 <script src="/combo/1.0.0/es5.js"></script>
-<![endif]--><script>let NODE_ENV = 'true'</script><title>EasyScheduler</title><link href="/css/common.8ba9af7.css" rel="stylesheet"><link href="/css/home/index.0212fa5.css" rel="stylesheet"></head><body><div id="app"></div><div id="contextmenu" class="contextmenu"></div><div class="global-loading"><div class="svg-box"><svg class="lds-gears" width="54px" height="54px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" style="background: none;"><g transform="translate(50 50)"><g transform="translate(-19 -19) scale(0.6)"><g transform="rotate(107.866)"><animateTransform attributeName="transform" type="rotate" values="0;360" keyTimes="0;1" dur="1s" begin="0s" repeatCount="indefinite"></animateTransform><path 
+<![endif]--><script>let NODE_ENV = 'true'</script><title>EasyScheduler</title><link href="/css/common.8ba9af7.css" rel="stylesheet"><link href="/css/home/index.b444b91.css" rel="stylesheet"></head><body><div id="app"></div><div id="contextmenu" class="contextmenu"></div><div class="global-loading"><div class="svg-box"><svg class="lds-gears" width="54px" height="54px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" style="background: none;"><g transform="translate(50 50)"><g transform="translate(-19 -19) scale(0.6)"><g transform="rotate(107.866)"><animateTransform attributeName="transform" type="rotate" values="0;360" keyTimes="0;1" dur="1s" begin="0s" repeatCount="indefinite"></animateTransform><path 
 d="M37.3496987939662 -7 L47.3496987939662 -7 L47.3496987939662 7 L37.3496987939662 7 A38 38 0 0 1 31.359972760794346 21.46047782418268 L31.359972760794346 21.46047782418268 L38.431040572659825 28.531545636048154 L28.531545636048154 38.431040572659825 L21.46047782418268 31.359972760794346 A38 38 0 0 1 7.0000000000000036 37.3496987939662 L7.0000000000000036 37.3496987939662 L7.000000000000004 47.3496987939662 L-6.999999999999999 47.3496987939662 L-7 37.3496987939662 A38 38 0 0 1 -21.46047782418268 31.35997276079435 L-21.46047782418268 31.35997276079435 L-28.531545636048154 38.431040572659825 L-38.43104057265982 28.531545636048158 L-31.359972760794346 21.460477824182682 A38 38 0 0 1 -37.3496987939662 7.000000000000007 L-37.3496987939662 7.000000000000007 L-47.3496987939662 7.000000000000008 L-47.3496987939662 -6.9999999999999964 L-37.3496987939662 -6.999999999999997 A38 38 0 0 1 -31.35997276079435 -21.460477824182675 L-31.35997276079435 -21.460477824182675 L-38.431040572659825 -28.531545636048147 L-28.53154563604818 -38.4310405726598 L-21.4604778241827 -31.35997276079433 A38 38 0 0 1 -6.999999999999992 -37.3496987939662 L-6.999999999999992 -37.3496987939662 L-6.999999999999994 -47.3496987939662 L6.999999999999977 -47.3496987939662 L6.999999999999979 -37.3496987939662 A38 38 0 0 1 21.460477824182686 -31.359972760794342 L21.460477824182686 -31.359972760794342 L28.531545636048158 -38.43104057265982 L38.4310405726598 -28.53154563604818 L31.35997276079433 -21.4604778241827 A38 38 0 0 1 37.3496987939662 -6.999999999999995 M0 -23A23 23 0 1 0 0 23 A23 23 0 1 0 0 -23" 
 fill="#0097e0"></path></g></g><g transform="translate(19 19) scale(0.6)"><g transform="rotate(229.634)"><animateTransform attributeName="transform" type="rotate" values="360;0" keyTimes="0;1" dur="1s" begin="-0.0625s" repeatCount="indefinite"></animateTransform><path 
 d="M37.3496987939662 -7 L47.3496987939662 -7 L47.3496987939662 7 L37.3496987939662 7 A38 38 0 0 1 31.359972760794346 21.46047782418268 L31.359972760794346 21.46047782418268 L38.431040572659825 28.531545636048154 L28.531545636048154 38.431040572659825 L21.46047782418268 31.359972760794346 A38 38 0 0 1 7.0000000000000036 37.3496987939662 L7.0000000000000036 37.3496987939662 L7.000000000000004 47.3496987939662 L-6.999999999999999 47.3496987939662 L-7 37.3496987939662 A38 38 0 0 1 -21.46047782418268 31.35997276079435 L-21.46047782418268 31.35997276079435 L-28.531545636048154 38.431040572659825 L-38.43104057265982 28.531545636048158 L-31.359972760794346 21.460477824182682 A38 38 0 0 1 -37.3496987939662 7.000000000000007 L-37.3496987939662 7.000000000000007 L-47.3496987939662 7.000000000000008 L-47.3496987939662 -6.9999999999999964 L-37.3496987939662 -6.999999999999997 A38 38 0 0 1 -31.35997276079435 -21.460477824182675 L-31.35997276079435 -21.460477824182675 L-38.431040572659825 -28.531545636048147 L-28.53154563604818 -38.4310405726598 L-21.4604778241827 -31.35997276079433 A38 38 0 0 1 -6.999999999999992 -37.3496987939662 L-6.999999999999992 -37.3496987939662 L-6.999999999999994 -47.3496987939662 L6.999999999999977 -47.3496987939662 L6.999999999999979 -37.3496987939662 A38 38 0 0 1 21.460477824182686 -31.359972760794342 L21.460477824182686 -31.359972760794342 L28.531545636048158 -38.43104057265982 L38.4310405726598 -28.53154563604818 L31.35997276079433 -21.4604778241827 A38 38 0 0 1 37.3496987939662 -6.999999999999995 M0 -23A23 23 0 1 0 0 23 A23 23 0 1 0 0 -23" 
-fill="#7f8b95"></path></g></g></g></svg> <span class="sp1">Loading ...</span></div></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.804ec41.js"></script><script src="/js/home/index.2ed28db.js"></script></body></html>
+fill="#7f8b95"></path></g></g></g></svg> <span class="sp1">Loading ...</span></div></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.8fb26e7.js"></script><script src="/js/home/index.1b09c2f.js"></script></body></html>

escheduler-ui/dist/js/28.5c6c701.js

@@ -1,2 +0,0 @@
-webpackJsonp([28],{1030:function(t,n,e){"use strict";n.__esModule=!0,n.default={name:"process-instance-index",data:function(){return{}},props:{},methods:{},watch:{},created:function(){},mounted:function(){},updated:function(){},beforeDestroy:function(){},destroyed:function(){},computed:{},components:{}}},1120:function(t,n,e){var o=e(1121);"string"==typeof o&&(o=[[t.i,o,""]]),o.locals&&(t.exports=o.locals);e(35)("00d558f4",o,!0,{})},1121:function(t,n,e){(t.exports=e(34)(!1)).push([t.i,"",""])},1122:function(t,n,e){"use strict";var o={render:function(){var t=this.$createElement;return(this._self._c||t)("router-view")},staticRenderFns:[]};n.a=o},610:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var o=e(1030),r=e.n(o);for(var u in o)"default"!==u&&function(t){e.d(n,t,function(){return o[t]})}(u);var c=e(1122);var i=function(t){e(1120)},s=e(27)(r.a,c.a,!1,i,null,null);n.default=s.exports}});
-//# sourceMappingURL=28.5c6c701.js.map

escheduler-ui/dist/js/29.0e863c8.js

@@ -1,2 +0,0 @@
-webpackJsonp([29],{1015:function(o,t,a){"use strict";t.__esModule=!0,t.default={name:"projects-index"}},1086:function(o,t,a){var r=a(1087);"string"==typeof r&&(r=[[o.i,r,""]]),r.locals&&(o.exports=r.locals);a(35)("f4add6ba",r,!0,{})},1087:function(o,t,a){(o.exports=a(34)(!1)).push([o.i,".state-tasks-color-sp>a,.toolbar-color-sp>a{display:inline-block;margin-right:10px;cursor:default}.state-tasks-color-sp>a:hover span,.toolbar-color-sp>a:hover span{color:#333}.state-tasks-color-sp>a>i,.toolbar-color-sp>a>i{border-radius:10px;display:inline-block;vertical-align:middle;font-size:14px}.state-tasks-color-sp>a span,.toolbar-color-sp>a span{vertical-align:middle;font-size:12px}.toolbar-color-sp>a>i{font-size:15px}",""])},1088:function(o,t,a){"use strict";var r={render:function(){var o=this.$createElement;return(this._self._c||o)("router-view")},staticRenderFns:[]};t.a=r},601:function(o,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=a(1015),s=a.n(r);for(var e in r)"default"!==e&&function(o){a.d(t,o,function(){return r[o]})}(e);var n=a(1088);var l=function(o){a(1086)},i=a(27)(s.a,n.a,!1,l,null,null);t.default=i.exports}});
-//# sourceMappingURL=29.0e863c8.js.map