文档优化第四次

docs/deploy/deploy_index_cn.md

@@ -1,4 +1,4 @@
-# Loopring部署文档
+# Loopring Relay Aws部署文档
 
 本文档是所有组件部署说明的索引，并按照组件的依赖顺序依次进行了详细的介绍，使用者也应该按照此顺序去阅读和部署。
 

docs/deploy/deploy_kafka_cn.md

@@ -49,7 +49,7 @@ log.flush.scheduler.interval.ms=300
 log.flush.start.offset.checkpoint.interval.ms=2000
 log.retention.hours=168
 #修改为3台zookeeper节点的内网ip，多个节点间使用逗号分隔
-zookeeper.connect=xx.xx.xx.xx:2181,xx.xx.xx.xx:2181,xx.xx.xx.xx:2181
+zookeeper.connect=x.x.x.x:2181,x.x.x.x:2181,x.x.x.x:2181
 default.replication.factor=3
 ```
 #### 启停
@@ -159,7 +159,7 @@ zookeeper.connect=x.x.x.x:2181
 default.replication.factor=3
 ```
 
-若采用免费aws实例，由于内存不足，启动后会立即exit，并在日志报错“Cannot allocate memory”，进行如下修改即可
+若采用免费aws实例做测试，由于内存不足，启动后会立即exit，并在日志报错“Cannot allocate memory”，进行如下修改即可
 
 `sudo vim /opt/loopring/kafka_2.12-0.11.0.2/bin/kafka-server-start.sh`
 
@@ -174,7 +174,7 @@ nohup /opt/loopring/kafka_2.12-0.11.0.2/bin/kafka-server-start.sh /opt/loopring/
 nohup /opt/loopring/kafka_2.12-0.11.0.2/bin/kafka-server-start.sh /opt/loopring/kafka_2.12-0.11.0.2/config/server.properties3 &
 ```
 
-###### 确认服务正常启动
+* ###### 确认服务正常启动
 ```
 tail -f /opt/loopring/kafka_2.12-0.11.0.2/nohup.out
 telnet 本实列内网ip 9092
@@ -186,5 +186,5 @@ telnet 本实列内网ip 9092
 /opt/loopring/kafka_2.12-0.11.0.2/bin/kafka-server-stop.sh /opt/loopring/kafka_2.12-0.11.0.2/config/server.properties2
 /opt/loopring/kafka_2.12-0.11.0.2/bin/kafka-server-stop.sh /opt/loopring/kafka_2.12-0.11.0.2/config/server.properties3
 ```
-##### 日志
+#### 日志
 `/opt/loopring/kafka_2.12-0.11.0.2/logs`

docs/deploy/deploy_miner_cn.md

@@ -30,7 +30,7 @@ error_output_paths = ["/var/log/miner/err.log"]
     port = "6379"
 #ethnode实例内网ip，多个实例之间用逗号进行分割
 [accessor]
-    raw_urls = ["http://xx.xx.xx.xx:8545", "http://xx.xx.xx.xx:8545"]
+    raw_urls = ["http://x.x.x.x:8545", "http://x.x.x.x:8545"]
 #eth主网合约配置，如果非主网，要联系开源人员获取最新的测试配置
 [loopring_accessor.address]
     "v1.5" = "0x8d8812b72d1e4ffCeC158D25f56748b7d67c1e78"
@@ -60,12 +60,12 @@ error_output_paths = ["/var/log/miner/err.log"]
 
 #zookeeper内网ip
 [zk_lock]
-    zk_servers = "xx.xx.xx.xx:2181,xx.xx.xx.xx:2181,xx.xx.xx.xx:2181"
+    zk_servers = "x.x.x.x:2181,x.x.x.x:2181,x.x.x.x:2181"
     #测试场景下修改为：zk_servers = "x.x.x.x:2181"
 ...
 #kafka内网ip
 [kafka]
-    brokers = ["xx.xx.xx.xx:9092","xx.xx.xx.xx:9092","xx.xx.xx.xx:9092"]
+    brokers = ["x.x.x.x:9092","x.x.x.x:9092","x.x.x.x:9092"]
     #测试场景下修改为：brokers = ["x.x.x.x:9092"]
 [cloud_watch]
     enabled = false
@@ -109,7 +109,7 @@ scp -i xx.pem tokens.json ubuntu@x.x.x.x:/opt/loopring/miner/config
 ```
 * 部署keystore
 
-通过私钥生成keystore并自动导入到miner中，其中--private-key填私钥，--passphrase填keystore的密码
+通过私钥生成keystore文件并自动导入到miner中，其中--private-key填私钥，--passphrase填该keystore的密码
 ```
 cd /opt/loopring/miner
 bin/miner account import --datadir config/keystore --private-key xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx --passphrase xxxxxx

docs/deploy/deploy_zookeeper_cn.md

@@ -42,12 +42,12 @@ cp zoo_sample.cfg zoo.cfg
 
 ```
 dataDir=/opt/loopring/data/zookeeper
-server.1=xx.xx.xx.xx:2888:3888
-server.2=xx.xx.xx.xx:2888:3888
-server.3=xx.xx.xx.xx:2888:3888
+server.1=x.x.x.x:2888:3888
+server.2=x.x.x.x:2888:3888
+server.3=x.x.x.x:2888:3888
 ```
 
-初始化myid，这里"n"在3台服务器的取值依次为1，2，3，和上面zoo.conf一致，每台服务器仅执行一次自身对应取值的命令
+初始化myid，这里"n"在三台服务器的取值依次为1，2，3与上面zoo.cfg对应，每台服务器仅执行一次自身对应取值的命令
 
 `echo "n" > /opt/loopring/data/zookeeper/myid`
 
@@ -147,7 +147,7 @@ echo "3" > /opt/loopring/data/zookeeper3/myid
 /opt/loopring/zookeeper-3.4.10/bin/zkServer.sh start /opt/loopring/zookeeper-3.4.10/conf/zoo2.cfg
 /opt/loopring/zookeeper-3.4.10/bin/zkServer.sh start /opt/loopring/zookeeper-3.4.10/conf/zoo3.cfg
 ```
-###### 确认服务正常启动
+* ###### 确认服务正常启动
 ```
 tail -f /opt/loopring/zookeeper-3.4.10/zookeeper.out
 telnet localhost 2181
@@ -159,6 +159,6 @@ telnet localhost 2181
 /opt/loopring/zookeeper-3.4.10/bin/zkServer.sh stop /opt/loopring/zookeeper-3.4.10/conf/zoo2.cfg
 /opt/loopring/zookeeper-3.4.10/bin/zkServer.sh stop /opt/loopring/zookeeper-3.4.10/conf/zoo3.cfg
 ```
-##### 日志
+#### 日志
 
 `/opt/loopring/zookeeper-3.4.10/zookeeper.out`

docs/relay_docker_cn.md

@@ -1,8 +1,18 @@
-# Loopring relay-cluster Docker 中文文档
+# Loopring Relay Docker部署文档
 
-loopring开发团队提供loopring/relay-cluster,最新版本是v1.5.0。<br>
+为方便合作伙伴部署分布式中继，我们将提供以下几个镜像(除relay-cluster外，其余镜像正在制作中)：
 
-## 部署
+* relay-cluster镜像
+* miner镜像
+* extractor镜像
+* zookeeper&kafka
+* mysql & redis 请自行下载官方镜像
+
+各个微服务和中间件的配置文件，都需要独立于镜像配置，官方会及时更新配置文件说明，增加自解释，这部分工作会和docker化一起完成，然后提供给合作伙伴使用，尽请期待！
+
+目前官方提供relay-cluster镜像，最新版本：v1.5.0
+
+## 部署relay-cluster
 * 获取docker镜像
 ```bash
 docker pull loopring/relay-cluster