diff --git a/core b/core
index e41358d4..c7160adc 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit e41358d48ff9143fcedb2ba498c62ffa8d92769b
+Subproject commit c7160adc704c53766427ecdf70f130e43f6cac43
diff --git a/deploy/deploy-peer/pom.xml b/deploy/deploy-peer/pom.xml
index 0def828c..42cbdf9f 100644
--- a/deploy/deploy-peer/pom.xml
+++ b/deploy/deploy-peer/pom.xml
@@ -76,6 +76,12 @@
${core.version}
+
+ com.jd.blockchain
+ jdchain-cli
+ ${core.version}
+
+
diff --git a/deploy/deploy-peer/src/main/resources/scripts/jdchain-cli.sh b/deploy/deploy-peer/src/main/resources/scripts/jdchain-cli.sh
new file mode 100644
index 00000000..437d482a
--- /dev/null
+++ b/deploy/deploy-peer/src/main/resources/scripts/jdchain-cli.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+HOME=$(cd `dirname $0`;cd ../; pwd)
+boot_file=$(ls $HOME/libs | grep jdchain-cli-)
+if [ ! -n "$boot_file" ]; then
+ echo "can not find jdchain-cli in libs"
+else
+ java -jar $HOME/libs/$boot_file $*
+fi
diff --git a/docs/cli/keys.md b/docs/cli/keys.md
index a3410b54..29ca2b49 100644
--- a/docs/cli/keys.md
+++ b/docs/cli/keys.md
@@ -1,6 +1,6 @@
### 密钥管理
-`jdchain-cli`提供基于本地目录的密钥管理:[密钥对列表](#密钥对列表),[添加密钥对](#添加密钥对),[更新私钥密码](#更新私钥密码),[删除密钥对](#删除密钥对)
+`jdchain-cli`提供基于本地目录的密钥管理:[密钥对列表](#密钥对列表),[显示密钥对](#显示密钥对),[添加密钥对](#添加密钥对),[更新私钥密码](#更新私钥密码),[删除密钥对](#删除密钥对)
```bash
:bin$ ./jdchain-cli.sh keys -h
@@ -13,6 +13,7 @@ List, create, update or delete keypairs.
-V, --version Print version information and exit.
Commands:
list List all the keypairs.
+ show Show keypair.
add Create a new keypair.
update Update privkey password.
delete Delete keypair.
@@ -41,6 +42,29 @@ NAME ALGORITHM ADDRESS PUBKEY
- `ADDRESS`,地址
- `PUBKEY`,公钥
+#### 显示密钥对
+```bash
+:bin$ ./jdchain-cli.sh keys show -h
+Show the keypair.
+Usage: jdchain-cli keys show [-hV] [--pretty] [--home=] -n=
+ -h, --help Show this help message and exit.
+ --home= Set the home directory.
+ -n, --name= Name of the key
+ --pretty Pretty json print
+ -V, --version Print version information and exit.
+```
+- `name`,密钥对名称
+
+如:
+```bash
+:bin$ ./jdchain-cli.sh keys show -n k1
+input the password:
+> 1
+NAME ALGORITHM ADDRESS PUBKEY PRIVKEY PASSWORD
+k1 ED25519 LdeNwzRRuF33BNkyzbMuzKV3zFNGMrYBsRXvm 7VeRPc4QsYJX7qpzHBBJTzwvvmXXFVvP1MwmdU7WCBv9Uvc5 177gk2XHAsWRMXyHLLcJsig2jvXWpgo4ZVg2HYgGaiXauAZqPcnsETNeLUeRShw2BKgHVbN 8EjkXVSTxMFjCvNNsTo8RBMDEVQmk7gYkW4SCDuvdsBG
+```
+会显示`k1`所有信息
+
#### 添加密钥对
```bash
:bin$ ./jdchain-cli.sh keys add -h
@@ -86,12 +110,12 @@ Usage: jdchain-cli keys update [-hV] [--pretty] [--home=] -n=
如:
```bash
:bin$ ./jdchain-cli.sh keys update -n k1
-input the current password: >
+input the current password:
// 输入当前密码
-1
-input new password: >
+> 1
+input new password:
// 输入新密码
-2
+> 2
NAME ALGORITHM ADDRESS PUBKEY
k1 ED25519 LdeP1iczD3zpmcayKAxTfSywict9y2r6Jpq6n 7VeRBamwPeMb7jzTNg3Ap2DscBiy3QE3PK5NqBvv9tUjQVk4
```
diff --git a/docs/cli/participant.md b/docs/cli/participant.md
index 0d23df02..ad4a0986 100644
--- a/docs/cli/participant.md
+++ b/docs/cli/participant.md
@@ -143,7 +143,7 @@ Usage: jdchain-cli participant active [-hV] [--pretty] [--shutdown]
在账本`j5sB3sVTFgTqTYzo7KtQjBLSy8YQGPpJpvQZaW9Eqk46dg`中激活`node4`(以步骤2中启动的服务地址和端口为`127.0.0.1`和`7084`例),共识端口设置为`10088`,同步节点地址和端口为`127.0.0.1`和`7080`为例:
```bash
-./jdchain-cli.sh participant active --ledger j5sB3sVTFgTqTYzo7KtQjBLSy8YQGPpJpvQZaW9Eqk46dg --host 127.0.0.1 --port 7084 --consensus-port 10088 --syn-host 127.0.0.1 --syn-port 7080
+:bin$./jdchain-cli.sh participant active --ledger j5sB3sVTFgTqTYzo7KtQjBLSy8YQGPpJpvQZaW9Eqk46dg --host 127.0.0.1 --port 7084 --consensus-port 10088 --syn-host 127.0.0.1 --syn-port 7080
participant activated
```
@@ -162,7 +162,7 @@ participant activated
如将`node4`共识端口由`10088`修改为`10188`,操作指令如下:
```bash
-./jdchain-cli.sh participant update --ledger j5sB3sVTFgTqTYzo7KtQjBLSy8YQGPpJpvQZaW9Eqk46dg --host 127.0.0.1 --port 7084 --consensus-port 10188 --syn-host 127.0.0.1 --syn-port 7080
+:bin$./jdchain-cli.sh participant update --ledger j5sB3sVTFgTqTYzo7KtQjBLSy8YQGPpJpvQZaW9Eqk46dg --host 127.0.0.1 --port 7084 --consensus-port 10188 --syn-host 127.0.0.1 --syn-port 7080
participant updated
```
指令成功执行后,`peer1`的共识端口将自动变更为`10188`
@@ -176,7 +176,7 @@ participant updated
如将`node4`共识`IP`由`127.0.0.1`修改为`192.168.1.100`(另一台机器),操作指令如下:
```bash
-./jdchain-cli.sh participant update --ledger j5sB3sVTFgTqTYzo7KtQjBLSy8YQGPpJpvQZaW9Eqk46dg --host 192.168.1.100 --port 7084 --consensus-port 10188 --syn-host 127.0.0.1 --syn-port 7080 -shutdown
+:bin$./jdchain-cli.sh participant update --ledger j5sB3sVTFgTqTYzo7KtQjBLSy8YQGPpJpvQZaW9Eqk46dg --host 192.168.1.100 --port 7084 --consensus-port 10188 --syn-host 127.0.0.1 --syn-port 7080 -shutdown
participant updated
```
diff --git a/docs/cli/query.md b/docs/cli/query.md
index 87e36020..b1110dae 100644
--- a/docs/cli/query.md
+++ b/docs/cli/query.md
@@ -60,6 +60,7 @@ j5sB3sVTFgTqTYzo7KtQjBLSy8YQGPpJpvQZaW9Eqk46dg
选择账本,打印当前账本详细信息:
```bash
+:bin$ ./jdchain-cli.sh query ledger
select ledger, input the index:
INDEX LEDGER
0 j5sB3sVTFgTqTYzo7KtQjBLSy8YQGPpJpvQZaW9Eqk46dg