Merge branch 'master' into develop

* master:
  upgraded version of bft-smart;
  upgraded version to 1.4.1.RELEASE;
  upgraded dependency of binary proto;
  upgraded the dependency of utils;
  upgraded the depending versions of utils project and binaryproto project;
  upgraded modules to rename the importing packages of utils;
  renamed the importing packages of http service agent framework;
  upgraded submodules to fix compilation error;
  added new module: libs/httpservice;
  renamed the importing packages of http service agent framework;
  upgraded binary-proto module;
  upgraded binary-proto module;
  added new modules;
  renamed the importing packages of binary-proto;
  refactored the structure of projects;
  added new libs;

# Conflicts:
#	core
#	deploy/deploy-gateway/pom.xml
#	deploy/deploy-peer/pom.xml
#	deploy/docker/docker-demo/pom.xml
#	deploy/docker/docker-sdk/pom.xml
#	deploy/docker/pom.xml
#	deploy/pom.xml
#	samples/pom.xml
#	test

.gitmodules

@@ -20,3 +20,12 @@
 	path = libs/kvdb
 	url = git@github.com:blockchain-jd-com/jdchain-kvdb.git 
 
+[submodule "libs/binary-proto"]
+	path = libs/binary-proto
+	url = git@github.com:blockchain-jd-com/binary-proto.git
+[submodule "libs/utils"]
+	path = libs/utils
+	url = git@github.com:blockchain-jd-com/utils.git
+[submodule "libs/httpservice"]
+	path = libs/httpservice
+	url = git@github.com:blockchain-jd-com/httpservice.git

deploy/deploy-gateway/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>deploy-root</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.4.1.RELEASE</version>
 	</parent>
 	<artifactId>deploy-gateway</artifactId>
 

deploy/deploy-peer/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>deploy-root</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.4.1.RELEASE</version>
 	</parent>
 	<artifactId>deploy-peer</artifactId>
 

deploy/docker/docker-demo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>docker</artifactId>
         <groupId>com.jd.blockchain</groupId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.4.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>docker-demo</artifactId>

deploy/docker/docker-sdk/pom.xml

@@ -3,9 +3,9 @@
          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">
     <parent>
-        <artifactId>docker</artifactId>
         <groupId>com.jd.blockchain</groupId>
-        <version>1.5.0-SNAPSHOT</version>
+        <artifactId>docker</artifactId>
+        <version>1.4.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -63,4 +63,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

deploy/docker/docker-sdk/src/main/java/com/jd/blockchain/SDK_Base_Demo.java

@@ -1,15 +1,21 @@
 package com.jd.blockchain;
 
+import static com.jd.blockchain.SDKDemo_Constant.readChainCodes;
+import static com.jd.blockchain.transaction.ContractReturnValue.decode;
+
 import com.jd.blockchain.crypto.HashDigest;
-import com.jd.blockchain.ledger.*;
+import com.jd.blockchain.ledger.BlockchainIdentity;
+import com.jd.blockchain.ledger.BlockchainKeyGenerator;
+import com.jd.blockchain.ledger.BlockchainKeypair;
+import com.jd.blockchain.ledger.PreparedTransaction;
+import com.jd.blockchain.ledger.TransactionResponse;
+import com.jd.blockchain.ledger.TransactionTemplate;
 import com.jd.blockchain.sdk.BlockchainService;
 import com.jd.blockchain.sdk.client.GatewayServiceFactory;
 import com.jd.blockchain.transaction.GenericValueHolder;
-import com.jd.blockchain.utils.Bytes;
 import com.jd.chain.contract.TransferContract;
 
