Commit 8a2d46e6 authored by baoliang's avatar baoliang
Browse files

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

parents 150b3f37 92e26b40

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

+11 −2
Original line number Diff line number Diff line
@@ -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目录下的文件(夹)的作用
@@ -188,5 +194,7 @@ sh ./bin/escheduler-daemon.sh stop alert-server 
```



## 3、数据库升级

数据库升级是在1.0.2版本增加的功能,执行以下命令即可自动升级数据库。

数据库升级是在1.0.2版本增加的功能,执行以下命令即可自动升级数据库

```

sh ./script/upgrade_escheduler.sh

```
 
 No newline at end of file

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

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ public class EschedulerManager { 
                version = "1.0.0";

            }else{

                logger.error("Unable to determine current software version, so cannot upgrade");

                throw new RuntimeException("Unable to determine current software version, so cannot upgrade");

            }

            // The target version of the upgrade

            String schemaVersion = "";

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

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ public class UpgradeEscheduler { 
	private static final Logger logger = LoggerFactory.getLogger(UpgradeEscheduler.class);



	public static void main(String[] args) {

		Thread.currentThread().setName("manager-UpgradeEscheduler");

		

		EschedulerManager eschedulerManager = new EschedulerManager();

		try {

			eschedulerManager.upgradeEscheduler();