From 5e7546e1034ae288ae3b9b59ef2e281294acbf7b Mon Sep 17 00:00:00 2001
From: shaozhuguang <shaozhuguang@jd.com>
Date: Wed, 11 Sep 2019 16:49:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jd/blockchain/gateway/GatewayServerBooter.java   | 1 -
 source/manager/pom.xml                                        | 4 ++--
 .../com/jd/blockchain/ump/service/UtilServiceHandler.java     | 4 ++--
 source/tools/pom.xml                                          | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/source/gateway/src/main/java/com/jd/blockchain/gateway/GatewayServerBooter.java b/source/gateway/src/main/java/com/jd/blockchain/gateway/GatewayServerBooter.java
index b022f925..76c39b61 100644
--- a/source/gateway/src/main/java/com/jd/blockchain/gateway/GatewayServerBooter.java
+++ b/source/gateway/src/main/java/com/jd/blockchain/gateway/GatewayServerBooter.java
@@ -115,7 +115,6 @@ public class GatewayServerBooter {
 		ConsoleUtils.info("\r\n\r\nStart connecting to peer ....");
 		BlockBrowserController blockBrowserController = appCtx.getBean(BlockBrowserController.class);
 		blockBrowserController.setDataRetrievalUrl(config.dataRetrievalUrl());
-		blockBrowserController.setSchemaRetrievalUrl(config.getSchemaRetrievalUrl());
 		PeerConnector peerConnector = appCtx.getBean(PeerConnector.class);
 		peerConnector.connect(config.masterPeerAddress(), defaultKeyPair, config.providerConfig().getProviders());
 		ConsoleUtils.info("Peer[%s] is connected success!", config.masterPeerAddress().toString());
diff --git a/source/manager/pom.xml b/source/manager/pom.xml
index 9972ceaf..a56f3423 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">
 	<modelVersion>4.0.0</modelVersion>
-	<!--<modules>
+	<modules>
 		<module>ump-booter</module>
 		<module>ump-web</module>
 		<module>ump-service</module>
 		<module>ump-model</module>
-	</modules>-->
+	</modules>
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>jdchain-root</artifactId>
diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UtilServiceHandler.java b/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UtilServiceHandler.java
index 3abf5bb4..3a2b3eee 100644
--- a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UtilServiceHandler.java
+++ b/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UtilServiceHandler.java
@@ -17,8 +17,8 @@ import org.springframework.stereotype.Service;
 
 import java.nio.charset.Charset;
 
-import static com.jd.blockchain.tools.keygen.KeyGenCommand.encodePrivKey;
-import static com.jd.blockchain.tools.keygen.KeyGenCommand.encodePubKey;
+import static com.jd.blockchain.crypto.KeyGenUtils.encodePrivKey;
+import static com.jd.blockchain.crypto.KeyGenUtils.encodePubKey;
 
 @Service
 public class UtilServiceHandler implements UtilService {
diff --git a/source/tools/pom.xml b/source/tools/pom.xml
index ce56cf0f..6218df3f 100644
--- a/source/tools/pom.xml
+++ b/source/tools/pom.xml
@@ -15,7 +15,7 @@
 		<module>tools-initializer</module>
 		<module>tools-initializer-booter</module>
 		<!--<module>tools-capability</module>-->
-        <!-- <module>tools-mocker</module> -->
+        <module>tools-mocker</module>
         <!-- <module>tools-package</module> -->
     </modules>
 </project>
\ No newline at end of file