diff --git a/source/deployment/deployment-peer/pom.xml b/source/deployment/deployment-peer/pom.xml
index 941178c7..7d94202b 100644
--- a/source/deployment/deployment-peer/pom.xml
+++ b/source/deployment/deployment-peer/pom.xml
@@ -25,11 +25,11 @@
runtime-modular-booter
${project.version}
-
+
com.jd.blockchain
storage-composite
diff --git a/source/deployment/deployment-peer/src/main/resources/assembly.xml b/source/deployment/deployment-peer/src/main/resources/assembly.xml
index 9ad916a2..0fc4ddf5 100644
--- a/source/deployment/deployment-peer/src/main/resources/assembly.xml
+++ b/source/deployment/deployment-peer/src/main/resources/assembly.xml
@@ -56,14 +56,14 @@
-
+
diff --git a/source/deployment/deployment-peer/src/main/resources/scripts/jump-start.sh b/source/deployment/deployment-peer/src/main/resources/scripts/jump-start.sh
index a31a5b28..6c1f44af 100644
--- a/source/deployment/deployment-peer/src/main/resources/scripts/jump-start.sh
+++ b/source/deployment/deployment-peer/src/main/resources/scripts/jump-start.sh
@@ -5,5 +5,5 @@ UMP=$(ls $HOME/ext | grep ump-booter-)
if [ ! -n "UMP" ]; then
echo "Unified Management Platform Is Null !!!"
else
- nohup java -jar -server -Djump.log=$HOME $HOME/ext/$UMP $* >$HOME/bin/jump.out 2>&1 &
+ nohup java -jar -server -Djump.log=$HOME $HOME/ext/$UMP -p 8000 $* >$HOME/bin/jump.out 2>&1 &
fi
\ No newline at end of file
diff --git a/source/manager/pom.xml b/source/manager/pom.xml
index a56f3423..9972ceaf 100644
--- a/source/manager/pom.xml
+++ b/source/manager/pom.xml
@@ -2,12 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
-
+
com.jd.blockchain
jdchain-root
diff --git a/source/manager/ump-booter/pom.xml b/source/manager/ump-booter/pom.xml
index 69ae2ff4..392cb3b9 100644
--- a/source/manager/ump-booter/pom.xml
+++ b/source/manager/ump-booter/pom.xml
@@ -51,6 +51,11 @@
+ com.jd.blockchain
+ ump-explorer
+
+
+
org.springframework.boot
spring-boot-starter-log4j2
diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpKeyController.java b/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpKeyController.java
index 3b274530..a7d2aed3 100644
--- a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpKeyController.java
+++ b/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpKeyController.java
@@ -20,6 +20,13 @@ public class UmpKeyController {
@Autowired
private UmpStateService umpStateService;
+
+ /**
+ * 创建用户
+ *
+ * @param builder
+ * @return
+ */
@RequestMapping(method = RequestMethod.POST, path = "create")
public UserKeysVv create(@RequestBody final UserKeyBuilder builder) {
@@ -54,6 +61,15 @@ public class UmpKeyController {
throw new IllegalStateException(String.format("Can not find UserKeys by %s", pubKey));
}
+ /**
+ * 解析UserKeys
+ *
+ * @param userId
+ * 用户ID
+ * @param pwd
+ * 密码（非编码后密码）
+ * @return
+ */
@RequestMapping(method = RequestMethod.GET, path = "resolve/{user}/{pwd}")
public UserKeys resolve(@PathVariable(name = "user") int userId,
@PathVariable(name = "pwd") String pwd) {
diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpMasterController.java b/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpMasterController.java
index 753ab3c0..7caa0584 100644
--- a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpMasterController.java
+++ b/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpMasterController.java
@@ -41,6 +41,14 @@ public class UmpMasterController {
return umpService.response(sharedConfigs, sharedConfig);
}
+ /**
+ * 接收其他Peer节点发送的安装信息
+ *
+ * @param installSchedule
+ * 安装信息
+ *
+ * @return
+ */
@RequestMapping(method = RequestMethod.POST, path = "receive")
public String receive(@RequestBody final InstallSchedule installSchedule) {
diff --git a/source/test/test-integration/src/test/resources/ledger-binding-mem-0.conf b/source/test/test-integration/src/test/resources/ledger-binding-mem-0.conf
index 1976cb9e..0c79d2ba 100644
--- a/source/test/test-integration/src/test/resources/ledger-binding-mem-0.conf
+++ b/source/test/test-integration/src/test/resources/ledger-binding-mem-0.conf
@@ -3,8 +3,12 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
#第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
+#账本的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=myledger
#账本的当前共识参与方的ID；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=0
+#账本的当前共识参与方的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.name=a.com
#账本的当前共识参与方的私钥文件的保存路径；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.pk-path=
#账本的当前共识参与方的私钥内容（Base58编码）；如果指定了，优先选用此属性，其次是 pk-path 属性；
diff --git a/source/test/test-integration/src/test/resources/ledger-binding-mem-1.conf b/source/test/test-integration/src/test/resources/ledger-binding-mem-1.conf
index de4e8387..8c0b420f 100644
--- a/source/test/test-integration/src/test/resources/ledger-binding-mem-1.conf
+++ b/source/test/test-integration/src/test/resources/ledger-binding-mem-1.conf
@@ -3,8 +3,12 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
#第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
+#账本的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=myledger
#账本的当前共识参与方的ID；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=1
+#账本的当前共识参与方的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.name=b.com
#账本的当前共识参与方的私钥文件的保存路径；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.pk-path=
#账本的当前共识参与方的私钥内容（Base58编码）；如果指定了，优先选用此属性，其次是 pk-path 属性；
diff --git a/source/test/test-integration/src/test/resources/ledger-binding-mem-2.conf b/source/test/test-integration/src/test/resources/ledger-binding-mem-2.conf
index 09d8c70a..8605cdb8 100644
--- a/source/test/test-integration/src/test/resources/ledger-binding-mem-2.conf
+++ b/source/test/test-integration/src/test/resources/ledger-binding-mem-2.conf
@@ -3,8 +3,12 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
#第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
+#账本的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=myledger
#账本的当前共识参与方的ID；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=2
+#账本的当前共识参与方的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.name=c.com
#账本的当前共识参与方的私钥文件的保存路径；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.pk-path=
#账本的当前共识参与方的私钥内容（Base58编码）；如果指定了，优先选用此属性，其次是 pk-path 属性；
diff --git a/source/test/test-integration/src/test/resources/ledger-binding-mem-3.conf b/source/test/test-integration/src/test/resources/ledger-binding-mem-3.conf
index de8e48b3..bfc77145 100644
--- a/source/test/test-integration/src/test/resources/ledger-binding-mem-3.conf
+++ b/source/test/test-integration/src/test/resources/ledger-binding-mem-3.conf
@@ -3,8 +3,12 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
#第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
+#账本的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=myledger
#账本的当前共识参与方的ID；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=3
+#账本的当前共识参与方的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.name=d.com
#账本的当前共识参与方的私钥文件的保存路径；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.pk-path=
#账本的当前共识参与方的私钥内容（Base58编码）；如果指定了，优先选用此属性，其次是 pk-path 属性；
diff --git a/source/test/test-integration/src/test/resources/ledger-binding-redis-0.conf b/source/test/test-integration/src/test/resources/ledger-binding-redis-0.conf
index 81ebfdfa..958d8846 100644
--- a/source/test/test-integration/src/test/resources/ledger-binding-redis-0.conf
+++ b/source/test/test-integration/src/test/resources/ledger-binding-redis-0.conf
@@ -3,8 +3,12 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
#第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
+#账本的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=myledger
#账本的当前共识参与方的ID；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=0
+#账本的当前共识参与方的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.name=a.com
#账本的当前共识参与方的私钥文件的保存路径；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.pk-path=
#账本的当前共识参与方的私钥内容（Base58编码）；如果指定了，优先选用此属性，其次是 pk-path 属性；
diff --git a/source/test/test-integration/src/test/resources/ledger-binding-redis-1.conf b/source/test/test-integration/src/test/resources/ledger-binding-redis-1.conf
index 04a378c9..c311a690 100644
--- a/source/test/test-integration/src/test/resources/ledger-binding-redis-1.conf
+++ b/source/test/test-integration/src/test/resources/ledger-binding-redis-1.conf
@@ -3,8 +3,12 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
#第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
+#账本的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=myledger
#账本的当前共识参与方的ID；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=1
+#账本的当前共识参与方的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.name=b.com
#账本的当前共识参与方的私钥文件的保存路径；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.pk-path=
#账本的当前共识参与方的私钥内容（Base58编码）；如果指定了，优先选用此属性，其次是 pk-path 属性；
diff --git a/source/test/test-integration/src/test/resources/ledger-binding-redis-2.conf b/source/test/test-integration/src/test/resources/ledger-binding-redis-2.conf
index 5054b7bc..d5a8ce58 100644
--- a/source/test/test-integration/src/test/resources/ledger-binding-redis-2.conf
+++ b/source/test/test-integration/src/test/resources/ledger-binding-redis-2.conf
@@ -3,8 +3,12 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
#第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
+#账本的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=myledger
#账本的当前共识参与方的ID；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=2
+#账本的当前共识参与方的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.name=c.com
#账本的当前共识参与方的私钥文件的保存路径；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.pk-path=
#账本的当前共识参与方的私钥内容（Base58编码）；如果指定了，优先选用此属性，其次是 pk-path 属性；
diff --git a/source/test/test-integration/src/test/resources/ledger-binding-redis-3.conf b/source/test/test-integration/src/test/resources/ledger-binding-redis-3.conf
index 7b7bb525..68ef1bd3 100644
--- a/source/test/test-integration/src/test/resources/ledger-binding-redis-3.conf
+++ b/source/test/test-integration/src/test/resources/ledger-binding-redis-3.conf
@@ -3,8 +3,12 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
#第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
+#账本的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=myledger
#账本的当前共识参与方的ID；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=3
+#账本的当前共识参与方的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.name=d.com
#账本的当前共识参与方的私钥文件的保存路径；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.pk-path=
#账本的当前共识参与方的私钥内容（Base58编码）；如果指定了，优先选用此属性，其次是 pk-path 属性；
diff --git a/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-0.conf b/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-0.conf
index a47d1ddd..73ac4731 100644
--- a/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-0.conf
+++ b/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-0.conf
@@ -3,8 +3,12 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
#第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
+#账本的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=myledger
#账本的当前共识参与方的ID；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=0
+#账本的当前共识参与方的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.name=a.com
#账本的当前共识参与方的私钥文件的保存路径；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.pk-path=
#账本的当前共识参与方的私钥内容（Base58编码）；如果指定了，优先选用此属性，其次是 pk-path 属性；
diff --git a/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-1.conf b/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-1.conf
index ccd3679f..9af1f941 100644
--- a/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-1.conf
+++ b/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-1.conf
@@ -3,8 +3,12 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
#第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
+#账本的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=myledger
#账本的当前共识参与方的ID；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=1
+#账本的当前共识参与方的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.name=b.com
#账本的当前共识参与方的私钥文件的保存路径；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.pk-path=
#账本的当前共识参与方的私钥内容（Base58编码）；如果指定了，优先选用此属性，其次是 pk-path 属性；
diff --git a/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-2.conf b/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-2.conf
index 0d440618..087955da 100644
--- a/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-2.conf
+++ b/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-2.conf
@@ -3,8 +3,12 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
#第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
+#账本的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=myledger
#账本的当前共识参与方的ID；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=2
+#账本的当前共识参与方的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.name=c.com
#账本的当前共识参与方的私钥文件的保存路径；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.pk-path=
#账本的当前共识参与方的私钥内容（Base58编码）；如果指定了，优先选用此属性，其次是 pk-path 属性；
diff --git a/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-3.conf b/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-3.conf
index 6fd34834..2e27c865 100644
--- a/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-3.conf
+++ b/source/test/test-integration/src/test/resources/ledger-binding-rocksdb-3.conf
@@ -3,8 +3,12 @@ ledger.bindings=6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ
#第 1 个账本[6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ]的配置；
+#账本的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.name=myledger
#账本的当前共识参与方的ID；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.id=3
+#账本的当前共识参与方的名字；
+binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.name=d.com
#账本的当前共识参与方的私钥文件的保存路径；
binding.6BCg5vgU57ykY6g2CpyUnt5ZMgdxfD1b3qXxQrRyfiXTQ.parti.pk-path=
#账本的当前共识参与方的私钥内容（Base58编码）；如果指定了，优先选用此属性，其次是 pk-path 属性；
diff --git a/source/test/test-integration/src/test/resources/ledger_init_test_web2.init b/source/test/test-integration/src/test/resources/ledger_init_test_web2.init
index 90dbedc1..5be0e69d 100644
--- a/source/test/test-integration/src/test/resources/ledger_init_test_web2.init
+++ b/source/test/test-integration/src/test/resources/ledger_init_test_web2.init
@@ -2,7 +2,7 @@
ledger.seed=932dfe23-fe23232f-283f32fa-dd32aa76-8322ca2f-56236cda-7136b322-cb323ffe
#账本的描述名称；此属性不参与共识，仅仅在当前参与方的本地节点用于描述用途；
-#ledger.name=
+ledger.name==myledger
#声明的账本创建时间；格式为 “yyyy-MM-dd HH:mm:ss.SSSZ”，表示”年-月-日 时:分:秒:毫秒时区“；例如：“2019-08-01 14:26:58.069+0800”，其中，+0800 表示时区是东8区
created-time=2019-08-01 14:26:58.069+0800