Commit 00223927 authored by dailidong's avatar dailidong
Browse files

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

parents 7e35c96d 2c4c4cc0

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

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

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

+16 −4
Original line number Diff line number Diff line
@@ -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)



#### 准备一: 基础软件安装(必装项请自行安装)
@@ -57,7 +57,7 @@ escheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL 
    flush privileges;

    ```



* 创建表和导入基础数据

* 1.0.0和1.0.1版本创建表和导入基础数据

    说明：在escheduler-backend/sql/escheduler.sql和quartz.sql



    ```sql
@@ -66,6 +66,12 @@ escheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL 
    mysql -h {host} -u {user} -p{password} -D {db} < quartz.sql

    ```



* 1.0.2版本创建表和导入基础数据



    ```

    sh ./script/create_escheduler.sh

    ```



#### 准备五: 修改部署目录权限及运行参数



我们先来大体了解下解压后escheduler-backend目录下的文件(夹)的作用
@@ -83,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` 环境变量



- 修改部署参数(根据自己服务器及业务情况):
@@ -130,7 +136,7 @@ install.sh : 一键部署脚本 


### 2.2 编译源码来部署



将源码包release版本1.0.1下载后，解压进入根目录

将源码包release版本1.0.2下载后，解压进入根目录



* 执行编译命令：
@@ -186,3 +192,9 @@ 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-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/controller/ExecutorController.java

+3 −2
Original line number Diff line number Diff line
@@ -149,10 +149,11 @@ public class ExecutorController extends BaseController { 
    @GetMapping(value = "/get-receiver-cc")

    @ResponseStatus(HttpStatus.OK)

    public Result getReceiverCc(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,

                                                        @RequestParam(value = "processDefinitionId") int processDefinitionId){

                                @RequestParam(value = "processDefinitionId",required = false) Integer processDefinitionId,

                                @RequestParam(value = "processInstanceId",required = false) Integer processInstanceId) {

        logger.info("login user {}, get process definition receiver and cc", loginUser.getUserName());

        try {

            Map<String, Object> result = execService.getReceiverCc(processDefinitionId);

            Map<String, Object> result = execService.getReceiverCc(processDefinitionId,processInstanceId);

            return returnDataList(result);

        } catch (Exception e) {

            logger.error(QUERY_RECIPIENTS_AND_COPYERS_BY_PROCESS_DEFINITION_ERROR.getMsg(),e);