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

docs/zh_CN/1.0.1-release.md

+Easy Scheduler Release 1.0.1
+===
+Easy Scheduler 1.0.2是1.x系列中的第二个版本。更新内容具体如下：
+
+- 1,outlook TSL 发邮件支持
+- 2,servlet 和 protobuf jar冲突解决
+- 3,创建租户同时建立linux用户
+- 4,重跑时间负数
+- 5,单机和集群都可以使用install.sh一键部署
+- 6,队列支持界面添加
+- 7,escheduler.t_escheduler_queue 增加了create_time和update_time字段
+
+
+
+
+

docs/zh_CN/1.0.2-release.md

+Easy Scheduler Release 1.0.2
+===
+Easy Scheduler 1.0.2是1.x系列中的第三个版本。此版本增加了调度开放接口、worker分组(指定任务运行的机器组)、任务流程及服务监控以及对oracle、clickhouse等支持，具体如下：
+
+新特性：
+===
+- [[EasyScheduler-79](https://github.com/analysys/EasyScheduler/issues/79)] 调度通过token方式对外开放接口，可以通过api进行操作
+- [[EasyScheduler-138](https://github.com/analysys/EasyScheduler/issues/138)] 可以指定任务运行的机器(组)
+- [[EasyScheduler-139](https://github.com/analysys/EasyScheduler/issues/139)] 任务流程监控及Master、Worker、Zookeeper运行状态监控
+- [[EasyScheduler-140](https://github.com/analysys/EasyScheduler/issues/140)] 工作流定义—增加流程超时报警
+- [[EasyScheduler-134](https://github.com/analysys/EasyScheduler/issues/134)] 任务类型支持Oracle、CLICKHOUSE、SQLSERVER、IMPALA
+- [[EasyScheduler-136](https://github.com/analysys/EasyScheduler/issues/136)] Sql任务节点可以独立选取抄送邮件用户 
+- [[EasyScheduler-141](https://github.com/analysys/EasyScheduler/issues/141)] 用户管理—用户可以绑定队列,用户队列级别高于租户队列级别，如果用户队列为空，则寻找租户队列 
+
+
+
+增强：
+===
+- [[EasyScheduler-154](https://github.com/analysys/EasyScheduler/issues/154)] 租户编码允许纯数字或者下划线这种的编码
+
+
+修复：
+===
+- [[EasyScheduler-135](https://github.com/analysys/EasyScheduler/issues/135)] Python任务可以指定python版本
+
+- [[EasyScheduler-125](https://github.com/analysys/EasyScheduler/issues/125)] 用户账号中手机号无法识别联通最新号码166开头
+
+- [[EasyScheduler-178](https://github.com/analysys/EasyScheduler/issues/178)] 修复ProcessDao里细微的拼写错误 
+
+- [[EasyScheduler-129](https://github.com/analysys/EasyScheduler/issues/129)] 租户管理中，租户编码带下划线等特殊字符无法通过校验 
+
+
+感谢：
+===
+最后但最重要的是，没有以下伙伴的贡献就没有新版本的诞生：
+
+Baoqi , chubbyjiang , coreychen , chgxtony, cmdares , datuzi , dingchao, fanguanqun , 风清扬, gaojun416 , googlechorme, hyperknob , hujiang75277381 , huanzui , kinssun, ivivi727 ,jimmy, jiangzhx , kevin5210 , lidongdai , lshmouse , lenboo, lyf198972 , lgcareer , lzy305 ,  moranrr ,  millionfor , mazhong8808, programlief, qiaozhanwei , roy110 , swxchappy , sherlock111 , samz406 , swxchappy, qq389401879 , lzy305,  vkingnew, William-GuoWei , woniulinux, yyl861, zhangxin1988, yangjiajun2014, yangqinlong, yangjiajun2014, zhzhenqin, zhangluck, zhanghaicheng1, zhuyizhizhi  
+
+以及微信群里众多的热心伙伴！在此非常感谢！
+
+
+
+
+
+
+
+
+
+

docs/zh_CN/SUMMARY.md

@@ -22,4 +22,10 @@
     * [开发环境搭建](后端开发文档.md#项目编译)
     * [自定义任务插件文档](任务插件开发.md#任务插件开发)
     
+* 历次版本发布内容
+    * [1.0.2 release](1.0.2-release.md)
+    * [1.0.1 release](1.0.1-release.md)
+    * [1.0.0 release 正式开源]
+    
+    
     
\ No newline at end of file

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

@@ -5,9 +5,9 @@
 ## 1、准备工作
 #### 下载安装包
 
-目前最新安装包版本是1.0.1，下载地址： [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files/)
+目前最新安装包版本是1.0.2，下载地址： [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files/)
 
-下载escheduler-ui-1.0.1.tar.gz后，解压后会产生dist目录,进入dist目录
+下载escheduler-ui-1.0.2.tar.gz后，解压后会产生dist目录,进入dist目录
 > cd dist  
 
 
@@ -98,4 +98,4 @@ systemctl restart nginx
 ```
 # 更改上传大小
 client_max_body_size 1024m
-```
\ No newline at end of file
+```

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

@@ -4,7 +4,7 @@
 
 ## 1、准备工作
 
-目前最新安装包版本是1.0.1，下载地址： [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files/) ，下载escheduler-backend-1.0.1.tar.gz后,解压后会产生escheduler-backend-1.0.1目录(后面简称escheduler-backend)
+目前最新安装包版本是1.0.2，下载地址： [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files/) ，下载escheduler-backend-1.0.2.tar.gz(后端简称escheduler-backend),escheduler-ui-1.0.2.tar.gz(前端简称escheduler-ui)
 
 #### 准备一: 基础软件安装(必装项请自行安装)
 
@@ -197,4 +197,4 @@ sh ./bin/escheduler-daemon.sh stop alert-server
 数据库升级是在1.0.2版本增加的功能,执行以下命令即可自动升级数据库
 ```
 sh ./script/upgrade_escheduler.sh
-```
\ No newline at end of file
+```

escheduler-alert/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>cn.analysys</groupId>
         <artifactId>escheduler</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>escheduler-alert</artifactId>
     <packaging>jar</packaging>

escheduler-api/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>cn.analysys</groupId>
     <artifactId>escheduler</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
   <artifactId>escheduler-api</artifactId>
   <packaging>jar</packaging>

escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java

@@ -114,7 +114,7 @@ public class ProcessDefinitionService extends BaseDAGService {
         ProcessData processData = JSONUtils.parseObject(processDefinitionJson, ProcessData.class);
         Map<String, Object> checkProcessJson = checkProcessNodeList(processData, processDefinitionJson);
         if (checkProcessJson.get(Constants.STATUS) != Status.SUCCESS) {
-            return result;
+            return checkProcessJson;
         }
 
         processDefine.setName(name);
@@ -263,7 +263,7 @@ public class ProcessDefinitionService extends BaseDAGService {
         ProcessData processData = JSONUtils.parseObject(processDefinitionJson, ProcessData.class);
         Map<String, Object> checkProcessJson = checkProcessNodeList(processData, processDefinitionJson);
         if ((checkProcessJson.get(Constants.STATUS) != Status.SUCCESS)) {
-            return result;
+            return checkProcessJson;
         }
         ProcessDefinition processDefinition = processDao.findProcessDefineById(id);
         if (processDefinition == null) {
@@ -719,7 +719,9 @@ public class ProcessDefinitionService extends BaseDAGService {
             List<String> preTasks = JSONUtils.toList(taskNodeResponse.getPreTasks(),String.class);
             if (CollectionUtils.isNotEmpty(preTasks)) {
                 for (String preTask : preTasks) {
-                    graph.addEdge(preTask, taskNodeResponse.getName());
+                    if (!graph.addEdge(preTask, taskNodeResponse.getName())) {
+                        return true;
+                    }
                 }
             }
         }

escheduler-common/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>escheduler</artifactId>
 		<groupId>cn.analysys</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>escheduler-common</artifactId>
 	<name>escheduler-common</name>

escheduler-dao/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.analysys</groupId>
 		<artifactId>escheduler</artifactId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>escheduler-dao</artifactId>
 	<name>escheduler-dao</name>

escheduler-dao/src/main/java/cn/escheduler/dao/datasource/ConnectionFactory.java

@@ -63,14 +63,14 @@ public class ConnectionFactory {
     druidDataSource.setTestOnReturn(getBoolean(Constants.SPRING_DATASOURCE_TEST_ON_RETURN));
     druidDataSource.setKeepAlive(getBoolean(Constants.SPRING_DATASOURCE_KEEP_ALIVE));
     //just for development
-    if (CommonUtils.isDevelopMode()) {
+    /*if (CommonUtils.isDevelopMode()) {
       //Configure filters that are intercepted by monitoring statistics, and SQL can not be counted after removing them.'wall'is used for firewall
       try {
         druidDataSource.setFilters("stat,wall,log4j");
       } catch (SQLException e) {
         logger.error(e.getMessage(), e);
       }
-    }
+    }*/
 
     druidDataSource.setMinIdle(getInt(Constants.SPRING_DATASOURCE_MIN_IDLE));
     druidDataSource.setMaxActive(getInt(Constants.SPRING_DATASOURCE_MAX_ACTIVE));

escheduler-rpc/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>escheduler</artifactId>
         <groupId>cn.analysys</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

escheduler-server/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>escheduler</artifactId>
 		<groupId>cn.analysys</groupId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>escheduler-server</artifactId>
 	<name>escheduler-server</name>

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>cn.analysys</groupId>
 	<artifactId>escheduler</artifactId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>escheduler</name>
 	<url>http://maven.apache.org</url>

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

@@ -182,6 +182,27 @@ delimiter ;
 CALL ac_escheduler_T_t_escheduler_schedules_C_worker_group_id;
 DROP PROCEDURE ac_escheduler_T_t_escheduler_schedules_C_worker_group_id;
 
+-- ac_escheduler_T_t_escheduler_process_instance_C_worker_group_id
+drop PROCEDURE if EXISTS ac_escheduler_T_t_escheduler_process_instance_C_worker_group_id;
+delimiter d//
+CREATE PROCEDURE ac_escheduler_T_t_escheduler_process_instance_C_worker_group_id()
+   BEGIN
+       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+           WHERE TABLE_NAME='t_escheduler_process_instance'
+           AND TABLE_SCHEMA=(SELECT DATABASE())
+           AND COLUMN_NAME='worker_group_id')
+   THEN
+         ALTER TABLE t_escheduler_process_instance ADD COLUMN `worker_group_id` int(11) NULL DEFAULT -1 COMMENT '任务指定运行的worker分组' AFTER `process_instance_priority`;
+       END IF;
+ END;
+
+d//
+
+delimiter ;
+CALL ac_escheduler_T_t_escheduler_process_instance_C_worker_group_id;
+DROP PROCEDURE ac_escheduler_T_t_escheduler_process_instance_C_worker_group_id;
+
+
 -- ac_escheduler_T_t_escheduler_process_instance_C_timeout
 drop PROCEDURE if EXISTS ac_escheduler_T_t_escheduler_process_instance_C_timeout;
 delimiter d//