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/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 @@ -50,6 +50,11 @@ ${project.version} + + 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) {