@@ -5,5 +5,5 @@ UMP=$(ls $HOME/ext | grep ump-booter-) | |||||
if [ ! -n "UMP" ]; then | if [ ! -n "UMP" ]; then | ||||
echo "Unified Management Platform Is Null !!!" | echo "Unified Management Platform Is Null !!!" | ||||
else | 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 | fi |
@@ -50,6 +50,11 @@ | |||||
<version>${project.version}</version> | <version>${project.version}</version> | ||||
</dependency> | </dependency> | ||||
<dependency> | |||||
<groupId>com.jd.blockchain</groupId> | |||||
<artifactId>ump-explorer</artifactId> | |||||
</dependency> | |||||
<dependency> | <dependency> | ||||
<groupId>org.springframework.boot</groupId> | <groupId>org.springframework.boot</groupId> | ||||
<artifactId>spring-boot-starter-log4j2</artifactId> | <artifactId>spring-boot-starter-log4j2</artifactId> | ||||
@@ -20,6 +20,13 @@ public class UmpKeyController { | |||||
@Autowired | @Autowired | ||||
private UmpStateService umpStateService; | private UmpStateService umpStateService; | ||||
/** | |||||
* 创建用户 | |||||
* | |||||
* @param builder | |||||
* @return | |||||
*/ | |||||
@RequestMapping(method = RequestMethod.POST, path = "create") | @RequestMapping(method = RequestMethod.POST, path = "create") | ||||
public UserKeysVv create(@RequestBody final UserKeyBuilder builder) { | 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)); | 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}") | @RequestMapping(method = RequestMethod.GET, path = "resolve/{user}/{pwd}") | ||||
public UserKeys resolve(@PathVariable(name = "user") int userId, | public UserKeys resolve(@PathVariable(name = "user") int userId, | ||||
@PathVariable(name = "pwd") String pwd) { | @PathVariable(name = "pwd") String pwd) { | ||||
@@ -41,6 +41,14 @@ public class UmpMasterController { | |||||
return umpService.response(sharedConfigs, sharedConfig); | return umpService.response(sharedConfigs, sharedConfig); | ||||
} | } | ||||
/** | |||||
* 接收其他Peer节点发送的安装信息 | |||||
* | |||||
* @param installSchedule | |||||
* 安装信息 | |||||
* | |||||
* @return | |||||
*/ | |||||
@RequestMapping(method = RequestMethod.POST, path = "receive") | @RequestMapping(method = RequestMethod.POST, path = "receive") | ||||
public String receive(@RequestBody final InstallSchedule installSchedule) { | public String receive(@RequestBody final InstallSchedule installSchedule) { | ||||