-import static com.jd.blockchain.SDKDemo_Constant.readChainCodes;
-import static com.jd.blockchain.transaction.ContractReturnValue.decode;
+import utils.Bytes;
 
 public abstract class SDK_Base_Demo {
     protected BlockchainKeypair adminKey;

deploy/docker/pom.xml

@@ -3,15 +3,18 @@
          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">
     <parent>
-        <artifactId>deploy-root</artifactId>
         <groupId>com.jd.blockchain</groupId>
-        <version>1.5.0-SNAPSHOT</version>
+        <artifactId>deploy-root</artifactId>
+        <version>1.4.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>docker</artifactId>
-
+	
+	<properties>
+		<framework.version>1.4.1.RELEASE</framework.version>
+	</properties>
 
     <modules>
         <module>docker-sdk</module>

deploy/pom.xml

@@ -9,12 +9,11 @@
 		<relativePath>../project/parent</relativePath>
 	</parent>
 	<artifactId>deploy-root</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+	<version>1.4.1.RELEASE</version>
 	<packaging>pom</packaging>
 
 	<properties>
-		<core.version>1.5.0-SNAPSHOT</core.version>
-                <framework.version>1.4.0.RELEASE</framework.version>
+		<core.version>1.4.1.RELEASE</core.version>
 	</properties>
 
 	<modules>

framework

@@ -1 +1 @@
-Subproject commit 02331175672597cbd627396c74ece32bead3f4ce
+Subproject commit b60d70105418aaa44e03078393657433f354643f

libs/bft-smart

@@ -1 +1 @@
-Subproject commit f817655c4632ca020411a403e4b7555b250c0dfb
+Subproject commit f27aaea6fce85edf73e35d4c25e30f324d4902cf

libs/binary-proto

@@ -0,0 +1 @@
+Subproject commit 19db4580048ef610eeb965187970ad28e63b7223

libs/httpservice

@@ -0,0 +1 @@
+Subproject commit 6af5fca352a2e0fb4def68988162b7a6fbadd81d

libs/kvdb

@@ -1 +1 @@
-Subproject commit 87edd6f608331e74f749256aaef9ce60734caacb
+Subproject commit a2de1ddab83127add5099e42e657589af295e5db

libs/utils

@@ -0,0 +1 @@
+Subproject commit 3886f0683748f18cd1b6b54a5b78fffc3935bdf4

samples/contract-samples/src/main/java/com/jdchain/samples/contract/SampleContractImpl.java

@@ -9,7 +9,8 @@ import com.jd.blockchain.crypto.SignatureFunction;
 import com.jd.blockchain.ledger.BlockchainKeypair;
 import com.jd.blockchain.ledger.Event;
 import com.jd.blockchain.ledger.TypedKVEntry;
-import com.jd.blockchain.utils.Bytes;
+
+import utils.Bytes;
 
 /**
  * 合约样例实现

samples/pom.xml

@@ -4,12 +4,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.jd.blockchain</groupId>
     <artifactId>jdchain-samples</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.4.0.RELEASE</version>
     <packaging>pom</packaging>
 
     <properties>
-        <framework.version>1.4.0.RELEASE</framework.version>
-        <core.version>1.5.0-SNAPSHOT</core.version>
+        <framework.version>1.4.1.RELEASE</framework.version>
     </properties>
 
     <modules>

samples/sdk-samples/pom.xml

@@ -58,11 +58,6 @@
             <artifactId>peer</artifactId>
             <version>${core.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.jd.blockchain</groupId>
-            <artifactId>utils-common</artifactId>
-            <version>${framework.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.jd.blockchain</groupId>
             <artifactId>gateway</artifactId>

samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java

@@ -19,13 +19,15 @@ import com.jd.blockchain.tools.initializer.DBConnectionConfig;
 import com.jd.blockchain.tools.initializer.LedgerBindingConfig;
 import com.jd.blockchain.tools.initializer.PresetAnswerPrompter;
 import com.jd.blockchain.tools.initializer.Prompter;
-import com.jd.blockchain.utils.concurrent.ThreadInvoker;
-import com.jd.blockchain.utils.io.FileUtils;
-import com.jd.blockchain.utils.net.NetworkAddress;
 import com.jdchain.samples.sdk.testnet.GatewayRunner;
 import com.jdchain.samples.sdk.testnet.NodeWebContext;
 import com.jdchain.samples.sdk.testnet.PartNode;
 import com.jdchain.samples.sdk.testnet.PeerServer;
+
+import utils.concurrent.ThreadInvoker;
+import utils.io.FileUtils;
+import utils.net.NetworkAddress;
+
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.junit.Assert;

samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/testnet/GatewayRunner.java

@@ -2,10 +2,13 @@ package com.jdchain.samples.sdk.testnet;
 
 import com.jd.blockchain.gateway.GatewayConfigProperties;
 import com.jd.blockchain.gateway.GatewayConfigProperties.KeyPairConfig;
+
+import utils.concurrent.ThreadInvoker;
+import utils.concurrent.ThreadInvoker.AsyncCallback;
+import utils.net.NetworkAddress;
+
 import com.jd.blockchain.gateway.GatewayServerBooter;
-import com.jd.blockchain.utils.concurrent.ThreadInvoker;
-import com.jd.blockchain.utils.concurrent.ThreadInvoker.AsyncCallback;
-import com.jd.blockchain.utils.net.NetworkAddress;
+
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.CollectionUtils;
 

samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/testnet/NodeWebContext.java

@@ -14,8 +14,10 @@ import com.jd.blockchain.tools.initializer.DBConnectionConfig;
 import com.jd.blockchain.tools.initializer.LedgerInitProcess;
 import com.jd.blockchain.tools.initializer.Prompter;
 import com.jd.blockchain.tools.initializer.web.LedgerInitializeWebController;
-import com.jd.blockchain.utils.concurrent.ThreadInvoker;
-import com.jd.blockchain.utils.net.NetworkAddress;
+
+import utils.concurrent.ThreadInvoker;
+import utils.net.NetworkAddress;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 

samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/testnet/PartNode.java

@@ -4,7 +4,8 @@ import com.jd.blockchain.crypto.AddressEncoding;
 import com.jd.blockchain.crypto.PubKey;
 import com.jd.blockchain.ledger.ParticipantNode;
 import com.jd.blockchain.ledger.ParticipantNodeState;
-import com.jd.blockchain.utils.Bytes;
+
+import utils.Bytes;
 
 public class PartNode implements ParticipantNode {
 

samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/testnet/PeerServer.java

@@ -4,8 +4,9 @@ import com.jd.blockchain.ledger.core.LedgerManager;
 import com.jd.blockchain.peer.PeerServerBooter;
 import com.jd.blockchain.storage.service.DbConnectionFactory;
 import com.jd.blockchain.tools.initializer.LedgerBindingConfig;
-import com.jd.blockchain.utils.concurrent.ThreadInvoker;
-import com.jd.blockchain.utils.net.NetworkAddress;
+
+import utils.concurrent.ThreadInvoker;
+import utils.net.NetworkAddress;
 
 public class PeerServer {
     private NetworkAddress serviceAddress;

samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/ContractSample.java

@@ -11,9 +11,11 @@ import com.jd.blockchain.ledger.TypedValue;
 import com.jd.blockchain.transaction.ContractEventSendOperationBuilder;
 import com.jd.blockchain.transaction.ContractReturnValue;
 import com.jd.blockchain.transaction.GenericValueHolder;
-import com.jd.blockchain.utils.io.BytesUtils;
-import com.jd.blockchain.utils.io.FileUtils;
 import com.jdchain.samples.contract.SampleContract;
+
+import utils.io.BytesUtils;
+import utils.io.FileUtils;
+
 import org.junit.Assert;
 import org.junit.Test;
 

samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/DataAccountSample.java

@@ -5,7 +5,9 @@ import com.jd.blockchain.ledger.BlockchainKeypair;
 import com.jd.blockchain.ledger.PreparedTransaction;
 import com.jd.blockchain.ledger.TransactionResponse;
 import com.jd.blockchain.ledger.TransactionTemplate;
-import com.jd.blockchain.utils.Bytes;
+
+import utils.Bytes;
+
 import org.junit.Assert;
 import org.junit.Test;
 

samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/EventSample.java

@@ -8,8 +8,10 @@ import com.jd.blockchain.ledger.PreparedTransaction;
 import com.jd.blockchain.ledger.SystemEvent;
 import com.jd.blockchain.ledger.TransactionResponse;
 import com.jd.blockchain.ledger.TransactionTemplate;
-import com.jd.blockchain.utils.Bytes;
-import com.jd.blockchain.utils.io.BytesUtils;
+
+import utils.Bytes;
+import utils.io.BytesUtils;
+
 import org.junit.Assert;
 import org.junit.Test;
 

samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/ParticipantSample.java

@@ -1,15 +1,8 @@
 package com.jdchain.samples.sdk;
 
-import com.jd.blockchain.crypto.KeyGenUtils;
-import com.jd.blockchain.ledger.BlockchainKeyGenerator;
-import com.jd.blockchain.ledger.BlockchainKeypair;
-import com.jd.blockchain.ledger.PreparedTransaction;
-import com.jd.blockchain.ledger.TransactionResponse;
-import com.jd.blockchain.ledger.TransactionTemplate;
-import com.jd.blockchain.utils.codec.Base58Utils;
-import com.jd.blockchain.utils.http.converters.JsonResponseConverter;
-import com.jd.blockchain.utils.security.ShaUtils;
-import com.jd.blockchain.utils.web.model.WebResponse;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -19,8 +12,17 @@ import org.apache.http.message.BasicNameValuePair;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.jd.blockchain.crypto.KeyGenUtils;
+import com.jd.blockchain.ledger.BlockchainKeyGenerator;
+import com.jd.blockchain.ledger.BlockchainKeypair;
+import com.jd.blockchain.ledger.PreparedTransaction;
+import com.jd.blockchain.ledger.TransactionResponse;
+import com.jd.blockchain.ledger.TransactionTemplate;
+import com.jd.httpservice.converters.JsonResponseConverter;
+import com.jd.httpservice.utils.web.WebResponse;
+
+import utils.codec.Base58Utils;
+import utils.security.ShaUtils;
 
 /**
  * 参与方节点相关操作示例：

samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/QuerySample.java

@@ -22,8 +22,10 @@ import com.jd.blockchain.ledger.TransactionState;
 import com.jd.blockchain.ledger.TypedKVEntry;
 import com.jd.blockchain.ledger.UserInfo;
 import com.jd.blockchain.ledger.UserPrivilegeSet;
-import com.jd.blockchain.utils.codec.Base58Utils;
-import com.jd.blockchain.utils.io.BytesUtils;
+
+import utils.codec.Base58Utils;
+import utils.io.BytesUtils;
+
 import org.junit.Assert;
 import org.junit.Test;
 

samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/SampleBase.java

@@ -8,7 +8,8 @@ import com.jd.blockchain.crypto.PubKey;
 import com.jd.blockchain.ledger.BlockchainKeypair;
 import com.jd.blockchain.sdk.BlockchainService;
 import com.jd.blockchain.sdk.client.GatewayServiceFactory;
-import com.jd.blockchain.utils.codec.Base58Utils;
+
+import utils.codec.Base58Utils;
 
 import java.util.Properties;
 

samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/UserSample.java

@@ -7,7 +7,9 @@ import com.jd.blockchain.ledger.PreparedTransaction;
 import com.jd.blockchain.ledger.TransactionPermission;
 import com.jd.blockchain.ledger.TransactionResponse;
 import com.jd.blockchain.ledger.TransactionTemplate;
-import com.jd.blockchain.utils.Bytes;
+
+import utils.Bytes;
+
 import org.junit.Assert;
 import org.junit.Test;