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

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

@@ -528,6 +528,19 @@ sh ./bin/escheduler-daemon.sh stop alert-server
 ### 6，一键部署
 
 - 安装 pip install kazoo
+- 安装目录如下：
+
+```
+    bin
+    conf
+    escheduler-1.0.0-SNAPSHOT.tar.gz
+    install.sh
+    lib
+    monitor_server.py
+    script
+    sql
+    
+```
 
 - 一键部署
 

escheduler-server/src/test/java/cn/escheduler/server/zk/ZKWorkerClientTest.java

@@ -5,6 +5,9 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 
+/**
+ *
+ */
 public class ZKWorkerClientTest {
 
     @Test