Commit 40e6a3b8 authored by baoliang's avatar baoliang
Browse files

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

parents 58cf1dc4 a5ba3ecc

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

+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+5 −3
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }