From 10240e29b17f81d2d6d840724f6f1931795b6c0b Mon Sep 17 00:00:00 2001
From: agapple <jianghang115@gmail.com>
Date: Mon, 2 Sep 2019 15:23:28 +0800
Subject: [PATCH] Updated AdminGuide (markdown)

---
 AdminGuide.md | 56 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/AdminGuide.md b/AdminGuide.md
index 482a972..999de7d 100644
--- a/AdminGuide.md
+++ b/AdminGuide.md
@@ -188,6 +188,11 @@ drwxr-xr-x 2 jianghang jianghang   48 2013-03-19 15:03 logs</pre>
 <td>无</td>
 </tr>
 <tr>
+<td>canal.register.ip</td>
+<td>canal server注册到外部zookeeper、admin的ip信息 (针对docker的外部可见ip)</td>
+<td>无</td>
+</tr>
+<tr>
 <td>canal.port</td>
 <td>canal server提供socket服务的端口</td>
 <td>11111</td>
@@ -380,15 +385,60 @@ drwxr-xr-x 2 jianghang jianghang   48 2013-03-19 15:03 logs</pre>
 <tr>
 <td>canal.instance.rds.accesskey</td>
 <td>
-<p><span style="color: #262626; font-family: 'Chinese Quote', -apple-system, system-ui, 'Segoe UI', Roboto, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; letter-spacing: 0.7px; white-space: pre-wrap;">aliyun账号的ak信息 (如果不需要在本地binlog超过18小时被清理后自动下载oss上的binlog，可以忽略该值)</span></p>
+<p>aliyun账号的ak信息</p>
+<p>(如果不需要在本地binlog超过18小时被清理后自动下载oss上的binlog，可以忽略该值</p>
 </td>
 <td>无</td>
 </tr>
 <tr>
 <td>canal.instance.rds.secretkey</td>
 <td>
-<div style="box-sizing: border-box; min-height: 24px; line-height: 24px; margin-top: 0px; margin-bottom: 0px; white-space: pre-wrap; color: #262626; font-family: 'Chinese Quote', -apple-system, system-ui, 'Segoe UI', Roboto, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; letter-spacing: 0.7px; background-color: #fafafa;" data-type="p">aliyun账号的sk信息</div>
-<div style="box-sizing: border-box; min-height: 24px; line-height: 24px; margin-top: 0px; margin-bottom: 0px; white-space: pre-wrap; color: #262626; font-family: 'Chinese Quote', -apple-system, system-ui, 'Segoe UI', Roboto, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; letter-spacing: 0.7px; background-color: #fafafa;" data-type="p">(如果不需要在本地binlog超过18小时被清理后自动下载oss上的binlog，可以忽略该值)</div>
+<p>aliyun账号的sk信息</p>
+<p>(如果不需要在本地binlog超过18小时被清理后自动下载oss上的binlog，可以忽略该值)</p>
+</td>
+<td>无</td>
+</tr>
+<tr>
+<td>canal.admin.manager</td>
+<td>
+canal链接canal-admin的地址 (v1.1.4新增)
+</td>
+<td>无</td>
+</tr>
+<tr>
+<td>canal.admin.port</td>
+<td>
+<p>admin管理指令链接端口 (v1.1.4新增)</p>
+</td>
+<td>11110</td>
+</tr>
+<tr>
+<td>canal.admin.user</td>
+<td>
+<p>admin管理指令链接的ACL配置 (v1.1.4新增)</p>
+</td>
+<td>admin</td>
+</tr>
+<tr>
+<td>canal.admin.passwd</td>
+<td>
+<p>admin管理指令链接的ACL配置 (v1.1.4新增)</p>
+</td>
+<td>密码默认值为admin的密文</td>
+</tr>
+<tr>
+<td>canal.user</td>
+<td>
+<p>canal数据端口订阅的ACL配置 (v1.1.4新增)</p>
+<p>如果为空，代表不开启</p>
+</td>
+<td>无</td>
+</tr>
+<tr>
+<td>canal.passwd</td>
+<td>
+<p>canal数据端口订阅的ACL配置 (v1.1.4新增)</p>
+<p>如果为空，代表不开启</p>
 </td>
 <td>无</td>
 </tr>