diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 440ade4ad7..6352e7f0eb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,8 +4,13 @@ EasyScheduler提交代码流程
* 远端仓库中目前有三个分支:
* master 正常交付分支
- * dev 日常开发分支
+ 发布稳定版本以后,将稳定版本分支的代码合并到master上。
+
+ * dev 日常开发分支
+ 日常dev开发分支,新提交的代码都可以pull request到这个分支上。
+
* branch-1.0.0 发布版本分支
+ 发布版本分支,后续会有2.0...等版本分支,版本分支只修改bug,不增加新功能。
* 把自己仓库clone到本地
@@ -38,7 +43,13 @@ git pull upstream dev
```
git checkout origin/dev
git merge --no-ff upstream/dev
+```
+
+如果远端分支有新加的分支`dev-1.0`,需要同步这个分支到本地仓库
+```
+git checkout -b dev-1.0 upstream/dev-1.0
+git push --set-upstream origin dev1.0
```
* 在本地修改代码以后,提交到自己仓库:
@@ -60,11 +71,3 @@ git pull upstream dev
* 接下来由管理员负责将**Merge**完成此次pull request
-
-
-
-
-
-
-
-
diff --git a/README.md b/README.md
index 58c1ecb51b..19c1d2e45b 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,9 @@ Easy Scheduler
- [**使用手册**](https://analysys.github.io/easyscheduler_docs_cn/系统使用手册.html?_blank "系统使用手册")
-- 我要体验 普通用户登录:demo/demo123
+- [**升级文档**](https://analysys.github.io/easyscheduler_docs_cn/升级文档.html?_blank "升级文档")
+
+- 我要体验
更多文档请参考 easyscheduler中文在线文档
diff --git a/docs/zh_CN/README.md b/docs/zh_CN/README.md
index 4beff2b5e4..ff6b0cc04f 100644
--- a/docs/zh_CN/README.md
+++ b/docs/zh_CN/README.md
@@ -41,7 +41,9 @@ Easy Scheduler
- [**使用手册**](https://analysys.github.io/easyscheduler_docs_cn/系统使用手册.html?_blank "系统使用手册")
-- 我要体验 普通用户登录:demo/demo123
+- [**升级文档**](https://analysys.github.io/easyscheduler_docs_cn/升级文档.html?_blank "升级文档")
+
+- 我要体验
更多文档请参考 easyscheduler中文在线文档
diff --git a/docs/zh_CN/SUMMARY.md b/docs/zh_CN/SUMMARY.md
index 581a360602..2092587305 100644
--- a/docs/zh_CN/SUMMARY.md
+++ b/docs/zh_CN/SUMMARY.md
@@ -22,6 +22,8 @@
* [开发环境搭建](后端开发文档.md#项目编译)
* [自定义任务插件文档](任务插件开发.md#任务插件开发)
+* 系统版本升级文档
+ * [版本升级](升级文档.md)
* 历次版本发布内容
* [1.0.2 release](1.0.2-release.md)
* [1.0.1 release](1.0.1-release.md)
diff --git a/docs/zh_CN/前端部署文档.md b/docs/zh_CN/前端部署文档.md
index 9b9bfe5266..96d1d48cf3 100644
--- a/docs/zh_CN/前端部署文档.md
+++ b/docs/zh_CN/前端部署文档.md
@@ -7,8 +7,8 @@
目前最新安装包版本是1.0.2,下载地址: [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files/)
-下载escheduler-ui-1.0.2.tar.gz后,解压后会产生dist目录,进入dist目录
-> cd dist
+下载 escheduler-ui-1.0.2.tar.gz 后,解压`tar -zxvf escheduler-ui-1.0.2.tar.gz ./`后,进入`escheduler-ui`目录
+
@@ -16,7 +16,7 @@
以下两种方式任选其一部署即可,推荐自动化部署
### 2.1 自动化部署
-在`escheduler-ui`目录下编辑安装文件`vi install(线上环境).sh`(执行时,最好修改install(线上环境).sh为install-ui.sh,跟后端部署区分)
+在`escheduler-ui`目录下编辑安装文件`vi install-escheduler-ui.sh`
更改前端访问端口和后端代理接口地址
@@ -28,9 +28,9 @@ esc_proxy="8888"
esc_proxy_port="http://192.168.xx.xx:12345"
```
-前端自动部署基于linux系统`yum`操作,部署之前请先安装更新`yum`
+>前端自动部署基于linux系统`yum`操作,部署之前请先安装更新`yum`
-在`escheduler-ui`目录下执行`./install(线上环境).sh` 或者改名后的 `./install-ui.sh`
+在该目录下执行`./install-escheduler-ui.sh`
### 2.2 手动部署
diff --git a/docs/zh_CN/升级文档.md b/docs/zh_CN/升级文档.md
index 8824377780..f7bafff6c1 100644
--- a/docs/zh_CN/升级文档.md
+++ b/docs/zh_CN/升级文档.md
@@ -1,9 +1,9 @@
# EasyScheduler升级文档
-## 1. 备份上一版本文件和数据库。
+## 1. 备份上一版本文件和数据库
-## 2. 停止escheduler所有服务.
+## 2. 停止escheduler所有服务
`sh ./script/stop_all.sh`
diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/UsersController.java b/escheduler-api/src/main/java/cn/escheduler/api/controller/UsersController.java
index d72e192f51..72f2eb31c2 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/controller/UsersController.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/controller/UsersController.java
@@ -64,7 +64,7 @@ public class UsersController extends BaseController{
@RequestParam(value = "userName") String userName,
@RequestParam(value = "userPassword") String userPassword,
@RequestParam(value = "tenantId") int tenantId,
- @RequestParam(value = "queue") String queue,
+ @RequestParam(value = "queue",required = false,defaultValue = "") String queue,
@RequestParam(value = "email") String email,
@RequestParam(value = "phone", required = false) String phone) {
logger.info("login user {}, create user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, user queue: {}",
@@ -128,7 +128,7 @@ public class UsersController extends BaseController{
@RequestParam(value = "id") int id,
@RequestParam(value = "userName") String userName,
@RequestParam(value = "userPassword") String userPassword,
- @RequestParam(value = "queue") String queue,
+ @RequestParam(value = "queue",required = false,defaultValue = "") String queue,
@RequestParam(value = "email") String email,
@RequestParam(value = "tenantId") int tenantId,
@RequestParam(value = "phone", required = false) String phone) {
diff --git a/escheduler-ui/.env b/escheduler-ui/.env
index 52ce563e9b..5cd5ba736d 100644
--- a/escheduler-ui/.env
+++ b/escheduler-ui/.env
@@ -1,6 +1,6 @@
# 后端接口地址
-API_BASE = http://192.168.220.247:12345
+API_BASE = http://192.168.xx.xx:12345
# 本地开发如需ip访问项目把"#"号去掉
#DEV_HOST = 192.168.xx.xx
diff --git a/escheduler-ui/dist/index.html b/escheduler-ui/dist/index.html
index 41be972e88..c7c5d1da25 100644
--- a/escheduler-ui/dist/index.html
+++ b/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"> Loading ...