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

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

@@ -89,7 +89,7 @@ install.sh : 一键部署脚本
     
     `sudo chown -R deployUser:deployUser escheduler-backend`
 
-- 修改conf/env/目录下的`escheduler_env.py`，  `.escheduler_env.sh` 两个文件中的环境变量
+- 修改conf/env/目录下的 `.escheduler_env.sh` 环境变量
 
 - 修改部署参数(根据自己服务器及业务情况):
 
@@ -136,7 +136,7 @@ install.sh : 一键部署脚本
 
 ### 2.2 编译源码来部署
 
-将源码包release版本1.0.1下载后，解压进入根目录
+将源码包release版本1.0.2下载后，解压进入根目录
 
 * 执行编译命令：
 

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-api/src/main/java/cn/escheduler/api/service/TenantService.java

@@ -80,7 +80,7 @@ public class TenantService extends BaseService{
     Tenant tenant = new Tenant();
     Date now = new Date();
 
-    if (!tenantCode.matches("^[0-9a-zA-Z_.]{1,}$") || tenantCode.startsWith("-")){
+    if (!tenantCode.matches("^[0-9a-zA-Z_.-]{1,}$") || tenantCode.startsWith("-") || tenantCode.startsWith(".")){
       putMsg(result, Status.VERIFY_TENANT_CODE_ERROR);
       return result;
     }

escheduler-api/src/test/java/cn/escheduler/api/HttpClientTest.java

@@ -34,26 +34,19 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 public class HttpClientTest {
 
     private static final Logger logger = LoggerFactory.getLogger(HttpClientTest.class);
 
-    public static void main(String[] args) throws Exception {
-//        doGETParamPathVariableAndChinese();
-//        doGETParam();
-//        doPOSTParam();
-
-        String md5 = EncryptionUtils.getMd5(String.valueOf(System.currentTimeMillis()) + "张三");
-        System.out.println(md5);
-        System.out.println(md5.length());
-    }
-
-    public static void doPOSTParam()throws Exception{
-        // create Httpclient
+    @Test
+    public  void doPOSTParam()throws Exception{
+        // create HttpClient
         CloseableHttpClient httpclient = HttpClients.createDefault();
-        // 创建http POST请求
+
+        // create http post request
         HttpPost httpPost = new HttpPost("http://127.0.0.1:12345/escheduler/projects/create");
         httpPost.setHeader("token", "123");
         // set parameters
@@ -83,23 +76,24 @@ public class HttpClientTest {
     }
 
     /**
-     *
+     * do get param path variables chinese
      * @throws Exception
      */
-    public static void doGETParamPathVariableAndChinese()throws Exception{
+    @Test
+    public  void doGETParamPathVariableAndChinese()throws Exception{
         // create HttpClient
         CloseableHttpClient httpclient = HttpClients.createDefault();
 
         List<NameValuePair> parameters = new ArrayList<NameValuePair>();
-//        parameters.add(new BasicNameValuePair("pageSize", "10"));
+       // parameters.add(new BasicNameValuePair("pageSize", "10"));
 
         // define the parameters of the request
-        URI uri = new URIBuilder("http://127.0.0.1:12345/escheduler/projects/%E5%85%A8%E9%83%A8%E6%B5%81%E7%A8%8B%E6%B5%8B%E8%AF%95/process/list")
+        URI uri = new URIBuilder("http://192.168.220.247:12345/escheduler/projects/%E5%85%A8%E9%83%A8%E6%B5%81%E7%A8%8B%E6%B5%8B%E8%AF%95/process/list")
                 .build();
 
         // create http GET request
         HttpGet httpGet = new HttpGet(uri);
-        httpGet.setHeader("token","123");
+        httpGet.setHeader("token","10f5625a2a1cbf9aa710653796c5d764");
         //response object
         CloseableHttpResponse response = null;
         try {
@@ -122,23 +116,27 @@ public class HttpClientTest {
 
     /**
      *
+     * do get param
      * @throws Exception
      */
-    public static void doGETParam()throws Exception{
+    @Test
+    public  void doGETParam()throws Exception{
         // create HttpClient
         CloseableHttpClient httpclient = HttpClients.createDefault();
 
         List<NameValuePair> parameters = new ArrayList<NameValuePair>();
-        parameters.add(new BasicNameValuePair("processInstanceId", "41415"));
+        parameters.add(new BasicNameValuePair("startDate", "2018-04-22 19:30:08"));
+        parameters.add(new BasicNameValuePair("endDate", "2028-04-22 19:30:08"));
+        parameters.add(new BasicNameValuePair("projectId", "0"));
 
         // define the parameters of the request
-        URI uri = new URIBuilder("http://127.0.0.1:12345/escheduler/projects/%E5%85%A8%E9%83%A8%E6%B5%81%E7%A8%8B%E6%B5%8B%E8%AF%95/instance/view-variables")
+        URI uri = new URIBuilder("http://192.168.220.247:12345/escheduler/projects/analysis/queue-count")
                  .setParameters(parameters)
                 .build();
 
         // create http GET request
         HttpGet httpGet = new HttpGet(uri);
-        httpGet.setHeader("token","123");
+        httpGet.setHeader("token","2aef24c052c212fab9eec78848c2258b");
         //response object
         CloseableHttpResponse response = null;
         try {

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>

escheduler-ui/dist/index.html

@@ -4,4 +4,4 @@
 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.c235295.js"></script><script src="/js/home/index.1b09c2f.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.5ba245f.js"></script><script src="/js/home/index.1b09c2f.js"></script></body></html>

escheduler-ui/dist/view/login/index.html

@@ -1,3 +1,3 @@
 <!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>Login - EasyScheduler</title><link href="/css/common.8ba9af7.css" rel="stylesheet"><link href="/css/login/index.5866c64.css" rel="stylesheet"></head><body><div id="app"></div><div class="login-bg"></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.c235295.js"></script><script src="/js/login/index.97eaebb.js"></script></body></html>
+<![endif]--><script>let NODE_ENV = 'true'</script><title>Login - EasyScheduler</title><link href="/css/common.8ba9af7.css" rel="stylesheet"><link href="/css/login/index.5866c64.css" rel="stylesheet"></head><body><div id="app"></div><div class="login-bg"></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.5ba245f.js"></script><script src="/js/login/index.97eaebb.js"></script></body></html>

escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue

@@ -34,7 +34,7 @@
       </div>
       <div class="content" style="padding-bottom: 10px;" v-if="checkedTimeout">
         <span>
-          <x-input v-model="timeout" style="width: 128px;" maxlength="9">
+          <x-input v-model="timeout" style="width: 160px;" maxlength="9">
             <span slot="append">{{$t('Minute')}}</span>
           </x-input>
         </span>

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

@@ -11,7 +11,7 @@
             <x-radio-group v-model="type" size="small">
               <x-radio :label="'MYSQL'">MYSQL</x-radio>
               <x-radio :label="'POSTGRESQL'">POSTGRESQL</x-radio>
-              <x-radio :label="'HIVE'">HIVE</x-radio>
+              <x-radio :label="'HIVE'">HIVE/IMPALA</x-radio>
               <x-radio :label="'SPARK'">SPARK</x-radio>
               <x-radio :label="'CLICKHOUSE'">CLICKHOUSE</x-radio>
               <x-radio :label="'ORACLE'">ORACLE</x-radio>
@@ -333,7 +333,7 @@
       padding: 0 20px;
     }
     .content-p {
-      min-width: 820px;
+      min-width: 850px;
       min-height: 100px;
       .list-box-f {
         .text {

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

@@ -114,12 +114,13 @@
         })
       },
       _verification () {
-        let isEn = /^\w+$/
+        let isEn = /^[0-9a-zA-Z_.-]{1,}$/
+
         if (!this.tenantCode) {
           this.$message.warning(`${i18n.$t('Please enter the tenant code in English')}`)
           return false
         }
-        if (!isEn.test(this.tenantCode) || this.tenantCode.split('')[0] === '_') {
+        if (!isEn.test(this.tenantCode) || _.startsWith(this.tenantCode, '_', 0) || _.startsWith(this.tenantCode, '.', 0)) {
           this.$message.warning(`${i18n.$t('Please enter tenant code in English')}`)
           return false
         }

escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue

@@ -12,9 +12,6 @@
           <th>
             <span>Token</span>
           </th>
-          <th>
-            <span>{{$t('Start Time')}}</span>
-          </th>
           <th>
             <span>{{$t('Failure time')}}</span>
           </th>
@@ -38,9 +35,6 @@
             </span>
           </td>
           <td><span>{{item.token}}</span></td>
-          <td>
-            <span>{{item.createTime | formatDate}}</span>
-          </td>
           <td>
             <span>{{item.expireTime | formatDate}}</span>
           </td>

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

@@ -448,5 +448,5 @@ export default {
   'Max used connections': 'Max used connections',
   'Threads running connections': 'Threads running connections',
   'Worker group': 'Worker group',
-  'Please enter a positive integer greater than 0': 'Please enter a positive integer greater than 0',
+  'Please enter a positive integer greater than 0': 'Please enter a positive integer greater than 0'
 }

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

@@ -448,5 +448,5 @@ export default {
   'Max used connections': '同时使用连接最大数',
   'Threads running connections': '数据库当前活跃连接数',
   'Worker group': 'Worker分组',
-  'Please enter a positive integer greater than 0': '请输入大于 0 的正整数',
+  'Please enter a positive integer greater than 0': '请输入大于 0 的正整数'
 }

install.sh

@@ -123,9 +123,6 @@ execPath="/tmp/escheduler/exec"
 # SHELL环境变量路径
 shellEnvPath="$installPath/conf/env/.escheduler_env.sh"
 
-# Python换将变量路径
-pythonEnvPath="$installPath/conf/env/escheduler_env.py"
-
 # 资源文件的后缀
 resSuffixs="txt,log,sh,conf,cfg,py,java,sql,hql,xml"
 
@@ -249,7 +246,6 @@ sed -i ${txt} "s#process.exec.basepath.*#process.exec.basepath=${execPath}#g" co
 sed -i ${txt} "s#data.store2hdfs.basepath.*#data.store2hdfs.basepath=${hdfsPath}#g" conf/common/common.properties
 sed -i ${txt} "s#hdfs.startup.state.*#hdfs.startup.state=${hdfsStartupSate}#g" conf/common/common.properties
 sed -i ${txt} "s#escheduler.env.path.*#escheduler.env.path=${shellEnvPath}#g" conf/common/common.properties
-sed -i ${txt} "s#escheduler.env.py.*#escheduler.env.py=${pythonEnvPath}#g" conf/common/common.properties
 sed -i ${txt} "s#resource.view.suffixs.*#resource.view.suffixs=${resSuffixs}#g" conf/common/common.properties
 sed -i ${txt} "s#development.state.*#development.state=${devState}#g" conf/common/common.properties
 

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.1_schema/mysql/escheduler_ddl.sql

@@ -38,4 +38,4 @@ d//
 
 delimiter ;
 CALL ac_escheduler_T_t_escheduler_queue_C_update_time;
-DROP PROCEDURE ac_escheduler_T_t_escheduler_queue_C_update_time;
+DROP PROCEDURE ac_escheduler_T_t_escheduler_queue_C_update_time;